X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fchat.ex;h=bacff24b59480d2e3faefb74321cd6f7a78b5dcf;hb=7f8785fd9be11fbb09283c2dbd32aeb7903a4f58;hp=6a03ee3c1d2e687a93ab76cf1b6e72749c43c45f;hpb=f335e1404a9cd19451b531e32e3591aa323761ff;p=akkoma
diff --git a/lib/pleroma/chat.ex b/lib/pleroma/chat.ex
index 6a03ee3c1..bacff24b5 100644
--- a/lib/pleroma/chat.ex
+++ b/lib/pleroma/chat.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Chat do
@@ -8,7 +8,7 @@ defmodule Pleroma.Chat do
import Ecto.Changeset
import Ecto.Query
- alias Pleroma.Object
+ alias Pleroma.Chat
alias Pleroma.Repo
alias Pleroma.User
@@ -18,48 +18,19 @@ defmodule Pleroma.Chat do
It is a helper only, to make it easy to display a list of chats with other people, ordered by last bump. The actual messages are retrieved by querying the recipients of the ChatMessages.
"""
+ @type t :: %__MODULE__{}
+ @primary_key {:id, FlakeId.Ecto.CompatType, autogenerate: true}
+
schema "chats" do
belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
field(:recipient, :string)
- field(:unread, :integer, default: 0, read_after_writes: true)
timestamps()
end
- def last_message_for_chat(chat) do
- messages_for_chat_query(chat)
- |> order_by(desc: :id)
- |> Repo.one()
- end
-
- def messages_for_chat_query(chat) do
- chat =
- chat
- |> Repo.preload(:user)
-
- from(o in Object,
- where: fragment("?->>'type' = ?", o.data, "ChatMessage"),
- where:
- fragment(
- """
- (?->>'actor' = ? and ?->'to' = ?)
- OR (?->>'actor' = ? and ?->'to' = ?)
- """,
- o.data,
- ^chat.user.ap_id,
- o.data,
- ^[chat.recipient],
- o.data,
- ^chat.recipient,
- o.data,
- ^[chat.user.ap_id]
- )
- )
- end
-
- def creation_cng(struct, params) do
+ def changeset(struct, params) do
struct
- |> cast(params, [:user_id, :recipient, :unread])
+ |> cast(params, [:user_id, :recipient])
|> validate_change(:recipient, fn
:recipient, recipient ->
case User.get_cached_by_ap_id(recipient) do
@@ -71,14 +42,31 @@ defmodule Pleroma.Chat do
|> unique_constraint(:user_id, name: :chats_user_id_recipient_index)
end
+ @spec get_by_user_and_id(User.t(), FlakeId.Ecto.CompatType.t()) ::
+ {:ok, t()} | {:error, :not_found}
+ def get_by_user_and_id(%User{id: user_id}, id) do
+ from(c in __MODULE__,
+ where: c.id == ^id,
+ where: c.user_id == ^user_id
+ )
+ |> Repo.find_resource()
+ end
+
+ @spec get_by_id(FlakeId.Ecto.CompatType.t()) :: t() | nil
+ def get_by_id(id) do
+ Repo.get(__MODULE__, id)
+ end
+
+ @spec get(FlakeId.Ecto.CompatType.t(), String.t()) :: t() | nil
def get(user_id, recipient) do
- __MODULE__
- |> Repo.get_by(user_id: user_id, recipient: recipient)
+ Repo.get_by(__MODULE__, user_id: user_id, recipient: recipient)
end
+ @spec get_or_create(FlakeId.Ecto.CompatType.t(), String.t()) ::
+ {:ok, t()} | {:error, Ecto.Changeset.t()}
def get_or_create(user_id, recipient) do
%__MODULE__{}
- |> creation_cng(%{user_id: user_id, recipient: recipient})
+ |> changeset(%{user_id: user_id, recipient: recipient})
|> Repo.insert(
# Need to set something, otherwise we get nothing back at all
on_conflict: [set: [recipient: recipient]],
@@ -87,18 +75,23 @@ defmodule Pleroma.Chat do
)
end
+ @spec bump_or_create(FlakeId.Ecto.CompatType.t(), String.t()) ::
+ {:ok, t()} | {:error, Ecto.Changeset.t()}
def bump_or_create(user_id, recipient) do
%__MODULE__{}
- |> creation_cng(%{user_id: user_id, recipient: recipient, unread: 1})
+ |> changeset(%{user_id: user_id, recipient: recipient})
|> Repo.insert(
- on_conflict: [set: [updated_at: NaiveDateTime.utc_now()], inc: [unread: 1]],
+ on_conflict: [set: [updated_at: NaiveDateTime.utc_now()]],
+ returning: true,
conflict_target: [:user_id, :recipient]
)
end
- def mark_as_read(chat) do
- chat
- |> change(%{unread: 0})
- |> Repo.update()
+ @spec for_user_query(FlakeId.Ecto.CompatType.t()) :: Ecto.Query.t()
+ def for_user_query(user_id) do
+ from(c in Chat,
+ where: c.user_id == ^user_id,
+ order_by: [desc: c.updated_at]
+ )
end
end