From 6aac806f7693c6c470dc6d90c879f85cfc3d6352 Mon Sep 17 00:00:00 2001 From: Vector73 Date: Wed, 23 Jul 2025 05:20:12 +0000 Subject: [PATCH] message_delete: Remove explicit is_spectator condition. Removes explicit `is_spectator` condition when checking if message can deleted as it is checked by `user_has_permission_for_group_setting` function. --- web/src/message_edit.ts | 5 ----- web/src/popover_menus_data.ts | 2 +- web/tests/message_edit.test.cjs | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/web/src/message_edit.ts b/web/src/message_edit.ts index f27a1e358c..39073ee161 100644 --- a/web/src/message_edit.ts +++ b/web/src/message_edit.ts @@ -48,7 +48,6 @@ import * as message_store from "./message_store.ts"; import type {Message} from "./message_store.ts"; import * as message_viewport from "./message_viewport.ts"; import * as onboarding_steps from "./onboarding_steps.ts"; -import {page_params} from "./page_params.ts"; import * as people from "./people.ts"; import * as resize from "./resize.ts"; import * as rows from "./rows.ts"; @@ -236,10 +235,6 @@ export function is_message_sent_by_my_bot(message: Message): boolean { } export function get_deletability(message: Message): boolean { - if (page_params.is_spectator) { - return false; - } - if (message.type === "stream" && stream_data.is_stream_archived(message.stream_id)) { return false; } diff --git a/web/src/popover_menus_data.ts b/web/src/popover_menus_data.ts index 11fbf5d66a..201c69e2ac 100644 --- a/web/src/popover_menus_data.ts +++ b/web/src/popover_menus_data.ts @@ -213,7 +213,7 @@ export function get_actions_popover_content_context(message_id: number): ActionP const conversation_time_url = hash_util.by_conversation_and_time_url(message); - const should_display_delete_option = message_edit.get_deletability(message) && not_spectator; + const should_display_delete_option = message_edit.get_deletability(message); const should_display_read_receipts_option = realm.realm_enable_read_receipts && not_spectator; const should_display_remind_me_option = not_spectator; diff --git a/web/tests/message_edit.test.cjs b/web/tests/message_edit.test.cjs index dbd2090422..4d94ec5227 100644 --- a/web/tests/message_edit.test.cjs +++ b/web/tests/message_edit.test.cjs @@ -216,9 +216,6 @@ run_test("get_deletability", ({override}) => { sender_id: 1, }; - page_params.is_spectator = true; - assert.equal(message_edit.get_deletability(message), false); - page_params.is_spectator = false; // User can delete any message