sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-29 19:25:23 +01:00
Code Issues Releases Wiki Activity

activity interpretation: formatting

Browse Source
This commit is contained in:
William Pitcock 2018-06-24 06:34:44 +00:00
parent 66819ea784
commit 971bb4f2bd
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -122,7 +122,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
# TODO: validate those with a Ecto scheme
# - tags
# - emoji
def handle_incoming(%{"type" => "Create", "object" => %{"type" => objtype} = object} = data) when objtype in ["Article", "Note"] do
def handle_incoming(%{"type" => "Create", "object" => %{"type" => objtype} = object} = data)
when objtype in ["Article", "Note"] do
with nil <- Activity.get_create_activity_by_object_ap_id(object["id"]),
%User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do
object = fix_object(data["object"])

1
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -210,6 +210,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
def render_content(%{"type" => "Article"} = object) do
summary = object["name"]
content =
if !!summary and summary != "" do
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"

2
lib/pleroma/web/twitter_api/views/activity_view.ex
View File

@ -261,6 +261,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
def render_content(%{"type" => "Note"} = object) do
summary = object["summary"]
content =
if !!summary and summary != "" do
"<p>#{summary}</p>#{object["content"]}"
@ -273,6 +274,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
def render_content(%{"type" => "Article"} = object) do
summary = object["name"] || object["summary"]
content =
if !!summary and summary != "" do
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"