Merge branch 'bugfix/trans_fix_url_videos' into 'develop'

Fix "url" of Videos in transmogrifier

Closes #367

See merge request pleroma/pleroma!459

diff --combined lib/pleroma/web/twitter_api/views/activity_view.ex
index bc90a1cd452405317cb9f61f2ac096a77e436ca6,c37d5486aa0b7838643ad68545dbf1bd70aef0aa..df93ceb6cd4cb1fc15c9749d1da549f7bbde94f7
--- 1/lib/pleroma/web/twitter_api/views/activity_view.ex
--- 2/lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/lib/pleroma/web/twitter_api/views/activity_view.ex
@@@ -245,11 -245,9 +245,11 @@@ defmodule Pleroma.Web.TwitterAPI.Activi
        |> Formatter.emojify(object["emoji"])
  
      text =
 -      content
 -      |> String.replace(~r/<br\s?\/?>/, "\n")
 -      |> HTML.strip_tags()
 +      if content do
 +        content
 +        |> String.replace(~r/<br\s?\/?>/, "\n")
 +        |> HTML.strip_tags()
 +      end
  
      reply_parent = Activity.get_in_reply_to_activity(activity)
  
@@@ -303,7 -301,8 +303,8 @@@
      {summary, content}
    end
  
-   def render_content(%{"type" => object_type} = object) when object_type in ["Article", "Page"] do
+   def render_content(%{"type" => object_type} = object)
+       when object_type in ["Article", "Page", "Video"] do
      summary = object["name"] || object["summary"]
  
      content =