fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-27 16:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/as2-page-support' into 'develop'

Browse source 
AS2 page support (prismo)

See merge request pleroma/pleroma!413
This commit is contained in:
kaniini 2018-11-01 10:48:09 +00:00
parent f20f575e29 24ba08de13
commit 4fab4e9ba4
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -263,7 +263,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
# - tags
# - emoji
def handle_incoming(%{"type" => "Create", "object" => %{"type" => objtype} = object} = data)
when objtype in ["Article", "Note", "Video"] do
when objtype in ["Article", "Note", "Video", "Page"] do
actor = get_actor(data)
data =

2
lib/pleroma/web/activity_pub/utils.ex
View file

@ -175,7 +175,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
Inserts a full object if it is contained in an activity.
"""
def insert_full_object(%{"object" => %{"type" => type} = object_data})
when is_map(object_data) and type in ["Article", "Note", "Video"] do
when is_map(object_data) and type in ["Article", "Note", "Video", "Page"] do
with {:ok, _} <- Object.create(object_data) do
:ok
end

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -236,7 +236,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
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"]
content =

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

@ -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 =