[#534] Merged upstream/develop.

2019-01-28 15:39:14 +03:00 · 2019-01-28 15:39:14 +03:00 · d3f9e6f6fe
commit d3f9e6f6fe
parent 1d2f41642c de0fb88a9c
76 changed files with 1588 additions and 187 deletions
--- a/lib/pleroma/web/websub/websub_client_subscription.ex
+++ b/lib/pleroma/web/websub/websub_client_subscription.ex
@ -13,7 +13,7 @@ defmodule Pleroma.Web.Websub.WebsubClientSubscription do
    field(:state, :string)
    field(:subscribers, {:array, :string}, default: [])
    field(:hub, :string)
-    belongs_to(:user, User)
+    belongs_to(:user, User, type: Pleroma.FlakeId)

    timestamps()
  end