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

[#1364] Minor improvements / comments.

Browse source 
Further fixes of incorrect usage of "relations" as a short form of "relationships".
This commit is contained in:
Ivan Tashkinov 2020-03-25 13:05:00 +03:00
commit 3fa3d45dbe
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/thread_mute.ex
View file

@ -41,15 +41,16 @@ defmodule Pleroma.ThreadMute do
def muter_ap_ids(context, ap_ids \\ nil)
def muter_ap_ids(context, ap_ids) when context not in [nil, ""] do
# Note: applies to fake activities (ActivityPub.Utils.get_notified_from_object/1 etc.)
def muter_ap_ids(context, _ap_ids) when is_nil(context), do: []
def muter_ap_ids(context, ap_ids) do
context
|> muters_query()
|> maybe_filter_on_ap_id(ap_ids)
|> Repo.all()
end
def muter_ap_ids(_context, _ap_ids), do: []
defp maybe_filter_on_ap_id(query, ap_ids) when is_list(ap_ids) do
where(query, [tm, u], u.ap_id in ^ap_ids)
end