fix(commons): use bot data for announce (#4210)

Fixes #4209

src/bot/commons.ts

@@ -70,7 +70,7 @@ export async function parserReply(response: string | Promise<string>, opts: { se
  */
 export const announceTypes = ['bets', 'duel', 'heist', 'timers', 'songs', 'scrim', 'raffles', 'polls', 'general'] as const;
 export async function announce(messageToAnnounce: string, type: typeof announceTypes[number]) {
-  messageToAnnounce = await new Message(messageToAnnounce).parse({}) as string;
+  messageToAnnounce = await new Message(messageToAnnounce).parse({ sender: getBotSender() }) as string;
   sendMessage(messageToAnnounce, {
     username: oauth.botUsername,
     displayName: oauth.botUsername,

src/bot/systems/timers.ts

@@ -37,7 +37,6 @@ class Timers extends System {
 
     this.addMenu({ category: 'manage', name: 'timers', id: 'manage/timers/list', this: this });
     if (isMainThread) {
-
       this.init();
     }
   }

test/tests/timers/bug#4209_custom_command_filter_is_not_triggered.js

@@ -0,0 +1,64 @@
+/* global describe it beforeEach */
+
+
+const assert = require('assert');
+require('../../general.js');
+
+const db = require('../../general.js').db;
+const message = require('../../general.js').message;
+
+const timers = (require('../../../dest/systems/timers')).default;
+const customcommands = (require('../../../dest/systems/customcommands')).default;
+const api = (require('../../../dest/api')).default;
+
+const { getRepository } = require('typeorm');
+const { Timer, TimerResponse } = require('../../../dest/database/entity/timer');
+
+const { linesParsed } = require('../../../dest/helpers/parser');
+
+// users
+const owner = { username: 'soge__' };
+
+describe('Timers - https://github.com/sogehige/sogeBot/issues/4209 - custom command filter is not properly triggered', () => {
+  before(async () => {
+    await db.cleanup();
+    await message.prepare();
+  });
+  after(async () => {
+    api.isStreamOnline = false;
+  });
+
+  it('Create timer', async () => {
+    await getRepository(Timer).save({
+      name: 'test',
+      triggerEveryMessage: 0,
+      triggerEverySecond: 0,
+      isEnabled: true,
+      triggeredAtTimestamp: Date.now(),
+      triggeredAtMessage: linesParsed,
+    });
+  });
+
+  it('Add custom command !telemetry', async () => {
+    const r = await customcommands.add({ sender: owner, parameters: '-c !telemetry -r Lorem Ipsum Dolor Sit Amet' });
+    assert.strictEqual(r[0].response, '$sender, command !telemetry was added');
+  });
+
+  it('Add (!telemetry) response to timer', async () => {
+    const r = await timers.add({ sender: owner, parameters: '-name test -response "(!telemetry)"' });
+
+    const item = await getRepository(TimerResponse).findOne({ response: '(!telemetry)' });
+    assert(typeof item !== 'undefined');
+
+    assert.strictEqual(r[0].response, `$sender, response (id: ${item.id}) for timer (name: test) was added - '(!telemetry)'`);
+  });
+
+  it('Set manually stream to be online and manually trigger timers check', () => {
+    api.isStreamOnline = true;
+    timers.check();
+  });
+
+  it('We should have correct response in chat in a while', async () => {
+    await message.isSentRaw('Lorem Ipsum Dolor Sit Amet', 'bot', 5000);
+  });
+});