fix: misc fixes

Author: lyricalsoul

assets/locales/en/commands.json

@@ -116,7 +116,7 @@
     "notPlaying": "🤨 You need to be listening to a track to interact with it."
   },
   "assembledLyrics": [
-    "🎶 **{{artist}} - {{track}}**\n",
+    "🎶 **{{artist}} - {{track}}**",
     "{{lyrics}}"
   ],
   "lyrics": {
@@ -127,7 +127,7 @@
     "crown_one": "👑 {{position}}. **{{artistName}}** - *{{playCount}} scrobbles* ({{count}} roubo)",
     "crown_other": "👑 {{position}}. **{{artistName}}** - *{{playCount}} scrobbles* ({{count}} roubos)",
     "list": [
-      "**{{displayName}}**'s crowns on **{{groupName}}**\n",
+      "**{{displayName}}**'s crowns on **{{groupName}}**",
       "{{- crownsText}}"
     ],
     "noCrowns": "You don't have any crowns in this group yet!"
@@ -171,7 +171,7 @@
   },
   "eval": [
     "**Code**: <pre><code class=\"language-javascript\">{{code}}</code></pre>",
-    "**Output**: <pre><code class=\"language-javascript\">{{output}}</code></pre>\n",
+    "**Output**: <pre><code class=\"language-javascript\">{{output}}</code></pre>",
     "⏱️ **Time taken**: {{time}}ms"
   ]
 }

src/commandEngine/commands/targeted+registered/mealbum.ts

@@ -5,7 +5,7 @@ export default async (ctx: Context) => {
   const data = await getNowPlaying(ctx, 'album', false, true)
 
   ctx.reply(`commands:mealbum`, {
-    user: ctx.targetedUser?.name,
+    user: ctx.registeredUser?.name,
     artist: data.artist,
     album: data.album,
     playCount: data.playCount,

src/commandEngine/commands/targeted+registered/meartist.ts

@@ -5,7 +5,7 @@ export default async (ctx: Context) => {
   const data = await getNowPlaying(ctx, 'artist', false, true)
 
   ctx.reply(`commands:meartist`, {
-    user: ctx.targetedUser?.name,
+    user: ctx.registeredUser?.name,
     artist: data.artist,
     playCount: data.playCount,
     tags: ctx.registeredUserData.sendTags ? `\n*${data.tags.map(a => `#${a}`).join(' ')}*` : '',

src/commandEngine/commands/targeted+registered/metrack.ts

@@ -5,7 +5,7 @@ export default async (ctx: Context) => {
   const data = await getNowPlaying(ctx, 'track', false, true)
 
   ctx.reply(`commands:youtrack`, {
-    user: ctx.targetedUser?.name,
+    user: ctx.registeredUser?.name,
     track: data.name,
     artist: data.artist,
     album: data.album,

src/multiplatformEngine/common/context.ts

@@ -24,6 +24,7 @@ interface ReplyOptions {
   alertText?: string
   warning?: boolean
   sendImageAsPhoto?: boolean
+  replyingToOriginal?: boolean
 }
 
 export class MinimalContext {
@@ -105,7 +106,7 @@ export class MinimalContext {
   }
 
   reply (translationKey: string, data: Record<string, any> = {}, options: ReplyOptions = {}) {
-    this.replyWith = options.noTranslation ? translationKey : this.t(translationKey, data)
+    this.replyWith = options.noTranslation ? translationKey : this.t(translationKey, data).trim()
 
     // detect markdown
     let hasMarkdown = (this.replyWith as string).includes('*') || (this.replyWith as string).includes('`') || (this.replyWith as string).includes('[')

src/multiplatformEngine/common/message.ts

@@ -8,6 +8,7 @@ export interface Message extends Base {
   isAnonymous: boolean
   replyingTo?: Message
   replyingToUser?: User
+  mustReply?: boolean
 }
 
 export const buildFromTelegramMessage = (message: Record<string, any>): Message => {
@@ -17,8 +18,9 @@ export const buildFromTelegramMessage = (message: Record<string, any>): Message
     sentAt: message.date,
     isAnonymous: !!message.sender_chat,
     platform: 'telegram',
-    replyingTo: message.reply_to_message ? buildFromTelegramMessage(message.reply_to_message) : undefined,
-    replyingToUser: message.reply_to_message ? buildFromTelegramUser(message.reply_to_message.from) : undefined
+    replyingTo: message.reply_to_message && message.reply_to_message.from.id !== 777000 ? buildFromTelegramMessage(message.reply_to_message) : undefined,
+    replyingToUser: message.reply_to_message && message.reply_to_message.from.id !== 777000 ? buildFromTelegramUser(message.reply_to_message.from) : undefined,
+    mustReply: message.reply_to_message?.from?.id === 777000
   }
 }
 

src/multiplatformEngine/index.ts

@@ -27,7 +27,7 @@ class PlatformManager {
   }
 }
 
-export const loadedPlatforms = await loadPlatforms()
+export const loadedPlatforms: Platform[] = await loadPlatforms()
 export let platformManager: PlatformManager | undefined
 
 export const start = () => {

src/multiplatformEngine/platforms/telegram.ts

@@ -116,7 +116,9 @@ export default class Telegram extends Platform {
 
   deliverMessage (ctx: Context) {
     const id = ctx.channel?.id || ctx.author.id
-    const replyTo = ctx.message.replyingTo ? ctx.message.id : undefined
+    const basedReply = (ctx.replyOptions?.replyingToOriginal || ctx.message.mustReply) ? ctx.message.id : undefined
+    const replyTo = ctx.message.replyingTo ? ctx.message.id : basedReply
+
     if (ctx.replyOptions?.sendImageAsPhoto) {
       return this.sendPhoto(id, { url: ctx.replyOptions!.imageURL!, caption: ctx.replyWith!.toString() }, {
         replyTo,

src/multiplatformEngine/utilities/telegram.ts

@@ -1,7 +1,16 @@
 import { commandRunner } from '../../commandEngine/index.js'
 import { Context } from '../common/context.js'
 
+const trashBotEasterEgg = async (data: Record<string, any>) => {
+  const ctx = Context.fromTelegramMessage(data, [], commandRunner)
+  ctx.reply('🤮 yeah that bot is trash', {}, { noTranslation: true, replyingToOriginal: true })
+  return ctx
+}
+
 export const handleTelegramMessage = async (botUser: string, data: Record<string, any>): Promise<Context | undefined> => {
+  if (data.text.toLowerCase().includes('lastfmplusbot')) return trashBotEasterEgg(data)
+  // if the text is "st" or "now", use Math.random() and if its smaller than 15%, run the easter egg
+  if (['st', 'now'].includes(data.text.toLowerCase()) && Math.random() < 0.1) return trashBotEasterEgg(data)
   if (!data.text.startsWith('/')) return
   const [name, ...args] = data.text.replace('/', '').replace(`@${botUser}`, '').split(' ')
   if (!commandRunner.hasCommand(name)) return