Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scrub room name when it is closed #533

Closed
wants to merge 2 commits into from
Closed

Scrub room name when it is closed #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d863e
Scrub room data when it is closed
johnshaughnessy Nov 18, 2021
3b33587
Do not need to scrub description because it does not appear in the page
johnshaughnessy Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/ret/hub.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,8 @@ defmodule Ret.Hub do
def changeset_for_entry_mode(%Hub{} = hub, entry_mode),
do: hub |> cast(%{entry_mode: entry_mode}, [:entry_mode])

def changeset_for_closed_room_name(hub), do: hub |> cast(%{name: "closed"}, [:name])

def changeset_for_new_host(%Hub{} = hub, host), do: hub |> cast(%{host: host}, [:host])

def changeset_for_creator_assignment(
Expand Down
9 changes: 9 additions & 0 deletions lib/ret_web/channels/hub_channel.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,13 +714,22 @@ defmodule RetWeb.HubChannel do
end
end

defp maybe_scrub_room_data(hub, entry_mode) do
if entry_mode == :deny do
Hub.changeset_for_closed_room_name(hub)
else
hub
end
end

defp handle_entry_mode_change(socket, entry_mode) do
hub = socket |> hub_for_socket
account = Guardian.Phoenix.Socket.current_resource(socket)

if account |> can?(close_hub(hub)) do
hub
|> Hub.changeset_for_entry_mode(entry_mode)
|> maybe_scrub_room_data(entry_mode)
|> Repo.update!()
|> Repo.preload(Hub.hub_preloads())
|> broadcast_hub_refresh!(socket, ["entry_mode"])
Expand Down
1 change: 1 addition & 0 deletions lib/ret_web/controllers/api/v1/hub_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ defmodule RetWeb.Api.V1.HubController do
Hub
|> Repo.get_by(hub_sid: hub_sid)
|> Hub.changeset_for_entry_mode(:deny)
|> Hub.changeset_for_closed_room_name()
|> Repo.update!()

conn |> send_resp(200, "OK")
Expand Down
7 changes: 6 additions & 1 deletion test/ret/hub_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,15 @@ defmodule Ret.HubTest do

%{join_hub: true} = hub |> Hub.perms_for_account(nil)

hub = hub |> Hub.changeset_for_entry_mode(:deny) |> Repo.update!()
hub = hub
|> Hub.changeset_for_entry_mode(:deny)
|> Hub.changeset_for_closed_room_name()
|> Repo.update!()

%{join_hub: false} = hub |> Hub.perms_for_account(nil)

%{name: "closed"} = hub

hub = hub |> Hub.changeset_for_entry_mode(:allow) |> Repo.update!()

%{join_hub: true} = hub |> Hub.perms_for_account(nil)
Expand Down
5 changes: 4 additions & 1 deletion test/ret_web/controllers/api/media_search_controller_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,10 @@ defmodule RetWeb.MediaSearchControllerTest do
assert length(Enum.filter(entries, fn e -> e["id"] == private_hub_2.hub_sid end)) == 1

# Close the first hub
private_hub |> Hub.changeset_for_entry_mode(:deny) |> Repo.update!()
private_hub
|> Hub.changeset_for_entry_mode(:deny)
|> Hub.changeset_for_closed_room_name()
|> Repo.update!()

resp =
conn
Expand Down