def feed_redirect(conn, %{"nickname" => nickname}) do
user = User.get_cached_by_nickname(nickname)
- redirect conn, external: OStatus.feed_path(user)
+
+ case get_format(conn) do
+ "html" -> Fallback.RedirectController.redirector(conn, nil)
+ _ -> redirect conn, external: OStatus.feed_path(user)
+ end
end
def feed(conn, %{"nickname" => nickname}) do
end
def object(conn, %{"uuid" => uuid}) do
- id = o_status_url(conn, :object, uuid)
- activity = Activity.get_create_activity_by_object_ap_id(id)
- user = User.get_cached_by_ap_id(activity.data["actor"])
+ with id <- o_status_url(conn, :object, uuid),
+ %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
+ %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
+ case get_format(conn) do
+ "html" -> redirect(conn, to: "/notice/#{activity.id}")
+ _ -> represent_activity(conn, activity, user)
+ end
+ end
+ end
+
+ def activity(conn, %{"uuid" => uuid}) do
+ with id <- o_status_url(conn, :activity, uuid),
+ %Activity{} = activity <- Activity.get_by_ap_id(id),
+ %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
+ case get_format(conn) do
+ "html" -> redirect(conn, to: "/notice/#{activity.id}")
+ _ -> represent_activity(conn, activity, user)
+ end
+ end
+ end
+ defp represent_activity(conn, activity, user) do
response = activity
|> ActivityRepresenter.to_simple_form(user, true)
|> ActivityRepresenter.wrap_with_entry