projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index fe017df3b32d456bfe99a79363445cb33fcd5acd..cdfe7ea9e482c9a36b332ce312801af7615a352b 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-4,10
+4,15
@@
defmodule Pleroma.Activity do
use Ecto.Schema
defmodule Pleroma.Activity do
use Ecto.Schema
- alias Pleroma.{Repo, Activity, Notification}
+
+ alias Pleroma.Repo
+ alias Pleroma.Activity
+ alias Pleroma.Notification
+
import Ecto.Query
@type t :: %__MODULE__{}
import Ecto.Query
@type t :: %__MODULE__{}
+ @primary_key {:id, Pleroma.FlakeId, 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 %{
@@
-36,6
+41,10
@@
defmodule Pleroma.Activity do
)
end
)
end
+ def get_by_id(id) do
+ Repo.get(Activity, id)
+ end
+
def by_object_ap_id(ap_id) do
from(
activity in Activity,
def by_object_ap_id(ap_id) do
from(
activity in Activity,