From 5d79071f536358c86efd0d485eb88ee573686071 Mon Sep 17 00:00:00 2001 From: Dante Date: Mon, 8 Aug 2022 19:57:23 +0100 Subject: [PATCH 1/4] Add new appserviceid setting to avoid collision of botname --- conf/config.yaml | 2 +- scripts/install | 2 ++ scripts/remove | 1 + scripts/restore | 1 + scripts/upgrade | 9 +++++++++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/conf/config.yaml b/conf/config.yaml index 71b538b..2e05b11 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -50,7 +50,7 @@ appservice: # The unique ID of this appservice. #id: whatsapp - id: __BOTNAME__ + id: __APPSERVICEID__ # Appservice bot details. bot: # Username of the appservice bot. diff --git a/scripts/install b/scripts/install index a62eee3..2d85424 100755 --- a/scripts/install +++ b/scripts/install @@ -24,6 +24,7 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= +appserviceid=$YNH_APP_INSTANCE_NAME botname=$YNH_APP_ARG_BOTNAME bot_synapse_adm=$YNH_APP_ARG_BOT_SYNAPSE_ADM encryption=$YNH_APP_ARG_ENCRYPTION @@ -76,6 +77,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=server_name --value=$server_name +ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid ynh_app_setting_set --app=$app --key=botname --value=$botname ynh_app_setting_set --app=$app --key=synapse_instance --value=$synapse_instance ynh_app_setting_set --app=$app --key=bot_synapse_adm --value=$bot_synapse_adm diff --git a/scripts/remove b/scripts/remove index 86bceee..34484fc 100755 --- a/scripts/remove +++ b/scripts/remove @@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) server_name=$(ynh_app_setting_get --app=$app --key=server_name) synapse_instance=$(ynh_app_setting_get --app=$app --key=synapse_instance) +appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid) botname=$(ynh_app_setting_get --app=$app --key=botname) botadmin=$(ynh_app_setting_get --app=$app --key=botadmin) port=$(ynh_app_setting_get --app=$app --key=port) diff --git a/scripts/restore b/scripts/restore index 9bea70f..4815fa6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,6 +31,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) server_name=$(ynh_app_setting_get --app=$app --key=server_name) +appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid) botname=$(ynh_app_setting_get --app=$app --key=botname) synapse_instance=$(ynh_app_setting_get --app=$app --key=synapse_instance) bot_synapse_adm=$(ynh_app_setting_get --app=$app --key=bot_synapse_adm) diff --git a/scripts/upgrade b/scripts/upgrade index aac2b86..127fa65 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) server_name=$(ynh_app_setting_get --app=$app --key=server_name) port=$(ynh_app_setting_get --app=$app --key=port) +appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid) botname=$(ynh_app_setting_get --app=$app --key=botname) synapse_instance=$(ynh_app_setting_get --app=$app --key=synapse_instance) encryption=$(ynh_app_setting_get --app=$app --key=encryption) @@ -87,6 +88,14 @@ then ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd fi +# If appserviceid doesn't exist, create it +if [ -z "$appserviceid" ] +then + appserviceid=$app + ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid +fi + + # If db_name doesn't exist, create it #if [ -z "$mautrix_whatsapp_db_name" ]; then # mautrix_whatsapp_db_name=$(ynh_sanitize_dbid --db_name=$app) From a53d04b61baf566fbd744295f993091982a4b9eb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 8 Aug 2022 18:57:36 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 440c74d..46265df 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) **Shipped version:** 0.6.0~ynh2 + ## Disclaimers / important information ### List of known public services diff --git a/README_fr.md b/README_fr.md index 701ddab..b1f62a5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,8 @@ C'est pourquoi [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_y ** Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix_synapse et mautrix_whatsapp en même temps!** -**Version incluse :** 0.6.0~ynh2 +**Version incluse :** 0.6.0~ynh2 + ## Avertissements / informations importantes ### Liste de passerelles publiques From c36ede5ce356a982e3d8e4b3caef28e1b6bcbd25 Mon Sep 17 00:00:00 2001 From: Dante Date: Mon, 8 Aug 2022 20:17:54 +0100 Subject: [PATCH 3/4] Bump Yuno version --- README.md | 3 +-- README_fr.md | 3 +-- manifest.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 46265df..46291c2 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,7 @@ Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) ** Attention: always backup and restore the Yunohost matrix_synapse et mautrix_whatsapp apps together!** -**Shipped version:** 0.6.0~ynh2 - +**Shipped version:** 0.6.0~ynh3 ## Disclaimers / important information ### List of known public services diff --git a/README_fr.md b/README_fr.md index b1f62a5..c2d3cd4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,8 +24,7 @@ C'est pourquoi [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_y ** Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix_synapse et mautrix_whatsapp en même temps!** -**Version incluse :** 0.6.0~ynh2 - +**Version incluse :** 0.6.0~ynh3 ## Avertissements / informations importantes ### Liste de passerelles publiques diff --git a/manifest.json b/manifest.json index 8470572..7f672be 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Matrix / Synapse puppeting bridge for WhatsApp", "fr": "Passerelle Matrix / Synapse pour WhatsApp" }, - "version": "0.6.0~ynh2", + "version": "0.6.0~ynh3", "url": "https://github.com/mautrix/whatsapp", "upstream": { "license": "AGPL-3.0-or-later", From 237095abd7b76fa303d47d7a23816c5482737940 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 8 Aug 2022 19:18:06 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 46291c2..e2b5c1c 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) **Shipped version:** 0.6.0~ynh3 + ## Disclaimers / important information ### List of known public services diff --git a/README_fr.md b/README_fr.md index c2d3cd4..d1084e6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,6 +25,7 @@ C'est pourquoi [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_y **Version incluse :** 0.6.0~ynh3 + ## Avertissements / informations importantes ### Liste de passerelles publiques