diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-13 12:42:36 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-13 12:42:36 +0300 |
| commit | fd2fb2bb2e2292997fbe6f70c4d12b50c56cfab9 (patch) | |
| tree | 12f2ac82ed24394fb52b5d0664583dc668814421 /lib/pleroma/scheduled_activity.ex | |
| parent | bfb48e3db6009c31e52cfe5ac4828a6143d7e549 (diff) | |
| parent | 156c8a508846bd6d4e55f666c4ecc6f0129ac5fc (diff) | |
| download | pleroma-fd2fb2bb2e2292997fbe6f70c4d12b50c56cfab9.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
Diffstat (limited to 'lib/pleroma/scheduled_activity.ex')
| -rw-r--r-- | lib/pleroma/scheduled_activity.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/scheduled_activity.ex b/lib/pleroma/scheduled_activity.ex index 8ff06a462..0937cb7db 100644 --- a/lib/pleroma/scheduled_activity.ex +++ b/lib/pleroma/scheduled_activity.ex @@ -40,7 +40,7 @@ defmodule Pleroma.ScheduledActivity do %{changes: %{params: %{"media_ids" => media_ids} = params}} = changeset ) when is_list(media_ids) do - media_attachments = Utils.attachments_from_ids(%{"media_ids" => media_ids}) + media_attachments = Utils.attachments_from_ids(%{media_ids: media_ids}) params = params |