Skip to content

A platform for community discussion. Free, open, simple.

FIX: Let live room owners delete their rooms (#45110)

Rafael dos Santos Silvad2c57fd4b4a3
diff --git a/plugins/live/app/controllers/live/rooms_controller.rb b/plugins/live/app/controllers/live/rooms_controller.rb
index e4f9c33c294..25ae643d71d 100644
--- a/plugins/live/app/controllers/live/rooms_controller.rb
+++ b/plugins/live/app/controllers/live/rooms_controller.rb
@@ -117,7 +117,7 @@ module Live
end
def destroy
- guardian.ensure_can_manage_live_room!(@room)
+ guardian.ensure_can_delete_live_room!(@room)
# Built before the destroy so the broadcast still targets the members
# whose memberships the destroy cascades away.
broadcaster = Live::DirectoryBroadcaster.new(@room, :destroyed)
diff --git a/plugins/live/app/serializers/live/room_serializer.rb b/plugins/live/app/serializers/live/room_serializer.rb
index 45292f95dd8..b768fc20023 100644
--- a/plugins/live/app/serializers/live/room_serializer.rb
+++ b/plugins/live/app/serializers/live/room_serializer.rb
@@ -18,6 +18,7 @@ module Live
:active_participants,
:creator_id,
:can_manage,
+ :can_delete,
:can_invite,
:description_excerpt,
:visit_count,
@@ -95,6 +96,10 @@ module Live
@can_manage = scope.can_manage_live_room?(object)
end
+ def can_delete
+ scope.can_delete_live_room?(object)
+ end
+
def can_invite
scope.can_invite_to_live_room?(object)
end
diff --git a/plugins/live/app/services/live/directory_broadcaster.rb b/plugins/live/app/services/live/directory_broadcaster.rb
index 7981082ee68..b66a949dc91 100644
--- a/plugins/live/app/services/live/directory_broadcaster.rb
+++ b/plugins/live/app/services/live/directory_broadcaster.rb
@@ -37,7 +37,7 @@ module Live
Live::RoomSerializer
.new(room, scope: Guardian.new(nil), root: false)
.as_json
- .except(:can_manage, :can_invite, :membership),
+ .except(:can_manage, :can_delete, :can_invite, :membership),
},
**targets,
)
diff --git a/plugins/live/assets/javascripts/discourse/app/services/live-rooms.js b/plugins/live/assets/javascripts/discourse/app/services/live-rooms.js
index 7255c492fb7..c178b8d8345 100644
--- a/plugins/live/assets/javascripts/discourse/app/services/live-rooms.js
+++ b/plugins/live/assets/javascripts/discourse/app/services/live-rooms.js
@@ -7,6 +7,7 @@ import { bind } from "discourse/lib/decorators";
// a response scoped to the current user supplies fresh values.
const USER_GATED_ROOM_FIELDS = [
"can_manage",
+ "can_delete",
"can_invite",
"membership",
"chat_available",
diff --git a/plugins/live/assets/javascripts/discourse/components/modal/live-room-info.gjs b/plugins/live/assets/javascripts/discourse/components/modal/live-room-info.gjs
index 87bd8f44006..66d5dc499d5 100644
--- a/plugins/live/assets/javascripts/discourse/components/modal/live-room-info.gjs
+++ b/plugins/live/assets/javascripts/discourse/components/modal/live-room-info.gjs
@@ -6,6 +6,8 @@ import { service } from "@ember/service";
import { trustHTML } from "@ember/template";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
+import { homepageNavigationDestination } from "discourse/lib/homepage-router-overrides";
+import { escapeExpression } from "discourse/lib/utilities";
import ComboBox from "discourse/select-kit/components/combo-box";
import UserChooser from "discourse/select-kit/components/user-chooser";
import DButton from "discourse/ui-kit/d-button";
@@ -17,7 +19,10 @@ import LiveRoomForm from "discourse/plugins/live/discourse/components/live-room-
import roomIcon from "discourse/plugins/live/discourse/lib/live/room-icon";
export default class LiveRoomInfoModal extends Component {
+ @service dialog;
@service liveRooms;
+ @service liveWebrtc;
+ @service router;
@service toasts;
@tracked memberships = [];
@@ -112,6 +117,43 @@ export default class LiveRoomInfoModal extends Component {
}
}
+ @action
+ deleteRoom() {
+ const room = this.room;
+
+ this.dialog.deleteConfirm({
+ message: i18n("live.room.delete_confirm", {
+ name: escapeExpression(room.name),
+ }),
+ didConfirm: async () => {
+ try {
+ await ajax(`/live/rooms/${room.id}`, { type: "DELETE" });
+ } catch (e) {
+ popupAjaxError(e);
+ return;
+ }
+
+ // The server already dropped the room, so a server-side leave would
+ // only fail; tear down the local call state instead.
+ if (this.liveWebrtc.connectionStateFor(room.id) !== "idle") {
+ this.liveWebrtc.leave(room, { skipServer: true });
+ }
+ this.liveRooms.handleDirectoryEvent({ type: "destroyed", room });
+
+ const currentRoute = this.router.currentRoute;
+ if (
+ currentRoute?.name === "live-room" &&
+ currentRoute.params?.slug === room.slug
+ ) {
+ this.router.replaceWith(homepageNavigationDestination());
+ }
+
+ this.toasts.success({ data: { message: i18n("live.room.deleted") } });
+ this.args.closeModal();
+ },
+ });
+ }
+
@action
setSelectedUsernames(usernames) {
this.selectedUsernames = usernames;
@@ -185,6 +227,14 @@ export default class LiveRoomInfoModal extends Component {
@onSubmit={{this.handleEdit}}
@room={{this.room}}
/>
+ {{#if this.room.can_delete}}
+ <DButton
+ class="btn-danger live-room-info-modal__delete-btn"
+ @action={{this.deleteRoom}}
+ @icon="trash-can"
+ @label="live.room.delete"
+ />
+ {{/if}}
</div>
{{else}}
<div class="live-room-info-modal__header">
diff --git a/plugins/live/assets/stylesheets/common/live.scss b/plugins/live/assets/stylesheets/common/live.scss
index 55a553a8656..9c2ec64cf41 100644
--- a/plugins/live/assets/stylesheets/common/live.scss
+++ b/plugins/live/assets/stylesheets/common/live.scss
@@ -811,6 +811,10 @@
align-self: flex-start;
}
+ &__delete-btn {
+ margin-top: 1.5rem;
+ }
+
&__edit-form {
padding: 1.5rem;
diff --git a/plugins/live/config/locales/client.en.yml b/plugins/live/config/locales/client.en.yml
index 4bc6db22579..d79c22cb6da 100644
--- a/plugins/live/config/locales/client.en.yml
+++ b/plugins/live/config/locales/client.en.yml
@@ -18,6 +18,9 @@ en:
leave: "Leave room"
info: "Room info"
edit: "Edit room"
+ delete: "Delete room"
+ delete_confirm: "Are you sure you want to delete '%{name}'? Everyone in it will be disconnected and its members removed."
+ deleted: "Room deleted."
copy_link: "Copy link"
link_copied: "Link copied to clipboard"
menu_title: "Room options"
diff --git a/plugins/live/lib/live/guardian_extension.rb b/plugins/live/lib/live/guardian_extension.rb
index 62d15484af4..475c83c3234 100644
--- a/plugins/live/lib/live/guardian_extension.rb
+++ b/plugins/live/lib/live/guardian_extension.rb
@@ -63,6 +63,22 @@ module Live
end
end
+ # Deleting discards the room for everyone, so it stays with its owner and
+ # staff rather than extending to room moderators. Ephemeral rooms are torn
+ # down by their own lifecycle.
+ def can_delete_live_room?(room)
+ return false unless can_access_live?
+ return false if !room || room.ephemeral?
+
+ is_staff? || room.creator_id == user.id
+ end
+
+ def ensure_can_delete_live_room!(room)
+ unless can_delete_live_room?(room)
+ raise Discourse::InvalidAccess.new(I18n.t("live.errors.not_authorized"))
+ end
+ end
+
def ensure_can_create_live_room!
unless can_create_live_room?
raise Discourse::InvalidAccess.new(I18n.t("live.errors.not_authorized"))
diff --git a/plugins/live/spec/lib/live/guardian_extension_spec.rb b/plugins/live/spec/lib/live/guardian_extension_spec.rb
index 94df039aa31..ff0785e37ac 100644
--- a/plugins/live/spec/lib/live/guardian_extension_spec.rb
+++ b/plugins/live/spec/lib/live/guardian_extension_spec.rb
@@ -165,6 +165,40 @@ RSpec.describe Live::GuardianExtension do
end
end
+ describe "#can_delete_live_room?" do
+ it "is true for the room creator" do
+ expect(creator.guardian.can_delete_live_room?(private_room)).to eq(true)
+ end
+
+ it "is true for site staff" do
+ expect(staff.guardian.can_delete_live_room?(private_room)).to eq(true)
+ end
+
+ it "is false for a room moderator" do
+ expect(room_moderator.guardian.can_delete_live_room?(private_room)).to eq(false)
+ end
+
+ it "is false for a plain participant member" do
+ expect(member.guardian.can_delete_live_room?(private_room)).to eq(false)
+ end
+
+ it "is false for ephemeral rooms" do
+ private_room.update!(ephemeral: true)
+
+ expect(creator.guardian.can_delete_live_room?(private_room)).to eq(false)
+ end
+
+ it "is false when the plugin is disabled" do
+ SiteSetting.live_enabled = false
+
+ expect(creator.guardian.can_delete_live_room?(private_room)).to eq(false)
+ end
+
+ it "is false for a nil room" do
+ expect(creator.guardian.can_delete_live_room?(nil)).to eq(false)
+ end
+ end
+
describe "#can_join_live_room?" do
it "lets any allowed user join public rooms" do
expect(low_trust_user.guardian.can_join_live_room?(public_room)).to eq(true)
diff --git a/plugins/live/spec/requests/live/rooms_controller_spec.rb b/plugins/live/spec/requests/live/rooms_controller_spec.rb
index e3bb7d05648..23e4f6b98ce 100644
--- a/plugins/live/spec/requests/live/rooms_controller_spec.rb
+++ b/plugins/live/spec/requests/live/rooms_controller_spec.rb
@@ -1354,6 +1354,27 @@ RSpec.describe Live::RoomsController do
expect(Live::Room.exists?(private_room.id)).to eq(false)
end
+ it "returns 403 for a room moderator who is not the creator" do
+ private_room.room_memberships.create!(
+ user: other_participant,
+ role: Live::RoomMembership::ROLE_MODERATOR,
+ )
+ sign_in(other_participant)
+
+ delete "/live/rooms/#{private_room.id}.json"
+
+ expect(response.status).to eq(403)
+ expect(Live::Room.exists?(private_room.id)).to eq(true)
+ end
+
+ it "serializes can_delete for the creator" do
+ sign_in(room_owner)
+
+ get "/live/rooms/#{private_room.id}.json"
+
+ expect(response.parsed_body.dig("room", "can_delete")).to eq(true)
+ end
+
it "broadcasts the destroy to the members the room had" do
sign_in(room_owner)
diff --git a/plugins/live/spec/system/live_rooms_spec.rb b/plugins/live/spec/system/live_rooms_spec.rb
index ac55bc7ba37..93e554616e6 100644
--- a/plugins/live/spec/system/live_rooms_spec.rb
+++ b/plugins/live/spec/system/live_rooms_spec.rb
@@ -315,6 +315,32 @@ describe "Live rooms" do
expect(live_media_track_live?(remote_video_selector, timeout: 10)).to eq(true)
end
end
+
+ it "lets the creator delete their own room" do
+ owned_room = Fabricate(:live_room, name: "My Room", creator: user, public: true)
+
+ visit("/latest")
+ live_sidebar.room_link(owned_room.id).hover
+ live_sidebar.room_link(owned_room.id).find(".sidebar-section-hover-button").click
+ click_button(I18n.t("js.live.room.edit"))
+ click_button(I18n.t("js.live.room.delete"))
+ find(".dialog-footer .btn-danger").click
+
+ expect(live_sidebar).to have_no_room_link(owned_room.id)
+ expect(Live::Room.exists?(owned_room.id)).to eq(false)
+ end
+
+ it "does not offer deletion of rooms the user does not own" do
+ room.room_memberships.create!(user: user, role: Live::RoomMembership::ROLE_MODERATOR)
+
+ visit("/latest")
+ live_sidebar.room_link(room.id).hover
+ live_sidebar.room_link(room.id).find(".sidebar-section-hover-button").click
+ click_button(I18n.t("js.live.room.edit"))
+
+ expect(page).to have_css(".live-room-info-modal__edit-form")
+ expect(page).to have_no_css(".live-room-info-modal__delete-btn")
+ end
end
context "with a stage room" do