Make it work, including Web interface

1 files changed, 25 insertions, 12 deletions

diff --git a/shardweb/lib/shard_web/channels/room_channel.ex b/shardweb/lib/shard_web/channels/room_channel.ex
index bb41a74..2935c45 100644
--- a/shardweb/lib/shard_web/channels/room_channel.ex
+++ b/shardweb/lib/shard_web/channels/room_channel.ex
@@ -6,17 +6,17 @@ defmodule ShardWeb.RoomChannel do
   def join("room:" <> room_name, payload, socket) do
     if authorized?(payload) do
 
-      list = for {_chid, manifest, chpid} <- Shard.Manager.list_shards,
-                 %SApp.Chat.Manifest{channel: chan} = manifest,
-                 do: {chan, chpid}
+      list = for {_chid, %SApp.Chat.Manifest{channel: chan}, chpid} <- Shard.Manager.list_shards,
+             do: {chan, chpid}
       pid = case List.keyfind(list, room_name, 0) do
         nil ->
-          {:ok, pid} = DynamicSupervisor.start_child(Shard.DynamicSupervisor, {SApp.Chat, room_name})
+          {:ok, pid} = Shard.Manifest.start %SApp.Chat.Manifest{channel: room_name}
           pid
         {_, pid} ->
           pid
       end
       socket = assign(socket, :pid, pid)
+      socket = assign(socket, :pk, Shard.Keys.get_any_identity) # TODO same as in session!
 
       GenServer.cast(pid, {:subscribe, self()})
       send(self(), :after_join)
@@ -29,16 +29,25 @@ defmodule ShardWeb.RoomChannel do
 
   def handle_info(:after_join, socket) do
     GenServer.call(socket.assigns.pid, {:read_history, nil, 100})
-    |> Enum.each(fn {{_ts, nick, msg}, true} -> push(socket, "shout", %{
-        name: nick,
-        message: msg,
-    }) end)
+    |> Enum.each(fn {{pk, msgbin, _sign}, true} ->
+        {_ts, msg} = SData.term_unbin msgbin
+        nick = SApp.Identity.get_nick pk
+        push(socket, "shout", %{
+          name: nick,
+          pk16: Shard.Keys.pk_display(pk),
+          message: msg,
+        }) 
+      end)
     {:noreply, socket}
   end
 
-  def handle_info({:chat_recv, _chan, {_ts, from, msg}}, socket) do
+  def handle_info({:chat_recv, _chan, {pk, msgbin, _sign}}, socket) do
+    {_ts, msg} = SData.term_unbin msgbin
+    nick = SApp.Identity.get_nick pk
     Logger.info("#{inspect self()} :chat_recv #{inspect msg}")
-    push socket, "shout", %{"name" => from, "message" => msg}
+    push socket, "shout", %{"name" => nick,
+      "pk16" => Shard.Keys.pk_display(pk),
+      "message" => msg}
     {:noreply, socket}
   end
 
@@ -55,9 +64,13 @@ defmodule ShardWeb.RoomChannel do
   # It is also common to receive messages from the client and
   # broadcast to everyone in the current topic (room:lobby).
   def handle_in("shout", payload, socket) do
+    pk = socket.assigns.pk
+    nick = SApp.Identity.get_nick pk
+    payload = Map.put(payload, "name", nick)
+    payload = Map.put(payload, "pk16", Shard.Keys.pk_display pk)
+
     broadcast socket, "shout", payload
-    Shard.Identity.set_nickname(payload["name"])
-    GenServer.cast(socket.assigns.pid, {:chat_send, payload["message"]})
+    GenServer.cast(socket.assigns.pid, {:chat_send, pk, payload["message"]})
     {:noreply, socket}
   end