projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/1218' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
index 37eeb2ac33be4d14d70da77a2f2dfa0ea04eb29f..bb81b061e7eb09179ac11d08eea0163386e212a8 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
@@
-13,8
+13,8
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
alias Pleroma.Bookmark
alias Pleroma.Config
alias Pleroma.Conversation.Participation
alias Pleroma.Bookmark
alias Pleroma.Config
alias Pleroma.Conversation.Participation
+ alias Pleroma.Emoji
alias Pleroma.Filter
alias Pleroma.Filter
- alias Pleroma.Formatter
alias Pleroma.HTTP
alias Pleroma.Notification
alias Pleroma.Object
alias Pleroma.HTTP
alias Pleroma.Notification
alias Pleroma.Object
@@
-140,7
+140,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
user_info_emojis =
user.info
|> Map.get(:emoji, [])
user_info_emojis =
user.info
|> Map.get(:emoji, [])
- |> Enum.concat(Formatter.get_emoji_map(emojis_text))
+ |> Enum.concat(
Emoji.
Formatter.get_emoji_map(emojis_text))
|> Enum.dedup()
info_params =
|> Enum.dedup()
info_params =
@@
-333,7
+333,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
defp mastodonized_emoji do
Pleroma.Emoji.get_all()
defp mastodonized_emoji do
Pleroma.Emoji.get_all()
- |> Enum.map(fn {shortcode,
relative_url, tags
} ->
+ |> Enum.map(fn {shortcode,
%Pleroma.Emoji{file: relative_url, tags: tags}
} ->
url = to_string(URI.merge(Web.base_url(), relative_url))
%{
url = to_string(URI.merge(Web.base_url(), relative_url))
%{
@@
-381,7
+381,6
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|> Map.put("local_only", local_only)
|> Map.put("blocking_user", user)
|> Map.put("muting_user", user)
|> Map.put("local_only", local_only)
|> Map.put("blocking_user", user)
|> Map.put("muting_user", user)
- |> Map.put("user", user)
|> ActivityPub.fetch_public_activities()
|> Enum.reverse()
|> ActivityPub.fetch_public_activities()
|> Enum.reverse()
@@
-611,7
+610,12
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:ok, activity} ->
conn
|> put_view(StatusView)
{:ok, activity} ->
conn
|> put_view(StatusView)
- |> try_render("status.json", %{activity: activity, for: user, as: :activity})
+ |> try_render("status.json", %{
+ activity: activity,
+ for: user,
+ as: :activity,
+ with_direct_conversation_id: true
+ })
end
end
end
end
end
end