diff --git a/src/commands/info.js b/src/commands/info.js index f0c6354..a35ad40 100644 --- a/src/commands/info.js +++ b/src/commands/info.js @@ -12,7 +12,7 @@ async function getUserInfo(ctx) { userInfo = Strings.userInfo .replace('{userName}', `${ctx.from.first_name} ${lastName}` || Strings.varStrings.varUnknown) .replace('{userId}', ctx.from.id || Strings.varStrings.varUnknown) - .replace('{userHandle}', ctx.from.username ? `@${ctx.from.username}` : Strings.varStrings.varStrings.varNone) + .replace('{userHandle}', ctx.from.username ? `@${ctx.from.username}` : Strings.varStrings.varNone) .replace('{userPremium}', ctx.from.is_premium ? Strings.varStrings.varYes : Strings.varStrings.varNo) .replace('{userLang}', ctx.from.language_code || Strings.varStrings.varUnknown); @@ -25,7 +25,7 @@ async function getChatInfo(ctx) { chatInfo = Strings.chatInfo .replace('{chatId}', ctx.chat.id || Strings.varStrings.varUnknown) .replace('{chatName}', ctx.chat.title || Strings.varStrings.varUnknown) - .replace('{chatHandle}', ctx.chat.username ? `@${ctx.chat.username}` : Strings.varStrings.varStrings.varNone) + .replace('{chatHandle}', ctx.chat.username ? `@${ctx.chat.username}` : Strings.varStrings.varNone) .replace('{chatMembersCount}', await ctx.getChatMembersCount(ctx.chat.id || Strings.varStrings.varUnknown)) .replace('{chatType}', ctx.chat.type || Strings.varStrings.varUnknown) .replace('{isForum}', ctx.chat.is_forum ? Strings.varStrings.varYes : Strings.varStrings.varNo); diff --git a/src/commands/ponyapi.js b/src/commands/ponyapi.js index bf01f21..87e650c 100644 --- a/src/commands/ponyapi.js +++ b/src/commands/ponyapi.js @@ -52,12 +52,12 @@ module.exports = (bot) => { charactersArray.push({ id: character.id, name: character.name, - alias: aliases.length > 0 ? aliases.join(', ') : 'None', + alias: aliases.length > 0 ? aliases.join(', ') : Strings.varStrings.varNone, url: character.url, sex: character.sex, - residence: character.residence ? character.residence.replace(/\n/g, ' / ') : 'None', - occupation: character.occupation ? character.occupation.replace(/\n/g, ' / ') : 'None', - kind: character.kind ? character.kind.join(', ') : 'None', + residence: character.residence ? character.residence.replace(/\n/g, ' / ') : Strings.varStrings.varNone, + occupation: character.occupation ? character.occupation.replace(/\n/g, ' / ') : Strings.varStrings.varNone, + kind: character.kind ? character.kind.join(', ') : Strings.varStrings.varNone, image: character.image }); }); @@ -124,9 +124,9 @@ module.exports = (bot) => { episode: episode.episode, overall: episode.overall, airdate: episode.airdate, - storyby: episode.storyby ? episode.storyby.replace(/\n/g, ' / ') : 'None', - writtenby: episode.writtenby ? episode.writtenby.replace(/\n/g, ' / ') : 'None', - storyboard: episode.storyboard ? episode.storyboard.replace(/\n/g, ' / ') : 'None', + storyby: episode.storyby ? episode.storyby.replace(/\n/g, ' / ') : Strings.varStrings.varNone, + writtenby: episode.writtenby ? episode.writtenby.replace(/\n/g, ' / ') : Strings.varStrings.varNone, + storyboard: episode.storyboard ? episode.storyboard.replace(/\n/g, ' / ') : Strings.varStrings.varNone, }); }); }; @@ -198,10 +198,10 @@ module.exports = (bot) => { series: comic.series, image: comic.image, url: comic.url, - writer: comic.writer ? comic.writer.replace(/\n/g, ' / ') : 'None', - artist: comic.artist ? comic.artist.replace(/\n/g, ' / ') : 'None', - colorist: comic.colorist ? comic.colorist.replace(/\n/g, ' / ') : 'None', - letterer: letterers.length > 0 ? letterers.join(', ') : 'None', + writer: comic.writer ? comic.writer.replace(/\n/g, ' / ') : Strings.varStrings.varNone, + artist: comic.artist ? comic.artist.replace(/\n/g, ' / ') : Strings.varStrings.varNone, + colorist: comic.colorist ? comic.colorist.replace(/\n/g, ' / ') : Strings.varStrings.varNone, + letterer: letterers.length > 0 ? letterers.join(', ') : Strings.varStrings.varNone, editor: comic.editor }); });