From: kaniini <nenolod@gmail.com>
Date: Sun, 10 Feb 2019 20:54:21 +0000 (+0000)
Subject: Merge branch 'fix/credo-issues' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=6c8d15da110e86f799052c82df8b7b2404f8f722;hp=-c;p=akkoma

Merge branch 'fix/credo-issues' into 'develop'

Fix credo issues

See merge request pleroma/pleroma!786
---

6c8d15da110e86f799052c82df8b7b2404f8f722
diff --combined lib/pleroma/object.ex
index 96079cf22,5f1fc801b..dabb49536
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@@ -4,8 -4,15 +4,15 @@@
  
  defmodule Pleroma.Object do
    use Ecto.Schema
-   alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
-   import Ecto.{Query, Changeset}
+ 
+   alias Pleroma.Repo
+   alias Pleroma.Object
+   alias Pleroma.User
+   alias Pleroma.Activity
+   alias Pleroma.ObjectTombstone
+ 
+   import Ecto.Query
+   import Ecto.Changeset
  
    schema "objects" do
      field(:data, :map)
@@@ -13,29 -20,9 +20,29 @@@
      timestamps()
    end
  
 +  def insert_or_get(cng) do
 +    {_, data} = fetch_field(cng, :data)
 +    id = data["id"] || data[:id]
 +    key = "object:#{id}"
 +
 +    fetcher = fn _ ->
 +      with nil <- get_by_ap_id(id),
 +           {:ok, object} <- Repo.insert(cng) do
 +        {:commit, object}
 +      else
 +        %Object{} = object -> {:commit, object}
 +        e -> {:ignore, e}
 +      end
 +    end
 +
 +    with {state, object} when state in [:commit, :ok] <- Cachex.fetch(:object_cache, key, fetcher) do
 +      {:ok, object}
 +    end
 +  end
 +
    def create(data) do
      Object.change(%Object{}, %{data: data})
 -    |> Repo.insert()
 +    |> insert_or_get()
    end
  
    def change(struct, params \\ %{}) do
diff --combined lib/pleroma/user.ex
index 361034887,b44ba1279..0060d966b
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@@ -5,13 -5,23 +5,23 @@@
  defmodule Pleroma.User do
    use Ecto.Schema
  
-   import Ecto.{Changeset, Query}
-   alias Pleroma.{Repo, User, Object, Web, Activity, Notification}
+   import Ecto.Changeset
+   import Ecto.Query
+ 
+   alias Pleroma.Repo
+   alias Pleroma.User
+   alias Pleroma.Object
+   alias Pleroma.Web
+   alias Pleroma.Activity
+   alias Pleroma.Notification
    alias Comeonin.Pbkdf2
    alias Pleroma.Formatter
    alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils
-   alias Pleroma.Web.{OStatus, Websub, OAuth}
-   alias Pleroma.Web.ActivityPub.{Utils, ActivityPub}
+   alias Pleroma.Web.OStatus
+   alias Pleroma.Web.Websub
+   alias Pleroma.Web.OAuth
+   alias Pleroma.Web.ActivityPub.Utils
+   alias Pleroma.Web.ActivityPub.ActivityPub
  
    require Logger
  
@@@ -96,6 -106,12 +106,6 @@@
      "#{ap_id(user)}/followers"
    end
  
 -  def follow_changeset(struct, params \\ %{}) do
 -    struct
 -    |> cast(params, [:following])
 -    |> validate_required([:following])
 -  end
 -
    def user_info(%User{} = user) do
      oneself = if user.local, do: 1, else: 0
  
@@@ -250,8 -266,8 +260,8 @@@
    @doc "Inserts provided changeset, performs post-registration actions (confirmation email sending etc.)"
    def register(%Ecto.Changeset{} = changeset) do
      with {:ok, user} <- Repo.insert(changeset),
 -         {:ok, _} <- try_send_confirmation_email(user),
 -         {:ok, user} <- autofollow_users(user) do
 +         {:ok, user} <- autofollow_users(user),
 +         {:ok, _} <- try_send_confirmation_email(user) do
        {:ok, user}
      end
    end
@@@ -301,13 -317,10 +311,13 @@@
      end
    end
  
 -  @doc "A mass follow for local users. Ignores blocks and has no side effects"
 +  @doc "A mass follow for local users. Respects blocks but does not create activities."
    @spec follow_all(User.t(), list(User.t())) :: {atom(), User.t()}
    def follow_all(follower, followeds) do
 -    followed_addresses = Enum.map(followeds, fn %{follower_address: fa} -> fa end)
 +    followed_addresses =
 +      followeds
 +      |> Enum.reject(fn %{ap_id: ap_id} -> ap_id in follower.info.blocks end)
 +      |> Enum.map(fn %{follower_address: fa} -> fa end)
  
      q =
        from(u in User,
diff --combined lib/pleroma/web/activity_pub/utils.ex
index 134701e80,964e11c9d..da6cca4dd
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@@ -3,11 -3,19 +3,19 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.ActivityPub.Utils do
-   alias Pleroma.{Repo, Web, Object, Activity, User, Notification}
+   alias Pleroma.Repo
+   alias Pleroma.Web
+   alias Pleroma.Object
+   alias Pleroma.Activity
+   alias Pleroma.User
+   alias Pleroma.Notification
    alias Pleroma.Web.Router.Helpers
    alias Pleroma.Web.Endpoint
-   alias Ecto.{Changeset, UUID}
+   alias Ecto.Changeset
+   alias Ecto.UUID
+ 
    import Ecto.Query
+ 
    require Logger
  
    @supported_object_types ["Article", "Note", "Video", "Page"]
@@@ -134,8 -142,14 +142,8 @@@
      context = context || generate_id("contexts")
      changeset = Object.context_mapping(context)
  
 -    case Repo.insert(changeset) do
 -      {:ok, object} ->
 -        object
 -
 -      # This should be solved by an upsert, but it seems ecto
 -      # has problems accessing the constraint inside the jsonb.
 -      {:error, _} ->
 -        Object.get_cached_by_ap_id(context)
 +    with {:ok, object} <- Object.insert_or_get(changeset) do
 +      object
      end
    end
  
diff --combined lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 8c7df5b90,c38827165..f4867d05b
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@@ -5,10 -5,11 +5,11 @@@
  defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
    use Pleroma.Web, :controller
  
+   alias Pleroma.Config
+   alias Pleroma.Repo
    alias Pleroma.Stats
+   alias Pleroma.User
    alias Pleroma.Web
-   alias Pleroma.{User, Repo}
-   alias Pleroma.Config
    alias Pleroma.Web.ActivityPub.MRF
  
    plug(Pleroma.Web.FederatingPlug)
@@@ -32,7 -33,7 +33,7 @@@
  
    # returns a nodeinfo 2.0 map, since 2.1 just adds a repository field
    # under software.
-   def raw_nodeinfo() do
+   def raw_nodeinfo do
      instance = Application.get_env(:pleroma, :instance)
      media_proxy = Application.get_env(:pleroma, :media_proxy)
      suggestions = Application.get_env(:pleroma, :suggestions)
@@@ -44,33 -45,6 +45,33 @@@
        Application.get_env(:pleroma, :mrf_simple)
        |> Enum.into(%{})
  
 +    # This horror is needed to convert regex sigils to strings
 +    mrf_keyword =
 +      Application.get_env(:pleroma, :mrf_keyword, [])
 +      |> Enum.map(fn {key, value} ->
 +        {key,
 +         Enum.map(value, fn
 +           {pattern, replacement} ->
 +             %{
 +               "pattern" =>
 +                 if not is_binary(pattern) do
 +                   inspect(pattern)
 +                 else
 +                   pattern
 +                 end,
 +               "replacement" => replacement
 +             }
 +
 +           pattern ->
 +             if not is_binary(pattern) do
 +               inspect(pattern)
 +             else
 +               pattern
 +             end
 +         end)}
 +      end)
 +      |> Enum.into(%{})
 +
      mrf_policies =
        MRF.get_policies()
        |> Enum.map(fn policy -> to_string(policy) |> String.split(".") |> List.last() end)
@@@ -93,14 -67,11 +94,12 @@@
        Config.get([:mrf_user_allowlist], [])
        |> Enum.into(%{}, fn {k, v} -> {k, length(v)} end)
  
-     mrf_transparency = Keyword.get(instance, :mrf_transparency)
- 
      federation_response =
-       if mrf_transparency do
+       if Keyword.get(instance, :mrf_transparency) do
          %{
            mrf_policies: mrf_policies,
            mrf_simple: mrf_simple,
 +          mrf_keyword: mrf_keyword,
            mrf_user_allowlist: mrf_user_allowlist,
            quarantined_instances: quarantined
          }
diff --combined lib/pleroma/web/twitter_api/twitter_api.ex
index ddd5c5cfb,db521a3ad..162beb9be
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@@ -3,8 -3,13 +3,13 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
-   alias Pleroma.{UserInviteToken, User, Activity, Repo, Object}
-   alias Pleroma.{UserEmail, Mailer}
+   alias Pleroma.UserInviteToken
+   alias Pleroma.User
+   alias Pleroma.Activity
+   alias Pleroma.Repo
+   alias Pleroma.Object
+   alias Pleroma.UserEmail
+   alias Pleroma.Mailer
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.TwitterAPI.UserView
    alias Pleroma.Web.CommonAPI
@@@ -305,8 -310,16 +310,8 @@@
      else
        _e ->
          changeset = Object.context_mapping(context)
 -
 -        case Repo.insert(changeset) do
 -          {:ok, %{id: id}} ->
 -            id
 -
 -          # This should be solved by an upsert, but it seems ecto
 -          # has problems accessing the constraint inside the jsonb.
 -          {:error, _} ->
 -            Object.get_cached_by_ap_id(context).id
 -        end
 +        {:ok, object} = Object.insert_or_get(changeset)
 +        object.id
      end
    end