projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[OpenAPI] Mark all not required request fields as nullable
[akkoma]
/
lib
/
pleroma
/
conversation
/
participation.ex
diff --git
a/lib/pleroma/conversation/participation.ex
b/lib/pleroma/conversation/participation.ex
index d4b2555370ad92db65938a85655fb71783c4f89a..51bb1bda94d43e85043d3c930896f4462565a2ca 100644
(file)
--- a/
lib/pleroma/conversation/participation.ex
+++ b/
lib/pleroma/conversation/participation.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Conversation.Participation do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Conversation.Participation do
@@
-128,22
+128,19
@@
defmodule Pleroma.Conversation.Participation do
|> Pleroma.Pagination.fetch_paginated(params)
end
|> Pleroma.Pagination.fetch_paginated(params)
end
- def restrict_recipients(query, user, %{
"recipients" =>
user_ids}) do
- user_ids =
+ def restrict_recipients(query, user, %{
recipients:
user_ids}) do
+ user_
binary_
ids =
[user.id | user_ids]
|> Enum.uniq()
[user.id | user_ids]
|> Enum.uniq()
- |> Enum.reduce([], fn user_id, acc ->
- {:ok, user_id} = FlakeId.Ecto.CompatType.dump(user_id)
- [user_id | acc]
- end)
+ |> User.binary_id()
conversation_subquery =
__MODULE__
|> group_by([p], p.conversation_id)
|> having(
[p],
conversation_subquery =
__MODULE__
|> group_by([p], p.conversation_id)
|> having(
[p],
- count(p.user_id) == ^length(user_ids) and
- fragment("array_agg(?) @> ?", p.user_id, ^user_ids)
+ count(p.user_id) == ^length(user_
binary_
ids) and
+ fragment("array_agg(?) @> ?", p.user_id, ^user_
binary_
ids)
)
|> select([p], %{id: p.conversation_id})
)
|> select([p], %{id: p.conversation_id})
@@
-175,7
+172,7
@@
defmodule Pleroma.Conversation.Participation do
| last_activity_id: activity_id
}
end)
| last_activity_id: activity_id
}
end)
- |> Enum.
filter(& &1.last_activity_id
)
+ |> Enum.
reject(&is_nil(&1.last_activity_id)
)
end
def get(_, _ \\ [])
end
def get(_, _ \\ [])