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}

lib/eventos_web/guardian.ex

@@ -7,8 +7,8 @@ defmodule EventosWeb.Guardian do
     user: [:base]
   }
 
-  alias Eventos.Accounts
-  alias Eventos.Accounts.User
+  alias Eventos.Actors
+  alias Eventos.Actors.User
 
   def subject_for_token(%User{} = user, _claims) do
     {:ok, "User:" <> to_string(user.id)}
@@ -22,7 +22,7 @@ defmodule EventosWeb.Guardian do
     try do
       case Integer.parse(uid_str) do
         {uid, ""} ->
-          {:ok, Accounts.get_user_with_account!(uid)}
+          {:ok, Actors.get_user_with_actor!(uid)}
         _ ->
           {:error, :invalid_id}
       end

lib/eventos_web/router.ex

@@ -9,7 +9,7 @@ defmodule EventosWeb.Router do
   end
 
   pipeline :well_known do
-    plug :accepts, ["json/application"]
+    plug :accepts, ["json/application", "jrd-json"]
   end
 
   pipeline :activity_pub do
@@ -37,13 +37,13 @@ defmodule EventosWeb.Router do
 
       post "/users", UserController, :register
       post "/login", UserSessionController, :sign_in
-      resources "/groups", GroupController, only: [:index, :show]
+      #resources "/groups", GroupController, only: [:index, :show]
       resources "/events", EventController, only: [:index, :show]
       resources "/comments", CommentController, only: [:show]
       get "/events/:id/ics", EventController, :export_to_ics
       get "/events/:id/tracks", TrackController, :show_tracks_for_event
       get "/events/:id/sessions", SessionController, :show_sessions_for_event
-      resources "/accounts", AccountController, only: [:index, :show]
+      resources "/actors", ActorController, only: [:index, :show]
       resources "/tags", TagController, only: [:index, :show]
       resources "/categories", CategoryController, only: [:index, :show]
       resources "/sessions", SessionController, only: [:index, :show]
@@ -58,19 +58,19 @@ defmodule EventosWeb.Router do
 
      scope "/v1" do
 
-       get "/user", UserController, :show_current_account
+       get "/user", UserController, :show_current_actor
        post "/sign-out", UserSessionController, :sign_out
        resources "/users", UserController, except: [:new, :edit, :show]
-       resources "/accounts", AccountController, except: [:new, :edit]
+       resources "/actors", ActorController, except: [:new, :edit]
        resources "/events", EventController
        resources "/comments", CommentController, except: [:new, :edit]
-       post "/events/:id/request", EventRequestController, :create_for_event
+       #post "/events/:id/request", EventRequestController, :create_for_event
        resources "/participant", ParticipantController
-       resources "/requests", EventRequestController
-       resources "/groups", GroupController, except: [:index, :show]
-       post "/groups/:id/request", GroupRequestController, :create_for_group
+       #resources "/requests", EventRequestController
+       #resources "/groups", GroupController, except: [:index, :show]
+       #post "/groups/:id/request", GroupRequestController, :create_for_group
        resources "/members", MemberController
-       resources "/requests", GroupRequestController
+       #resources "/requests", GroupRequestController
        resources "/sessions", SessionController, except: [:index, :show]
        resources "/tracks", TrackController, except: [:index, :show]
        get "/tracks/:id/sessions", SessionController, :show_sessions_for_track
@@ -95,10 +95,12 @@ defmodule EventosWeb.Router do
   scope "/", EventosWeb do
     pipe_through :activity_pub
 
-    get "/@:username", ActivityPubController, :account
-    get "/@:username/outbox", ActivityPubController, :outbox
-    get "/@:username/:slug", ActivityPubController, :event
-    post "/@:username/inbox", ActivityPubController, :inbox
+    get "/@:name", ActivityPubController, :actor
+    get "/@:name/outbox", ActivityPubController, :outbox
+    get "/@:name/following", ActivityPubController, :following
+    get "/@:name/followers", ActivityPubController, :followers
+    get "/@:name/:slug", ActivityPubController, :event
+    post "/@:name/inbox", ActivityPubController, :inbox
     post "/inbox", ActivityPubController, :inbox
   end
 

lib/eventos_web/views/account_view.ex

@@ -1,48 +1,44 @@
-defmodule EventosWeb.AccountView do
+defmodule EventosWeb.ActorView do
   @moduledoc """
-  View for Accounts
+  View for Actors
   """
   use EventosWeb, :view
-  alias EventosWeb.{AccountView, EventView}
+  alias EventosWeb.{ActorView, EventView}
 
-  def render("index.json", %{accounts: accounts}) do
-    %{data: render_many(accounts, AccountView, "acccount_basic.json")}
+  def render("index.json", %{actors: actors}) do
+    %{data: render_many(actors, ActorView, "acccount_basic.json")}
   end
 
-  def render("show.json", %{account: account}) do
-    %{data: render_one(account, AccountView, "account.json")}
+  def render("show.json", %{actor: actor}) do
+    %{data: render_one(actor, ActorView, "actor.json")}
   end
 
-  def render("show_basic.json", %{account: account}) do
-    %{data: render_one(account, AccountView, "account_basic.json")}
+  def render("show_basic.json", %{actor: actor}) do
+    %{data: render_one(actor, ActorView, "actor_basic.json")}
   end
 
-  def render("acccount_basic.json", %{account: account}) do
-    %{id: account.id,
-      username: account.username,
-      domain: account.domain,
-      display_name: account.display_name,
-      description: account.description,
-      # public_key: account.public_key,
-      suspended: account.suspended,
-      url: account.url,
-      avatar_url: account.avatar_url,
-      banner_url: account.banner_url,
+  def render("acccount_basic.json", %{actor: actor}) do
+    %{id: actor.id,
+      username: actor.username,
+      domain: actor.domain,
+      display_name: actor.display_name,
+      description: actor.description,
+      # public_key: actor.public_key,
+      suspended: actor.suspended,
+      url: actor.url,
     }
   end
 
-  def render("account.json", %{account: account}) do
-    %{id: account.id,
-      username: account.username,
-      domain: account.domain,
-      display_name: account.display_name,
-      description: account.description,
-      # public_key: account.public_key,
-      suspended: account.suspended,
-      url: account.url,
-      avatar_url: account.avatar_url,
-      banner_url: account.banner_url,
-      organized_events: render_many(account.organized_events, EventView, "event_simple.json")
+  def render("actor.json", %{actor: actor}) do
+    %{id: actor.id,
+      username: actor.username,
+      domain: actor.domain,
+      display_name: actor.display_name,
+      description: actor.description,
+      # public_key: actor.public_key,
+      suspended: actor.suspended,
+      url: actor.url,
+      organized_events: render_many(actor.organized_events, EventView, "event_simple.json")
     }
   end
 end

lib/eventos_web/views/activity_pub/account_view.ex

@@ -1,117 +0,0 @@
-defmodule EventosWeb.ActivityPub.AccountView do
-  use EventosWeb, :view
-
-  alias EventosWeb.ActivityPub.AccountView
-  alias EventosWeb.ActivityPub.ObjectView
-  alias EventosWeb.WebFinger
-  alias Eventos.Accounts.Account
-  alias Eventos.Repo
-  alias Eventos.Service.ActivityPub
-  alias Eventos.Service.ActivityPub.Transmogrifier
-  alias Eventos.Service.ActivityPub.Utils
-  import Ecto.Query
-
-  def render("account.json", %{account: account}) do
-    {:ok, public_key} = Account.get_public_key_for_account(account)
-
-    %{
-      "id" => account.url,
-      "type" => "Person",
-      #"following" => "#{account.url}/following",
-      #"followers" => "#{account.url}/followers",
-      "inbox" => "#{account.url}/inbox",
-      "outbox" => "#{account.url}/outbox",
-      "preferredUsername" => account.username,
-      "name" => account.display_name,
-      "summary" => account.description,
-      "url" => account.url,
-      #"manuallyApprovesFollowers" => false,
-      "publicKey" => %{
-        "id" => "#{account.url}#main-key",
-        "owner" => account.url,
-        "publicKeyPem" => public_key
-      },
-      "endpoints" => %{
-        "sharedInbox" => "#{EventosWeb.Endpoint.url()}/inbox"
-      },
-#      "icon" => %{
-#        "type" => "Image",
-#        "url" => User.avatar_url(account)
-#      },
-#      "image" => %{
-#        "type" => "Image",
-#        "url" => User.banner_url(account)
-#      }
-    }
-    |> Map.merge(Utils.make_json_ld_header())
-  end
-
-  def render("outbox.json", %{account: account, page: page}) do
-    {page, no_page} = if page == 0 do
-      {1, true}
-    else
-      {page, false}
-    end
-
-     {activities, total} = ActivityPub.fetch_public_activities_for_account(account, page)
-
-    collection =
-      Enum.map(activities, fn act ->
-        {:ok, data} = Transmogrifier.prepare_outgoing(act.data)
-        data
-      end)
-
-    iri = "#{account.url}/outbox"
-
-    page = %{
-      "id" => "#{iri}?page=#{page}",
-      "type" => "OrderedCollectionPage",
-      "partOf" => iri,
-      "totalItems" => total,
-      "orderedItems" => render_many(activities, AccountView, "activity.json", as: :activity),
-      "next" => "#{iri}?page=#{page + 1}"
-    }
-
-    if no_page do
-      %{
-        "id" => iri,
-        "type" => "OrderedCollection",
-        "totalItems" => total,
-        "first" => page
-      }
-      |> Map.merge(Utils.make_json_ld_header())
-    else
-      page |> Map.merge(Utils.make_json_ld_header())
-    end
-  end
-
-  def render("activity.json", %{activity: activity}) do
-    %{
-      "id" => activity.data.url <> "/activity",
-      "type" => "Create",
-      "actor" => activity.data.organizer_account.url,
-      "published" => Timex.now(),
-      "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-      "object" => render_one(activity.data, ObjectView, "event.json", as: :event)
-    }
-  end
-
-  def collection(collection, iri, page, total \\ nil) do
-    offset = (page - 1) * 10
-    items = Enum.slice(collection, offset, 10)
-    items = Enum.map(items, fn user -> user.ap_id end)
-    total = total || length(collection)
-
-    map = %{
-      "id" => "#{iri}?page=#{page}",
-      "type" => "OrderedCollectionPage",
-      "partOf" => iri,
-      "totalItems" => total,
-      "orderedItems" => items
-    }
-
-    if offset < total do
-      Map.put(map, "next", "#{iri}?page=#{page + 1}")
-    end
-  end
-end

lib/eventos_web/views/activity_pub/actor_view.ex

@@ -0,0 +1,155 @@
+defmodule EventosWeb.ActivityPub.ActorView do
+  use EventosWeb, :view
+
+  alias EventosWeb.ActivityPub.ActorView
+  alias EventosWeb.ActivityPub.ObjectView
+  alias EventosWeb.WebFinger
+  alias Eventos.Actors.Actor
+  alias Eventos.Repo
+  alias Eventos.Service.ActivityPub
+  alias Eventos.Service.ActivityPub.Transmogrifier
+  alias Eventos.Service.ActivityPub.Utils
+  import Ecto.Query
+
+  def render("actor.json", %{actor: actor}) do
+    {:ok, public_key} = Actor.get_public_key_for_actor(actor)
+
+    %{
+      "id" => actor.url,
+      "type" => "Person",
+      "following" => actor.following_url,
+      "followers" => actor.followers_url,
+      "inbox" => actor.inbox_url,
+      "outbox" => actor.outbox_url,
+      "preferredUsername" => actor.preferred_username,
+      "name" => actor.name,
+      "summary" => actor.summary,
+      "url" => actor.url,
+      "manuallyApprovesFollowers" => actor.manually_approves_followers,
+      "publicKey" => %{
+        "id" => "#{actor.url}#main-key",
+        "owner" => actor.url,
+        "publicKeyPem" => public_key
+      },
+      "endpoints" => %{
+        "sharedInbox" => actor.shared_inbox_url,
+      },
+#      "icon" => %{
+#        "type" => "Image",
+#        "url" => User.avatar_url(actor)
+#      },
+#      "image" => %{
+#        "type" => "Image",
+#        "url" => User.banner_url(actor)
+#      }
+    }
+    |> Map.merge(Utils.make_json_ld_header())
+  end
+
+  def render("following.json", %{actor: actor, page: page}) do
+    following = Actor.get_followings(actor)
+
+    collection(following, actor.following_url, page)
+    |> Map.merge(Utils.make_json_ld_header())
+  end
+
+  def render("following.json", %{actor: actor}) do
+    following = Actor.get_followings(actor)
+
+    %{
+      "id" => actor.following_url,
+      "type" => "OrderedCollection",
+      "totalItems" => length(following),
+      "first" => collection(following, actor.following_url, 1)
+    }
+    |> Map.merge(Utils.make_json_ld_header())
+  end
+
+  def render("followers.json", %{actor: actor, page: page}) do
+    followers = Actor.get_followers(actor)
+
+    collection(followers, actor.followers_url, page)
+    |> Map.merge(Utils.make_json_ld_header())
+  end
+
+  def render("followers.json", %{actor: actor}) do
+    followers = Actor.get_followers(actor)
+
+    %{
+      "id" => actor.followers_url,
+      "type" => "OrderedCollection",
+      "totalItems" => length(followers),
+      "first" => collection(followers, actor.followers_url, 1)
+    }
+    |> Map.merge(Utils.make_json_ld_header())
+  end
+
+  def render("outbox.json", %{actor: actor, page: page}) do
+    {page, no_page} = if page == 0 do
+      {1, true}
+    else
+      {page, false}
+    end
+
+     {activities, total} = ActivityPub.fetch_public_activities_for_actor(actor, page)
+
+    collection =
+      Enum.map(activities, fn act ->
+        {:ok, data} = Transmogrifier.prepare_outgoing(act.data)
+        data
+      end)
+
+    iri = "#{actor.url}/outbox"
+
+    page = %{
+      "id" => "#{iri}?page=#{page}",
+      "type" => "OrderedCollectionPage",
+      "partOf" => iri,
+      "totalItems" => total,
+      "orderedItems" => render_many(activities, ActorView, "activity.json", as: :activity),
+      "next" => "#{iri}?page=#{page + 1}"
+    }
+
+    if no_page do
+      %{
+        "id" => iri,
+        "type" => "OrderedCollection",
+        "totalItems" => total,
+        "first" => page
+      }
+      |> Map.merge(Utils.make_json_ld_header())
+    else
+      page |> Map.merge(Utils.make_json_ld_header())
+    end
+  end
+
+  def render("activity.json", %{activity: activity}) do
+    %{
+      "id" => activity.data.url <> "/activity",
+      "type" => "Create",
+      "actor" => activity.data.organizer_actor.url,
+      "published" => Timex.now(),
+      "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+      "object" => render_one(activity.data, ObjectView, "event.json", as: :event)
+    }
+  end
+
+  def collection(collection, iri, page, total \\ nil) do
+    offset = (page - 1) * 10
+    items = Enum.slice(collection, offset, 10)
+    items = Enum.map(items, fn account -> account.url end)
+    total = total || length(collection)
+
+    map = %{
+      "id" => "#{iri}?page=#{page}",
+      "type" => "OrderedCollectionPage",
+      "partOf" => iri,
+      "totalItems" => total,
+      "orderedItems" => items
+    }
+
+    if offset < total do
+      Map.put(map, "next", "#{iri}?page=#{page + 1}")
+    end
+  end
+end

lib/eventos_web/views/event_view.ex

@@ -3,7 +3,7 @@ defmodule EventosWeb.EventView do
   View for Events
   """
   use EventosWeb, :view
-  alias EventosWeb.{EventView, AccountView, GroupView, AddressView}
+  alias EventosWeb.{EventView, ActorView, GroupView, AddressView}
 
   def render("index.json", %{events: events}) do
     %{data: render_many(events, EventView, "event_simple.json")}
@@ -32,9 +32,9 @@ defmodule EventosWeb.EventView do
       description: event.description,
       begins_on: event.begins_on,
       ends_on: event.ends_on,
-      organizer: render_one(event.organizer_account, AccountView, "acccount_basic.json"),
+      organizer: render_one(event.organizer_actor, ActorView, "acccount_basic.json"),
       group: render_one(event.organizer_group, GroupView, "group_basic.json"),
-      participants: render_many(event.participants, AccountView, "show_basic.json"),
+      participants: render_many(event.participants, ActorView, "show_basic.json"),
       address: render_one(event.address, AddressView, "address.json"),
     }
   end

lib/eventos_web/views/group_view.ex

@@ -3,7 +3,7 @@ defmodule EventosWeb.GroupView do
   View for Groups
   """
   use EventosWeb, :view
-  alias EventosWeb.{GroupView, AccountView}
+  alias EventosWeb.{GroupView, ActorView}
 
   def render("index.json", %{groups: groups}) do
     %{data: render_many(groups, GroupView, "group_simple.json")}
@@ -32,7 +32,7 @@ defmodule EventosWeb.GroupView do
       description: group.description,
       suspended: group.suspended,
       url: group.url,
-      members: render_many(group.members, AccountView, "acccount_basic.json"),
+      members: render_many(group.members, ActorView, "acccount_basic.json"),
       events: render_many(group.organized_events, EventView, "event_simple.json")
     }
   end

lib/eventos_web/views/user_view.ex

@@ -4,7 +4,7 @@ defmodule EventosWeb.UserView do
   """
   use EventosWeb, :view
   alias EventosWeb.UserView
-  alias EventosWeb.AccountView
+  alias EventosWeb.ActorView
 
   def render("index.json", %{users: users}) do
     %{data: render_many(users, UserView, "user_simple.json")}
@@ -28,14 +28,14 @@ defmodule EventosWeb.UserView do
   def render("user_simple.json", %{user: user}) do
     %{id: user.id,
       role: user.role,
-      account: render_one(user.account, AccountView, "acccount_basic.json")
+      actor: render_one(user.actor, ActorView, "acccount_basic.json")
     }
   end
 
   def render("user.json", %{user: user}) do
     %{id: user.id,
       role: user.role,
-      account: render_one(user.account, AccountView, "account.json")
+      actor: render_one(user.actor, ActorView, "actor.json")
     }
   end