No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
	index 067af9816..2ac857759 100644
	--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
	+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
	@@ -1,42 +1,43 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.StaticFE.StaticFEController do
	use Pleroma.Web, :controller

	alias Pleroma.Repo
	alias Pleroma.Activity
	alias Pleroma.Object
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.Visibility

	require Logger

	def show_notice(conn, %{"notice_id" => notice_id}) do
	with %Activity{} = activity <- Repo.get(Activity, notice_id),
	true <- Visibility.is_public?(activity),
	%User{} = user <- User.get_or_fetch(activity.data["actor"]),
	%Object{} = object <- Object.normalize(activity.data["object"]) do
	conn
	\|> put_layout(:static_fe)
	\|> put_status(200)
	\|> put_view(Pleroma.Web.StaticFE.StaticFEView)
	\|> render("notice.html", %{notice: activity, object: object, user: user})
	else
	_ ->
	conn
	\|> put_status(404)
	\|> text("Not found")
	end
	end

	- def show(%{path_info: ["notice", notice_id]} = conn, _params), do: show_notice(conn, %{"notice_id" => notice_id})
	+ def show(%{path_info: ["notice", notice_id]} = conn, _params),
	+ do: show_notice(conn, %{"notice_id" => notice_id})

	# Fallback for unhandled types
	def show(conn, _params) do
	conn
	\|> put_status(404)
	\|> text("Not found")
	end
	end