projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
views
/
activity_view.ex
diff --git
a/lib/pleroma/web/twitter_api/views/activity_view.ex
b/lib/pleroma/web/twitter_api/views/activity_view.ex
index 661022afa7f9464169c8d520d54fe6fa08d09355..433322eb8fbfce70632803921504a234d789b3b8 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/activity_view.ex
@@
-10,12
+10,12
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
+ alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.TwitterAPI.ActivityView
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.TwitterAPI.ActivityView
- alias Pleroma.Web.TwitterAPI.TwitterAPI
- alias Pleroma.Web.TwitterAPI.UserView
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
+ alias Pleroma.Web.TwitterAPI.UserView
import Ecto.Query
require Logger
import Ecto.Query
require Logger
@@
-77,7
+77,7
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
defp get_context_id(%{data: %{"context" => context}}, options) do
cond do
id = options[:context_ids][context] -> id
defp get_context_id(%{data: %{"context" => context}}, options) do
cond do
id = options[:context_ids][context] -> id
- true ->
TwitterAPI
.context_to_conversation_id(context)
+ true ->
Utils
.context_to_conversation_id(context)
end
end
end
end
@@
-254,10
+254,10
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
html =
content
html =
content
- |> HTML.get_cached_scrubbed_html_for_
object
(
+ |> HTML.get_cached_scrubbed_html_for_
activity
(
User.html_filter_policy(opts[:for]),
activity,
User.html_filter_policy(opts[:for]),
activity,
- __MODULE__
+ "twitterapi:content"
)
|> Formatter.emojify(object["emoji"])
)
|> Formatter.emojify(object["emoji"])
@@
-265,7
+265,9
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
- |> HTML.get_cached_stripped_html_for_object(activity, __MODULE__)
+ |> HTML.get_cached_stripped_html_for_activity(activity, "twitterapi:content")
+ else
+ ""
end
reply_parent = Activity.get_in_reply_to_activity(activity)
end
reply_parent = Activity.get_in_reply_to_activity(activity)
@@
-309,7
+311,8
@@
defmodule Pleroma.Web.TwitterAPI.ActivityView do
"visibility" => StatusView.get_visibility(object),
"summary" => summary,
"summary_html" => summary |> Formatter.emojify(object["emoji"]),
"visibility" => StatusView.get_visibility(object),
"summary" => summary,
"summary_html" => summary |> Formatter.emojify(object["emoji"]),
- "card" => card
+ "card" => card,
+ "muted" => CommonAPI.thread_muted?(user, activity) || User.mutes?(opts[:for], user)
}
end
}
end