From 7003671e3ee25e9421e6fe684da9df31589e4dd3 Mon Sep 17 00:00:00 2001
From: Roman Chvanikov <chvanikoff@pm.me>
Date: Sat, 18 Apr 2020 15:22:10 +0300
Subject: cleanup

---
 lib/mix/tasks/pleroma/frontend.ex                         | 2 +-
 lib/mix/tasks/pleroma/instance.ex                         | 4 ++--
 lib/pleroma/web/controllers/frontend/static_controller.ex | 9 ++++-----
 lib/pleroma/web/frontend_controller.ex                    | 5 +----
 lib/pleroma/web/router.ex                                 | 4 ----
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/mix/tasks/pleroma/frontend.ex b/lib/mix/tasks/pleroma/frontend.ex
index 34c61ec2b..b56eef1c7 100644
--- a/lib/mix/tasks/pleroma/frontend.ex
+++ b/lib/mix/tasks/pleroma/frontend.ex
@@ -73,7 +73,7 @@ defmodule Mix.Tasks.Pleroma.Frontend do
       :ok
     else
       error ->
-        error
+        {:error, error}
     end
   end
 
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index cd4a01149..3e0f0fdc8 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -203,7 +203,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
       fe_mastodon_ref =
         get_frontend_ref(install_mastodon_fe?, "mastodon", :fe_mastodon_ref, options)
 
-      with true <- install_mastodon_fe? do
+      if install_mastodon_fe? do
         install_fe.("mastodon", fe_mastodon_ref)
       end
 
@@ -217,7 +217,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
       fe_admin_ref = get_frontend_ref(install_admin_fe?, "admin", :fe_admin_ref, options)
 
-      with true <- install_admin_fe? do
+      if install_admin_fe? do
         install_fe.("admin", fe_admin_ref)
       end
 
diff --git a/lib/pleroma/web/controllers/frontend/static_controller.ex b/lib/pleroma/web/controllers/frontend/static_controller.ex
index 41270436f..ee821c61c 100644
--- a/lib/pleroma/web/controllers/frontend/static_controller.ex
+++ b/lib/pleroma/web/controllers/frontend/static_controller.ex
@@ -129,9 +129,10 @@ defmodule Pleroma.Web.Frontend.StaticController do
     {:ok, user} = User.get_or_fetch(activity.object.data["actor"])
 
     link =
-      case user.local do
-        true -> o_status_url(Pleroma.Web.Endpoint, :notice, activity)
-        _ -> data["url"] || data["external_url"] || data["id"]
+      if user.local do
+        o_status_url(Pleroma.Web.Endpoint, :notice, activity)
+      else
+        data["url"] || data["external_url"] || data["id"]
       end
 
     content =
@@ -139,8 +140,6 @@ defmodule Pleroma.Web.Frontend.StaticController do
         data["content"]
         |> Pleroma.HTML.filter_tags()
         |> Pleroma.Emoji.Formatter.emojify(Map.get(data, "emoji", %{}))
-      else
-        nil
       end
 
     %{
diff --git a/lib/pleroma/web/frontend_controller.ex b/lib/pleroma/web/frontend_controller.ex
index 8fdf8fec9..71fae0bb8 100644
--- a/lib/pleroma/web/frontend_controller.ex
+++ b/lib/pleroma/web/frontend_controller.ex
@@ -9,10 +9,7 @@ defmodule Pleroma.Web.FrontendController do
   def action(conn, _opts) do
     # `conn.private[:frontend]` can be unset if the function is called outside
     # of the standard controller pipeline
-    fe_config =
-      with nil <- conn.private[:frontend] do
-        get_primary_fe_opts()
-      end
+    fe_config = conn.private[:frontend] || get_primary_fe_opts()
 
     # can only be true for :primary frontend
     static_enabled? = Map.get(fe_config, :static, false)
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 34eff708c..7dffb9377 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -537,10 +537,6 @@ defmodule Pleroma.Web.Router do
     plug(:accepts, ["html", "xml", "rss", "atom", "activity+json", "json"])
   end
 
-  # pipeline :static_fe do
-  #   plug(Pleroma.Plugs.StaticFEPlug)
-  # end
-
   pipeline :oembed do
     plug(:accepts, ["json", "xml"])
   end
-- 
cgit v1.2.3