Commit ff6c9a5c authored by rinpatch's avatar rinpatch
Browse files

Introduce get_by_id in Activity, replace newlines with spaces

parent 850912b0
......@@ -207,7 +207,7 @@
ip: {0, 0, 0, 0},
port: 9999
config :pleroma, :metadata, opengraph: true
config :pleroma, :metadata, providers: []
config :pleroma, :suggestions,
enabled: false,
......
......@@ -35,7 +35,10 @@ def get_by_ap_id(ap_id) do
)
)
end
def get_by_id(id) do
Repo.get(Activity, id)
end
# TODO:
# Go through these and fix them everywhere.
# Wrong name, only returns create activities
......
......@@ -47,6 +47,7 @@ defp scrub_html_and_truncate(content) do
content
# html content comes from DB already encoded, decode first and scrub after
|> HtmlEntities.decode()
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
|> Formatter.truncate()
end
......
......@@ -7,7 +7,6 @@ defmodule Pleroma.Web.OStatus.OStatusController do
alias Pleroma.{User, Activity, Object}
alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
alias Pleroma.Repo
alias Pleroma.Web.{OStatus, Federator}
alias Pleroma.Web.XML
alias Pleroma.Web.ActivityPub.ObjectView
......@@ -141,7 +140,7 @@ def activity(conn, %{"uuid" => uuid}) do
end
def notice(conn, %{"id" => id}) do
with {_, %Activity{} = activity} <- {:activity, Repo.get(Activity, id)},
with {_, %Activity{} = activity} <- {:activity, Activity.get_by_id(id)},
{_, true} <- {:public?, ActivityPub.is_public?(activity)},
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
case format = get_format(conn) do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment