Merge branch 'fix/unsafe-variables' into 'develop'

Get rid of unsafe variables.

See merge request pleroma/pleroma!145

lib/pleroma/web/activity_pub/mrf/simple_policy.ex

@@ -17,9 +17,10 @@ defp check_media_removal(actor_info, object) do
     if actor_info.host in @media_removal do
       child_object = Map.delete(object["object"], "attachment")
       object = Map.put(object, "object", child_object)
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
   @media_nsfw Keyword.get(@mrf_policy, :media_nsfw)
@@ -32,9 +33,10 @@ defp check_media_nsfw(actor_info, object) do
       child_object = Map.put(child_object, "tags", tags)
       child_object = Map.put(child_object, "sensitive", true)
       object = Map.put(object, "object", child_object)
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
   @ftl_removal Keyword.get(@mrf_policy, :federated_timeline_removal)
@@ -43,22 +45,28 @@ defp check_ftl_removal(actor_info, object) do
       user = User.get_by_ap_id(object["actor"])
 
       # flip to/cc relationship to make the post unlisted
-      if "https://www.w3.org/ns/activitystreams#Public" in object["to"] and
+      object =
-           user.follower_address in object["cc"] do
+        if "https://www.w3.org/ns/activitystreams#Public" in object["to"] and
-        to =
+             user.follower_address in object["cc"] do
-          List.delete(object["to"], "https://www.w3.org/ns/activitystreams#Public") ++
+          to =
-            [user.follower_address]
+            List.delete(object["to"], "https://www.w3.org/ns/activitystreams#Public") ++
+              [user.follower_address]
 
-        cc =
+          cc =
-          List.delete(object["cc"], user.follower_address) ++
+            List.delete(object["cc"], user.follower_address) ++
-            ["https://www.w3.org/ns/activitystreams#Public"]
+              ["https://www.w3.org/ns/activitystreams#Public"]
 
-        object = Map.put(object, "to", to)
+          object
-        object = Map.put(object, "cc", cc)
+          |> Map.put("to", to)
-      end
+          |> Map.put("cc", cc)
+        else
+          object
+        end
+
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
   def filter(object) do

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -72,9 +72,12 @@ def fix_emoji(object) do
       |> Enum.reduce(%{}, fn data, mapping ->
         name = data["name"]
 
-        if String.starts_with?(name, ":") do
+        name =
-          name = name |> String.slice(1..-2)
+          if String.starts_with?(name, ":") do
-        end
+            name = name |> String.slice(1..-2)
+          else
+            name
+          end
 
         mapping |> Map.put(name, data["icon"]["url"])
       end)

lib/pleroma/web/activity_pub/views/user_view.ex

@@ -123,9 +123,12 @@ def render("outbox.json", %{user: user, max_id: max_qid}) do
       "limit" => "10"
     }
 
-    if max_qid != nil do
+    params =
-      params = Map.put(params, "max_id", max_qid)
+      if max_qid != nil do
-    end
+        Map.put(params, "max_id", max_qid)
+      else
+        params
+      end
 
     activities = ActivityPub.fetch_public_activities(params)
     min_id = Enum.at(activities, 0).id

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

@@ -212,14 +212,14 @@ def user_statuses(%{assigns: %{user: user}} = conn, params) do
         |> Map.put("actor_id", ap_id)
         |> Map.put("whole_db", true)
 
-      if params["pinned"] == "true" do
+      activities =
-        # Since Pleroma has no "pinned" posts feature, we'll just set an empty list here
+        if params["pinned"] == "true" do
-        activities = []
+          # Since Pleroma has no "pinned" posts feature, we'll just set an empty list here
-      else
+          []
-        activities =
+        else
           ActivityPub.fetch_public_activities(params)
           |> Enum.reverse()
-      end
+        end
 
       conn
       |> add_link_headers(:user_statuses, activities, params["id"])

lib/pleroma/web/web_finger/web_finger.ex

@@ -239,13 +239,14 @@ def finger(account) do
           URI.parse(account).host
       end
 
-    case find_lrdd_template(domain) do
+    address =
-      {:ok, template} ->
+      case find_lrdd_template(domain) do
-        address = String.replace(template, "{uri}", URI.encode(account))
+        {:ok, template} ->
+          String.replace(template, "{uri}", URI.encode(account))
 
-      _ ->
+        _ ->
-        address = "http://#{domain}/.well-known/webfinger?resource=acct:#{account}"
+          "http://#{domain}/.well-known/webfinger?resource=acct:#{account}"
-    end
+      end
 
     with response <-
            @httpoison.get(