More tests

lib/eventos_web/controllers/activity_pub_controller.ex

@@ -18,10 +18,16 @@ defmodule EventosWeb.ActivityPubController do
   end
 
   def event(conn, %{"uuid" => uuid}) do
-    with %Event{} = event <- Events.get_event_full_by_uuid(uuid) do
+    with %Event{} = event <- Events.get_event_full_by_uuid(uuid),
+         true <- event.public do
       conn
       |> put_resp_header("content-type", "application/activity+json")
       |> json(ObjectView.render("event.json", %{event: event}))
+    else
+      false ->
+        conn
+        |> put_status(404)
+        |> json("Not found")
     end
   end
 

lib/eventos_web/controllers/actor_controller.ex

@@ -37,8 +37,12 @@ defmodule EventosWeb.ActorController do
   end
 
   def show(conn, %{"name" => name}) do
-    actor = Actors.get_actor_by_name_with_everything(name)
-    render(conn, "show.json", actor: actor)
+    with %Actor{} = actor <- Actors.get_actor_by_name_with_everything(name) do
+      render(conn, "show.json", actor: actor)
+    else
+      nil ->
+        send_resp(conn, :not_found, "")
+    end
   end
 
   @email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
@@ -57,7 +61,7 @@ defmodule EventosWeb.ActorController 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)
+      render(conn, "show_basic.json", actor: actor)
     end
   end
 

lib/eventos_web/controllers/group_controller.ex

@@ -15,15 +15,13 @@ defmodule EventosWeb.GroupController do
   end
 
   def create(conn, %{"group" => group_params}) do
-    with {:ok, %Actor{} = group} <- Actors.create_group(group_params) do
-      %Member{} =
-        _member =
-        Actors.create_member(%{
-          "parent_id" => group.id,
-          "actor_id" => Actors.get_local_actor_by_name(group_params["actor_admin"]).id,
-          "role" => 2
-        })
-
+    with {:ok, %Actor{} = group} <- Actors.create_group(group_params),
+         {:ok, %Member{} = member} <-
+           Actors.create_member(%{
+             "parent_id" => group.id,
+             "actor_id" => Actors.get_local_actor_by_name(group_params["actor_admin"]).id,
+             "role" => 2
+           }) do
       conn
       |> put_status(:created)
       |> put_resp_header("location", actor_path(conn, :show, group))
@@ -34,7 +32,7 @@ defmodule EventosWeb.GroupController do
   def join(conn, %{"name" => group_name, "actor_name" => actor_name}) do
     with %Actor{} = group <- Actors.get_group_by_name(group_name),
          %Actor{} = actor <- Actors.get_local_actor_by_name(actor_name),
-         %Member{} = member <-
+         {:ok, %Member{} = member} <-
            Actors.create_member(%{"parent_id" => group.id, "actor_id" => actor.id}) do
       conn
       |> put_status(:created)

lib/eventos_web/controllers/user_controller.ex

@@ -42,11 +42,15 @@ defmodule EventosWeb.UserController do
     end
   end
 
+  @time_before_resend 3600
   def resend_confirmation(conn, %{"email" => email}) do
     with {:ok, %User{} = user} <- Actors.find_by_email(email),
          false <- is_nil(user.confirmation_token),
          true <-
-           Timex.before?(Timex.shift(user.confirmation_sent_at, hours: 1), DateTime.utc_now()) do
+           Timex.before?(
+             Timex.shift(user.confirmation_sent_at, seconds: @time_before_resend),
+             DateTime.utc_now()
+           ) do
       Activation.resend_confirmation_email(user)
       render(conn, "confirmation.json", %{user: user})
     else
@@ -58,7 +62,10 @@ defmodule EventosWeb.UserController do
       _ ->
         conn
         |> put_status(:not_found)
-        |> json(%{"error" => "Unable to resend the validation token"})
+        |> json(%{
+          "error" =>
+            "Unable to resend the validation token. Please wait a while before you can ask for resending token"
+        })
     end
   end
 
@@ -67,7 +74,7 @@ defmodule EventosWeb.UserController do
          {:ok, _} <- ResetPassword.send_password_reset_email(user) do
       render(conn, "password_reset.json", %{user: user})
     else
-      {:error, :not_found} ->
+      {:error, nil} ->
         conn
         |> put_status(:not_found)
         |> json(%{"errors" => "Unable to find an user with this email"})
@@ -105,23 +112,23 @@ defmodule EventosWeb.UserController do
     render(conn, "show_simple.json", user: user)
   end
 
-  defp handle_changeset_errors(errors) do
-    errors
-    |> Enum.map(fn {field, detail} ->
-      "#{field} " <> render_detail(detail)
-    end)
-    |> Enum.join()
-  end
+  # defp handle_changeset_errors(errors) do
+  #   errors
+  #   |> Enum.map(fn {field, detail} ->
+  #     "#{field} " <> render_detail(detail)
+  #   end)
+  #   |> Enum.join()
+  # end
 
-  defp render_detail({message, values}) do
-    Enum.reduce(values, message, fn {k, v}, acc ->
-      String.replace(acc, "%{#{k}}", to_string(v))
-    end)
-  end
+  # defp render_detail({message, values}) do
+  #   Enum.reduce(values, message, fn {k, v}, acc ->
+  #     String.replace(acc, "%{#{k}}", to_string(v))
+  #   end)
+  # end
 
-  defp render_detail(message) do
-    message
-  end
+  # defp render_detail(message) do
+  #   message
+  # end
 
   def update(conn, %{"id" => id, "user" => user_params}) do
     user = Actors.get_user!(id)

lib/eventos_web/router.ex

@@ -122,6 +122,7 @@ defmodule EventosWeb.Router do
     get("/@:name/following", ActivityPubController, :following)
     get("/@:name/followers", ActivityPubController, :followers)
     get("/events/:uuid", ActivityPubController, :event)
+    get("/comments/:uuid", ActivityPubController, :event)
     post("/@:name/inbox", ActivityPubController, :inbox)
     post("/inbox", ActivityPubController, :inbox)
   end

lib/eventos_web/views/activity_pub/actor_view.ex

@@ -134,10 +134,17 @@ defmodule EventosWeb.ActivityPub.ActorView do
         else
           "Announce"
         end,
-      "actor" => activity.data.organizer_actor.url,
+      "actor" => activity.actor,
       "published" => Timex.now(),
       "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-      "object" => render_one(activity.data, ObjectView, "event.json", as: :event)
+      "object" =>
+        case activity.type do
+          :Event ->
+            render_one(activity.data, ObjectView, "event.json", as: :event)
+
+          :Comment ->
+            render_one(activity.data, ObjectView, "note.json", as: :note)
+        end
     }
   end
 

lib/eventos_web/views/activity_pub/object_view.ex

@@ -32,6 +32,19 @@ defmodule EventosWeb.ActivityPub.ObjectView do
     Map.merge(event, @base)
   end
 
+  def render("note.json", %{note: note}) do
+    event = %{
+      "type" => "Note",
+      "id" => note.url,
+      "content" => note.text,
+      "mediaType" => "text/markdown",
+      "published" => Timex.format!(note.inserted_at, "{ISO:Extended}"),
+      "updated" => Timex.format!(note.updated_at, "{ISO:Extended}")
+    }
+
+    Map.merge(event, @base)
+  end
+
   def render("category.json", %{category: category}) do
     %{"title" => category.title}
   end