Move and reorganize some stuff

2 files changed, 0 insertions, 121 deletions

diff --git a/shardweb/lib/shard_web/channels/room_channel.ex b/shardweb/lib/shard_web/channels/room_channel.ex
deleted file mode 100644
index 7c3a16c..0000000
--- a/shardweb/lib/shard_web/channels/room_channel.ex
+++ /dev/null
@@ -1,72 +0,0 @@
-defmodule ShardWeb.RoomChannel do
-  use ShardWeb, :channel
-
-  require Logger
-
-  def join("room:" <> room_name, payload, socket) do
-    if authorized?(payload) do
-
-      pid = Shard.Manager.find_or_start %SApp.Chat.Manifest{channel: room_name}
-      socket = assign(socket, :pid, pid)
-
-      GenServer.cast(pid, {:subscribe, self()})
-      send(self(), :after_join)
-      
-      {:ok, socket}
-    else
-      {:error, %{reason: "unauthorized"}}
-    end
-  end
-
-  def handle_info(:after_join, socket) do
-    GenServer.call(socket.assigns.pid, {:read_history, nil, 100})
-    |> 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, {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" => nick,
-      "pk16" => Shard.Keys.pk_display(pk),
-      "message" => msg}
-    {:noreply, socket}
-  end
-
-  def handle_info({:chat_send, _, _}, socket) do
-    {:noreply, socket}
-  end
-
-  # Channels can be used in a request/response fashion
-  # by sending replies to requests from the client
-  def handle_in("ping", payload, socket) do
-    {:reply, {:ok, payload}, socket}
-  end
-
-  # 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)
-
-    GenServer.cast(socket.assigns.pid, {:chat_send, pk, payload["message"]})
-    broadcast socket, "shout", payload
-    {:noreply, socket}
-  end
-
-  # Add authorization logic here as required.
-  defp authorized?(_payload) do
-    true
-  end
-end
diff --git a/shardweb/lib/shard_web/channels/user_socket.ex b/shardweb/lib/shard_web/channels/user_socket.ex
deleted file mode 100644
index a3aa1a5..0000000
--- a/shardweb/lib/shard_web/channels/user_socket.ex
+++ /dev/null
@@ -1,49 +0,0 @@
-defmodule ShardWeb.UserSocket do
-  use Phoenix.Socket
-
-  require Logger
-
-  ## Channels
-  channel "room:*", ShardWeb.RoomChannel
-
-  ## Transports
-  transport :websocket, Phoenix.Transports.WebSocket
-  # transport :longpoll, Phoenix.Transports.LongPoll
-
-  # Socket params are passed from the client and can
-  # be used to verify and authenticate a user. After
-  # verification, you can put default assigns into
-  # the socket that will be set for all channels, ie
-  #
-  #     {:ok, assign(socket, :user_id, verified_user_id)}
-  #
-  # To deny connection, return `:error`.
-  #
-  # See `Phoenix.Token` documentation for examples in
-  # performing token verification on connect.
-  def connect(params, socket) do
-    case Base.decode16(params["pk"]) do
-      {:ok, pk} ->
-        if Shard.Keys.have_sk? pk do
-          socket = assign(socket, :pk, pk)
-          {:ok, socket}
-        else
-          Logger.warn("Invalid pk at user_socket.connect... #{params["pk"]}")
-          :error
-        end
-      _ -> :error
-    end
-  end
-
-  # Socket id's are topics that allow you to identify all sockets for a given user:
-  #
-  #     def id(socket), do: "user_socket:#{socket.assigns.user_id}"
-  #
-  # Would allow you to broadcast a "disconnect" event and terminate
-  # all active sockets and channels for a given user:
-  #
-  #     ShardWeb.Endpoint.broadcast("user_socket:#{user.id}", "disconnect", %{})
-  #
-  # Returning `nil` makes this socket anonymous.
-  def id(_socket), do: nil
-end