projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index ec558168ae05e43ad5e85f76c18b72623752c87d..c1065611bf31d9eccc5e8eba005ac8cc210c55e4 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-21,7
+21,7
@@
defmodule Pleroma.Activity do
@type t :: %__MODULE__{}
@type actor :: String.t()
@type t :: %__MODULE__{}
@type actor :: String.t()
- @primary_key {:id,
Pleroma.FlakeId
, autogenerate: true}
+ @primary_key {:id,
FlakeId.Ecto.CompatType
, autogenerate: true}
# https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
@mastodon_notification_types %{
# https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
@mastodon_notification_types %{
@@
-137,11
+137,18
@@
defmodule Pleroma.Activity do
|> Repo.one()
end
|> Repo.one()
end
+ @spec get_by_id(String.t()) :: Activity.t() | nil
def get_by_id(id) do
def get_by_id(id) do
- Activity
- |> where([a], a.id == ^id)
- |> restrict_deactivated_users()
- |> Repo.one()
+ case FlakeId.flake_id?(id) do
+ true ->
+ Activity
+ |> where([a], a.id == ^id)
+ |> restrict_deactivated_users()
+ |> Repo.one()
+
+ _ ->
+ nil
+ end
end
def get_by_id_with_object(id) do
end
def get_by_id_with_object(id) do