aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-01-05 11:36:57 +0000
committerlain <lain@soykaf.club>2021-01-05 11:36:57 +0000
commitca7cf62d2aae25c3a299181baa3a8f389dfd1858 (patch)
treef5f006864a9d70bc9be0dd28bf2bc0893fb97f3e /lib
parentb3c36d3f7a637973ab9a16dca03eac763a5ccc68 (diff)
parentbea69853a234589b48e492b15ddb2449ec61b661 (diff)
downloadpleroma-ca7cf62d2aae25c3a299181baa3a8f389dfd1858.tar.gz
Merge branch 'pleroma-moderation-log-stuff' into 'develop'
AdminAPI: return id for moderation log entries See merge request pleroma/pleroma!3232
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/admin_api/views/moderation_log_view.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/admin_api/views/moderation_log_view.ex b/lib/pleroma/web/admin_api/views/moderation_log_view.ex
index 112f9e0e1..3fa778b0a 100644
--- a/lib/pleroma/web/admin_api/views/moderation_log_view.ex
+++ b/lib/pleroma/web/admin_api/views/moderation_log_view.ex
@@ -21,6 +21,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogView do
|> DateTime.to_unix()
%{
+ id: log_entry.id,
data: log_entry.data,
time: time,
message: ModerationLog.get_log_entry_message(log_entry)