paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 02:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

peer_data: Stop returning unused boolean from remove_subscriber.

Browse Source
This commit is contained in:
Evy Kassirer
2025-06-27 13:13:13 -07:00
committed by Tim Abbott
parent 428efeb1a4
commit 5a23287cf5
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/peer_data.ts
View File

@@ -254,16 +254,14 @@ export function add_subscriber(stream_id: number, user_id: number): void {
subscribers.add(user_id); subscribers.add(user_id);
} }
export function remove_subscriber(stream_id: number, user_id: number): boolean { export function remove_subscriber(stream_id: number, user_id: number): void {
const subscribers = get_loaded_subscriber_subset(stream_id); const subscribers = get_loaded_subscriber_subset(stream_id);
if (!subscribers.has(user_id)) { if (!subscribers.has(user_id)) {
blueslip.warn(`We tried to remove invalid subscriber: ${user_id}`); blueslip.warn(`We tried to remove invalid subscriber: ${user_id}`);
return false; return;
} }
subscribers.delete(user_id); subscribers.delete(user_id);
return true;
} }
export function bulk_add_subscribers({ export function bulk_add_subscribers({

9
web/tests/peer_data.test.cjs
View File

@@ -184,8 +184,7 @@ test("subscribers", async () => {
assert.equal(peer_data.get_subscriber_count(stream_id), 1); assert.equal(peer_data.get_subscriber_count(stream_id), 1);
// remove // remove
let ok = peer_data.remove_subscriber(stream_id, brutus.user_id); peer_data.remove_subscriber(stream_id, brutus.user_id);
assert.ok(ok);
assert.ok(!stream_data.is_user_subscribed(stream_id, brutus.user_id)); assert.ok(!stream_data.is_user_subscribed(stream_id, brutus.user_id));
assert.equal(peer_data.get_subscriber_count(stream_id), 0); assert.equal(peer_data.get_subscriber_count(stream_id), 0);
@@ -196,14 +195,12 @@ test("subscribers", async () => {
"We called get_loaded_subscriber_subset for an untracked stream: " + bad_stream_id, "We called get_loaded_subscriber_subset for an untracked stream: " + bad_stream_id,
); );
blueslip.expect("warn", "We tried to remove invalid subscriber: 104"); blueslip.expect("warn", "We tried to remove invalid subscriber: 104");
ok = peer_data.remove_subscriber(bad_stream_id, brutus.user_id); peer_data.remove_subscriber(bad_stream_id, brutus.user_id);
assert.ok(!ok);
blueslip.reset(); blueslip.reset();
// verify that removing an already-removed subscriber is a noop // verify that removing an already-removed subscriber is a noop
blueslip.expect("warn", "We tried to remove invalid subscriber: 104"); blueslip.expect("warn", "We tried to remove invalid subscriber: 104");
ok = peer_data.remove_subscriber(stream_id, brutus.user_id); peer_data.remove_subscriber(stream_id, brutus.user_id);
assert.ok(!ok);
assert.ok(!stream_data.is_user_subscribed(stream_id, brutus.user_id)); assert.ok(!stream_data.is_user_subscribed(stream_id, brutus.user_id));
assert.equal(peer_data.get_subscriber_count(stream_id), 0); assert.equal(peer_data.get_subscriber_count(stream_id), 0);
blueslip.reset(); blueslip.reset();