projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
16c451f
)
user: harden get_friends_query(), get_followers_query() and their wrappers
author
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Wed, 2 Sep 2020 18:24:03 +0000
(20:24 +0200)
committer
rinpatch
<rinpatch@sdf.org>
Tue, 8 Sep 2020 17:21:34 +0000
(20:21 +0300)
lib/pleroma/user.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 94c96de8db55dd7274c95aeb9af7e4edc4bc1297..f323fc6edcc0fbec15ab17e4844764c41e0f5c40 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-1125,31
+1125,31
@@
defmodule Pleroma.User do
User.Query.build(%{followers: user, deactivated: false})
end
User.Query.build(%{followers: user, deactivated: false})
end
- def get_followers_query(user, page) do
+ def get_followers_query(
%User{} =
user, page) do
user
|> get_followers_query(nil)
|> User.Query.paginate(page, 20)
end
@spec get_followers_query(User.t()) :: Ecto.Query.t()
user
|> get_followers_query(nil)
|> User.Query.paginate(page, 20)
end
@spec get_followers_query(User.t()) :: Ecto.Query.t()
- def get_followers_query(user), do: get_followers_query(user, nil)
+ def get_followers_query(
%User{} =
user), do: get_followers_query(user, nil)
@spec get_followers(User.t(), pos_integer() | nil) :: {:ok, list(User.t())}
@spec get_followers(User.t(), pos_integer() | nil) :: {:ok, list(User.t())}
- def get_followers(user, page \\ nil) do
+ def get_followers(
%User{} =
user, page \\ nil) do
user
|> get_followers_query(page)
|> Repo.all()
end
@spec get_external_followers(User.t(), pos_integer() | nil) :: {:ok, list(User.t())}
user
|> get_followers_query(page)
|> Repo.all()
end
@spec get_external_followers(User.t(), pos_integer() | nil) :: {:ok, list(User.t())}
- def get_external_followers(user, page \\ nil) do
+ def get_external_followers(
%User{} =
user, page \\ nil) do
user
|> get_followers_query(page)
|> User.Query.build(%{external: true})
|> Repo.all()
end
user
|> get_followers_query(page)
|> User.Query.build(%{external: true})
|> Repo.all()
end
- def get_followers_ids(user, page \\ nil) do
+ def get_followers_ids(
%User{} =
user, page \\ nil) do
user
|> get_followers_query(page)
|> select([u], u.id)
user
|> get_followers_query(page)
|> select([u], u.id)
@@
-1161,29
+1161,29
@@
defmodule Pleroma.User do
User.Query.build(%{friends: user, deactivated: false})
end
User.Query.build(%{friends: user, deactivated: false})
end
- def get_friends_query(user, page) do
+ def get_friends_query(
%User{} =
user, page) do
user
|> get_friends_query(nil)
|> User.Query.paginate(page, 20)
end
@spec get_friends_query(User.t()) :: Ecto.Query.t()
user
|> get_friends_query(nil)
|> User.Query.paginate(page, 20)
end
@spec get_friends_query(User.t()) :: Ecto.Query.t()
- def get_friends_query(user), do: get_friends_query(user, nil)
+ def get_friends_query(
%User{} =
user), do: get_friends_query(user, nil)
- def get_friends(user, page \\ nil) do
+ def get_friends(
%User{} =
user, page \\ nil) do
user
|> get_friends_query(page)
|> Repo.all()
end
user
|> get_friends_query(page)
|> Repo.all()
end
- def get_friends_ap_ids(user) do
+ def get_friends_ap_ids(
%User{} =
user) do
user
|> get_friends_query(nil)
|> select([u], u.ap_id)
|> Repo.all()
end
user
|> get_friends_query(nil)
|> select([u], u.ap_id)
|> Repo.all()
end
- def get_friends_ids(user, page \\ nil) do
+ def get_friends_ids(
%User{} =
user, page \\ nil) do
user
|> get_friends_query(page)
|> select([u], u.id)
user
|> get_friends_query(page)
|> select([u], u.id)