diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 5818f1a..bd81a78 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Matrix Signal bridge for YunoHost -[![Integration level](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://dash.yunohost.org/appci/app/mautrix_signal) ![Working status](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://ci-apps.yunohost.org/ci/apps/mautrix_signal/) ![Working status](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) [![Install Matrix Signal bridge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal) @@ -22,7 +22,7 @@ Currently the Matrix user can NOT invite other Matrix user in a bridged Signal r The ["Mautrix-Signal"](https://docs.mau.fi/bridges/go/signal/index.html) bridge consists in a Synapse App Service and relies on postgresql (mysql also possible). Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) should be installed beforehand. -**Shipped version:** 0.6.2~ynh1 +**Shipped version:** 0.6.3~ynh2 ## Documentation and resources - Official user documentation: diff --git a/README_es.md b/README_es.md index 0889608..e24d44c 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Matrix Signal bridge para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://dash.yunohost.org/appci/app/mautrix_signal) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://ci-apps.yunohost.org/ci/apps/mautrix_signal/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) [![Instalar Matrix Signal bridge con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal) @@ -22,7 +22,7 @@ Currently the Matrix user can NOT invite other Matrix user in a bridged Signal r The ["Mautrix-Signal"](https://docs.mau.fi/bridges/go/signal/index.html) bridge consists in a Synapse App Service and relies on postgresql (mysql also possible). Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) should be installed beforehand. -**Versión actual:** 0.6.2~ynh1 +**Versión actual:** 0.6.3~ynh2 ## Documentaciones y recursos - Documentación usuario oficial: diff --git a/README_eu.md b/README_eu.md index 7e3d2e0..dba5abf 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Matrix Signal bridge YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://dash.yunohost.org/appci/app/mautrix_signal) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://ci-apps.yunohost.org/ci/apps/mautrix_signal/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) [![Instalatu Matrix Signal bridge YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal) @@ -22,7 +22,7 @@ Currently the Matrix user can NOT invite other Matrix user in a bridged Signal r The ["Mautrix-Signal"](https://docs.mau.fi/bridges/go/signal/index.html) bridge consists in a Synapse App Service and relies on postgresql (mysql also possible). Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) should be installed beforehand. -**Paketatutako bertsioa:** 0.6.2~ynh1 +**Paketatutako bertsioa:** 0.6.3~ynh2 ## Dokumentazioa eta baliabideak - Erabiltzaileen dokumentazio ofiziala: diff --git a/README_fr.md b/README_fr.md index 75654f8..b4570ac 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Matrix Signal bridge pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://dash.yunohost.org/appci/app/mautrix_signal) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://ci-apps.yunohost.org/ci/apps/mautrix_signal/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) [![Installer Matrix Signal bridge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal) @@ -23,7 +23,7 @@ La passerelle ["Mautrix-Signal"](https://docs.mau.fi/bridges/python/signal/index **Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix-synapse et mautrix_signal en même temps!** -**Version incluse :** 0.6.2~ynh1 +**Version incluse :** 0.6.3~ynh2 ## Documentations et ressources - Documentation officielle utilisateur : diff --git a/README_gl.md b/README_gl.md index 6892ffe..b21ccab 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Matrix Signal bridge para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://dash.yunohost.org/appci/app/mautrix_signal) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://ci-apps.yunohost.org/ci/apps/mautrix_signal/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) [![Instalar Matrix Signal bridge con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal) @@ -22,7 +22,7 @@ Currently the Matrix user can NOT invite other Matrix user in a bridged Signal r The ["Mautrix-Signal"](https://docs.mau.fi/bridges/go/signal/index.html) bridge consists in a Synapse App Service and relies on postgresql (mysql also possible). Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) should be installed beforehand. -**Versión proporcionada:** 0.6.2~ynh1 +**Versión proporcionada:** 0.6.3~ynh2 ## Documentación e recursos - Documentación oficial para usuarias: diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..6058168 --- /dev/null +++ b/README_id.md @@ -0,0 +1,45 @@ + + +# Matrix Signal bridge untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://ci-apps.yunohost.org/ci/apps/mautrix_signal/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) + +[![Pasang Matrix Signal bridge dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Matrix Signal bridge secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +A puppeting bridge between Matrix and Signal packaged as a YunoHost service. Messages, notifications (and sometimes media) are bridged between a Signal user and a Matrix user. +Currently the Matrix user can NOT invite other Matrix user in a bridged Signal room, so only someone with a Signal account can participate to Signal group conversations. + +The ["Mautrix-Signal"](https://docs.mau.fi/bridges/go/signal/index.html) bridge consists in a Synapse App Service and relies on postgresql (mysql also possible). Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) should be installed beforehand. + + +**Versi terkirim:** 0.6.3~ynh2 +## Dokumentasi dan sumber daya + +- Dokumentasi pengguna resmi: +- Repositori kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/mautrix_signal_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mautrix_signal_ynh/tree/testing --debug +atau +sudo yunohost app upgrade mautrix_signal -u https://github.com/YunoHost-Apps/mautrix_signal_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index e09bd8e..08f931d 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Matrix Signal bridge -[![集成程度](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://dash.yunohost.org/appci/app/mautrix_signal) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/mautrix_signal.svg)](https://ci-apps.yunohost.org/ci/apps/mautrix_signal/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mautrix_signal.maintain.svg) [![使用 YunoHost 安装 Matrix Signal bridge](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal) @@ -22,7 +22,7 @@ Currently the Matrix user can NOT invite other Matrix user in a bridged Signal r The ["Mautrix-Signal"](https://docs.mau.fi/bridges/go/signal/index.html) bridge consists in a Synapse App Service and relies on postgresql (mysql also possible). Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) should be installed beforehand. -**分发版本：** 0.6.2~ynh1 +**分发版本：** 0.6.3~ynh2 ## 文档与资源 - 官方用户文档： diff --git a/conf/config.yaml b/conf/config.yaml index 997e91b..706bf78 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -141,7 +141,7 @@ bridge: caption_in_message: false # Format for generating URLs from location messages for sending to Signal # Google Maps: 'https://www.google.com/maps/place/%[1]s,%[2]s' - # OpenStreetMap: 'https://www.openstreetmap.org/?mlat=%[1]s&mlon=%[2]' + # OpenStreetMap: 'https://www.openstreetmap.org/?mlat=%[1]s&mlon=%[2]s' location_format: 'https://www.google.com/maps/place/%[1]s,%[2]s' # Whether or not created rooms should have federation enabled. # If false, created portal rooms will never be federated. diff --git a/conf/systemd.service b/conf/systemd.service index 2f37346..05a1bc1 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,6 +8,8 @@ User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ ExecStart=__INSTALL_DIR__/mautrix-signal -c=__INSTALL_DIR__/config.yaml +Restart=always +RestartSec=3 [Install] WantedBy=multi-user.target diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 2081f7b..3ecdbcc 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -11,12 +11,12 @@ * First your Matrix user or Synapse Server has to be authorized in the Configuration of the bridge (see below) * Then, invite the bot (default @signalbot:yoursynapse.domain) in this new Mautrix-Signal bot administration room. * If the Bot does bot accept, see the [troubleshooting page](https://docs.mau.fi/bridges/general/troubleshooting.html) -* Send ``!sg help`` to the bot in the created room to know how to control the bot. +* Send ``!signal help`` to the bot in the created room to know how to control the bot. See also [upstream wiki Authentication page](https://docs.mau.fi/bridges/go/signal/authentication.html) #### Linking the Bridge as a secondary device -* Type ``!sg link`` +* Type ``!signal link`` * Open Signal App of your primary device * Open Settings => Linked Devices => + => Capture the QR code with the camera * By defaults, only conversations with very recent messages will be bridged @@ -24,9 +24,9 @@ See also [upstream wiki Authentication page](https://docs.mau.fi/bridges/go/sign #### Registering the Bridge as a primary device -* Type ``!sg register ``, where ```` is your phone number in the international format with no space, e.g. ``!sg register +33612345678`` +* Type ``!signal register ``, where ```` is your phone number in the international format with no space, e.g. ``!signal register +33612345678`` * Answer in the bot room with the verification code that you reveived in SMS. -* Set a profile name with ``!sg set-profile-name `` +* Set a profile name with ``!signal set-profile-name `` ### Double puppeting @@ -38,7 +38,7 @@ See also [upstream wiki Authentication page](https://docs.mau.fi/bridges/go/sign * Create a room on the signal side * Your bridged users will be invited on the Matrix side once they are invited on the Signal side * You can invite more people over on the Matrix side -* Have one of the bridged users (who has the right permission) type `!sg set-relay` on the Matrix side. Their signal account will relay messages from other Matrix users +* Have one of the bridged users (who has the right permission) type `!signal set-relay` on the Matrix side. Their signal account will relay messages from other Matrix users It is not yet possible to bridge to an existing signal room, or create a new signal room from the Matrix side. ## Configuration of the bridge diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index f24e12b..7d9f414 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -16,7 +16,7 @@ Voir aussi [upstream wiki Authentication page](https://docs.mau.fi/bridges/pytho #### Relier la passerelle comme un appareil secondaire -* Tapez ``!sg link`` +* Tapez ``!signal link`` * Ouvrez l'application Signal de votre appareil principal * Ouvrez Paramètres => Appareils reliés => + => filmer le QR * Par défaut, seules les conversations avec des messages très récents seront mises-en-miroir @@ -24,9 +24,9 @@ Voir aussi [upstream wiki Authentication page](https://docs.mau.fi/bridges/pytho #### Enregistrer la passerelle comme appareil principal -* Tapez ``!sg register ``, où ```` est votre numéro de téléphone au format international sans espace, p.ex. ``!sg register +33612345678`` +* Tapez ``!signal register ``, où ```` est votre numéro de téléphone au format international sans espace, p.ex. ``!signal register +33612345678`` * Répondez dans le salon d'administration avec le code de vérification reçu par SMS. -* Définissez une nom de profil ``!sg set-profile-name `` +* Définissez une nom de profil ``!signal set-profile-name `` ### Robot-Relai "Relaybot": Relayer les conversations de TOUS les comptes Matrix et TOUS les comptes Signal présents dans UN groupe/salon diff --git a/doc/PRE_UPGRADE.d/0.6.3~ynh2.md b/doc/PRE_UPGRADE.d/0.6.3~ynh2.md new file mode 100644 index 0000000..6fbd8f4 --- /dev/null +++ b/doc/PRE_UPGRADE.d/0.6.3~ynh2.md @@ -0,0 +1 @@ +With this upgrade, the command `!sg` will be replaced by `!signal`. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 8dc7f36..dffc104 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Matrix Signal bridge" description.en = "Matrix / Synapse puppeting bridge for Signal" description.fr = "Passerelle Matrix / Synapse pour Signal" -version = "0.6.2~ynh1" +version = "0.6.3~ynh2" maintainers = ["MayeulC", "nathanael-h"] @@ -74,11 +74,10 @@ ram.runtime = "128M" [install.botusers] ask.en = "Choose Matrix user(s) authorized to bridge with the Signal bot" ask.fr = "Choisissez le/les compte(s) Matrix autorisés à utiliser la passerelle Signal" - help.en = "Either the administrator only (admin), all local Synapse users (domain), a remote or local user (@johndoe:server.name), a remote server (matrix.org), or all remote/local servers (*) can be authorized. Give the Matrix server_name, not the full domain/URL." - help.fr = "L'administrateur seulement (admin), tous les comptes Synapse locaux (domain), un compte local ou distant (@johndoe:server.name), un serveur distant (matrix.org), ou tous les serveurs remote/local (*). Donner le nom du serveur Matrix, pas le domaine/URL complet." type = "string" - example = "admin or domain or @johndoe:server.name or server.name or *" - default = "domain" + example = "@johndoe:server.name or server.name or *" + help.en = "A remote or local user (@johndoe:server.name),the local server (server.name), a remote server (matrix.org), or all remote/local servers (*) can be authorized. Give the Matrix server_name, not the full domain/URL. It is also possible to specify multiple values by separating them with comma. Example: @johndoe:server.name,domain.tld,matrix.org" + help.fr = "Un compte local ou distant (@johndoe:server.name), le serveur local (server.name), un serveur distant (matrix.org), ou tous les serveurs remote/local (*). Donner le nom du serveur Matrix, pas le domaine/URL complet. Il est également possible de spécifier plusieurs valeurs en les séparant par une virgule. Exemple : @johndoe:server.name,domain.tld,matrix.org" [install.enable_relaybot] ask.en = "Choose whether to enable the relay bot feature" @@ -94,10 +93,10 @@ ram.runtime = "128M" in_subdir = false extract = false rename = "mautrix-signal" - amd64.url = "https://github.com/mautrix/signal/releases/download/v0.6.2/mautrix-signal-amd64" - amd64.sha256 = "ad55aea9c55bb250de1165287e061b0b85df82b43fb39a8f5ec5d09592cd186e" - arm64.url = "https://github.com/mautrix/signal/releases/download/v0.6.2/mautrix-signal-arm64" - arm64.sha256 = "b9612d90437eee1ae1062cce84f67eae4321b515276bcff0bf45b4ca0e3ff7d5" + amd64.url = "https://github.com/mautrix/signal/releases/download/v0.6.3/mautrix-signal-amd64" + amd64.sha256 = "b98a509c9e4a2d471d8801ab5f4002f7b3edd6c0d385fb0bc05df8f91cdfd457" + arm64.url = "https://github.com/mautrix/signal/releases/download/v0.6.3/mautrix-signal-arm64" + arm64.sha256 = "af75a17b28f60674a77dd6d96b25ab7fb684767a59f65e928b3ff9c3bf59483e" autoupdate.strategy = "latest_github_release" autoupdate.asset.amd64 = "^mautrix-signal-amd64$" diff --git a/scripts/remove b/scripts/remove index aab16f7..6f08ce3 100755 --- a/scripts/remove +++ b/scripts/remove @@ -54,8 +54,6 @@ ynh_script_progression --message="Removing various files..." --weight=6 ynh_secure_remove --file="/etc/matrix-$synapse_instance/app-service/$app.yaml" /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh || ynh_die --message="Synapse can't restart with the appservice configuration" -# Remove the log files - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index e9858f4..bfd2874 100755 --- a/scripts/restore +++ b/scripts/restore @@ -48,7 +48,7 @@ ynh_script_progression --message="Registering Synapse app-service" --weight=1 $install_dir/mautrix-signal -g -c $install_dir/config.yaml -r /etc/matrix-$synapse_instance/app-service/$app.yaml /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh || ynh_die --message="Synapse can't restart with the appservice configuration" -chown -R $app:$app "$install_dir" +chown -R $app:$app "$install_dir/config.yaml" ynh_store_file_checksum --file="/etc/matrix-$synapse_instance/app-service/$app.yaml" ynh_store_file_checksum --file="$install_dir/config.yaml" diff --git a/scripts/upgrade b/scripts/upgrade index 813b29e..c357095 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,7 +10,7 @@ source _common.sh source /usr/share/yunohost/helpers mautrix_version=$(ynh_app_upstream_version) -synapse_db_name="matrix_$synapse_instance" +synapse_db_name="$(get_synapse_db_name $synapse_instance)" server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name) domain=$(ynh_app_setting_get --app $synapse_instance --key domain) diff --git a/tests.toml b/tests.toml index 142ce5b..d65e3a1 100644 --- a/tests.toml +++ b/tests.toml @@ -12,4 +12,4 @@ test_format = 1.0 args.botadmin = "@johndoe:synapsedomain.tld" args.botusers = "synapsedomain.tld" - test_upgrade_from.53823e7d92a678c5c27f62f64f7e914bd7096d0d.name = "Upgrade from 0.4.3~ynh2 (latest Python version)" + test_upgrade_from.53ee4060497125585a0da304a4128985028d6aee.name = "Upgrade from 0.6.1~ynh1 (first Go version)"