aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-04 17:14:42 +0200
committerlain <lain@soykaf.club>2020-06-04 17:14:42 +0200
commit00748e9650e911d828dfe6f769ac20a6b31c8b69 (patch)
tree861913ed7bbb6eb26cc182147213fc4ef4080942 /lib
parent6e103a18af6cfd7f454a911e2f0e1ae35cd45aa4 (diff)
downloadpleroma-00748e9650e911d828dfe6f769ac20a6b31c8b69.tar.gz
ChatMessageReferences: Change seen -> unread
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/chat_message_reference.ex18
-rw-r--r--lib/pleroma/web/activity_pub/side_effects.ex2
-rw-r--r--lib/pleroma/web/pleroma_api/views/chat_message_reference_view.ex4
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/pleroma/chat_message_reference.ex b/lib/pleroma/chat_message_reference.ex
index 9b00443f5..fc2aaae7a 100644
--- a/lib/pleroma/chat_message_reference.ex
+++ b/lib/pleroma/chat_message_reference.ex
@@ -23,15 +23,15 @@ defmodule Pleroma.ChatMessageReference do
belongs_to(:object, Object)
belongs_to(:chat, Chat)
- field(:seen, :boolean, default: false)
+ field(:unread, :boolean, default: true)
timestamps()
end
def changeset(struct, params) do
struct
- |> cast(params, [:object_id, :chat_id, :seen])
- |> validate_required([:object_id, :chat_id, :seen])
+ |> cast(params, [:object_id, :chat_id, :unread])
+ |> validate_required([:object_id, :chat_id, :unread])
end
def get_by_id(id) do
@@ -73,11 +73,11 @@ defmodule Pleroma.ChatMessageReference do
|> Repo.one()
end
- def create(chat, object, seen) do
+ def create(chat, object, unread) do
params = %{
chat_id: chat.id,
object_id: object.id,
- seen: seen
+ unread: unread
}
%__MODULE__{}
@@ -88,13 +88,13 @@ defmodule Pleroma.ChatMessageReference do
def unread_count_for_chat(chat) do
chat
|> for_chat_query()
- |> where([cmr], cmr.seen == false)
+ |> where([cmr], cmr.unread == true)
|> Repo.aggregate(:count)
end
def mark_as_read(cm_ref) do
cm_ref
- |> changeset(%{seen: true})
+ |> changeset(%{unread: false})
|> Repo.update()
end
@@ -103,7 +103,7 @@ defmodule Pleroma.ChatMessageReference do
|> for_chat_query()
|> exclude(:order_by)
|> exclude(:preload)
- |> where([cmr], cmr.seen == false)
- |> Repo.update_all(set: [seen: true])
+ |> where([cmr], cmr.unread == true)
+ |> Repo.update_all(set: [unread: false])
end
end
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index 0c5709356..e9f109d80 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -140,7 +140,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|> Enum.each(fn [user, other_user] ->
if user.local do
{:ok, chat} = Chat.bump_or_create(user.id, other_user.ap_id)
- {:ok, cm_ref} = ChatMessageReference.create(chat, object, user.ap_id == actor.ap_id)
+ {:ok, cm_ref} = ChatMessageReference.create(chat, object, user.ap_id != actor.ap_id)
Streamer.stream(
["user", "user:pleroma_chat"],
diff --git a/lib/pleroma/web/pleroma_api/views/chat_message_reference_view.ex b/lib/pleroma/web/pleroma_api/views/chat_message_reference_view.ex
index f9405aec5..592bb17f0 100644
--- a/lib/pleroma/web/pleroma_api/views/chat_message_reference_view.ex
+++ b/lib/pleroma/web/pleroma_api/views/chat_message_reference_view.ex
@@ -16,7 +16,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatMessageReferenceView do
id: id,
object: %{data: chat_message},
chat_id: chat_id,
- seen: seen
+ unread: unread
}
}
) do
@@ -30,7 +30,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatMessageReferenceView do
attachment:
chat_message["attachment"] &&
StatusView.render("attachment.json", attachment: chat_message["attachment"]),
- unread: !seen
+ unread: unread
}
end