projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/remove_auto_nsfw' into 'develop'
[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 d7dcdad9019ca423c98993c37957b704be18209c..8668b600ebd5b69f75bbf2556986c89fe1dae21f 100644
(file)
--- a/
lib/pleroma/web/common_api/activity_draft.ex
+++ b/
lib/pleroma/web/common_api/activity_draft.ex
@@
-179,7
+179,7
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
end
defp sensitive(draft) do
end
defp sensitive(draft) do
- sensitive = draft.params[:sensitive]
|| Enum.member?(draft.tags, {"#nsfw", "nsfw"})
+ sensitive = draft.params[:sensitive]
%__MODULE__{draft | sensitive: sensitive}
end
%__MODULE__{draft | sensitive: sensitive}
end
@@
-190,7
+190,7
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
Utils.make_note_data(draft)
|> Map.put("emoji", emoji)
|> Map.put("source", draft.status)
Utils.make_note_data(draft)
|> Map.put("emoji", emoji)
|> Map.put("source", draft.status)
- |> Map.put("
application", draft.params[:application
])
+ |> Map.put("
generator", draft.params[:generator
])
%__MODULE__{draft | object: object}
end
%__MODULE__{draft | object: object}
end