X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fchat.ex;h=bacff24b59480d2e3faefb74321cd6f7a78b5dcf;hb=9134ef5ecb72f6fe2042f978be3deef41c9b4ce7;hp=b8545063a3ee2bb931c5fbc0b75ab896cd5a0e5d;hpb=30ea6bb1674482ef6ddbfd8744f9bd878eae91e9;p=akkoma
diff --git a/lib/pleroma/chat.ex b/lib/pleroma/chat.ex
index b8545063a..bacff24b5 100644
--- a/lib/pleroma/chat.ex
+++ b/lib/pleroma/chat.ex
@@ -1,11 +1,14 @@
# 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
use Ecto.Schema
+
import Ecto.Changeset
+ import Ecto.Query
+ alias Pleroma.Chat
alias Pleroma.Repo
alias Pleroma.User
@@ -15,21 +18,23 @@ 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 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
- nil -> [recipient: "must a an existing user"]
+ nil -> [recipient: "must be an existing user"]
_ -> []
end
end)
@@ -37,27 +42,56 @@ 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(
- on_conflict: :nothing,
+ # Need to set something, otherwise we get nothing back at all
+ on_conflict: [set: [recipient: recipient]],
returning: true,
conflict_target: [:user_id, :recipient]
)
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
+
+ @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