diff options
author | lain <lain@soykaf.club> | 2019-12-02 16:26:19 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-12-02 16:26:19 +0000 |
commit | 7722e5a67a46304f3ae0e37f674a44ca9268be5e (patch) | |
tree | 504f7b7623c6917fcfa567050d80153e2f2aee11 /priv | |
parent | d468cba2d56f60a41b0372a381b1017a8d2d046b (diff) | |
parent | 1fc28a4b441fdc0de8b2b43e2b045da38ee50b0a (diff) | |
download | pleroma-7722e5a67a46304f3ae0e37f674a44ca9268be5e.tar.gz pleroma-7722e5a67a46304f3ae0e37f674a44ca9268be5e.zip |
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
Diffstat (limited to 'priv')
-rw-r--r-- | priv/repo/migrations/20191025081729_add_move_support_to_users.exs | 10 | ||||
-rw-r--r-- | priv/static/schemas/litepub-0.1.jsonld | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/priv/repo/migrations/20191025081729_add_move_support_to_users.exs b/priv/repo/migrations/20191025081729_add_move_support_to_users.exs new file mode 100644 index 000000000..580b9eb0f --- /dev/null +++ b/priv/repo/migrations/20191025081729_add_move_support_to_users.exs @@ -0,0 +1,10 @@ +defmodule Pleroma.Repo.Migrations.AddMoveSupportToUsers do + use Ecto.Migration + + def change do + alter table(:users) do + add(:also_known_as, {:array, :string}, default: [], null: false) + add(:allow_following_move, :boolean, default: true, null: false) + end + end +end diff --git a/priv/static/schemas/litepub-0.1.jsonld b/priv/static/schemas/litepub-0.1.jsonld index 8bae42f6d..e7ebf72be 100644 --- a/priv/static/schemas/litepub-0.1.jsonld +++ b/priv/static/schemas/litepub-0.1.jsonld @@ -29,7 +29,11 @@ "@id": "litepub:oauthRegistrationEndpoint", "@type": "@id" }, - "EmojiReaction": "litepub:EmojiReaction" + "EmojiReaction": "litepub:EmojiReaction", + "alsoKnownAs": { + "@id": "as:alsoKnownAs", + "@type": "@id" + } } ] } |