diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-26 16:13:07 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-26 16:16:30 +0300 |
| commit | 3d722dc2008ab7e5dde4b474bb038a1857a28d85 (patch) | |
| tree | 53c05aaea7626ec1f4782dd33eee779bb38d8730 /lib/pleroma/activity.ex | |
| parent | d75d0ae134e0a8de9504507f4c78567b9eedcc72 (diff) | |
| parent | 6abe12dceda8d0d32878208987a9631d5d546a3d (diff) | |
| download | pleroma-3d722dc2008ab7e5dde4b474bb038a1857a28d85.tar.gz | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'lib/pleroma/activity.ex')
| -rw-r--r-- | lib/pleroma/activity.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index b6e8e9e1d..c1065611b 100644 --- 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() - @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 %{ @@ -139,7 +139,7 @@ defmodule Pleroma.Activity do @spec get_by_id(String.t()) :: Activity.t() | nil def get_by_id(id) do - case Pleroma.FlakeId.is_flake_id?(id) do + case FlakeId.flake_id?(id) do true -> Activity |> where([a], a.id == ^id) |