- <%= render_user_avatar(user, class: "h-7 w-7 flex-shrink-0", text_class: "text-xs") %>
-
- <%= user.name || "Anonymous" %>
-
+
+ <%= for {client_pid, user} <- @data_view.clients do %>
+
+
+ <%= if client_pid != @self do %>
+
+
+
+
+
+
+ <% end %>
<% end %>
@@ -276,6 +298,19 @@ defmodule LivebookWeb.SessionLive do
end
@impl true
+ def handle_event("session_init", _params, socket) do
+ data = socket.private.data
+
+ payload = %{
+ clients:
+ Enum.map(data.clients_map, fn {client_pid, user_id} ->
+ client_info(client_pid, data.users_map[user_id])
+ end)
+ }
+
+ {:reply, payload, socket}
+ end
+
def handle_event("cell_init", %{"cell_id" => cell_id}, socket) do
data = socket.private.data
@@ -490,6 +525,17 @@ defmodule LivebookWeb.SessionLive do
create_session(socket, notebook: notebook, copy_images_from: images_dir)
end
+ def handle_event("location_report", report, socket) do
+ Phoenix.PubSub.broadcast_from(
+ Livebook.PubSub,
+ self(),
+ "sessions:#{socket.assigns.session_id}",
+ {:location_report, self(), report}
+ )
+
+ {:noreply, socket}
+ end
+
defp create_session(socket, opts) do
case SessionSupervisor.create_session(opts) do
{:ok, id} ->
@@ -549,8 +595,30 @@ defmodule LivebookWeb.SessionLive do
{:noreply, assign(socket, :current_user, user)}
end
+ def handle_info({:location_report, client_pid, report}, socket) do
+ report = Map.put(report, :client_pid, inspect(client_pid))
+ {:noreply, push_event(socket, "location_report", report)}
+ end
+
def handle_info(_message, socket), do: {:noreply, socket}
+ defp after_operation(socket, _prev_socket, {:client_join, client_pid, user}) do
+ push_event(socket, "client_joined", %{client: client_info(client_pid, user)})
+ end
+
+ defp after_operation(socket, _prev_socket, {:client_leave, client_pid}) do
+ push_event(socket, "client_left", %{client_pid: inspect(client_pid)})
+ end
+
+ defp after_operation(socket, _prev_socket, {:update_user, _client_pid, user}) do
+ updated_clients =
+ socket.private.data.clients_map
+ |> Enum.filter(fn {_client_pid, user_id} -> user_id == user.id end)
+ |> Enum.map(fn {client_pid, _user_id} -> client_info(client_pid, user) end)
+
+ push_event(socket, "clients_updated", %{clients: updated_clients})
+ end
+
defp after_operation(socket, _prev_socket, {:insert_section, client_pid, _index, section_id}) do
if client_pid == self() do
push_event(socket, "section_inserted", %{section_id: section_id})
@@ -620,6 +688,10 @@ defmodule LivebookWeb.SessionLive do
defp handle_action(socket, _action), do: socket
+ defp client_info(pid, user) do
+ %{pid: inspect(pid), hex_color: user.hex_color, name: user.name || "Anonymous"}
+ end
+
defp normalize_name(name) do
name
|> String.trim()
@@ -660,11 +732,10 @@ defmodule LivebookWeb.SessionLive do
for section <- data.notebook.sections do
%{id: section.id, name: section.name}
end,
- users:
+ clients:
data.clients_map
- |> Map.values()
- |> Enum.map(&data.users_map[&1])
- |> Enum.sort_by(& &1.name),
+ |> Enum.map(fn {client_pid, user_id} -> {client_pid, data.users_map[user_id]} end)
+ |> Enum.sort_by(fn {_client_pid, user} -> user.name end),
section_views: Enum.map(data.notebook.sections, §ion_to_view(&1, data))
}
end