Introduce get_by_id in Activity, replace newlines with spaces

diff --git a/config/config.exs b/config/config.exs
index 895dbb3ab2b8da5db104401df3b26d27a30dd5c5..b8c208cb4b5bd0ab90648d454c611936e84ad64b 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -207,7 +207,7 @@ config :pleroma, :gopher,
   ip: {0, 0, 0, 0},
   port: 9999
 
-config :pleroma, :metadata, opengraph: true
+config :pleroma, :metadata, providers: []
 
 config :pleroma, :suggestions,
   enabled: false,

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 353f9f6cd7722d915369218576540e77c2efc89e..47562306d136a76fc10917926025ac4c015fbee5 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -35,7 +35,10 @@ defmodule Pleroma.Activity 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

diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex
index 5f8bed2fb476debc16f0ec77924ccc0790148466..6d86c0ee6d5720d7b89ada56bf4b4eac9cd4954b 100644 (file)
--- a/lib/pleroma/web/metadata/opengraph.ex
+++ b/lib/pleroma/web/metadata/opengraph.ex
@@ -47,6 +47,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph 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

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index be648a6ee8bb80ba6fa3fd55eaa5f490982fb4bc..2a47519d1b5407e192b896731434b59d11f0e458 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -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 @@ defmodule Pleroma.Web.OStatus.OStatusController 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