3 files changed, 25 insertions, 7 deletions
diff --git a/lib/rook_web/channels/request_channel.ex b/lib/rook_web/channels/request_channel.ex
index 6290ae6..cc84b0f 100644
--- a/lib/rook_web/channels/request_channel.ex
+++ b/lib/rook_web/channels/request_channel.ex
@@ -4,7 +4,7 @@ defmodule RookWeb.RequestChannel do
   def join("request:" <> token, %{"share" => share_token}, socket) do
     if Rook.Token.match?(token, socket) do
       if Rook.Share.exists?(share_token) do
-        Rook.Request.start(token, share_token)
+        Rook.Request.Actions.start(token, share_token)
         {:ok, socket}
       else
         {:error, %{reason: "No such share exists."}}
@@ -17,4 +17,14 @@ defmodule RookWeb.RequestChannel do
   def join("request:" <> _token, _params, _socket) do
     {:error, %{reason: "No share given to request."}}
   end
+
+  def handle_in("accept_share", description, socket) do
+    Rook.Request.Actions.accept_share(socket.assigns.token, description)
+    {:noreply, socket}
+  end
+
+  def handle_in("ice_candidate", %{"candidate" => candidate}, socket) do
+    Rook.Request.Actions.ice_candidate(socket.assigns.token, candidate)
+    {:noreply, socket}
+  end
 end
diff --git a/lib/rook_web/channels/share_channel.ex b/lib/rook_web/channels/share_channel.ex
index 0efb3ba..02c6fc0 100644
--- a/lib/rook_web/channels/share_channel.ex
+++ b/lib/rook_web/channels/share_channel.ex
@@ -5,15 +5,17 @@ defmodule RookWeb.ShareChannel do
 
   def join("share:" <> token, _params, socket) do
     if Rook.Token.match?(token, socket) do
-      Rook.Share.start(token)
+      Rook.Share.Actions.start(token)
       {:ok, socket}
     else
       {:error, %{reason: "Wrong token."}}
     end
   end
 
-  def handle_in("accept_request", %{"request" => _request_token}, socket) do
-    # TODO: Send request accept message.
+  def handle_in("accept_request", %{"token" => request_token} = params, socket) do
+    description = Map.delete(params, :token)
+    token = socket.assigns.token
+    Rook.Share.Actions.accept_request(token, request_token, description)
     {:noreply, socket}
   end
 
@@ -21,8 +23,14 @@ defmodule RookWeb.ShareChannel do
     {:error, %{reason: "No request given to accept."}}
   end
 
-  def handle_out("new_request", %{request: request_token} = msg, socket) do
-    Rook.Request.acknowledge_request(request_token)
+  def handle_in("ice_candidate", %{"token" => request_token, "candidate" => candidate}, socket) do
+    token = socket.assigns.token
+    Rook.Share.Actions.ice_candidate(token, request_token, candidate)
+    {:noreply, socket}
+  end
+
+  def handle_out("new_request", %{token: request_token} = msg, socket) do
+    Rook.Request.Events.request_acknowledged(request_token)
     push(socket, "new_request", msg)
     {:noreply, socket}
   end
diff --git a/lib/rook_web/channels/token_channel.ex b/lib/rook_web/channels/token_channel.ex
index 72cabb1..d91b6ac 100644
--- a/lib/rook_web/channels/token_channel.ex
+++ b/lib/rook_web/channels/token_channel.ex
@@ -6,6 +6,6 @@ defmodule RookWeb.TokenChannel do
   end
 
   def handle_in("get_token", _attrs, socket) do
-    {:reply, {:ok, %{token: socket.assigns[:token]}}, socket}
+    {:reply, {:ok, %{token: socket.assigns.token}}, socket}
   end
 end