projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/1.1.9' into 'stable'
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index ec558168ae05e43ad5e85f76c18b72623752c87d..2c04a26f95f11627cc966b4776793d76908f0659 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 %{