projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge develop
[akkoma]
/
lib
/
pleroma
/
conversation
/
participation.ex
diff --git
a/lib/pleroma/conversation/participation.ex
b/lib/pleroma/conversation/participation.ex
index 61021fb18104bfc07e0c706f52859602d6a82811..2a11f9069940d221aec41bb39d6f758fa4dd71aa 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]
)