Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(api): ignore after=0 when listing guild members (#3622)

Hampusb2be537d3338
diff --git a/fluxer_api/src/api/infrastructure/GatewayService.ts b/fluxer_api/src/api/infrastructure/GatewayService.ts
index 2359f5384..076fff355 100644
--- a/fluxer_api/src/api/infrastructure/GatewayService.ts
+++ b/fluxer_api/src/api/infrastructure/GatewayService.ts
@@ -672,7 +672,7 @@ export class GatewayService {
}>('guild.list_members_cursor', {
guild_id: guildId.toString(),
limit,
- ...(after !== undefined && {after: after.toString()}),
+ ...(after !== undefined && after > 0n && {after: after.toString()}),
});
return {
members: result.members ?? [],
diff --git a/fluxer_api/src/api/infrastructure/tests/GatewayServiceMemberCursor.test.ts b/fluxer_api/src/api/infrastructure/tests/GatewayServiceMemberCursor.test.ts
new file mode 100644
index 000000000..dde6326a3
--- /dev/null
+++ b/fluxer_api/src/api/infrastructure/tests/GatewayServiceMemberCursor.test.ts
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {createGuildID, createUserID} from '@app/api/BrandedTypes';
+import {GatewayRpcClient} from '@app/api/infrastructure/GatewayRpcClient';
+import {GatewayService} from '@app/api/infrastructure/GatewayService';
+import {afterEach, describe, expect, it} from 'vitest';
+
+function serviceRecordingParams(calls: Array<Record<string, unknown>>): GatewayService {
+ GatewayRpcClient.createForTests({
+ async call(_method: string, params: Record<string, unknown>): Promise<unknown> {
+ calls.push(params);
+ return {members: [], total: 0};
+ },
+ async destroy(): Promise<void> {},
+ });
+ return new GatewayService();
+}
+
+describe('GatewayService member list cursor', () => {
+ afterEach(async () => {
+ await GatewayRpcClient.resetForTests();
+ });
+
+ it('starts from the first member when after is 0', async () => {
+ const calls: Array<Record<string, unknown>> = [];
+ const service = serviceRecordingParams(calls);
+ await service.listGuildMembersCursor({guildId: createGuildID(1n), limit: 1000, after: createUserID(0n)});
+ await service.listGuildMembersCursor({guildId: createGuildID(1n), limit: 1000, after: createUserID(5n)});
+ expect(calls).toEqual([
+ {guild_id: '1', limit: 1000},
+ {guild_id: '1', limit: 1000, after: '5'},
+ ]);
+ });
+});