v0.1.10

* Update config.yaml

* update 0.1.10

* Update README.md

* Update README_fr.md

* check upgrade from 0.1.8

README.md

@@ -14,7 +14,7 @@ A puppeting bridge between Matrix and WhatsApp packaged as a YunoHost service. M
 
 ** Attention: always backup and restore the Yunohost matrix_synapse et mautrix_whatsapp apps together!**
 
-**Shipped version:** 0.1.8
+**Shipped version:** 0.1.10
 
 
 ## Screenshots

README_fr.md

@@ -13,7 +13,7 @@ Une passerelle entre Matrix et WhatsApp empaquetée comme un service YunoHost. L
 
 ** Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix_synapse et mautrix_whatsapp en même temps!**
 
-**Version incluse:** 0.1.7
+**Version incluse:** 0.1.10
 
 ## Captures d'écran
 
@@ -100,7 +100,7 @@ Si vous devez téléverser vos fichiers log quelque-part, soyez avertis qu'ils c
  * Signaler un bug:  https://github.com/YunoHost-Apps/mautrix-whatsapp_ynh/issues
  * Site de l'application: https://github.com/YunoHost-Apps/mautrix-whatsapp_ynh
  * Documentation de l'application principale: https://docs.mau.fi/bridges/go/whatsapp/index.html
- * Dépôt de l'application principale: https://github.com/tulir/mautrix-whatsapp
+ * Dépôt de l'application principale: https://github.com/mautrix/whatsapp
  * Up-Upstream repository: https://github.com/Rhymen/go-whatsapp
  * Up-Up-Upstream repository: https://github.com/sigalor/whatsapp-web-reveng
  * Site web YunoHost: https://yunohost.org/

check_process

@@ -18,7 +18,7 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
-		#upgrade=1	from_commit=636be2f9f900e578d9aa26ee887dcec2ef8d4e71
+		upgrade=1	from_commit=ede0231ac59aaa1d65a3009bcbdfe333bf5e87fd
 		#upgrade=1	from_commit=a95215f2ea5d1f34b1c804f776e78c4785477023
 		backup_restore=1
 		multi_instance=1
@@ -27,7 +27,7 @@
 		actions=0
 		config_panel=0
 ;;; Upgrade options
-#	; commit=636be2f9f900e578d9aa26ee887dcec2ef8d4e71
-#		name=0.1.6
+	; commit=ede0231ac59aaa1d65a3009bcbdfe333bf5e87fd
+		name=0.1.8
 #	; commit=a95215f2ea5d1f34b1c804f776e78c4785477023
 #		name=0.1.7

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mautrix/whatsapp/archive/v0.1.8.tar.gz
-SOURCE_SUM=66d696d868293bad9cb9b47403d1afda0a4fec3fd294599fa42344cf298b7f33
+SOURCE_URL=https://github.com/mautrix/whatsapp/archive/v0.1.10.tar.gz
+SOURCE_SUM=388bf9a0ec6771fba4018763fa112a8076effef0792eacc79d16c2b9eb2e13eb
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/config.yaml

@@ -83,13 +83,12 @@ bridge:
     username_template: whatsapp_{{.}}
     # Displayname template for WhatsApp users.
     # {{.Notify}} - nickname set by the WhatsApp user
-    # {{.Jid}}    - phone number (international format)
+    # {{.VName}} - validated WhatsApp business name
+    # {{.JID}}    - phone number (international format)
     # The following variables are also available, but will cause problems on multi-user instances:
     # {{.Name}}   - display name from contact list
     # {{.Short}}  - short display name from contact list
-    # To use multiple if's, you need to use: {{else if .Name}}, for example:
-    # "{{if .Notify}}{{.Notify}}{{else if .Name}}{{.Name}}{{else}}{{.Jid}}{{end}} (WA)"
-    displayname_template: "{{if .Notify}}{{.Notify}}{{else}}{{.Jid}}{{end}} (WA)"
+    displayname_template: "{{if .Notify}}{{.Notify}}{{else if .VName}}{{.VName}}{{else}}{{.JID}}{{end}} (WA)"
     # Localpart template for per-user room grouping community IDs.
     # On startup, the bridge will try to create these communities, add all of the specific user's
     # portals to the community, and invite the Matrix user to it.
@@ -232,11 +231,21 @@ bridge:
     # The prefix for commands. Only required in non-management rooms.
     command_prefix: "!wa"
 
-    # End-to-bridge encryption support options. This requires login_shared_secret to be configured
-    # in order to get a device for the bridge bot.
+    # Messages sent upon joining a management room.
+    # Markdown is supported. The defaults are listed below.
+    management_room_text:
+        # Sent when joining a room.
+        welcome: "Hello, I'm a WhatsApp bridge bot."
+        # Sent when joining a management room and the user is already logged in.
+        welcome_connected: "Use `help` for help."
+        # Sent when joining a management room and the user is not logged in.
+        welcome_unconnected: "Use `help` for help or `login` to log in."
+        # Optional extra text sent when joining a management room.
+        # additional_help: "This would be some additional text in case you need it."
+
+    # End-to-bridge encryption support options.
     #
-    # Additionally, https://github.com/matrix-org/synapse/pull/5758 is required if using a normal
-    # application service.
+    # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info.    
     encryption:
         # Allow encryption, work in group chat rooms with e2ee enabled
         allow: false

manifest.json

@@ -6,7 +6,7 @@
 		"en": "A WhatsApp puppeting bridge for Matrix/Synapse.",
 		"fr": "Passerelle WhatsApp pour Matrix/Synapse."
 	},
-	"version": "0.1.8~ynh1",
+	"version": "0.1.10~ynh1",
 	"url": "https://github.com/mautrix/whatsapp",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {