projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix: Reuse Controller.Helper pagination for APC2S
[akkoma]
/
lib
/
pleroma
/
thread_mute.ex
diff --git
a/lib/pleroma/thread_mute.ex
b/lib/pleroma/thread_mute.ex
index 2b4cf02cf44ab5f10b3f15eea5f3d9409d17b420..be01d541dab5ef977e1950fd08f63b33834c631e 100644
(file)
--- a/
lib/pleroma/thread_mute.ex
+++ b/
lib/pleroma/thread_mute.ex
@@
-25,10
+25,10
@@
defmodule Pleroma.ThreadMute do
end
def query(user_id, context) do
end
def query(user_id, context) do
-
{:ok, user_id} = FlakeId.Ecto.CompatType.dump
(user_id)
+
user_binary_id = User.binary_id
(user_id)
ThreadMute
ThreadMute
- |> where(user_id: ^user_id)
+ |> where(user_id: ^user_
binary_
id)
|> where(context: ^context)
end
|> where(context: ^context)
end
@@
-41,15
+41,16
@@
defmodule Pleroma.ThreadMute do
def muter_ap_ids(context, ap_ids \\ nil)
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
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
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
@@
-67,8
+68,8
@@
defmodule Pleroma.ThreadMute do
|> Repo.delete_all()
end
|> Repo.delete_all()
end
- def
check_muted
(user_id, context) do
+ def
exists?
(user_id, context) do
query(user_id, context)
query(user_id, context)
- |> Repo.
all
()
+ |> Repo.
exists?
()
end
end
end
end