reorganize

16 files changed, 88 insertions, 82 deletions

diff --git a/lib/matrix_app_service/phoenix/controllers/v1/room_controller.ex b/lib/matrix_app_service/phoenix/controllers/v1/room_controller.ex
deleted file mode 100644
index 409ffa7..0000000
--- a/lib/matrix_app_service/phoenix/controllers/v1/room_controller.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-defmodule MatrixAppService.Phoenix.V1.RoomController do
-  use MatrixAppService.Phoenix, :controller
-
-  def show(conn, _params) do
-    send_resp(conn, 404, "")
-  end
-end
diff --git a/lib/matrix_app_service/phoenix/controllers/v1/third_party_controller.ex b/lib/matrix_app_service/phoenix/controllers/v1/third_party_controller.ex
deleted file mode 100644
index 32b7e7b..0000000
--- a/lib/matrix_app_service/phoenix/controllers/v1/third_party_controller.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-defmodule MatrixAppService.Phoenix.V1.ThirdPartyController do
-  use MatrixAppService.Phoenix, :controller
-
-  def show(conn, _params) do
-    send_resp(conn, 200, "")
-  end
-end
diff --git a/lib/matrix_app_service/phoenix/controllers/v1/transaction_controller.ex b/lib/matrix_app_service/phoenix/controllers/v1/transaction_controller.ex
deleted file mode 100644
index ebee348..0000000
--- a/lib/matrix_app_service/phoenix/controllers/v1/transaction_controller.ex
+++ /dev/null
@@ -1,52 +0,0 @@
-defmodule MatrixAppService.Phoenix.V1.TransactionController do
-  use MatrixAppService.Phoenix, :controller
-
-  @module Application.compile_env!(:matrix_app_service, :module)
-
-  # %{"access_token" => access_token,
-  #   "events" => [
-  #     %{"age" => 199,
-  #       "content" => %{
-  #         "body" => "test",
-  #         "msgtype" => "m.room.message"},
-  #       "event_id" => "$pMDN7TcsCapjLRYoITwryk0anpQGs60y2Eng3lxropc",
-  #       "origin_server_ts" => 1588950428966,
-  #       "room_id" => "!SrVtqmyqzuaMnfVImP:matrix.imago.local",
-  #       "sender" => "@alice:matrix.imago.local",
-  #       "type" => "m.room.message",
-  #       "unsigned" => %{"age" => 199},
-  #       "user_id" => "@alice:matrix.imago.local"}],
-  #   "txn_id" => "269"}
-
-  defp create_event(
-    %{"age" => age,
-      "content" => content,
-      "event_id" => event_id,
-      "origin_server_ts" => origin_server_ts,
-      "room_id" => room_id,
-      "sender" => sender,
-      "type" => type,
-      "unsigned" => unsigned,
-      "user_id" => user_id
-    }) do
-      event =
-        %MatrixAppService.Event{
-          age: age,
-          content: content,
-          event_id: event_id,
-          origin_server_ts: origin_server_ts,
-          room_id: room_id,
-          sender: sender,
-          type: type,
-          unsigned: unsigned,
-          user_id: user_id
-        }
-
-      @module.new_event(event)
-    end
-
-  def create(conn, %{"events" => events}) do
-    Enum.each(events, &create_event(&1))
-    send_resp(conn, 200, "{}")
-  end
-end
diff --git a/lib/matrix_app_service/phoenix/controllers/v1/user_controller.ex b/lib/matrix_app_service/phoenix/controllers/v1/user_controller.ex
deleted file mode 100644
index df11a4b..0000000
--- a/lib/matrix_app_service/phoenix/controllers/v1/user_controller.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-defmodule MatrixAppService.Phoenix.V1.UserController do
-  use MatrixAppService.Phoenix, :controller
-
-  def show(conn, _params) do
-    send_resp(conn, 404, "")
-  end
-end
diff --git a/lib/matrix_app_service/phoenix/router.ex b/lib/matrix_app_service/phoenix/router.ex
index 715464b..a85a5fa 100644
--- a/lib/matrix_app_service/phoenix/router.ex
+++ b/lib/matrix_app_service/phoenix/router.ex
@@ -6,7 +6,7 @@ defmodule MatrixAppService.Phoenix.Router do
         plug :accepts, ["json"]
       end
 
-      scope "/matrix", MatrixAppService.Phoenix.V1 do
+      scope "/matrix", MatrixAppServiceWeb.V1 do
         pipe_through :matrix_api
 
         # scope "/v1", V1 do
diff --git a/lib/matrix_app_service/phoenix/phoenix.ex b/lib/matrix_app_service_web.ex
index 989c131..bf02126 100644
--- a/lib/matrix_app_service/phoenix/phoenix.ex
+++ b/lib/matrix_app_service_web.ex
@@ -1,4 +1,4 @@
-defmodule MatrixAppService.Phoenix do
+defmodule MatrixAppServiceWeb do
   @moduledoc """
   The entrypoint for defining your web interface, such
   as controllers, views, channels and so on.
@@ -22,7 +22,7 @@ defmodule MatrixAppService.Phoenix do
       use Phoenix.Controller, namespace: MatrixAppServiceWeb
 
       import Plug.Conn
-      alias MatrixAppService.Phoenix.Router.Helpers, as: Routes
+      alias MatrixAppServiceWeb.Router.Helpers, as: Routes
     end
   end
 
@@ -30,7 +30,7 @@ defmodule MatrixAppService.Phoenix do
     quote do
       use Phoenix.View,
         root: "lib/matrix_app_service/phoenix/templates",
-        namespace: MatrixAppService.Phoenix
+        namespace: MatrixAppServiceWeb
 
       # Import convenience functions from controllers
       import Phoenix.Controller, only: [get_flash: 1, get_flash: 2, view_module: 1]
@@ -60,8 +60,8 @@ defmodule MatrixAppService.Phoenix do
       # Import basic rendering functionality (render, render_layout, etc)
       import Phoenix.View
 
-      import MatrixAppService.Phoenix.ErrorHelpers
-      alias MatrixAppService.Phoenix.Router.Helpers, as: Routes
+      import MatrixAppServiceWeb.ErrorHelpers
+      alias MatrixAppServiceWeb.Router.Helpers, as: Routes
     end
   end
 
diff --git a/lib/matrix_app_service/phoenix/channels/user_socket.ex b/lib/matrix_app_service_web/channels/user_socket.ex
index ec2e9fb..ec2e9fb 100644
--- a/lib/matrix_app_service/phoenix/channels/user_socket.ex
+++ b/lib/matrix_app_service_web/channels/user_socket.ex
diff --git a/lib/matrix_app_service_web/controllers/v1/room_controller.ex b/lib/matrix_app_service_web/controllers/v1/room_controller.ex
new file mode 100644
index 0000000..3729708
--- /dev/null
+++ b/lib/matrix_app_service_web/controllers/v1/room_controller.ex
@@ -0,0 +1,7 @@
+defmodule MatrixAppServiceWeb.V1.RoomController do
+  use MatrixAppServiceWeb, :controller
+
+  def show(conn, _params) do
+    send_resp(conn, 404, "")
+  end
+end
diff --git a/lib/matrix_app_service_web/controllers/v1/third_party_controller.ex b/lib/matrix_app_service_web/controllers/v1/third_party_controller.ex
new file mode 100644
index 0000000..6ef00ee
--- /dev/null
+++ b/lib/matrix_app_service_web/controllers/v1/third_party_controller.ex
@@ -0,0 +1,7 @@
+defmodule MatrixAppServiceWeb.V1.ThirdPartyController do
+  use MatrixAppServiceWeb, :controller
+
+  def show(conn, _params) do
+    send_resp(conn, 200, "")
+  end
+end
diff --git a/lib/matrix_app_service_web/controllers/v1/transaction_controller.ex b/lib/matrix_app_service_web/controllers/v1/transaction_controller.ex
new file mode 100644
index 0000000..a71b497
--- /dev/null
+++ b/lib/matrix_app_service_web/controllers/v1/transaction_controller.ex
@@ -0,0 +1,51 @@
+defmodule MatrixAppServiceWeb.V1.TransactionController do
+  use MatrixAppServiceWeb, :controller
+
+  # %{"access_token" => access_token,
+  #   "events" => [
+  #     %{"age" => 199,
+  #       "content" => %{
+  #         "body" => "test",
+  #         "msgtype" => "m.room.message"},
+  #       "event_id" => "$pMDN7TcsCapjLRYoITwryk0anpQGs60y2Eng3lxropc",
+  #       "origin_server_ts" => 1588950428966,
+  #       "room_id" => "!SrVtqmyqzuaMnfVImP:matrix.imago.local",
+  #       "sender" => "@alice:matrix.imago.local",
+  #       "type" => "m.room.message",
+  #       "unsigned" => %{"age" => 199},
+  #       "user_id" => "@alice:matrix.imago.local"}],
+  #   "txn_id" => "269"}
+
+  defp create_event(%{
+         "age" => age,
+         "content" => content,
+         "event_id" => event_id,
+         "origin_server_ts" => origin_server_ts,
+         "room_id" => room_id,
+         "sender" => sender,
+         "type" => type,
+         "unsigned" => unsigned,
+         "user_id" => user_id
+       }) do
+    module = Application.get_env(:matrix_app_service, :transaction_module)
+
+    event = %MatrixAppService.Event{
+      age: age,
+      content: content,
+      event_id: event_id,
+      origin_server_ts: origin_server_ts,
+      room_id: room_id,
+      sender: sender,
+      type: type,
+      unsigned: unsigned,
+      user_id: user_id
+    }
+
+    module.new_event(event)
+  end
+
+  def create(conn, %{"events" => events}) do
+    Enum.each(events, &create_event(&1))
+    send_resp(conn, 200, "{}")
+  end
+end
diff --git a/lib/matrix_app_service_web/controllers/v1/user_controller.ex b/lib/matrix_app_service_web/controllers/v1/user_controller.ex
new file mode 100644
index 0000000..31301d2
--- /dev/null
+++ b/lib/matrix_app_service_web/controllers/v1/user_controller.ex
@@ -0,0 +1,7 @@
+defmodule MatrixAppServiceWeb.V1.UserController do
+  use MatrixAppServiceWeb, :controller
+
+  def show(conn, _params) do
+    send_resp(conn, 404, "")
+  end
+end
diff --git a/lib/matrix_app_service/phoenix/endpoint.ex b/lib/matrix_app_service_web/endpoint.ex
index 8af15eb..8af15eb 100644
--- a/lib/matrix_app_service/phoenix/endpoint.ex
+++ b/lib/matrix_app_service_web/endpoint.ex
diff --git a/lib/matrix_app_service_web/router.ex b/lib/matrix_app_service_web/router.ex
new file mode 100644
index 0000000..99f4dfd
--- /dev/null
+++ b/lib/matrix_app_service_web/router.ex
@@ -0,0 +1,7 @@
+defmodule MatrixAppServiceWeb.Router do
+  use MatrixAppServiceWeb, :router
+
+  require MatrixAppService.Phoenix.Router
+
+  MatrixAppService.Phoenix.Router.routes()
+end
diff --git a/lib/matrix_app_service/phoenix/telemetry.ex b/lib/matrix_app_service_web/telemetry.ex
index de3ec2d..de3ec2d 100644
--- a/lib/matrix_app_service/phoenix/telemetry.ex
+++ b/lib/matrix_app_service_web/telemetry.ex
diff --git a/lib/matrix_app_service/phoenix/views/error_helpers.ex b/lib/matrix_app_service_web/views/error_helpers.ex
index 21e3555..4eff422 100644
--- a/lib/matrix_app_service/phoenix/views/error_helpers.ex
+++ b/lib/matrix_app_service_web/views/error_helpers.ex
@@ -1,4 +1,4 @@
-defmodule MatrixAppService.Phoenix.ErrorHelpers do
+defmodule MatrixAppServiceWeb.ErrorHelpers do
   @moduledoc """
   Conveniences for translating and building error messages.
   """
diff --git a/lib/matrix_app_service/phoenix/views/error_view.ex b/lib/matrix_app_service_web/views/error_view.ex
index d9b91cc..2358355 100644
--- a/lib/matrix_app_service/phoenix/views/error_view.ex
+++ b/lib/matrix_app_service_web/views/error_view.ex
@@ -1,5 +1,5 @@
-defmodule MatrixAppService.Phoenix.ErrorView do
-  use MatrixAppService.Phoenix, :view
+defmodule MatrixAppServiceWeb.ErrorView do
+  use MatrixAppServiceWeb, :view
 
   # If you want to customize a particular status code
   # for a certain format, you may uncomment below.