mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 00:26:30 +00:00
MastoAPI: Add emoji output.
This commit is contained in:
parent
38f3908c14
commit
64bc38e009
3 changed files with 17 additions and 3 deletions
|
@ -74,6 +74,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|||
reply_to = Activity.get_create_activity_by_object_ap_id(object["inReplyTo"])
|
||||
reply_to_user = reply_to && User.get_cached_by_ap_id(reply_to.data["actor"])
|
||||
|
||||
emojis = (activity.data["object"]["emoji"] || [])
|
||||
|> Enum.map(fn {name, url} -> %{ shortcode: name, url: url, static_url: url } end)
|
||||
|
||||
%{
|
||||
id: activity.id,
|
||||
uri: object["id"],
|
||||
|
@ -99,7 +102,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|||
name: "Web",
|
||||
website: nil
|
||||
},
|
||||
language: nil
|
||||
language: nil,
|
||||
emojis: emojis
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -26,7 +26,10 @@ defmodule Pleroma.Factory do
|
|||
"likes" => [],
|
||||
"like_count" => 0,
|
||||
"context" => "2hu",
|
||||
"tag" => ["2hu"]
|
||||
"tag" => ["2hu"],
|
||||
"emoji" => %{
|
||||
"2hu" => "corndog.png"
|
||||
}
|
||||
}
|
||||
|
||||
%Pleroma.Object{
|
||||
|
|
|
@ -41,7 +41,14 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
|
|||
name: "Web",
|
||||
website: nil
|
||||
},
|
||||
language: nil
|
||||
language: nil,
|
||||
emojis: [
|
||||
%{
|
||||
shortcode: "2hu",
|
||||
url: "corndog.png",
|
||||
static_url: "corndog.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
assert status == expected
|
||||
|
|
Loading…
Reference in a new issue