From a3fa0a2f9c7a83a912cf152f186005f75ee57d7a Mon Sep 17 00:00:00 2001 From: Kaitlyn Allan Date: Sat, 1 Apr 2023 22:49:14 +1000 Subject: [PATCH] Clarify variable names --- .../src/server/api/stream/channels/channel.ts | 4 ++-- .../src/server/api/stream/channels/messaging.ts | 4 ++-- packages/backend/src/server/api/stream/index.ts | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts index 5d2bb24f5..5a0f70981 100644 --- a/packages/backend/src/server/api/stream/channels/channel.ts +++ b/packages/backend/src/server/api/stream/channels/channel.ts @@ -61,8 +61,8 @@ export default class extends Channel { this.typers.delete(userId); } - const keys = Array.from(this.typers.keys()); - const users = await Users.packMany(keys, null, { + const userIds = Array.from(this.typers.keys()); + const users = await Users.packMany(userIds, null, { detail: false, }); diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts index ec477e9b2..f20b1ead1 100644 --- a/packages/backend/src/server/api/stream/channels/messaging.ts +++ b/packages/backend/src/server/api/stream/channels/messaging.ts @@ -112,8 +112,8 @@ export default class extends Channel { this.typers.delete(userId); } - const ids = Array.from(this.typers.keys()); - const users = await Users.packMany(ids, null, { + const userIds = Array.from(this.typers.keys()); + const users = await Users.packMany(userIds, null, { detail: false, }); diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts index a34b1e9aa..03cecf542 100644 --- a/packages/backend/src/server/api/stream/index.ts +++ b/packages/backend/src/server/api/stream/index.ts @@ -339,10 +339,10 @@ export default class Connection { private onSubscribeNote(payload: any) { if (!payload.id) return; - const c = this.subscribingNotes.get(payload.id) || 0; - this.subscribingNotes.set(payload.id, c + 1); + const current = this.subscribingNotes.get(payload.id) || 0; + this.subscribingNotes.set(payload.id, current + 1); - if (!c) { + if (!current) { this.subscriber.on(`noteStream:${payload.id}`, this.onNoteStreamMessage); } } @@ -353,13 +353,13 @@ export default class Connection { private onUnsubscribeNote(payload: any) { if (!payload.id) return; - const c = this.subscribingNotes.get(payload.id) || 0; - if (c <= 1) { + const current = this.subscribingNotes.get(payload.id) || 0; + if (current <= 1) { this.subscribingNotes.delete(payload.id); this.subscriber.off(`noteStream:${payload.id}`, this.onNoteStreamMessage); return; } - this.subscribingNotes.set(payload.id, c - 1); + this.subscribingNotes.set(payload.id, current - 1); } private async onNoteStreamMessage(data: StreamMessages["note"]["payload"]) {