Merge d5fdf65d20 into 0e35c575b0

2024-09-03 19:46:07 +02:00 · 2024-08-28 10:53:59 +02:00 · 2024-08-28 10:53:59 +02:00 · d4d5ca80c4
commit d4d5ca80c4
parent 0e35c575b0 d5fdf65d20
13 changed files with 71 additions and 25 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -6,4 +6,5 @@
 - [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_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -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.3~ynh1
+**Shipped version:** 0.7.0~ynh1
 ## Documentation and resources

 - Official user documentation: <https://docs.mau.fi/bridges/go/signal/index.html>
--- a/README_es.md
+++ b/README_es.md
@ -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.3~ynh1
+**Versión actual:** 0.7.0~ynh1
 ## Documentaciones y recursos

 - Documentación usuario oficial: <https://docs.mau.fi/bridges/go/signal/index.html>
--- a/README_eu.md
+++ b/README_eu.md
@ -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.3~ynh1
+**Paketatutako bertsioa:** 0.7.0~ynh1
 ## Dokumentazioa eta baliabideak

 - Erabiltzaileen dokumentazio ofiziala: <https://docs.mau.fi/bridges/go/signal/index.html>
--- a/README_fr.md
+++ b/README_fr.md
@ -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.3~ynh1
+**Version incluse :** 0.7.0~ynh1
 ## Documentations et ressources

 - Documentation officielle utilisateur : <https://docs.mau.fi/bridges/go/signal/index.html>
--- a/README_gl.md
+++ b/README_gl.md
@ -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.3~ynh1
+**Versión proporcionada:** 0.7.0~ynh1
 ## Documentación e recursos

 - Documentación oficial para usuarias: <https://docs.mau.fi/bridges/go/signal/index.html>
--- a/README_id.md
+++ b/README_id.md
@ -22,11 +22,11 @@ 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 terkirim:** 0.6.3~ynh1
+**Versi terkirim:** 0.7.0~ynh1
 ## Dokumentasi dan sumber daya

 - Dokumentasi pengguna resmi: <https://docs.mau.fi/bridges/go/signal/index.html>
- Repositori kode aplikasi hulu: <https://github.com/mautrix/signal>
+- Depot kode aplikasi hulu: <https://github.com/mautrix/signal>
 - Gudang YunoHost: <https://apps.yunohost.org/app/mautrix_signal>
 - Laporkan bug: <https://github.com/YunoHost-Apps/mautrix_signal_ynh/issues>

--- a/README_ru.md
+++ b/README_ru.md
@ -0,0 +1,45 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Matrix Signal bridge для YunoHost
+
+[![Уровень интеграции](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)
+
+[![Установите Matrix Signal bridge с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_signal)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Matrix Signal bridge быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+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.
+
+
+**Поставляемая версия:** 0.7.0~ynh1
+## Документация и ресурсы
+
+- Официальная документация пользователя: <https://docs.mau.fi/bridges/go/signal/index.html>
+- Репозиторий кода главной ветки приложения: <https://github.com/mautrix/signal>
+- Магазин YunoHost: <https://apps.yunohost.org/app/mautrix_signal>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/mautrix_signal_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/mautrix_signal_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/mautrix_signal_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade mautrix_signal -u https://github.com/YunoHost-Apps/mautrix_signal_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -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.3~ynh1
+**分发版本：** 0.7.0~ynh1
 ## 文档与资源

 - 官方用户文档： <https://docs.mau.fi/bridges/go/signal/index.html>
--- 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 <phone>``, where ``<phone>`` is your phone number in the international format with no space, e.g. ``!sg register +33612345678``
+* Type ``!signal register <phone>``, where ``<phone>`` 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 <name>``
+* Set a profile name with ``!signal set-profile-name <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
--- 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 <phone>``, où ``<phone>`` est votre numéro de téléphone au format international sans espace, p.ex. ``!sg register +33612345678``
+* Tapez ``!signal register <phone>``, où ``<phone>`` 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 <name>``
+* Définissez une nom de profil ``!signal set-profile-name <name>``

 ### Robot-Relai "Relaybot": Relayer les conversations de TOUS les comptes Matrix et TOUS les comptes Signal présents dans UN groupe/salon

--- a/doc/PRE_UPGRADE.d/0.6.3~ynh2.md
+++ b/doc/PRE_UPGRADE.d/0.6.3~ynh2.md
@ -0,0 +1 @@
+With this upgrade, the command `!sg` will be replaced by `!signal`. 
--- 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.3~ynh1"
+version = "0.7.0~ynh1"

 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.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"
+    amd64.url = "https://github.com/mautrix/signal/releases/download/v0.7.0/mautrix-signal-amd64"
+    amd64.sha256 = "9d04a968f93efe37dd6f48ff6328518e51fb707bf94bb3097b51c146a0cdfcdb"
+    arm64.url = "https://github.com/mautrix/signal/releases/download/v0.7.0/mautrix-signal-arm64"
+    arm64.sha256 = "541c57ae08667129291616cd2bdc41eeba09525bfe13752dbca4dd353d573996"

    autoupdate.strategy = "latest_github_release"
    autoupdate.asset.amd64 = "^mautrix-signal-amd64$"
				`@ -0,0 +1 @@`
				With this upgrade, the command `!sg` will be replaced by `!signal`.