hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Basic peertube support.

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2018-07-12 19:06:28 +02:00
commit 74c74decf5
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
8 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -170,6 +170,15 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
HtmlSanitizeEx.basic_html(content)
|> Formatter.emojify(object["emoji"])
video =
if object["type"] == "Video" do
vid = [object]
else
[]
end
attachments = (object["attachment"] || []) ++ video
%{
"id" => activity.id,
"uri" => activity.data["object"]["id"],
@ -181,7 +190,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
"created_at" => created_at,
"in_reply_to_status_id" => object["inReplyToStatusId"],
"statusnet_conversation_id" => conversation_id,
"attachments" => (object["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts),
"attachments" => attachments |> ObjectRepresenter.enum_to_list(opts),
"attentions" => attentions,
"fave_num" => like_count,
"repeat_num" => announcement_count,

4
lib/pleroma/web/twitter_api/representers/object_representer.ex
View file

@ -7,7 +7,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
%{
url: url["href"] |> Pleroma.Web.MediaProxy.url(),
mimetype: url["mediaType"],
mimetype: url["mediaType"] || url["mimeType"],
id: data["uuid"],
oembed: false
}
@ -16,7 +16,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
%{
url: url |> Pleroma.Web.MediaProxy.url(),
mimetype: data["mediaType"],
mimetype: data["mediaType"] || url["mimeType"],
id: data["uuid"],
oembed: false
}