serverless-ircd 0.5.0 → 0.6.0

package/packages/irc-core/tests/commands/account-notify.test.ts

@@ -0,0 +1,171 @@
+import { describe, expect, it } from 'vitest';
+import { emitAccountNotify } from '../../src/commands/account-notify';
+import { Effect } from '../../src/effects';
+import type { Effect as EffectType, RawLine } from '../../src/effects';
+import { type ConnectionState, createConnection } from '../../src/state/connection';
+
+const L = (text: string): RawLine => ({ text });
+
+function makeConn(id = 'c1', nick = 'alice'): ConnectionState {
+  const s = createConnection({ id, connectedSince: 0 });
+  s.nick = nick;
+  s.user = 'alice';
+  s.host = 'example.com';
+  s.realname = 'Alice';
+  s.registration = 'registered';
+  return s;
+}
+
+describe('emitAccountNotify — login', () => {
+  it('emits a cap-split Broadcast per joined channel with the account name', () => {
+    const conn = makeConn();
+    conn.joinedChannels.add('#foo');
+    conn.joinedChannels.add('#bar');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    expect(effects).toEqual<EffectType[]>([
+      Effect.broadcast('#foo', [], 'c1', 'account-notify', [
+        L(':alice!alice@example.com ACCOUNT alice'),
+      ]),
+      Effect.broadcast('#bar', [], 'c1', 'account-notify', [
+        L(':alice!alice@example.com ACCOUNT alice'),
+      ]),
+    ]);
+  });
+
+  it('excludes the sender (except) so non-echo peers do not see their own ACCOUNT', () => {
+    const conn = makeConn();
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    const bcast = effects[0];
+    if (bcast?.tag === 'Broadcast') {
+      expect(bcast.except).toBe('c1');
+    }
+  });
+
+  it('uses empty legacy lines so non-cap peers receive nothing', () => {
+    const conn = makeConn();
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    const bcast = effects[0];
+    if (bcast?.tag === 'Broadcast') {
+      expect(bcast.lines).toEqual([]);
+      expect(bcast.cap).toBe('account-notify');
+    }
+  });
+});
+
+describe('emitAccountNotify — logout', () => {
+  it('emits ACCOUNT * for a logout', () => {
+    const conn = makeConn();
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: undefined });
+
+    expect(effects).toEqual<EffectType[]>([
+      Effect.broadcast('#foo', [], 'c1', 'account-notify', [
+        L(':alice!alice@example.com ACCOUNT *'),
+      ]),
+    ]);
+  });
+});
+
+describe('emitAccountNotify — gating', () => {
+  it('emits nothing before registration completes', () => {
+    const conn = makeConn();
+    conn.registration = 'pre-registration';
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    expect(effects).toEqual([]);
+  });
+
+  it('emits nothing during registration', () => {
+    const conn = makeConn();
+    conn.registration = 'registering';
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    expect(effects).toEqual([]);
+  });
+
+  it('emits nothing when the connection has no joined channels', () => {
+    const conn = makeConn();
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    expect(effects).toEqual([]);
+  });
+
+  it('falls back to ? for the source when nick/user/host are absent', () => {
+    const conn = createConnection({ id: 'c1', connectedSince: 0 });
+    conn.registration = 'registered';
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    const bcast = effects[0];
+    if (bcast?.tag === 'Broadcast') {
+      expect(bcast.capLines?.[0]?.text).toBe(':? ACCOUNT alice');
+    }
+  });
+});
+
+describe('emitAccountNotify — echo-message', () => {
+  it('echoes ACCOUNT back to a sender with echo-message negotiated', () => {
+    const conn = makeConn();
+    conn.caps.add('echo-message');
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    // First: the broadcast (sender excluded). Then the echo Send to sender.
+    expect(effects).toEqual<EffectType[]>([
+      Effect.broadcast('#foo', [], 'c1', 'account-notify', [
+        L(':alice!alice@example.com ACCOUNT alice'),
+      ]),
+      Effect.send('c1', [L(':alice!alice@example.com ACCOUNT alice')]),
+    ]);
+  });
+
+  it('does not echo when the sender lacks echo-message', () => {
+    const conn = makeConn();
+    conn.joinedChannels.add('#foo');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    expect(effects).toHaveLength(1);
+    expect(effects[0]?.tag).toBe('Broadcast');
+  });
+
+  it('does not echo when the sender has echo-message but no joined channels', () => {
+    const conn = makeConn();
+    conn.caps.add('echo-message');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    expect(effects).toEqual([]);
+  });
+
+  it('echoes a single ACCOUNT even across multiple shared channels', () => {
+    const conn = makeConn();
+    conn.caps.add('echo-message');
+    conn.joinedChannels.add('#foo');
+    conn.joinedChannels.add('#bar');
+
+    const effects = emitAccountNotify({ conn, account: 'alice' });
+
+    // Two broadcasts (one per channel) + exactly one echo Send.
+    const broadcasts = effects.filter((e) => e.tag === 'Broadcast');
+    const sends = effects.filter((e) => e.tag === 'Send');
+    expect(broadcasts).toHaveLength(2);
+    expect(sends).toHaveLength(1);
+  });
+});

package/packages/irc-core/tests/commands/away.test.ts

@@ -2,7 +2,13 @@ import { describe, expect, it } from 'vitest';
 import { awayReducer } from '../../src/commands/away';
 import { Effect } from '../../src/effects';
 import type { Effect as EffectType, RawLine } from '../../src/effects';
-import { EmptyMotdProvider, FakeClock, SequentialIdFactory } from '../../src/ports';
+import {
+  type AwayStore,
+  EmptyMotdProvider,
+  FakeClock,
+  InMemoryAwayStore,
+  SequentialIdFactory,
+} from '../../src/ports';
 import { type ConnectionState, createConnection } from '../../src/state/connection';
 import { type Ctx, type ServerConfig, buildCtx } from '../../src/types';
 
@@ -18,13 +24,14 @@ const serverConfig: ServerConfig = {
   quitMessage: 'Client Quit',
 };
 
-function makeCtx(conn: ConnectionState, clock = new FakeClock(1_000)): Ctx {
+function makeCtx(conn: ConnectionState, clock = new FakeClock(1_000), away?: AwayStore): Ctx {
   return buildCtx({
     serverConfig,
     clock,
     ids: new SequentialIdFactory(),
     motd: EmptyMotdProvider,
     connection: conn,
+    ...(away !== undefined ? { away } : {}),
   });
 }
 
@@ -231,3 +238,79 @@ describe('awayReducer — defensive', () => {
     expect(broadcast?.lines[0]?.text).toBe(':? AWAY :gone');
   });
 });
+
+// ============================================================================
+// awayReducer — draft/pre-away persistence
+// ============================================================================
+
+describe('awayReducer — draft/pre-away persistence', () => {
+  it('persists the reason to the AwayStore keyed by account when setting away', () => {
+    const store = new InMemoryAwayStore();
+    const conn = makeConn();
+    conn.account = 'alice';
+    const ctx = makeCtx(conn, new FakeClock(1_000), store);
+
+    awayReducer(conn, { command: 'AWAY', params: ['brb'], tags: {} }, ctx);
+
+    expect(store.get('alice')).toBe('brb');
+  });
+
+  it('overwrites the persisted reason when the away reason changes', () => {
+    const store = new InMemoryAwayStore();
+    const conn = makeConn();
+    conn.account = 'alice';
+    const ctx = makeCtx(conn, new FakeClock(1_000), store);
+
+    awayReducer(conn, { command: 'AWAY', params: ['brb'], tags: {} }, ctx);
+    awayReducer(conn, { command: 'AWAY', params: ['lunch'], tags: {} }, ctx);
+
+    expect(store.get('alice')).toBe('lunch');
+  });
+
+  it('clears the persisted reason when AWAY is unset (no param)', () => {
+    const store = new InMemoryAwayStore();
+    store.set('alice', 'brb');
+    const conn = makeConn();
+    conn.account = 'alice';
+    conn.away = 'brb';
+    const ctx = makeCtx(conn, new FakeClock(1_000), store);
+
+    awayReducer(conn, { command: 'AWAY', params: [], tags: {} }, ctx);
+
+    expect(store.get('alice')).toBeUndefined();
+  });
+
+  it('clears the persisted reason when AWAY is unset (empty param)', () => {
+    const store = new InMemoryAwayStore();
+    store.set('alice', 'brb');
+    const conn = makeConn();
+    conn.account = 'alice';
+    conn.away = 'brb';
+    const ctx = makeCtx(conn, new FakeClock(1_000), store);
+
+    awayReducer(conn, { command: 'AWAY', params: [''], tags: {} }, ctx);
+
+    expect(store.get('alice')).toBeUndefined();
+  });
+
+  it('does not persist when no AwayStore is bound (in-memory only)', () => {
+    const conn = makeConn();
+    conn.account = 'alice';
+    const ctx = makeCtx(conn); // no store
+
+    awayReducer(conn, { command: 'AWAY', params: ['brb'], tags: {} }, ctx);
+
+    // In-memory reason still set so the session's own view is consistent.
+    expect(conn.away).toBe('brb');
+  });
+
+  it('does not persist when the connection is unidentified (no account)', () => {
+    const store = new InMemoryAwayStore();
+    const conn = makeConn(); // no account
+    const ctx = makeCtx(conn, new FakeClock(1_000), store);
+
+    awayReducer(conn, { command: 'AWAY', params: ['brb'], tags: {} }, ctx);
+
+    expect(store.get('alice')).toBeUndefined();
+  });
+});

package/packages/irc-core/tests/commands/cap.test.ts

@@ -142,6 +142,32 @@ describe('capReducer — LS', () => {
     }
   });
 
+  it('advertises draft/multiline=4096 with the default byte budget', () => {
+    const state = makeState();
+    const ctx = makeCtx(state);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('draft/multiline=4096');
+    }
+  });
+
+  it('advertises the configured multiline byte budget when overridden', () => {
+    const state = makeState();
+    const cfg: ServerConfig = { ...serverConfig, multilineMaxBytes: 8192 };
+    const ctx = makeCtx(state, cfg);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('draft/multiline=8192');
+      expect(body).not.toContain('draft/multiline=4096');
+    }
+  });
+
   it('marks the connection as in CAP negotiation so the welcome is deferred', () => {
     const state = makeState();
     const ctx = makeCtx(state);
@@ -529,3 +555,142 @@ describe('capReducer — unknown subcommands', () => {
     ]);
   });
 });
+
+// ============================================================================
+// capReducer — IRCv3 `sts` (Strict Transport Security) advertisement
+// ============================================================================
+
+describe('capReducer — STS advertisement', () => {
+  it('omits the sts cap when no STS policy is configured', () => {
+    const state = makeState();
+    const ctx = makeCtx(state);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).not.toContain('sts=');
+      expect(body).not.toContain(' sts ');
+    }
+  });
+
+  it('advertises sts=duration=…,port=… on a plaintext connection', () => {
+    const state = makeState();
+    state.secure = false;
+    const cfg: ServerConfig = {
+      ...serverConfig,
+      sts: { duration: 600, port: 6697 },
+    };
+    const ctx = makeCtx(state, cfg);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('sts=duration=600,port=6697');
+    }
+  });
+
+  it('reads duration and port from ServerConfig (not literals)', () => {
+    const state = makeState();
+    state.secure = false;
+    const cfg: ServerConfig = {
+      ...serverConfig,
+      sts: { duration: 12345, port: 7000 },
+    };
+    const ctx = makeCtx(state, cfg);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('sts=duration=12345,port=7000');
+      expect(body).not.toContain('sts=duration=600');
+      expect(body).not.toContain('port=6697');
+    }
+  });
+
+  it('appends preload when configured on a plaintext connection', () => {
+    const state = makeState();
+    state.secure = false;
+    const cfg: ServerConfig = {
+      ...serverConfig,
+      sts: { duration: 600, port: 6697, preload: true },
+    };
+    const ctx = makeCtx(state, cfg);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('sts=duration=600,port=6697,preload');
+    }
+  });
+
+  it('advertises only duration on a TLS connection (wss / irc+tls)', () => {
+    const state = makeState();
+    state.secure = true;
+    const cfg: ServerConfig = {
+      ...serverConfig,
+      sts: { duration: 600, port: 6697 },
+    };
+    const ctx = makeCtx(state, cfg);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('sts=duration=600');
+      expect(body).not.toContain('port=');
+      expect(body).not.toContain('preload');
+    }
+  });
+
+  it('omits preload on a TLS connection even when configured', () => {
+    const state = makeState();
+    state.secure = true;
+    const cfg: ServerConfig = {
+      ...serverConfig,
+      sts: { duration: 600, port: 6697, preload: true },
+    };
+    const ctx = makeCtx(state, cfg);
+    const out = capReducer(state, { command: 'CAP', params: ['LS'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('sts=duration=600');
+      expect(body).not.toContain('preload');
+    }
+  });
+
+  it('ACKs CAP REQ sts when configured', () => {
+    const state = readyState();
+    const cfg: ServerConfig = {
+      ...serverConfig,
+      sts: { duration: 600, port: 6697 },
+    };
+    const ctx = makeCtx(state, cfg);
+    const out = capReducer(state, { command: 'CAP', params: ['REQ', 'sts'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('ACK :sts');
+    }
+    expect(out.state.caps.has('sts')).toBe(true);
+  });
+
+  it('NAKs CAP REQ sts when no STS policy is configured', () => {
+    const state = readyState();
+    const ctx = makeCtx(state);
+    const out = capReducer(state, { command: 'CAP', params: ['REQ', 'sts'], tags: {} }, ctx);
+    const send = out.effects[0];
+    expect(send).toBeDefined();
+    if (send?.tag === 'Send') {
+      const body = send.lines[0]?.text ?? '';
+      expect(body).toContain('NAK :sts');
+    }
+    expect(out.state.caps.has('sts')).toBe(false);
+  });
+});

package/packages/irc-core/tests/commands/chathistory.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { chathistoryReducer } from '../../src/commands/chathistory';
+import { chathistoryReducer, formatReplayLine } from '../../src/commands/chathistory';
 import { Effect } from '../../src/effects';
 import type { Effect as EffectType, RawLine } from '../../src/effects';
 import {
@@ -396,6 +396,113 @@ describe('chathistoryReducer — BEFORE / AFTER / AROUND / BETWEEN', () => {
   });
 });
 
+// ============================================================================
+// BEFORE — draft/read-marker fallback (no explicit pivot)
+// ============================================================================
+//
+// IRCv3 draft/read-marker integration: when a cap-enabled client omits the
+// pivot msgid on CHATHISTORY BEFORE, the reducer falls back to the
+// connection's per-channel last-read marker. This lets a client resume
+// reading "everything before my last read position" without re-supplying the
+// msgid. When no marker is recorded either, the reducer keeps the legacy
+// 461 ERR_NEEDMOREPARAMS behaviour.
+// ============================================================================
+
+describe('chathistoryReducer — BEFORE read-marker fallback', () => {
+  it('falls back to the last-read marker when BEFORE omits the pivot', () => {
+    const store = new InMemoryMessageStore();
+    const seeded = seed(store, '#foo', 5);
+    const conn = makeConn();
+    conn.lastReadMarkers = new Map<string, string>([['#foo', 'm4']]);
+    const chan = makeChan();
+    chan.members.set('c1', { conn: 'c1', nick: 'alice', op: false, voice: false });
+    const ctx = makeCtx(conn, store);
+
+    const out = chathistoryReducer(
+      chan,
+      { command: 'CHATHISTORY', params: ['BEFORE', '#foo'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects).toEqual<EffectType[]>(
+      expectedBatch(
+        [
+          replayLine(seeded[0] as StoredMessage, '#foo'),
+          replayLine(seeded[1] as StoredMessage, '#foo'),
+          replayLine(seeded[2] as StoredMessage, '#foo'),
+        ],
+        'batch-0',
+        '#foo',
+      ),
+    );
+  });
+
+  it('honours an explicit pivot over the marker when both are supplied', () => {
+    const store = new InMemoryMessageStore();
+    const seeded = seed(store, '#foo', 5);
+    const conn = makeConn();
+    // Marker points at m4, but the client explicitly asks for messages before m3.
+    conn.lastReadMarkers = new Map<string, string>([['#foo', 'm4']]);
+    const chan = makeChan();
+    chan.members.set('c1', { conn: 'c1', nick: 'alice', op: false, voice: false });
+    const ctx = makeCtx(conn, store);
+
+    const out = chathistoryReducer(
+      chan,
+      { command: 'CHATHISTORY', params: ['BEFORE', '#foo', 'm3', '10'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects).toEqual<EffectType[]>(
+      expectedBatch(
+        [
+          replayLine(seeded[0] as StoredMessage, '#foo'),
+          replayLine(seeded[1] as StoredMessage, '#foo'),
+        ],
+        'batch-0',
+        '#foo',
+      ),
+    );
+  });
+
+  it('returns 461 when BEFORE omits the pivot and no marker is recorded', () => {
+    const store = new InMemoryMessageStore();
+    seed(store, '#foo', 3);
+    const conn = makeConn(); // no marker
+    const chan = makeChan();
+    chan.members.set('c1', { conn: 'c1', nick: 'alice', op: false, voice: false });
+    const ctx = makeCtx(conn, store);
+
+    const out = chathistoryReducer(
+      chan,
+      { command: 'CHATHISTORY', params: ['BEFORE', '#foo'], tags: {} },
+      ctx,
+    );
+
+    expect((out.effects[0] as { lines: RawLine[] }).lines[0]?.text).toContain('461');
+  });
+
+  it('returns an empty batch when the marker points at an evicted msgid', () => {
+    const store = new InMemoryMessageStore();
+    seed(store, '#foo', 3);
+    const conn = makeConn();
+    // Marker references a message the store no longer retains; BEFORE must
+    // not surface an INVALID_PARAMS error, just an empty result.
+    conn.lastReadMarkers = new Map<string, string>([['#foo', 'evicted']]);
+    const chan = makeChan();
+    chan.members.set('c1', { conn: 'c1', nick: 'alice', op: false, voice: false });
+    const ctx = makeCtx(conn, store);
+
+    const out = chathistoryReducer(
+      chan,
+      { command: 'CHATHISTORY', params: ['BEFORE', '#foo'], tags: {} },
+      ctx,
+    );
+
+    expect(out.effects).toEqual([]);
+  });
+});
+
 // ============================================================================
 // TARGETS
 // ============================================================================
@@ -994,3 +1101,43 @@ describe('chathistoryReducer — unregistered connection', () => {
     );
   });
 });
+
+// ===========================================================================
+// formatReplayLine — clientTags on chathistory replay
+//
+// A stored message carrying `clientTags` (e.g. `+draft/multiline` from a
+// multi-line batch) must surface those tags in the chathistory replay so
+// message-tags-aware clients can recognise the message kind.
+// ===========================================================================
+
+describe('formatReplayLine — clientTags', () => {
+  const baseMsg: StoredMessage = {
+    msgid: 'abc123',
+    time: 1_700_000_000_000,
+    chan: '#foo',
+    command: 'PRIVMSG',
+    nick: 'alice',
+    user: 'alice',
+    host: 'example.com',
+    text: 'line one\nline two',
+  };
+
+  it('appends +draft/multiline to the tag section when clientTags are present', () => {
+    const out = formatReplayLine({ ...baseMsg, clientTags: ['+draft/multiline'] }, '#foo');
+    expect(out.text).toBe(
+      '@time=2023-11-14T22:13:20.000Z;msgid=abc123;+draft/multiline :alice!alice@example.com PRIVMSG #foo :line one\nline two',
+    );
+  });
+
+  it('omits the client-tag section entirely when clientTags is undefined', () => {
+    const out = formatReplayLine(baseMsg, '#foo');
+    expect(out.text).toBe(
+      '@time=2023-11-14T22:13:20.000Z;msgid=abc123 :alice!alice@example.com PRIVMSG #foo :line one\nline two',
+    );
+  });
+
+  it('omits the client-tag section when clientTags is empty', () => {
+    const out = formatReplayLine({ ...baseMsg, clientTags: [] }, '#foo');
+    expect(out.text).not.toContain('+draft/multiline');
+  });
+});

package/packages/irc-core/tests/commands/echo-message.test.ts

@@ -73,7 +73,9 @@ describe('echo-message — channel PRIVMSG', () => {
     );
 
     expect(out.effects).toEqual<EffectType[]>([
-      Effect.broadcast('#foo', [L(':alice!alice@example.com PRIVMSG #foo :hi')], 'c1'),
+      Effect.broadcast('#foo', [L(':alice!alice@example.com PRIVMSG #foo :hi')], 'c1', 'msgid', [
+        L('@msgid=nonce-0 :alice!alice@example.com PRIVMSG #foo :hi'),
+      ]),
     ]);
   });
 
@@ -90,7 +92,9 @@ describe('echo-message — channel PRIVMSG', () => {
     );
 
     expect(out.effects).toEqual<EffectType[]>([
-      Effect.broadcast('#foo', [L(':alice!alice@example.com PRIVMSG #foo :hi')], 'c1'),
+      Effect.broadcast('#foo', [L(':alice!alice@example.com PRIVMSG #foo :hi')], 'c1', 'msgid', [
+        L('@msgid=nonce-0 :alice!alice@example.com PRIVMSG #foo :hi'),
+      ]),
       Effect.send('c1', [L(':alice!alice@example.com PRIVMSG #foo :hi')]),
     ]);
   });
@@ -108,7 +112,9 @@ describe('echo-message — channel PRIVMSG', () => {
     );
 
     expect(out.effects).toEqual<EffectType[]>([
-      Effect.broadcast('#foo', [L(':alice!alice@example.com NOTICE #foo :hi')], 'c1'),
+      Effect.broadcast('#foo', [L(':alice!alice@example.com NOTICE #foo :hi')], 'c1', 'msgid', [
+        L('@msgid=nonce-0 :alice!alice@example.com NOTICE #foo :hi'),
+      ]),
       Effect.send('c1', [L(':alice!alice@example.com NOTICE #foo :hi')]),
     ]);
   });