From d5a542cf97d21d978e4eccfe6199453a61dccd92 Mon Sep 17 00:00:00 2001
From: pitchum <pitchum@users.noreply.chapril.org>
Date: Sat, 24 Dec 2022 08:46:30 +0100
Subject: [PATCH] Fix bash function xmpp_send_server_notice_all()

---
 useful_functions/.bash_aliases | 52 ----------------------------------
 useful_functions/functions.sh  |  5 ++--
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 useful_functions/.bash_aliases

diff --git a/useful_functions/.bash_aliases b/useful_functions/.bash_aliases
deleted file mode 100644
index a653656..0000000
--- a/useful_functions/.bash_aliases
+++ /dev/null
@@ -1,52 +0,0 @@
-
-xmpp_user_rooms_count() {
-    sudo -u ejabberd ejabberdctl get_user_rooms ${1} chapril.org | wc -l
-}
-xmpp_user_contacts_count() {
-    sudo -u ejabberd ejabberdctl get_roster ${1} chapril.org | wc -l
-}
-xmpp_user_info() {
-    echo "${1}:$(xmpp_user_contacts_count ${1}):$(xmpp_user_rooms_count ${1})"
-}
-
-xmpp_users() {
-    for user in $(sudo -u ejabberd ejabberdctl registered_users chapril.org); do
-        xmpp_user_info "${user}"
-    done
-}
-
-xmpp_ban_user_by_patern() {
-    LIST=$(sudo -u ejabberd ejabberdctl registered_users chapril.org | grep ${1} | uniq)
-
-    for ADDRESS in $LIST
-    do
-        sudo -u ejabberd ejabberdctl kick_user $ADDRESS chapril.org
-        sudo -u ejabberd ejabberdctl unregister $ADDRESS chapril.org
-        echo Done with $ADDRESS
-    done
-}
-
-xmpp_send_server_notice() {
-    sudo -u ejabberd ejabberdctl send_message headline xmpp-admin@chapril.org \ 
-        chapril.org/announce/online "Annonce du Serveur" "${1}"
-}
-
-xmpp_send_server_notice_to_connected() {
-    LIST=$(sudo -u ejabberd ejabberdctl connected_users_info | cut -f 1 | cut -d "/" -f 1 | uniq)
-
-    for ADDRESS in $LIST
-    do
-        sudo -u ejabberd ejabberdctl send_message headline chapril.org "$ADDRESS" "Annonce du Serveur" "${2}"
-        echo Done with $ADDRESS
-    done
-}
-
-xmpp_send_server_notice_by_pattern() {
-    LIST=$(sudo -u ejabberd ejabberdctl registered_users chapril.org | grep ${1} | uniq)
-
-    for ADDRESS in $LIST
-    do
-        sudo -u ejabberd ejabberdctl send_message headline chapril.org "$ADDRESS" "Annonce du Serveur" "${2}"
-        echo Done with $ADDRESS
-    done
-}
diff --git a/useful_functions/functions.sh b/useful_functions/functions.sh
index 85caa5b..c7db66c 100644
--- a/useful_functions/functions.sh
+++ b/useful_functions/functions.sh
@@ -27,8 +27,7 @@ xmpp_ban_users() {
 }
 
 xmpp_send_server_notice_all() {
-    sudo -u ejabberd ejabberdctl send_message headline xmpp-admin@chapril.org \ 
-        chapril.org/announce/online "Annonce du Serveur" "${1}"
+    sudo -u ejabberd ejabberdctl send_message chat chapril.org chapril.org/announce/online "Annonce du Serveur" "${1}"
 }
 
 xmpp_send_server_notice_connected() {
@@ -41,7 +40,7 @@ xmpp_send_server_notice_connected() {
     done
 }
 
-xmpp_send_server_notice() {
+xmpp_send_server_notice_pattern() {
     LIST=$(sudo -u ejabberd ejabberdctl registered_users chapril.org | grep ${1} | uniq)
     
     for ADDRESS in $LIST