Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'

fixes 1957 Add option to send user chatmessage instead of dm Closes #1957 See merge request pleroma/pleroma!2782
2020-08-03 21:01:56 +00:00 · 2020-08-03 21:01:56 +00:00 · e3953923ac
commit e3953923ac
parent 56b5b9aa27 cbf8bfc694
8 changed files with 158 additions and 7 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -261,6 +261,11 @@ config :pleroma, :welcome,
    sender_nickname: nil,
    message: nil
  ],
+  chat_message: [
+    enabled: false,
+    sender_nickname: nil,
+    message: nil
+  ],
  email: [
    enabled: false,
    sender: nil,