projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'remove-tag-warning' into 'develop'
[akkoma]
/
lib
/
pleroma
/
conversation
/
participation.ex
diff --git
a/lib/pleroma/conversation/participation.ex
b/lib/pleroma/conversation/participation.ex
index f200c1df56698495f49cac149daeb95a527f238d..2c13c4b408a3ac9a434be385b1cd77ee23dea016 100644
(file)
--- a/
lib/pleroma/conversation/participation.ex
+++ b/
lib/pleroma/conversation/participation.ex
@@
-22,15
+22,17
@@
defmodule Pleroma.Conversation.Participation do
def creation_cng(struct, params) do
struct
def creation_cng(struct, params) do
struct
- |> cast(params, [:user_id, :conversation_id])
+ |> cast(params, [:user_id, :conversation_id
, :read
])
|> validate_required([:user_id, :conversation_id])
end
|> validate_required([:user_id, :conversation_id])
end
- def create_for_user_and_conversation(user, conversation) do
+ def create_for_user_and_conversation(user, conversation, opts \\ []) do
+ read = !!opts[:read]
+
%__MODULE__{}
%__MODULE__{}
- |> creation_cng(%{user_id: user.id, conversation_id: conversation.id})
+ |> creation_cng(%{user_id: user.id, conversation_id: conversation.id
, read: read
})
|> Repo.insert(
|> Repo.insert(
- on_conflict: [set: [read:
false
, updated_at: NaiveDateTime.utc_now()]],
+ on_conflict: [set: [read:
read
, updated_at: NaiveDateTime.utc_now()]],
returning: true,
conflict_target: [:user_id, :conversation_id]
)
returning: true,
conflict_target: [:user_id, :conversation_id]
)
@@
-65,26
+67,18
@@
defmodule Pleroma.Conversation.Participation do
def for_user_with_last_activity_id(user, params \\ %{}) do
for_user(user, params)
def for_user_with_last_activity_id(user, params \\ %{}) do
for_user(user, params)
- |> Repo.preload(:conversation)
|> Enum.map(fn participation ->
|> Enum.map(fn participation ->
- # TODO: Don't load all those activities, just get the most recent
- # Involves splitting up the query.
- activities =
- ActivityPub.fetch_activities_for_context(participation.conversation.ap_id, %{
+ activity_id =
+ ActivityPub.fetch_latest_activity_id_for_context(participation.conversation.ap_id, %{
"user" => user,
"blocking_user" => user
})
"user" => user,
"blocking_user" => user
})
- activity_id =
- case activities do
- [activity | _] -> activity.id
- _ -> nil
- end
-
%{
participation
| last_activity_id: activity_id
}
end)
%{
participation
| last_activity_id: activity_id
}
end)
+ |> Enum.filter(& &1.last_activity_id)
end
end
end
end