hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'

Browse source 
expires_in in scheduled status params

Closes #2498

See merge request pleroma/pleroma!3315
This commit is contained in:
feld 2021-02-26 16:49:11 +00:00
commit 840686ecd5
6 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/api_spec/schemas/scheduled_status.ex
View file

@ -30,7 +30,8 @@ defmodule Pleroma.Web.ApiSpec.Schemas.ScheduledStatus do
visibility: %Schema{allOf: [VisibilityScope], nullable: true},
scheduled_at: %Schema{type: :string, format: :"date-time", nullable: true},
poll: StatusOperation.poll_params(),
in_reply_to_id: %Schema{type: :string, nullable: true}
in_reply_to_id: %Schema{type: :string, nullable: true},
expires_in: %Schema{type: :integer, nullable: true}
}
}
},
@ -46,7 +47,8 @@ defmodule Pleroma.Web.ApiSpec.Schemas.ScheduledStatus do
scheduled_at: nil,
poll: nil,
idempotency: nil,
in_reply_to_id: nil
in_reply_to_id: nil,
expires_in: nil
},
media_attachments: [Attachment.schema().example]
}

3
lib/pleroma/web/mastodon_api/views/scheduled_activity_view.ex
View file

@ -37,7 +37,8 @@ defmodule Pleroma.Web.MastodonAPI.ScheduledActivityView do
visibility: params["visibility"],
scheduled_at: params["scheduled_at"],
poll: params["poll"],
in_reply_to_id: params["in_reply_to_id"]
in_reply_to_id: params["in_reply_to_id"],
expires_in: params["expires_in"]
}
|> Pleroma.Maps.put_if_present(:media_ids, params["media_ids"])
end