projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make password reset pages translatable
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
activity_draft.ex
diff --git
a/lib/pleroma/web/common_api/activity_draft.ex
b/lib/pleroma/web/common_api/activity_draft.ex
index 80a9fa7bb5eabd4ab78d8462ca4440fa2921be55..bd56b6e20bc86a7661d59c2bf6e7d22f51e9f29c 100644
(file)
--- a/
lib/pleroma/web/common_api/activity_draft.ex
+++ b/
lib/pleroma/web/common_api/activity_draft.ex
@@
-6,6
+6,7
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
alias Pleroma.Activity
alias Pleroma.Conversation.Participation
alias Pleroma.Object
alias Pleroma.Activity
alias Pleroma.Conversation.Participation
alias Pleroma.Object
+ alias Pleroma.Web.ActivityPub.Builder
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
@@
-212,18
+213,22
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
end
emoji = Map.merge(emoji, summary_emoji)
end
emoji = Map.merge(emoji, summary_emoji)
+ {:ok, note_data, _meta} = Builder.note(draft)
object =
object =
- Utils.make_note_data(draft)
+ note_data
|> Map.put("emoji", emoji)
|> Map.put("emoji", emoji)
- |> Map.put("source", draft.status)
+ |> Map.put("source", %{
+ "content" => draft.status,
+ "mediaType" => draft.params[:content_type]
+ })
|> Map.put("generator", draft.params[:generator])
%__MODULE__{draft | object: object}
end
defp preview?(draft) do
|> Map.put("generator", draft.params[:generator])
%__MODULE__{draft | object: object}
end
defp preview?(draft) do
- preview? = Pleroma.Web.
ControllerHelper
.truthy_param?(draft.params[:preview])
+ preview? = Pleroma.Web.
Utils.Params
.truthy_param?(draft.params[:preview])
%__MODULE__{draft | preview?: preview?}
end
%__MODULE__{draft | preview?: preview?}
end