projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'emoji-loader-fix' into 'develop'
[akkoma]
/
lib
/
pleroma
/
list.ex
diff --git
a/lib/pleroma/list.ex
b/lib/pleroma/list.ex
index a99e3245b9fedc90eca575bad87d21df93a5ba9e..a5b1cad680ddf20dc3eb23e5981917cfa765a840 100644
(file)
--- a/
lib/pleroma/list.ex
+++ b/
lib/pleroma/list.ex
@@
-1,10
+1,19
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.List do
use Ecto.Schema
defmodule Pleroma.List do
use Ecto.Schema
- import Ecto.{Changeset, Query}
- alias Pleroma.{User, Repo, Activity}
+
+ import Ecto.Query
+ import Ecto.Changeset
+
+ alias Pleroma.Activity
+ alias Pleroma.Repo
+ alias Pleroma.User
schema "lists" do
schema "lists" do
- belongs_to(:user,
Pleroma.User
)
+ belongs_to(:user,
User, type: Pleroma.FlakeId
)
field(:title, :string)
field(:following, {:array, :string}, default: [])
field(:title, :string)
field(:following, {:array, :string}, default: [])
@@
-23,7
+32,7
@@
defmodule Pleroma.List do
|> validate_required([:following])
end
|> validate_required([:following])
end
- def for_user(user, opts) do
+ def for_user(user,
_
opts) do
query =
from(
l in Pleroma.List,
query =
from(
l in Pleroma.List,
@@
-46,7
+55,7
@@
defmodule Pleroma.List do
Repo.one(query)
end
Repo.one(query)
end
- def get_following(%Pleroma.List{following: following} = list) do
+ def get_following(%Pleroma.List{following: following} =
_
list) do
q =
from(
u in User,
q =
from(
u in User,
@@
-71,12
+80,20
@@
defmodule Pleroma.List do
# Get lists to which the account belongs.
def get_lists_account_belongs(%User{} = owner, account_id) do
# Get lists to which the account belongs.
def get_lists_account_belongs(%User{} = owner, account_id) do
- user = Repo.get(User, account_id)
+ user = User.get_cached_by_id(account_id)
+
query =
from(
l in Pleroma.List,
query =
from(
l in Pleroma.List,
- where: l.user_id == ^owner.id and fragment("? = ANY(?)", ^user.follower_address, l.following)
+ where:
+ l.user_id == ^owner.id and
+ fragment(
+ "? = ANY(?)",
+ ^user.follower_address,
+ l.following
+ )
)
)
+
Repo.all(query)
end
Repo.all(query)
end