diff --git a/src/commands/crew.js b/src/commands/crew.js index 18b0eb9..52a3703 100644 --- a/src/commands/crew.js +++ b/src/commands/crew.js @@ -62,7 +62,7 @@ async function handleAdminCommand(ctx, action, successMessage, errorMessage) { reply_to_message_id: ctx.message.message_id }); } catch (error) { - ctx.reply(errorMessage.replace('{error}', error.message), { + ctx.reply(errorMessage.replace(/{error}/g, error.message), { parse_mode: 'Markdown', reply_to_message_id: ctx.message.message_id }); @@ -91,12 +91,12 @@ module.exports = (bot) => { handleAdminCommand(ctx, async () => { try { const commitHash = await getGitCommitHash(); - await ctx.reply(Strings.gitCurrentCommit.replace('{commitHash}', commitHash), { + await ctx.reply(Strings.gitCurrentCommit.replace(/{commitHash}/g, commitHash), { parse_mode: 'Markdown', reply_to_message_id: ctx.message.message_id }); } catch (error) { - ctx.reply(Strings.gitErrRetrievingCommit.replace('{error}', error), { + ctx.reply(Strings.gitErrRetrievingCommit.replace(/{error}/g, error), { parse_mode: 'Markdown', reply_to_message_id: ctx.message.message_id }); @@ -109,12 +109,12 @@ module.exports = (bot) => { handleAdminCommand(ctx, async () => { try { const result = await updateBot(); - await ctx.reply(Strings.botUpdated.replace('{result}', result), { + await ctx.reply(Strings.botUpdated.replace(/{result}/g, result), { parse_mode: 'Markdown', reply_to_message_id: ctx.message.message_id }); } catch (error) { - ctx.reply(Strings.errorUpdatingBot.replace('{error}', error), { + ctx.reply(Strings.errorUpdatingBot.replace(/{error}/g, error), { parse_mode: 'Markdown', reply_to_message_id: ctx.message.message_id }); @@ -127,7 +127,7 @@ module.exports = (bot) => { const botName = ctx.message.text.split(' ').slice(1).join(' '); handleAdminCommand(ctx, async () => { await ctx.telegram.setMyName(botName); - }, Strings.botNameChanged.replace('{botName}', botName), Strings.botNameErr.replace('{error}', error)); + }, Strings.botNameChanged.replace(/{botName}/g, botName), Strings.botNameErr.replace(/{error}/g, error)); }); bot.command('setbotdesc', spamwatchMiddleware, async (ctx) => { @@ -135,7 +135,7 @@ module.exports = (bot) => { const botDesc = ctx.message.text.split(' ').slice(1).join(' '); handleAdminCommand(ctx, async () => { await ctx.telegram.setMyDescription(botDesc); - }, Strings.botDescChanged.replace('{botDesc}', botDesc), Strings.botDescErr.replace('{error}', error)); + }, Strings.botDescChanged.replace(/{botDesc}/g, botDesc), Strings.botDescErr.replace(/{error}/g, error)); }); bot.command('botkickme', spamwatchMiddleware, async (ctx) => { @@ -159,7 +159,7 @@ module.exports = (bot) => { caption: botFile }); } catch (error) { - ctx.reply(Strings.unexpectedErr.replace('{error}', error.message), { + ctx.reply(Strings.unexpectedErr.replace(/{error}/g, error.message), { parse_mode: 'Markdown', reply_to_message_id: ctx.message.message_id }); diff --git a/src/commands/help.js b/src/commands/help.js index 58dfa86..ab9e601 100644 --- a/src/commands/help.js +++ b/src/commands/help.js @@ -6,8 +6,8 @@ async function sendHelpMessage(ctx, isEditing) { const Strings = getStrings(ctx.from.language_code); const botInfo = await ctx.telegram.getMe(); const helpText = Strings.botHelp - .replace('{botName}', botInfo.first_name) - .replace("{sourceLink}", process.env.botSource); + .replace(/{botName}/g, botInfo.first_name) + .replace(/{sourceLink}/g, process.env.botSource); const options = { parse_mode: 'Markdown', disable_web_page_preview: true, @@ -35,7 +35,7 @@ module.exports = (bot) => { bot.command("about", spamwatchMiddleware, async (ctx) => { const Strings = getStrings(ctx.from.language_code); - const aboutMsg = Strings.botAbout.replace("{sourceLink}", `${process.env.botSource}`); + const aboutMsg = Strings.botAbout.replace(/{sourceLink}/g, `${process.env.botSource}`); ctx.reply(aboutMsg, { parse_mode: 'Markdown', diff --git a/src/commands/main.js b/src/commands/main.js index c111603..6333296 100644 --- a/src/commands/main.js +++ b/src/commands/main.js @@ -6,7 +6,7 @@ module.exports = (bot) => { bot.start(spamwatchMiddleware, async (ctx) => { const Strings = getStrings(ctx.from.language_code); const botInfo = await ctx.telegram.getMe(); - const startMsg = Strings.botWelcome.replace('{botName}', botInfo.first_name); + const startMsg = Strings.botWelcome.replace(/{botName}/g, botInfo.first_name); ctx.reply(startMsg, { parse_mode: 'Markdown',