Merge pull request #4 from YunoHost-Apps/testing

Testing

README.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -21,12 +21,7 @@ A puppeting bridge between Matrix and Discord packaged as a YunoHost service. Me
 **Attention: always backup and restore the Yunohost matrix_synapse et mautrix_discord apps together!**
 
 
-**Shipped version:** 0.6.5~ynh1
+**Shipped version:** 0.6.5~ynh2
-
-## Screenshots
-
-![Screenshot of Matrix-Discord bridge](./doc/screenshots/example.jpg)
-
 ## Documentation and resources
 
 * Official admin documentation: <https://docs.mau.fi/bridges/go/discord/index.html>
@@ -46,4 +41,4 @@ or
 sudo yunohost app upgrade mautrix_discord -u https://github.com/YunoHost-Apps/mautrix_discord_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -20,12 +20,7 @@ Un pont entre Matrix et Discord présenté comme un service YunoHost. Les messag
 
 **Attention : toujours sauvegarder et restaurer les applications matrix_synapse et mautrix_discord de Yunohost ensemble !
 
-**Version incluse :** 0.6.5~ynh1
+**Version incluse :** 0.6.5~ynh2
-
-## Captures d’écran
-
-![Capture d’écran de Matrix-Discord bridge](./doc/screenshots/example.jpg)
-
 ## Documentations et ressources
 
 * Documentation officielle de l’admin : <https://docs.mau.fi/bridges/go/discord/index.html>

conf/config.yaml

@@ -250,10 +250,10 @@ bridge:
     # 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
+        allow: true
         # Default to encryption, force-enable encryption in all portals the bridge creates
         # This will cause the bridge bot to be in private chats for the encryption to work properly.
-        default: false
+        default: true
         # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.
         appservice: false
         # Require encryption, drop any unencrypted messages.
@@ -343,9 +343,9 @@ bridge:
     #   domain - All users on that homeserver
     #     mxid - Specific user
     permissions:
-      "__LISTRELAY__": "relay"
+        "__LISTRELAY__": "relay"
-      "__LISTUSER__": "user"
+        "__LISTUSER__": "user"
-      "__LISTADMIN__": "admin"
+        "__LISTADMIN__": "admin"
 
 # Logging config. See https://github.com/tulir/zeroconfig for details.
 logging:

config_panel.toml

@@ -0,0 +1,54 @@
+version = "1.0"
+
+[main]
+name = "Main Settings"
+services = ["__APP__"]
+
+    [main.permissions]
+    name = "Permissions for using the bridge"
+
+        [main.permissions.helptext]
+        ask = '''
+        Roles with Increasing Power: Relay<User<Admin
+        Allowed values for roles:
+        - * : All Matrix users
+        - domain.tld : All users on a given homeserver
+        - mxid (@user:matrix.org) : Specific Matrix user
+        '''
+        type = "markdown"
+
+        [main.permissions.listrelay]
+        ask = "Users bridged thanks to Relay Mode"
+        type = "tags"
+        help = "Relay Role: Talk on Discord through the RelayBot in a room where it has been activated with '!wa set-relay', no access otherwise."
+
+        [main.permissions.listuser]
+        ask = "Bridge Users"
+        type = "tags"
+        help = "User Role: Access to use the bridge to chat with a Discord account."
+
+        [main.permissions.listadmin]
+        ask = "Bridge Administrators"
+        type = "tags"
+        help = "Admin Role: User level and some additional administration tools."
+
+    [main.bot]
+    name = "Robot Settings"
+
+        [main.bot.botname]
+        ask = "Username of the AppService Bot"
+        type = "string"
+        help = "Sets bot username. Please keep in mind that the bot admin room for previous bot username will stop working so you may need to create a new one using the new username"
+        bind = "bot>username:__INSTALL_DIR__/config.yaml"
+
+        [main.bot.displayname]
+        ask = "Display name for Bot"
+        type = "string"
+        help = "Set to 'remove' to remove display name, leave empty to set default 'Discord bridge bot'"
+        bind = ":__INSTALL_DIR__/config.yaml"
+
+        [main.bot.avatar]
+        ask = "Avatar for Bot"
+        type = "string"
+        help = "Should be in format 'mxc://server_name/NeXNQarUbrlYBiPCpprYsRqr', see README for tutorial. Set to 'remove' to remove avatar, leave empty to use standard Discord logo."
+        bind = ":__INSTALL_DIR__/config.yaml"

manifest.toml

@@ -7,7 +7,7 @@ name = "Matrix-Discord bridge"
 description.en = "Matrix / Synapse puppeting bridge for Discord"
 description.fr = "Passerelle Matrix / Synapse pour Discord"
 
-version = "0.6.5~ynh1"
+version = "0.6.5~ynh2"
 
 maintainers = ["fflorent"]
 
@@ -86,7 +86,11 @@ ram.runtime = "1024M"
         arm64.sha256 = "080b520871a51ddbe866ad83c889d47323452e6c25ee1b785e04a690884a77d9"
         armhf.url = "https://github.com/mautrix/discord/releases/download/v0.6.5/mautrix-discord-arm"
         armhf.sha256 = "e3a9eb3f64dc6d9e568f34f79b0b22cd08584c01779d22788ee6e966f5cde827"
-
+        
+        autoupdate.strategy = "latest_github_release"
+        autoupdate.asset.amd64 = "mautrix-discord-amd64"
+        autoupdate.asset.arm64 = "mautrix-discord-arm64"
+        autoupdate.asset.armhf = "mautrix-discord-arm"
 
     [resources.system_user]
     home = "/opt/yunohost/__APP__"

scripts/change_url

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source _common.sh
-source /usr/share/yunohost/helpers
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# STOP SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
-
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
-
-#=================================================
-# MODIFY URL IN NGINX CONF
-#=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
-
-ynh_change_url_nginx_config
-
-#=================================================
-# SPECIFIC MODIFICATIONS
-#=================================================
-# ...
-#=================================================
-
-#=================================================
-# GENERIC FINALISATION
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
-
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-
-#=================================================
-# END OF SCRIPT
-#=================================================
-
-ynh_script_progression --message="Change of URL completed for $app" --last