From 9a0ff13cc2c228e45e9def48f3e25122003c1e6f Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Fri, 12 Jul 2024 11:21:55 +0200
Subject: [PATCH] mod_register: Send welcome message as 'chat' too (#4246)

Apparently, some clients don't display 'normal' messages to the user.
---
 src/mod_register.erl    | 6 ++++++
 test/ejabberd_SUITE.erl | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/mod_register.erl b/src/mod_register.erl
index 7da8ca74a..d656263bf 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -412,6 +412,12 @@ send_welcome_message(JID) ->
     case mod_register_opt:welcome_message(Host) of
       {<<"">>, <<"">>} -> ok;
       {Subj, Body} ->
+	  ejabberd_router:route(
+	    #message{from = jid:make(Host),
+		     to = JID,
+		     type = chat,
+		     subject = xmpp:mk_text(Subj),
+		     body = xmpp:mk_text(<<Subj/binary, "\n\n", Body/binary>>)}),
 	  ejabberd_router:route(
 	    #message{from = jid:make(Host),
 		     to = JID,
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index b3f2bf980..b7c72a02b 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -920,6 +920,8 @@ presence_broadcast(Config) ->
     IQ = #iq{type = get,
 	     from = JID,
 	     sub_els = [#disco_info{node = Node}]} = recv_iq(Config),
+    #message{type = chat,
+             subject = [#text{lang = <<"en">>,data = <<"Welcome!">>}]} = recv_message(Config),
     #message{type = normal,
              subject = [#text{lang = <<"en">>,data = <<"Welcome!">>}]} = recv_message(Config),
     #presence{from = JID, to = JID} = recv_presence(Config),