projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
scheduled_activity_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/scheduled_activity_view.ex
b/lib/pleroma/web/mastodon_api/views/scheduled_activity_view.ex
index 458f6bc78636de7ece1bf98c94459631feec6b90..13774d23709705b19bba1f93d5b13ba9f54a6670 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/scheduled_activity_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/scheduled_activity_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityView do
@@
-30,7
+30,7
@@
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityView do
defp with_media_attachments(data, _), do: data
defp status_params(params) do
defp with_media_attachments(data, _), do: data
defp status_params(params) do
-
data =
%{
+ %{
text: params["status"],
sensitive: params["sensitive"],
spoiler_text: params["spoiler_text"],
text: params["status"],
sensitive: params["sensitive"],
spoiler_text: params["spoiler_text"],
@@
-39,10
+39,6
@@
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityView do
poll: params["poll"],
in_reply_to_id: params["in_reply_to_id"]
}
poll: params["poll"],
in_reply_to_id: params["in_reply_to_id"]
}
-
- case params["media_ids"] do
- nil -> data
- media_ids -> Map.put(data, :media_ids, media_ids)
- end
+ |> Pleroma.Maps.put_if_present(:media_ids, params["media_ids"])
end
end
end
end