Merge branch 'tests' into 'master'

Make tests great again !

See merge request tcit/eventos!14

.credo.exs

+# This file contains the configuration for Credo and you are probably reading
+# this after creating it with `mix credo.gen.config`.
+#
+# If you find anything wrong or unclear in this file, please report an
+# issue on GitHub: https://github.com/rrrene/credo/issues
+#
+%{
+  #
+  # You can have as many configs as you like in the `configs:` field.
+  configs: [
+    %{
+      #
+      # Run any exec using `mix credo -C <name>`. If no exec name is given
+      # "default" is used.
+      #
+      name: "default",
+      #
+      # These are the files included in the analysis:
+      files: %{
+        #
+        # You can give explicit globs or simply directories.
+        # In the latter case `**/*.{ex,exs}` will be used.
+        #
+        included: ["lib/", "src/", "test/", "web/", "apps/"],
+        excluded: [~r"/_build/", ~r"/deps/"]
+      },
+      #
+      # If you create your own checks, you must specify the source files for
+      # them here, so they can be loaded by Credo before running the analysis.
+      #
+      requires: [],
+      #
+      # If you want to enforce a style guide and need a more traditional linting
+      # experience, you can change `strict` to `true` below:
+      #
+      strict: false,
+      #
+      # If you want to use uncolored output by default, you can change `color`
+      # to `false` below:
+      #
+      color: true,
+      #
+      # You can customize the parameters of any check by adding a second element
+      # to the tuple.
+      #
+      # To disable a check put `false` as second element:
+      #
+      #     {Credo.Check.Design.DuplicatedCode, false}
+      #
+      checks: [
+        #
+        ## Consistency Checks
+        #
+        {Credo.Check.Consistency.ExceptionNames},
+        {Credo.Check.Consistency.LineEndings},
+        {Credo.Check.Consistency.ParameterPatternMatching},
+        {Credo.Check.Consistency.SpaceAroundOperators},
+        {Credo.Check.Consistency.SpaceInParentheses},
+        {Credo.Check.Consistency.TabsOrSpaces},
+
+        #
+        ## Design Checks
+        #
+        # You can customize the priority of any check
+        # Priority values are: `low, normal, high, higher`
+        #
+        {Credo.Check.Design.AliasUsage, priority: :low},
+        # For some checks, you can also set other parameters
+        #
+        # If you don't want the `setup` and `test` macro calls in ExUnit tests
+        # or the `schema` macro in Ecto schemas to trigger DuplicatedCode, just
+        # set the `excluded_macros` parameter to `[:schema, :setup, :test]`.
+        #
+        {Credo.Check.Design.DuplicatedCode, excluded_macros: []},
+        # You can also customize the exit_status of each check.
+        # If you don't want TODO comments to cause `mix credo` to fail, just
+        # set this value to 0 (zero).
+        #
+        {Credo.Check.Design.TagTODO, exit_status: 0},
+        {Credo.Check.Design.TagFIXME},
+
+        #
+        ## Readability Checks
+        #
+        {Credo.Check.Readability.AliasOrder},
+        {Credo.Check.Readability.FunctionNames},
+        {Credo.Check.Readability.LargeNumbers},
+        {Credo.Check.Readability.MaxLineLength, priority: :low, max_length: 80},
+        {Credo.Check.Readability.ModuleAttributeNames},
+        {Credo.Check.Readability.ModuleDoc},
+        {Credo.Check.Readability.ModuleNames},
+        {Credo.Check.Readability.ParenthesesOnZeroArityDefs},
+        {Credo.Check.Readability.ParenthesesInCondition},
+        {Credo.Check.Readability.PredicateFunctionNames},
+        {Credo.Check.Readability.PreferImplicitTry},
+        {Credo.Check.Readability.RedundantBlankLines},
+        {Credo.Check.Readability.StringSigils},
+        {Credo.Check.Readability.TrailingBlankLine},
+        {Credo.Check.Readability.TrailingWhiteSpace},
+        {Credo.Check.Readability.VariableNames},
+        {Credo.Check.Readability.Semicolons},
+        {Credo.Check.Readability.SpaceAfterCommas},
+
+        #
+        ## Refactoring Opportunities
+        #
+        {Credo.Check.Refactor.DoubleBooleanNegation},
+        {Credo.Check.Refactor.CondStatements},
+        {Credo.Check.Refactor.CyclomaticComplexity},
+        {Credo.Check.Refactor.FunctionArity},
+        {Credo.Check.Refactor.LongQuoteBlocks},
+        {Credo.Check.Refactor.MatchInCondition},
+        {Credo.Check.Refactor.NegatedConditionsInUnless},
+        {Credo.Check.Refactor.NegatedConditionsWithElse},
+        {Credo.Check.Refactor.Nesting, max_nesting: 3},
+        {Credo.Check.Refactor.PipeChainStart,
+         excluded_argument_types: [:atom, :binary, :fn, :keyword], excluded_functions: []},
+        {Credo.Check.Refactor.UnlessWithElse},
+
+        #
+        ## Warnings
+        #
+        {Credo.Check.Warning.BoolOperationOnSameValues},
+        {Credo.Check.Warning.ExpensiveEmptyEnumCheck},
+        {Credo.Check.Warning.IExPry},
+        {Credo.Check.Warning.IoInspect},
+        {Credo.Check.Warning.LazyLogging},
+        {Credo.Check.Warning.OperationOnSameValues},
+        {Credo.Check.Warning.OperationWithConstantResult},
+        {Credo.Check.Warning.UnusedEnumOperation},
+        {Credo.Check.Warning.UnusedFileOperation},
+        {Credo.Check.Warning.UnusedKeywordOperation},
+        {Credo.Check.Warning.UnusedListOperation},
+        {Credo.Check.Warning.UnusedPathOperation},
+        {Credo.Check.Warning.UnusedRegexOperation},
+        {Credo.Check.Warning.UnusedStringOperation},
+        {Credo.Check.Warning.UnusedTupleOperation},
+        {Credo.Check.Warning.RaiseInsideRescue},
+
+        #
+        # Controversial and experimental checks (opt-in, just remove `, false`)
+        #
+        {Credo.Check.Refactor.ABCSize, false},
+        {Credo.Check.Refactor.AppendSingleItem, false},
+        {Credo.Check.Refactor.VariableRebinding, false},
+        {Credo.Check.Warning.MapGetUnsafePass, false},
+        {Credo.Check.Consistency.MultiAliasImportRequireUse, false},
+
+        #
+        # Deprecated checks (these will be deleted after a grace period)
+        #
+        {Credo.Check.Readability.Specs, false}
+
+        #
+        # Custom checks can be created using `mix credo.gen.check`.
+        #
+      ]
+    }
+  ]
+}

lib/eventos/actors/actor.ex

@@ -46,7 +46,7 @@ defmodule Eventos.Actors.Actor do
 
   import Logger
 
-#  @type t :: %Actor{description: String.t, id: integer(), inserted_at: DateTime.t, updated_at: DateTime.t, display_name: String.t, domain: String.t, private_key: String.t, public_key: String.t, suspended: boolean(), url: String.t, username: String.t, organized_events: list(), groups: list(), group_request: list(), user: User.t, field: ActorTypeEnum.t}
+#  @type t :: %Actor{description: String.t, id: integer(), inserted_at: DateTime.t, updated_at: DateTime.t, display_name: String.t, domain: String.t, keys: String.t, suspended: boolean(), url: String.t, username: String.t, organized_events: list(), groups: list(), group_request: list(), user: User.t, field: ActorTypeEnum.t}
 
   schema "actors" do
     field :url, :string
@@ -55,13 +55,12 @@ defmodule Eventos.Actors.Actor do
     field :following_url, :string
     field :followers_url, :string
     field :shared_inbox_url, :string
-    field :type, Eventos.Actors.ActorTypeEnum
+    field :type, Eventos.Actors.ActorTypeEnum, default: :Person
     field :name, :string
     field :domain, :string
     field :summary, :string
     field :preferred_username, :string
-    field :public_key, :string
-    field :private_key, :string
+    field :keys, :string
     field :manually_approves_followers, :boolean, default: false
     field :suspended, :boolean, default: false
     field :avatar_url, :string
@@ -77,24 +76,25 @@ defmodule Eventos.Actors.Actor do
   @doc false
   def changeset(%Actor{} = actor, attrs) do
     actor
-    |> Ecto.Changeset.cast(attrs, [:url, :outbox_url, :inbox_url, :shared_inbox_url, :following_url, :followers_url, :type, :name, :domain, :summary, :preferred_username, :public_key, :private_key, :manually_approves_followers, :suspended, :avatar_url, :banner_url])
-    |> validate_required([:preferred_username, :public_key, :suspended, :url])
+    |> Ecto.Changeset.cast(attrs, [:url, :outbox_url, :inbox_url, :shared_inbox_url, :following_url, :followers_url, :type, :name, :domain, :summary, :preferred_username, :keys, :manually_approves_followers, :suspended, :avatar_url, :banner_url])
+    |> validate_required([:preferred_username, :keys, :suspended, :url])
     |> unique_constraint(:prefered_username, name: :actors_preferred_username_domain_index)
   end
 
   def registration_changeset(%Actor{} = actor, attrs) do
     actor
-    |> Ecto.Changeset.cast(attrs, [:preferred_username, :domain, :name, :summary, :private_key, :public_key, :suspended, :url, :type])
-    |> validate_required([:preferred_username, :public_key, :suspended, :url, :type])
-    |> unique_constraint(:prefered_username, name: :actors_preferred_username_domain_index)
+    |> Ecto.Changeset.cast(attrs, [:preferred_username, :domain, :name, :summary, :keys, :keys, :suspended, :url, :type, :avatar_url])
+    |> unique_constraint(:preferred_username, name: :actors_preferred_username_domain_index)
+    |> put_change(:url, "#{EventosWeb.Endpoint.url()}/@#{attrs["prefered_username"]}")
+    |> validate_required([:preferred_username, :keys, :suspended, :url, :type])
   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])?)*$/
   def remote_actor_creation(params) do
     changes =
       %Actor{}
-      |> Ecto.Changeset.cast(params, [:url, :outbox_url, :inbox_url, :shared_inbox_url, :following_url, :followers_url, :type, :name, :domain, :summary, :preferred_username, :public_key, :manually_approves_followers, :avatar_url, :banner_url])
-      |> validate_required([:url, :outbox_url, :inbox_url, :type, :name, :domain, :preferred_username, :public_key])
+      |> Ecto.Changeset.cast(params, [:url, :outbox_url, :inbox_url, :shared_inbox_url, :following_url, :followers_url, :type, :name, :domain, :summary, :preferred_username, :keys, :manually_approves_followers, :avatar_url, :banner_url])
+      |> validate_required([:url, :outbox_url, :inbox_url, :type, :name, :domain, :preferred_username, :keys])
       |> unique_constraint(:preferred_username, name: :actors_preferred_username_domain_index)
       |> validate_length(:summary, max: 5000)
       |> validate_length(:preferred_username, max: 100)
@@ -135,20 +135,31 @@ defmodule Eventos.Actors.Actor do
   #@spec get_public_key_for_url(Actor.t) :: {:ok, String.t}
   def get_public_key_for_url(url) do
     with %Actor{} = actor <- get_or_fetch_by_url(url) do
-      get_public_key_for_actor(actor)
+      actor
+      |> get_keys_for_actor
+      |> Eventos.Service.ActivityPub.Utils.pem_to_public_key
     else
       _ -> :error
     end
   end
 
+  @deprecated "Use get_keys_for_actor/1 instead"
   #@spec get_public_key_for_actor(Actor.t) :: {:ok, String.t}
   def get_public_key_for_actor(%Actor{} = actor) do
-    {:ok, actor.public_key}
+    {:ok, actor.keys}
+  end
+
+  @doc """
+  Returns a pem encoded keypair (if local) or public key
+  """
+  def get_keys_for_actor(%Actor{} = actor) do
+    actor.keys
   end
 
+  @deprecated "Use get_keys_for_actor/1 instead"
   #@spec get_private_key_for_actor(Actor.t) :: {:ok, String.t}
   def get_private_key_for_actor(%Actor{} = actor) do
-    actor.private_key
+    actor.keys
   end
 
   def get_followers(%Actor{id: actor_id} = actor) do

lib/eventos/actors/actors.ex

@@ -185,7 +185,7 @@ defmodule Eventos.Actors do
 
   def insert_or_update_actor(data) do
     cs = Actor.remote_actor_creation(data)
-    Repo.insert(cs, on_conflict: [set: [public_key: data.public_key, avatar_url: data.avatar_url, banner_url: data.banner_url, name: data.name]], conflict_target: [:preferred_username, :domain])
+    Repo.insert(cs, on_conflict: [set: [keys: data.keys, avatar_url: data.avatar_url, banner_url: data.banner_url, name: data.name]], conflict_target: [:preferred_username, :domain])
   end
 
 #  def increase_event_count(%Actor{} = actor) do
@@ -335,16 +335,25 @@ defmodule Eventos.Actors do
   Register user
   """
   def register(%{email: email, password: password, username: username}) do
-    #{:ok, {privkey, pubkey}} = RsaEx.generate_keypair("4096")
-    {:ok, rsa_priv_key} = ExPublicKey.generate_key()
-    {:ok, rsa_pub_key} = ExPublicKey.public_key_from_private_key(rsa_priv_key)
+    key = :public_key.generate_key({:rsa, 2048, 65_537})
+    entry = :public_key.pem_entry_encode(:RSAPrivateKey, key)
+    pem = [entry] |> :public_key.pem_encode() |> String.trim_trailing()
+
+    import Exgravatar
+
+    avatar_url = gravatar_url(email, default: "404")
+    avatar = case HTTPoison.get(avatar_url) do
+      {:ok, %HTTPoison.Response{status_code: 200}} ->
+        avatar_url
+      _ ->
+        nil
+    end
 
     actor = Eventos.Actors.Actor.registration_changeset(%Eventos.Actors.Actor{}, %{
       preferred_username: username,
       domain: nil,
-      private_key: rsa_priv_key |> ExPublicKey.pem_encode(),
-      public_key: rsa_pub_key |> ExPublicKey.pem_encode(),
-      url: EventosWeb.Endpoint.url() <> "/@" <> username,
+      keys: pem,
+      avatar_url: avatar,
     })
 
     user = Eventos.Actors.User.registration_changeset(%Eventos.Actors.User{}, %{
@@ -361,24 +370,19 @@ defmodule Eventos.Actors do
       {:ok, user}
     rescue
      e in Ecto.InvalidChangesetError ->
-      {:error, e.changeset.changes.user.errors}
+      {:error, e.changeset}
     end
   end
 
   def register_bot_account(%{name: name, summary: summary}) do
-    key = :public_key.generate_key({:rsa, 2048, 65537})
+    key = :public_key.generate_key({:rsa, 2048, 65_537})
     entry = :public_key.pem_entry_encode(:RSAPrivateKey, key)
-    pem = :public_key.pem_encode([entry]) |> String.trim_trailing()
-
-    {:ok, rsa_priv_key} = ExPublicKey.generate_key()
-    {:ok, rsa_pub_key} = ExPublicKey.public_key_from_private_key(rsa_priv_key)
+    pem = [entry] |> :public_key.pem_encode() |> String.trim_trailing()
 
     actor = Eventos.Actors.Actor.registration_changeset(%Eventos.Actors.Actor{}, %{
       preferred_username: name,
       domain: nil,
-      private_key: pem,
-      public_key: "toto",
-      url: EventosWeb.Endpoint.url() <> "/@" <> name,
+      keys: pem,
       summary: summary,
       type: :Service
     })
@@ -387,7 +391,7 @@ defmodule Eventos.Actors do
       Eventos.Repo.insert!(actor)
     rescue
       e in Ecto.InvalidChangesetError ->
-        {:error, e}
+        {:error, e.changeset}
     end
   end
 

lib/eventos/addresses/address.ex

@@ -26,5 +26,6 @@ defmodule Eventos.Addresses.Address do
   def changeset(%Address{} = address, attrs) do
     address
     |> cast(attrs, [:description, :floor, :geom, :addressCountry, :addressLocality, :addressRegion, :postalCode, :streetAddress])
+    |> validate_required([:streetAddress])
   end
 end

lib/eventos/events/comment.ex

 defmodule Eventos.Events.Comment do
+  @moduledoc """
+  An actor comment (for instance on an event or on a group)
+  """
+
   use Ecto.Schema
   import Ecto.Changeset
 
@@ -10,7 +14,9 @@ defmodule Eventos.Events.Comment do
     field :text, :string
     field :url, :string
     field :local, :boolean, default: true
+    field :uuid, Ecto.UUID
     belongs_to :actor, Actor, [foreign_key: :actor_id]
+    belongs_to :attributed_to, Actor, [foreign_key: :attributed_to_id]
     belongs_to :event, Event, [foreign_key: :event_id]
     belongs_to :in_reply_to_comment, Comment, [foreign_key: :in_reply_to_comment_id]
     belongs_to :origin_comment, Comment, [foreign_key: :origin_comment_id]
@@ -20,8 +26,11 @@ defmodule Eventos.Events.Comment do
 
   @doc false
   def changeset(comment, attrs) do
+    uuid = Ecto.UUID.generate()
     comment
-    |> cast(attrs, [:url, :text, :actor_id, :event_id, :in_reply_to_comment_id])
-    |> validate_required([:url, :text, :actor_id])
+    |> cast(attrs, [:url, :text, :actor_id, :event_id, :in_reply_to_comment_id, :attributed_to_id])
+    |> validate_required([:text, :actor_id])
+    |> put_change(:uuid, uuid)
+    |> put_change(:url, "#{EventosWeb.Endpoint.url()}/comments/#{uuid}")
   end
 end

lib/eventos/events/event.ex

@@ -53,6 +53,7 @@ defmodule Eventos.Events.Event do
     field :publish_at, Timex.Ecto.DateTimeWithTimezone
     field :uuid, Ecto.UUID, default: Ecto.UUID.generate()
     belongs_to :organizer_actor, Actor, [foreign_key: :organizer_actor_id]
+    belongs_to :attributed_to, Actor, [foreign_key: :attributed_to_id]
     many_to_many :tags, Tag, join_through: "events_tags"
     belongs_to :category, Category
     many_to_many :participants, Actor, join_through: Participant
@@ -65,17 +66,22 @@ defmodule Eventos.Events.Event do
 
   @doc false
   def changeset(%Event{} = event, attrs) do
-    changeset = event
+    uuid = Ecto.UUID.generate()
+
+    # TODO : check what's the use here. Tests ?
+    actor_url = if Map.has_key?(attrs, :organizer_actor) do
+      attrs.organizer_actor.preferred_username
+    else
+      ""
+    end
+    event
     |> cast(attrs, [:title, :description, :url, :begins_on, :ends_on, :organizer_actor_id, :category_id, :state, :status, :public, :thumbnail, :large_image, :publish_at])
     |> cast_assoc(:tags)
     |> cast_assoc(:address)
-    |> validate_required([:title, :description, :begins_on, :ends_on, :organizer_actor_id, :category_id])
     |> TitleSlug.maybe_generate_slug()
     |> TitleSlug.unique_constraint()
-    |> put_change(:uuid, Ecto.UUID.generate())
-
-    import Logger
-    Logger.debug(inspect changeset)
-    changeset
+    |> put_change(:uuid, uuid)
+    |> put_change(:url, "#{EventosWeb.Endpoint.url()}/@#{actor_url}/#{uuid}")
+    |> validate_required([:title, :description, :begins_on, :ends_on, :organizer_actor_id, :category_id, :url, :uuid])
   end
 end

lib/eventos/events/events.ex

@@ -152,10 +152,11 @@ defmodule Eventos.Events do
 
   """
   def create_event(attrs \\ %{}) do
-    %Event{}
-    |> Event.changeset(attrs)
-    |> Repo.insert!()
-    |> Repo.preload([:organizer_actor])
+    case %Event{} |> Event.changeset(attrs) |> Repo.insert() do
+      {:ok, %Event{} = event} -> {:ok, Repo.preload(event, [:organizer_actor])}
+      err -> err
+    end
+
   end
 
   @doc """
@@ -522,8 +523,13 @@ defmodule Eventos.Events do
   @doc """
   Returns the list of sessions for an event
   """
-  def list_sessions_for_event(event_id) do
-    Repo.all(from s in Session, where: s.event_id == ^event_id)
+  def list_sessions_for_event(event_uuid) do
+    Repo.all(
+      from s in Session,
+      join: e in Event,
+      on: s.event_id == e.id,
+      where: e.uuid == ^event_uuid
+    )
   end
 
   @doc """
@@ -741,6 +747,8 @@ defmodule Eventos.Events do
   """
   def get_comment!(id), do: Repo.get!(Comment, id)
 
+  def get_comment_with_uuid!(uuid), do: Repo.get_by!(Comment, uuid: uuid)
+
   @doc """
   Creates a comment.
 

lib/eventos/events/participant.ex

@@ -9,8 +9,7 @@ defmodule Eventos.Events.Participant do
 
   @primary_key false
   schema "participants" do
-    field :role, :integer, default: 0 # 0 : participant, 1 : moderator, 2 : administrator, 3 : creator
-    field :approved, :boolean
+    field :role, :integer, default: 0 # 0 : not_approved, 1 : participant, 2 : moderator, 3 : administrator, 4 : creator
     belongs_to :event, Event, primary_key: true
     belongs_to :actor, Actor, primary_key: true
 

lib/eventos_web/controllers/activity_pub_controller.ex

@@ -17,8 +17,8 @@ defmodule EventosWeb.ActivityPubController do
     end
   end
 
-  def event(conn, %{"name" => name, "slug" => slug}) do
-    with %Event{} = event <- Events.get_event_full_by_name_and_slug!(name, slug) do
+  def event(conn, %{"uuid" => uuid}) do
+    with %Event{} = event <- Events.get_event_full_by_uuid(uuid) do
       conn
       |> put_resp_header("content-type", "application/activity+json")
       |> json(ObjectView.render("event.json", %{event: event}))
@@ -83,13 +83,13 @@ defmodule EventosWeb.ActivityPubController do
   def inbox(conn, params) do
     headers = Enum.into(conn.req_headers, %{})
 
-    if !String.contains?(headers["signature"] || "", params["actor"]) do
-      Logger.info("Signature not from author, relayed message, fetching from source")
-      ActivityPub.fetch_event_from_url(params["object"]["id"])
-    else
+    if String.contains?(headers["signature"] || "", params["actor"]) do
       Logger.info("Signature error")
       Logger.info("Could not validate #{params["actor"]}")
       Logger.info(inspect(conn.req_headers))
+    else
+      Logger.info("Signature not from author, relayed message, fetching from source")
+      ActivityPub.fetch_event_from_url(params["object"]["id"])
     end
 
     json(conn, "ok")

lib/eventos_web/controllers/bot_controller.ex

@@ -2,7 +2,7 @@ defmodule EventosWeb.BotController do
   use EventosWeb, :controller
 
   alias Eventos.Actors
-  alias Eventos.Actors.Bot
+  alias Eventos.Actors.{Bot, Actor}
 
   action_fallback EventosWeb.FallbackController
 
@@ -12,9 +12,9 @@ defmodule EventosWeb.BotController do
   end
 
   def create(conn, %{"bot" => bot_params}) do
-    with user <- Guardian.Plug.current_resource,
+    with user <- Guardian.Plug.current_resource(conn),
          bot_params <- Map.put(bot_params, "user_id", user.id),
-         {:ok, actor} <- Actors.register_bot_account(%{name: bot_params["name"], summary: bot_params["summary"]}),
+         %Actor{} = actor <- Actors.register_bot_account(%{name: bot_params["name"], summary: bot_params["summary"]}),
          bot_params <- Map.put(bot_params, "actor_id", actor.id),
          {:ok, %Bot{} = bot} <- Actors.create_bot(bot_params) do
       conn

lib/eventos_web/controllers/comment_controller.ex

@@ -20,21 +20,21 @@ defmodule EventosWeb.CommentController do
     end
   end
 
-  def show(conn, %{"id" => id}) do
-    comment = Events.get_comment!(id)
+  def show(conn, %{"uuid" => uuid}) do
+    comment = Events.get_comment_with_uuid!(uuid)
     render(conn, "show.json", comment: comment)
   end
 
-  def update(conn, %{"id" => id, "comment" => comment_params}) do
-    comment = Events.get_comment!(id)
+  def update(conn, %{"uuid" => uuid, "comment" => comment_params}) do
+    comment = Events.get_comment_with_uuid!(uuid)
 
     with {:ok, %Comment{} = comment} <- Events.update_comment(comment, comment_params) do
       render(conn, "show.json", comment: comment)
     end
   end
 
-  def delete(conn, %{"id" => id}) do
-    comment = Events.get_comment!(id)
+  def delete(conn, %{"uuid" => uuid}) do
+    comment = Events.get_comment_with_uuid!(uuid)
     with {:ok, %Comment{}} <- Events.delete_comment(comment) do
       send_resp(conn, :no_content, "")
     end

lib/eventos_web/controllers/event_controller.ex

@@ -9,6 +9,8 @@ defmodule EventosWeb.EventController do
   alias Eventos.Export.ICalendar
   alias Eventos.Addresses
 
+  import Logger
+
   action_fallback EventosWeb.FallbackController
 
   def index(conn, _params) do
@@ -32,11 +34,7 @@ defmodule EventosWeb.EventController do
   end
 
   defp process_address(address) do
-    import Logger
-    Logger.debug("process address")
-    Logger.debug(inspect address)
     geom = EventosWeb.AddressController.process_geom(address["geom"])
-    Logger.debug(inspect geom)
     case geom do
       nil ->
         address
@@ -53,12 +51,16 @@ defmodule EventosWeb.EventController do
   end
 
   def show(conn, %{"uuid" => uuid}) do
-    event = Events.get_event_full_by_uuid(uuid)
-    render(conn, "show.json", event: event)
+    case Events.get_event_full_by_uuid(uuid) do
+      nil ->
+        send_resp(conn, 404, "")
+      event ->
+        render(conn, "show.json", event: event)
+    end
   end
 
   def export_to_ics(conn, %{"uuid" => uuid}) do
-    event = Events.get_event_full_by_uuid(uuid) |> ICalendar.export_event()
+    event = uuid |> Events.get_event_full_by_uuid() |> ICalendar.export_event()
     send_resp(conn, 200, event)
   end
 
@@ -71,8 +73,8 @@ defmodule EventosWeb.EventController do
   end
 
   def delete(conn, %{"uuid" => uuid}) do
-    event = Events.get_event_by_uuid(uuid)
-    with {:ok, %Event{}} <- Events.delete_event(event) do
+    with event <- Events.get_event_by_uuid(uuid),
+      {:ok, %Event{}} <- Events.delete_event(event) do
       send_resp(conn, :no_content, "")
     end
   end

lib/eventos_web/controllers/session_controller.ex

@@ -28,8 +28,8 @@ defmodule EventosWeb.SessionController do
     render(conn, "show.json", session: session)
   end
 
-  def show_sessions_for_event(conn, %{"id" => event_id}) do
-    sessions = Events.list_sessions_for_event(event_id)
+  def show_sessions_for_event(conn, %{"uuid" => event_uuid}) do
+    sessions = Events.list_sessions_for_event(event_uuid)
     render(conn, "index.json", sessions: sessions)
   end
 

lib/eventos_web/controllers/user_controller.ex

@@ -16,16 +16,11 @@ defmodule EventosWeb.UserController do
   end
 
   def register(conn, %{"username" => username, "email" => email, "password" => password}) do
-    case Actors.register(%{email: email, password: password, username: username}) do
-      {:ok, %User{} = user} ->
-        {:ok, token, _claims} = EventosWeb.Guardian.encode_and_sign(user)
+    with {:ok, %User{} = user} <- Actors.register(%{email: email, password: password, username: username}),
+        {:ok, token, _claims} <- EventosWeb.Guardian.encode_and_sign(user) do
         conn
         |> put_status(:created)
         |> render("show_with_token.json", %{token: token, user: user})
-      {:error, error} ->
-        conn
-        |> put_resp_content_type("application/json")
-        |> send_resp(400, Poison.encode!(%{"msg" => handle_changeset_errors(error)}))
     end
   end
 

lib/eventos_web/http_signature.ex

 defmodule EventosWeb.HTTPSignaturePlug do
+  @moduledoc """
+  # HTTPSignaturePlug
+
+  Plug to check HTTP Signatures on every incoming request
+  """
+
   alias Eventos.Service.HTTPSignatures
   import Plug.Conn
   require Logger
@@ -13,7 +19,9 @@ defmodule EventosWeb.HTTPSignaturePlug do
 
   def call(conn, _opts) do
     user = conn.params["actor"]
-    Logger.debug("Checking sig for #{user}")
+    Logger.debug fn ->
+      "Checking sig for #{user}"
+    end
     with [signature | _] <- get_req_header(conn, "signature") do
       cond do
         signature && String.contains?(signature, user) ->

lib/eventos_web/router.ex

@@ -44,8 +44,9 @@ defmodule EventosWeb.Router do
       get "/events/:uuid/tracks", TrackController, :show_tracks_for_event
       get "/events/:uuid/sessions", SessionController, :show_sessions_for_event
       get "/events/:uuid", EventController, :show
-      resources "/comments", CommentController, only: [:show]
-      get "/bots/:id", BotController, :view
+      get "/comments/:uuid", CommentController, :show
+      get "/bots/:id", BotController, :show
+      get "/bots", BotController, :index
 
       get "/actors", ActorController, :index
       get "/actors/search/:name", ActorController, :search
@@ -74,10 +75,13 @@ defmodule EventosWeb.Router do
        patch "/events/:uuid", EventController, :update
        put "/events/:uuid", EventController, :update
        delete "/events/:uuid", EventController, :delete
-       resources "/comments", CommentController, except: [:new, :edit, :show]
+       post "/comments", CommentController, :create
+       patch "/comments/:uuid", CommentController, :update
+       put "/comments/:uuid", CommentController, :update
+       delete "/comments/:uuid", CommentController, :delete
        #post "/events/:id/request", EventRequestController, :create_for_event
        resources "/participant", ParticipantController
-       resources "/bots", BotController, except: [:new, :edit, :show]
+       resources "/bots", BotController, except: [:new, :edit, :show, :index]
        #resources "/requests", EventRequestController
        post "/groups", GroupController, :create
        post "/groups/:name/join", GroupController, :join
@@ -110,7 +114,7 @@ defmodule EventosWeb.Router do
     get "/@:name/outbox", ActivityPubController, :outbox
     get "/@:name/following", ActivityPubController, :following
     get "/@:name/followers", ActivityPubController, :followers
-    get "/@:name/:slug", ActivityPubController, :event
+    get "/events/:uuid", ActivityPubController, :event
     post "/@:name/inbox", ActivityPubController, :inbox
     post "/inbox", ActivityPubController, :inbox
   end

lib/eventos_web/views/activity_pub/actor_view.ex

@@ -13,7 +13,8 @@ defmodule EventosWeb.ActivityPub.ActorView do
   import Ecto.Query
 
   def render("actor.json", %{actor: actor}) do
-    {:ok, public_key} = Actor.get_public_key_for_actor(actor)
+    pem = Actor.get_keys_for_actor(actor)
+    public_key = Eventos.Service.ActivityPub.Utils.pem_to_public_key_pem(pem)
 
     %{
       "id" => actor.url,
@@ -48,9 +49,9 @@ defmodule EventosWeb.ActivityPub.ActorView do
   end
 
   def render("following.json", %{actor: actor, page: page}) do
-    following = Actor.get_followings(actor)
-
-    collection(following, actor.following_url, page)
+    actor
+    |> Actor.get_followings()
+    |> collection(actor.following_url, page)
     |> Map.merge(Utils.make_json_ld_header())
   end
 
@@ -67,9 +68,9 @@ defmodule EventosWeb.ActivityPub.ActorView do
   end
 
   def render("followers.json", %{actor: actor, page: page}) do
-    followers = Actor.get_followers(actor)
-
-    collection(followers, actor.followers_url, page)
+    actor
+    |> Actor.get_followers()
+    |> collection(actor.followers_url, page)
     |> Map.merge(Utils.make_json_ld_header())
   end
 

lib/eventos_web/views/comment_view.ex

@@ -12,7 +12,9 @@ defmodule EventosWeb.CommentView do
 
   def render("comment.json", %{comment: comment}) do
     %{id: comment.id,
+      uuid: comment.uuid,
       url: comment.url,
-      text: comment.text}
+      text: comment.text
+    }
   end
 end

lib/mix/tasks/create_bot.ex

 defmodule Mix.Tasks.CreateBot do
+  @moduledoc """
+  Creates a bot from a source
+  """
+
   use Mix.Task
   alias Eventos.Actors
   alias Eventos.Actors.Bot

lib/service/activity_pub/activity_pub.ex

 defmodule Eventos.Service.ActivityPub do
+  @moduledoc """
+  # ActivityPub
+
+  Every ActivityPub method
+  """
+
   alias Eventos.Events
   alias Eventos.Events.{Event, Category}
   alias Eventos.Service.ActivityPub.Transmogrifier
@@ -49,8 +55,8 @@ defmodule Eventos.Service.ActivityPub do
                url,
                [Accept: "application/activity+json"],
                follow_redirect: true,
-               timeout: 10000,
-               recv_timeout: 20000
+               timeout: 10_000,
+               recv_timeout: 20_000
              ),
            {:ok, data} <- Jason.decode(body),
            nil <- Events.get_event_by_url!(data["id"]),
@@ -253,7 +259,7 @@ defmodule Eventos.Service.ActivityPub do
       preferred_username: data["preferredUsername"],
       follower_address: data["followers"],
       summary: data["summary"],
-      public_key: data["publicKey"]["publicKeyPem"],
+      keys: data["publicKey"]["publicKeyPem"],
       inbox_url: data["inbox"],
       outbox_url: data["outbox"],
       following_url: data["following"],
@@ -285,9 +291,7 @@ defmodule Eventos.Service.ActivityPub do
         case bot.type do
           "ics" ->
             {:ok, %HTTPoison.Response{body: body} = _resp} = HTTPoison.get(bot.source)
-            ical_events = body
-                          |> ExIcal.parse()
-                          |> ExIcal.by_range(DateTime.utc_now(), DateTime.utc_now() |> Timex.shift(years: 1))
+            ical_events = body |> ExIcal.parse() |> ExIcal.by_range(DateTime.utc_now(), DateTime.utc_now() |> Timex.shift(years: 1))
             activities = ical_events
             |> Enum.chunk_every(limit)
             |> Enum.at(page - 1)