projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'optimize-command_available' into 'develop'
[akkoma]
/
lib
/
pleroma
/
filter.ex
diff --git
a/lib/pleroma/filter.ex
b/lib/pleroma/filter.ex
index 91884c6b38b17de25374320db52e001f612a4eb4..fc531f7fcdd7eef6e5821e066143bde394303424 100644
(file)
--- a/
lib/pleroma/filter.ex
+++ b/
lib/pleroma/filter.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Filter do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Filter do
@@
-42,7
+42,7
@@
defmodule Pleroma.Filter do
from(f in query, where: f.hide)
end
from(f in query, where: f.hide)
end
- def get_
by_user(query, %User{id: user_id} = _user
) do
+ def get_
filters(query \\ __MODULE__, %User{id: user_id}
) do
query =
from(
f in query,
query =
from(
f in query,
@@
-110,7
+110,7
@@
defmodule Pleroma.Filter do
__MODULE__
|> get_active()
|> get_irreversible()
__MODULE__
|> get_active()
|> get_irreversible()
- |> get_
by_user
(user)
+ |> get_
filters
(user)
|> compose_regex(format)
end
|> compose_regex(format)
end