diff options
| author | tusooa <tusooa@kazv.moe> | 2022-09-04 18:43:36 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-09-04 18:43:36 +0000 |
| commit | 20347898e22d10f377cd35f21407555dbac53bbf (patch) | |
| tree | 2e8b1afbda166dc3368152e058e5caca2df65241 /lib/pleroma/web/api_spec | |
| parent | c63cf954dea70f76beed007e11902d0a0470fc3a (diff) | |
| parent | 88c1c76d3eca3412d1e02008f1b8d96fe8fe0b96 (diff) | |
| download | pleroma-20347898e22d10f377cd35f21407555dbac53bbf.tar.gz | |
Merge branch 'fix/federation-context-issues' into 'develop'
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects
See merge request pleroma/pleroma!3717
Diffstat (limited to 'lib/pleroma/web/api_spec')
| -rw-r--r-- | lib/pleroma/web/api_spec/schemas/status.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/api_spec/schemas/status.ex b/lib/pleroma/web/api_spec/schemas/status.ex index f803caec2..698f11794 100644 --- a/lib/pleroma/web/api_spec/schemas/status.ex +++ b/lib/pleroma/web/api_spec/schemas/status.ex @@ -148,9 +148,15 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do description: "A map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain`" }, + context: %Schema{ + type: :string, + description: "The thread identifier the status is associated with" + }, conversation_id: %Schema{ type: :integer, - description: "The ID of the AP context the status is associated with (if any)" + deprecated: true, + description: + "The ID of the AP context the status is associated with (if any); deprecated, please use `context` instead" }, direct_conversation_id: %Schema{ type: :integer, @@ -325,6 +331,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do "pinned" => false, "pleroma" => %{ "content" => %{"text/plain" => "foobar"}, + "context" => "http://localhost:4001/objects/8b4c0c80-6a37-4d2a-b1b9-05a19e3875aa", "conversation_id" => 345_972, "direct_conversation_id" => nil, "emoji_reactions" => [], |