WIP

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/eventos_web/controllers/account_controller.ex

@@ -1,37 +1,37 @@
-defmodule EventosWeb.AccountController do
+defmodule EventosWeb.ActorController do
   @moduledoc """
-  Controller for Accounts
+  Controller for Actors
   """
   use EventosWeb, :controller
 
-  alias Eventos.Accounts
-  alias Eventos.Accounts.Account
+  alias Eventos.Actors
+  alias Eventos.Actors.Actor
 
   action_fallback EventosWeb.FallbackController
 
   def index(conn, _params) do
-    accounts = Accounts.list_accounts()
-    render(conn, "index.json", accounts: accounts)
+    actors = Actors.list_actors()
+    render(conn, "index.json", actors: actors)
   end
 
   def show(conn, %{"id" => id}) do
-    account = Accounts.get_account_with_everything!(id)
-    render(conn, "show.json", account: account)
+    actor = Actors.get_actor_with_everything!(id)
+    render(conn, "show.json", actor: actor)
   end
 
-  def update(conn, %{"id" => id, "account" => account_params}) do
-    account = Accounts.get_account!(id)
+  def update(conn, %{"id" => id, "actor" => actor_params}) do
+    actor = Actors.get_actor!(id)
 
-    with {:ok, %Account{} = account} <- Accounts.update_account(account, account_params) do
-      render(conn, "show.json", account: account)
+    with {:ok, %Actor{} = actor} <- Actors.update_actor(actor, actor_params) do
+      render(conn, "show.json", actor: actor)
     end
   end
 
   def delete(conn, %{"id" => id_str}) do
     {id, _} = Integer.parse(id_str)
-    if Guardian.Plug.current_resource(conn).account.id == id do
-      account = Accounts.get_account!(id)
-      with {:ok, %Account{}} <- Accounts.delete_account(account) do
+    if Guardian.Plug.current_resource(conn).actor.id == id do
+      actor = Actors.get_actor!(id)
+      with {:ok, %Actor{}} <- Actors.delete_actor(actor) do
         send_resp(conn, :no_content, "")
       end
     else

lib/eventos_web/controllers/activity_pub_controller.ex

@@ -1,7 +1,7 @@
 defmodule EventosWeb.ActivityPubController do
   use EventosWeb, :controller
-  alias Eventos.{Accounts, Accounts.Account, Events, Events.Event}
-  alias EventosWeb.ActivityPub.{ObjectView, AccountView}
+  alias Eventos.{Actors, Actors.Actor, Events, Events.Event}
+  alias EventosWeb.ActivityPub.{ObjectView, ActorView}
   alias Eventos.Service.ActivityPub
   alias Eventos.Service.Federator
 
@@ -9,72 +9,69 @@ defmodule EventosWeb.ActivityPubController do
 
   action_fallback(:errors)
 
-  def account(conn, %{"username" => username}) do
-    with %Account{} = account <- Accounts.get_account_by_username(username) do
+  def actor(conn, %{"name" => name}) do
+    with %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
       conn
       |> put_resp_header("content-type", "application/activity+json")
-      |> json(AccountView.render("account.json", %{account: account}))
+      |> json(ActorView.render("actor.json", %{actor: actor}))
     end
   end
 
-  def event(conn, %{"username" => username, "slug" => slug}) do
-    with %Event{} = event <- Events.get_event_full_by_username_and_slug!(username, slug) do
+  def event(conn, %{"name" => name, "slug" => slug}) do
+    with %Event{} = event <- Events.get_event_full_by_name_and_slug!(name, slug) do
       conn
       |> put_resp_header("content-type", "application/activity+json")
       |> json(ObjectView.render("event.json", %{event: event}))
     end
   end
 
-#  def following(conn, %{"username" => username, "page" => page}) do
-#    with %Account{} = account <- Accounts.get_account_by_username(username) do
-#      {page, _} = Integer.parse(page)
-#
-#      conn
-#      |> put_resp_header("content-type", "application/activity+json")
-#      |> json(UserView.render("following.json", %{account: account, page: page}))
-#    end
-#  end
-#
-#  def following(conn, %{"nickname" => nickname}) do
-#    with %User{} = user <- User.get_cached_by_nickname(nickname),
-#         {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
-#      conn
-#      |> put_resp_header("content-type", "application/activity+json")
-#      |> json(UserView.render("following.json", %{user: user}))
-#    end
-#  end
-#
-#  def followers(conn, %{"nickname" => nickname, "page" => page}) do
-#    with %User{} = user <- User.get_cached_by_nickname(nickname),
-#         {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
-#      {page, _} = Integer.parse(page)
-#
-#      conn
-#      |> put_resp_header("content-type", "application/activity+json")
-#      |> json(UserView.render("followers.json", %{user: user, page: page}))
-#    end
-#  end
-#
-#  def followers(conn, %{"nickname" => nickname}) do
-#    with %User{} = user <- User.get_cached_by_nickname(nickname),
-#         {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
-#      conn
-#      |> put_resp_header("content-type", "application/activity+json")
-#      |> json(UserView.render("followers.json", %{user: user}))
-#    end
-#  end
+  def following(conn, %{"name" => name, "page" => page}) do
+    with %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
+      {page, _} = Integer.parse(page)
 
-  def outbox(conn, %{"username" => username, "page" => page}) do
-    with {page, ""} = Integer.parse(page),
-         %Account{} = account <- Accounts.get_account_by_username(username) do
       conn
       |> put_resp_header("content-type", "application/activity+json")
-      |> json(AccountView.render("outbox.json", %{account: account, page: page}))
+      |> json(ActorView.render("following.json", %{actor: actor, page: page}))
     end
   end
 
-  def outbox(conn, %{"username" => username}) do
-    outbox(conn, %{"username" => username, "page" => "0"})
+  def following(conn, %{"name" => name}) do
+    with %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(ActorView.render("following.json", %{actor: actor}))
+    end
+  end
+
+  def followers(conn, %{"name" => name, "page" => page}) do
+    with %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
+      {page, _} = Integer.parse(page)
+
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(ActorView.render("followers.json", %{actor: actor, page: page}))
+    end
+  end
+
+  def followers(conn, %{"name" => name}) do
+    with %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(ActorView.render("followers.json", %{actor: actor}))
+    end
+  end
+
+  def outbox(conn, %{"name" => name, "page" => page}) do
+    with {page, ""} = Integer.parse(page),
+         %Actor{} = actor <- Actors.get_local_actor_by_name(name) do
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(ActorView.render("outbox.json", %{actor: actor, page: page}))
+    end
+  end
+
+  def outbox(conn, %{"name" => username}) do
+    outbox(conn, %{"name" => username, "page" => "0"})
   end
 
   # TODO: Ensure that this inbox is a recipient of the message

lib/eventos_web/controllers/event_request_controller.ex

@@ -1,52 +1,52 @@
-defmodule EventosWeb.EventRequestController do
-  @moduledoc """
-  Controller for Event requests
-  """
-  use EventosWeb, :controller
-
-  alias Eventos.Events
-  alias Eventos.Events.Request
-
-  action_fallback EventosWeb.FallbackController
-
-  def index_for_user(conn, _params) do
-    account = Guardian.Plug.current_resource(conn).account
-    requests = Events.list_requests_for_account(account)
-    render(conn, "index.json", requests: requests)
-  end
-
-  def create(conn, %{"request" => request_params}) do
-    request_params = Map.put(request_params, "account_id", Guardian.Plug.current_resource(conn).account.id)
-    with {:ok, %Request{} = request} <- Events.create_request(request_params) do
-      conn
-      |> put_status(:created)
-      |> put_resp_header("location", event_request_path(conn, :show, request))
-      |> render("show.json", request: request)
-    end
-  end
-
-  def create_for_event(conn, %{"request" => request_params, "id" => event_id}) do
-    request_params = Map.put(request_params, "event_id", event_id)
-    create(conn, request_params)
-  end
-
-  def show(conn, %{"id" => id}) do
-    request = Events.get_request!(id)
-    render(conn, "show.json", request: request)
-  end
-
-  def update(conn, %{"id" => id, "request" => request_params}) do
-    request = Events.get_request!(id)
-
-    with {:ok, %Request{} = request} <- Events.update_request(request, request_params) do
-      render(conn, "show.json", request: request)
-    end
-  end
-
-  def delete(conn, %{"id" => id}) do
-    request = Events.get_request!(id)
-    with {:ok, %Request{}} <- Events.delete_request(request) do
-      send_resp(conn, :no_content, "")
-    end
-  end
-end
+#defmodule EventosWeb.EventRequestController do
+#  @moduledoc """
+#  Controller for Event requests
+#  """
+#  use EventosWeb, :controller
+#
+#  alias Eventos.Events
+#  alias Eventos.Events.{Event, Request}
+#
+#  action_fallback EventosWeb.FallbackController
+#
+#  def index_for_user(conn, _params) do
+#    actor = Guardian.Plug.current_resource(conn).actor
+#    requests = Events.list_requests_for_actor(actor)
+#    render(conn, "index.json", requests: requests)
+#  end
+#
+#  def create(conn, %{"request" => request_params}) do
+#    request_params = Map.put(request_params, "actor_id", Guardian.Plug.current_resource(conn).actor.id)
+#    with {:ok, %Request{} = request} <- Events.create_request(request_params) do
+#      conn
+#      |> put_status(:created)
+#      |> put_resp_header("location", event_request_path(conn, :show, request))
+#      |> render("show.json", request: request)
+#    end
+#  end
+#
+#  def create_for_event(conn, %{"request" => request_params, "id" => event_id}) do
+#    request_params = Map.put(request_params, "event_id", event_id)
+#    create(conn, request_params)
+#  end
+#
+#  def show(conn, %{"id" => id}) do
+#    request = Events.get_request!(id)
+#    render(conn, "show.json", request: request)
+#  end
+#
+#  def update(conn, %{"id" => id, "request" => request_params}) do
+#    request = Events.get_request!(id)
+#
+#    with {:ok, %Request{} = request} <- Events.update_request(request, request_params) do
+#      render(conn, "show.json", request: request)
+#    end
+#  end
+#
+#  def delete(conn, %{"id" => id}) do
+#    request = Events.get_request!(id)
+#    with {:ok, %Request{}} <- Events.delete_request(request) do
+#      send_resp(conn, :no_content, "")
+#    end
+#  end
+#end

lib/eventos_web/controllers/group_controller.ex

@@ -1,46 +1,46 @@
-defmodule EventosWeb.GroupController do
-  @moduledoc """
-  Controller for Groups
-  """
-  use EventosWeb, :controller
-
-  alias Eventos.Groups
-  alias Eventos.Groups.Group
-
-  action_fallback EventosWeb.FallbackController
-
-  def index(conn, _params) do
-    groups = Groups.list_groups()
-    render(conn, "index.json", groups: groups)
-  end
-
-  def create(conn, %{"group" => group_params}) do
-    group_params = Map.put(group_params, "url", "h")
-    with {:ok, %Group{} = group} <- Groups.create_group(group_params) do
-      conn
-      |> put_status(:created)
-      |> put_resp_header("location", group_path(conn, :show, group))
-      |> render("show_simple.json", group: group)
-    end
-  end
-
-  def show(conn, %{"id" => id}) do
-    group = Groups.get_group_full!(id)
-    render(conn, "show.json", group: group)
-  end
-
-  def update(conn, %{"id" => id, "group" => group_params}) do
-    group = Groups.get_group!(id)
-
-    with {:ok, %Group{} = group} <- Groups.update_group(group, group_params) do
-      render(conn, "show_simple.json", group: group)
-    end
-  end
-
-  def delete(conn, %{"id" => id}) do
-    group = Groups.get_group!(id)
-    with {:ok, %Group{}} <- Groups.delete_group(group) do
-      send_resp(conn, :no_content, "")
-    end
-  end
-end
+#defmodule EventosWeb.GroupController do
+#  @moduledoc """
+#  Controller for Groups
+#  """
+#  use EventosWeb, :controller
+#
+#  alias Eventos.Actors
+#  alias Eventos.Actors.Actor
+#
+#  action_fallback EventosWeb.FallbackController
+#
+#  def index(conn, _params) do
+#    groups = Actors.list_groups()
+#    render(conn, "index.json", groups: groups)
+#  end
+#
+#  def create(conn, %{"group" => group_params}) do
+#    group_params = Map.put(group_params, "url", "h")
+#    with {:ok, %Group{} = group} <- Actors.create_group(group_params) do
+#      conn
+#      |> put_status(:created)
+#      |> put_resp_header("location", group_path(conn, :show, group))
+#      |> render("show_simple.json", group: group)
+#    end
+#  end
+#
+#  def show(conn, %{"id" => id}) do
+#    group = Actors.get_group_full!(id)
+#    render(conn, "show.json", group: group)
+#  end
+#
+#  def update(conn, %{"id" => id, "group" => group_params}) do
+#    group = Actors.get_group!(id)
+#
+#    with {:ok, %Actor{} = group} <- Actors.update_group(group, group_params) do
+#      render(conn, "show_simple.json", group: group)
+#    end
+#  end
+#
+#  def delete(conn, %{"id" => id}) do
+#    group = Actors.get_group!(id)
+#    with {:ok, %Actor{}} <- Actors.delete_group(group) do
+#      send_resp(conn, :no_content, "")
+#    end
+#  end
+#end

lib/eventos_web/controllers/nodeinfo_controller.ex

@@ -2,7 +2,7 @@ defmodule EventosWeb.NodeinfoController do
   use EventosWeb, :controller
 
   alias EventosWeb
-  alias Eventos.{Accounts, Events}
+  alias Eventos.{Actors, Events}
 
   @instance Application.get_env(:eventos, :instance)
 
@@ -40,7 +40,7 @@ defmodule EventosWeb.NodeinfoController do
       usage: %{
         users: %{
           #total: stats.user_count || 0
-          total: Accounts.count_users()
+          total: Actors.count_users()
         },
         localPosts: Events.count_local_events(),
         localComments: Events.count_local_comments(),

lib/eventos_web/controllers/outboxes_controller.ex

@@ -3,8 +3,8 @@ defmodule EventosWeb.OutboxesController do
   use EventosWeb, :controller
 
   def show(conn) do
-    account = Guardian.Plug.current_resource(conn).account
-    events = account.events
+    actor = Guardian.Plug.current_resource(conn).actor
+    events = actor.events
 
     render(conn, "index.json", events: events)
   end

lib/eventos_web/controllers/user_controller.ex

@@ -4,19 +4,19 @@ defmodule EventosWeb.UserController do
   """
   use EventosWeb, :controller
 
-  alias Eventos.Accounts
-  alias Eventos.Accounts.User
+  alias Eventos.Actors
+  alias Eventos.Actors.User
   alias Eventos.Repo
 
   action_fallback EventosWeb.FallbackController
 
   def index(conn, _params) do
-    users = Accounts.list_users_with_accounts()
+    users = Actors.list_users_with_actors()
     render(conn, "index.json", users: users)
   end
 
   def register(conn, %{"username" => username, "email" => email, "password" => password}) do
-    case Accounts.register(%{email: email, password: password, username: username}) do
+    case Actors.register(%{email: email, password: password, username: username}) do
       {:ok, %User{} = user} ->
         {:ok, token, _claims} = EventosWeb.Guardian.encode_and_sign(user)
         conn
@@ -29,10 +29,10 @@ defmodule EventosWeb.UserController do
     end
   end
 
-  def show_current_account(conn, _params) do
+  def show_current_actor(conn, _params) do
     user = Guardian.Plug.current_resource(conn)
     user
-    |> Repo.preload(:account)
+    |> Repo.preload(:actor)
     render(conn, "show_simple.json", user: user)
   end
 
@@ -56,16 +56,16 @@ defmodule EventosWeb.UserController do
   end
 
   def update(conn, %{"id" => id, "user" => user_params}) do
-    user = Accounts.get_user!(id)
+    user = Actors.get_user!(id)
 
-    with {:ok, %User{} = user} <- Accounts.update_user(user, user_params) do
+    with {:ok, %User{} = user} <- Actors.update_user(user, user_params) do
       render(conn, "show.json", user: user)
     end
   end
 
   def delete(conn, %{"id" => id}) do
-    user = Accounts.get_user!(id)
-    with {:ok, %User{}} <- Accounts.delete_user(user) do
+    user = Actors.get_user!(id)
+    with {:ok, %User{}} <- Actors.delete_user(user) do
       send_resp(conn, :no_content, "")
     end
   end

lib/eventos_web/controllers/user_session_controller.ex

@@ -3,14 +3,14 @@ defmodule EventosWeb.UserSessionController do
   Controller for user sessions
   """
   use EventosWeb, :controller
-  alias Eventos.Accounts.User
-  alias Eventos.Accounts
+  alias Eventos.Actors.User
+  alias Eventos.Actors
 
   def sign_in(conn, %{"email" => email, "password" => password}) do
-    case Accounts.find_by_email(email) do
+    case Actors.find_by_email(email) do
       %User{} = user ->
         # Attempt to authenticate the user
-        case Accounts.authenticate(%{user: user, password: password}) do
+        case Actors.authenticate(%{user: user, password: password}) do
           {:ok, token, _claims} ->
             # Render the token
             render conn, "token.json", %{token: token, user: user}