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

2 files changed, 34 insertions, 0 deletions

diff --git a/config/config.exs b/config/config.exs
index 6acb38051..fa8051e40 100644
--- 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,
diff --git a/config/description.exs b/config/description.exs
index d623a9f75..ae2f6d23f 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -998,6 +998,35 @@ config :pleroma, :config_description, [
         ]
       },
       %{
+        group: :chat_message,
+        type: :group,
+        descpiption: "Chat message settings",
+        children: [
+          %{
+            key: :enabled,
+            type: :boolean,
+            description: "Enables sends chat message for new user after registration"
+          },
+          %{
+            key: :message,
+            type: :string,
+            description:
+              "A message that will be sent to a newly registered users as a chat message",
+            suggestions: [
+              "Hello, welcome on board!"
+            ]
+          },
+          %{
+            key: :sender_nickname,
+            type: :string,
+            description: "The nickname of the local user that sends the welcome message",
+            suggestions: [
+              "lain"
+            ]
+          }
+        ]
+      },
+      %{
         group: :email,
         type: :group,
         descpiption: "Email message settings",