aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-11-01 10:48:09 +0000
committerkaniini <nenolod@gmail.com>2018-11-01 10:48:09 +0000
commit4fab4e9ba44cdedccb9cf92a0d9b590a654bba69 (patch)
treeece1a11dc48537f058bc1b3895893786c6992c14 /lib/pleroma/web/twitter_api
parentf20f575e298b7d98f6c025e552564e8e73e7bd49 (diff)
parent24ba08de13ef8c0cb4330a613758d006453dfec3 (diff)
downloadpleroma-4fab4e9ba44cdedccb9cf92a0d9b590a654bba69.tar.gz
Merge branch 'feature/as2-page-support' into 'develop'
AS2 page support (prismo) See merge request pleroma/pleroma!413
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r--lib/pleroma/web/twitter_api/views/activity_view.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex
index fb97f199b..8e8b3f5ed 100644
--- a/lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/lib/pleroma/web/twitter_api/views/activity_view.ex
@@ -283,7 +283,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
{summary, content}
end
- def render_content(%{"type" => "Article"} = object) do
+ def render_content(%{"type" => object_type} = object) when object_type in ["Article", "Page"] do
summary = object["name"] || object["summary"]
content =