Front-end stuff

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

lib/eventos_web/controllers/account_controller.ex

@@ -1,41 +0,0 @@
-defmodule EventosWeb.ActorController do
-  @moduledoc """
-  Controller for Actors
-  """
-  use EventosWeb, :controller
-
-  alias Eventos.Actors
-  alias Eventos.Actors.Actor
-
-  action_fallback EventosWeb.FallbackController
-
-  def index(conn, _params) do
-    actors = Actors.list_actors()
-    render(conn, "index.json", actors: actors)
-  end
-
-  def show(conn, %{"id" => id}) do
-    actor = Actors.get_actor_with_everything!(id)
-    render(conn, "show.json", actor: actor)
-  end
-
-  def update(conn, %{"id" => id, "actor" => actor_params}) do
-    actor = Actors.get_actor!(id)
-
-    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).actor.id == id do
-      actor = Actors.get_actor!(id)
-      with {:ok, %Actor{}} <- Actors.delete_actor(actor) do
-        send_resp(conn, :no_content, "")
-      end
-    else
-      send_resp(conn, 401, "")
-    end
-  end
-end

lib/eventos_web/controllers/actor_controller.ex

@@ -0,0 +1,50 @@
+defmodule EventosWeb.ActorController do
+  @moduledoc """
+  Controller for Actors
+  """
+  use EventosWeb, :controller
+
+  alias Eventos.Actors
+  alias Eventos.Actors.Actor
+  alias Eventos.Service.ActivityPub
+
+  action_fallback EventosWeb.FallbackController
+
+  def index(conn, _params) do
+    actors = Actors.list_actors()
+    render(conn, "index.json", actors: actors)
+  end
+
+  def show(conn, %{"name" => name}) do
+    actor = Actors.get_actor_by_name_with_everything(name)
+    render(conn, "show.json", actor: actor)
+  end
+
+  def search(conn, %{"name" => name}) do
+    with {:ok, actor} <- ActivityPub.make_actor_from_nickname(name) do
+      render(conn, "acccount_basic.json", actor: actor)
+    else
+      {:error, err} -> json(conn, err)
+    end
+  end
+
+  def update(conn, %{"name" => name, "actor" => actor_params}) do
+    actor = Actors.get_local_actor_by_name(name)
+
+    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).actor.id == id do
+#      actor = Actors.get_actor!(id)
+#      with {:ok, %Actor{}} <- Actors.delete_actor(actor) do
+#        send_resp(conn, :no_content, "")
+#      end
+#    else
+#      send_resp(conn, 401, "")
+#    end
+#  end
+end

lib/eventos_web/controllers/event_controller.ex

@@ -35,28 +35,27 @@ defmodule EventosWeb.EventController do
     end
   end
 
-  def show(conn, %{"id" => id}) do
-    event = Events.get_event_full!(id)
+  def show(conn, %{"username" => username, "slug" => slug}) do
+    event = Events.get_event_full_by_name_and_slug!(username, slug)
     render(conn, "show.json", event: event)
   end
 
-  def export_to_ics(conn, %{"id" => id}) do
-    event = id
-      |> Events.get_event!()
+  def export_to_ics(conn, %{"username" => username, "slug" => slug}) do
+    event = Events.get_event_full_by_name_and_slug!(username, slug)
       |> ICalendar.export_event()
     send_resp(conn, 200, event)
   end
 
-  def update(conn, %{"id" => id, "event" => event_params}) do
-    event = Events.get_event!(id)
+  def update(conn, %{"username" => username, "slug" => slug, "event" => event_params}) do
+    event = Events.get_event_full_by_name_and_slug!(username, slug)
 
     with {:ok, %Event{} = event} <- Events.update_event(event, event_params) do
       render(conn, "show_simple.json", event: event)
     end
   end
 
-  def delete(conn, %{"id" => id}) do
-    event = Events.get_event!(id)
+  def delete(conn, %{"username" => username, "slug" => slug}) do
+    event = Events.get_event_full_by_name_and_slug!(username, slug)
     with {:ok, %Event{}} <- Events.delete_event(event) do
       send_resp(conn, :no_content, "")
     end

lib/eventos_web/router.ex

@@ -38,12 +38,16 @@ defmodule EventosWeb.Router do
       post "/users", UserController, :register
       post "/login", UserSessionController, :sign_in
       #resources "/groups", GroupController, only: [:index, :show]
-      resources "/events", EventController, only: [:index, :show]
+      get "/events", EventController, :index
+      get "/events/:username/:slug", EventController, :show
+      get "/events/:username/:slug/ics", EventController, :export_to_ics
+      get "/events/:username/:slug/tracks", TrackController, :show_tracks_for_event
+      get "/events/:username/:slug/sessions", SessionController, :show_sessions_for_event
       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 "/actors", ActorController, only: [:index, :show]
+
+      get "/actors", ActorController, :index
+      get "/actors/search/:name", ActorController, :search
+      get "/actors/:name", ActorController, :show
       resources "/tags", TagController, only: [:index, :show]
       resources "/categories", CategoryController, only: [:index, :show]
       resources "/sessions", SessionController, only: [:index, :show]
@@ -61,8 +65,11 @@ defmodule EventosWeb.Router do
        get "/user", UserController, :show_current_actor
        post "/sign-out", UserSessionController, :sign_out
        resources "/users", UserController, except: [:new, :edit, :show]
-       resources "/actors", ActorController, except: [:new, :edit]
-       resources "/events", EventController
+       patch "/actors/:name", ActorController, :update
+       post "/events", EventController, :create
+       patch "/events/:username/:slug", EventController, :update
+       put "/events/:username/:slug", EventController, :update
+       delete "/events/:username/:slug", EventController, :delete
        resources "/comments", CommentController, except: [:new, :edit]
        #post "/events/:id/request", EventRequestController, :create_for_event
        resources "/participant", ParticipantController

lib/eventos_web/views/actor_view.ex

@@ -19,10 +19,10 @@ defmodule EventosWeb.ActorView do
 
   def render("acccount_basic.json", %{actor: actor}) do
     %{id: actor.id,
-      username: actor.username,
+      username: actor.preferred_username,
       domain: actor.domain,
-      display_name: actor.display_name,
-      description: actor.description,
+      display_name: actor.name,
+      description: actor.summary,
       # public_key: actor.public_key,
       suspended: actor.suspended,
       url: actor.url,
@@ -31,14 +31,14 @@ defmodule EventosWeb.ActorView do
 
   def render("actor.json", %{actor: actor}) do
     %{id: actor.id,
-      username: actor.username,
+      username: actor.preferred_username,
       domain: actor.domain,
-      display_name: actor.display_name,
-      description: actor.description,
+      display_name: actor.name,
+      description: actor.summary,
       # public_key: actor.public_key,
       suspended: actor.suspended,
       url: actor.url,
-      organized_events: render_many(actor.organized_events, EventView, "event_simple.json")
+      organized_events: render_many(actor.organized_events, EventView, "event_for_actor.json")
     }
   end
 end

lib/eventos_web/views/event_view.ex

@@ -17,12 +17,23 @@ defmodule EventosWeb.EventView do
     %{data: render_one(event, EventView, "event.json")}
   end
 
+  def render("event_for_actor.json", %{event: event}) do
+    %{id: event.id,
+      title: event.title,
+      slug: event.slug
+    }
+  end
+
   def render("event_simple.json", %{event: event}) do
     %{id: event.id,
       title: event.title,
+      slug: event.slug,
       description: event.description,
       begins_on: event.begins_on,
       ends_on: event.ends_on,
+      organizer: %{
+        username: event.organizer_actor.preferred_username
+      },
     }
   end
 
@@ -33,7 +44,6 @@ defmodule EventosWeb.EventView do
       begins_on: event.begins_on,
       ends_on: event.ends_on,
       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, ActorView, "show_basic.json"),
       address: render_one(event.address, AddressView, "address.json"),
     }