aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/controllers/frontend/static_controller.ex
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-04-18 15:22:10 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-04-18 15:22:10 +0300
commit7003671e3ee25e9421e6fe684da9df31589e4dd3 (patch)
tree029d5d26a76e852970a608d13ad65d4bfd6d5aab /lib/pleroma/web/controllers/frontend/static_controller.ex
parent48f9835f8db67851d0f9d4ad0718f4d2740a7905 (diff)
downloadpleroma-7003671e3ee25e9421e6fe684da9df31589e4dd3.tar.gz
cleanup
Diffstat (limited to 'lib/pleroma/web/controllers/frontend/static_controller.ex')
-rw-r--r--lib/pleroma/web/controllers/frontend/static_controller.ex9
1 files changed, 4 insertions, 5 deletions
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
%{