From e87754b201aa072df5c3e11e000168807834facc Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 26 Feb 2024 01:05:10 +0100 Subject: [PATCH 01/31] Upgrade to v1.18.0 (#13) --- README.md | 6 +++--- README_fr.md | 4 ++-- manifest.toml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2850245..36e8d96 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. -**Shipped version:** 1.17.3~ynh1 +**Shipped version:** 1.18.0~ynh1 **Demo:** https://fluffychat.im/web @@ -47,4 +47,4 @@ or sudo yunohost app upgrade fluffychat -u https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index f50ca8c..5f3d747 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po [FluffyChat](https://fluffychat.im) est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. -**Version incluse :** 1.17.3~ynh1 +**Version incluse :** 1.18.0~ynh1 **Démo :** https://fluffychat.im/web diff --git a/manifest.toml b/manifest.toml index 802a2de..ba25858 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Fluffychat" description.en = "Matrix messenger client" description.fr = "Client de messagerie Matrix" -version = "1.17.3~ynh1" +version = "1.18.0~ynh1" maintainers = [ "OniriCorpe" ] @@ -51,8 +51,8 @@ ram.runtime = "50M" [resources.sources.main] - url = "https://github.com/krille-chan/fluffychat/releases/download/v1.17.3/fluffychat-web.tar.gz" - sha256 = "cd88c8d6aaf1c90ddba1b69696eda8212d7d529d2c1f5f6943a589621ae38ca9" + url = "https://github.com/krille-chan/fluffychat/releases/download/v1.18.0/fluffychat-web.tar.gz" + sha256 = "0b9fbc74e1098c3df966dd1b689ec16bef5aa3e83cecb7d3f408a5fab6128cf7" in_subdir = 2 autoupdate.asset = "fluffychat-web.tar.gz" From fce41fec48e3a104cfe0db2e976195bee356c3d3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 2 Jan 2024 08:45:25 +0000 Subject: [PATCH 02/31] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2c2a535..8bd7353 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -[FluffyChat](https://fluffychat.im) is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. +FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. **Shipped version:** 1.16.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 39b70c5..4d5896a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -[FluffyChat](https://fluffychat.im) est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. +FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. **Version incluse :** 1.16.0~ynh1 From 203779abd5439bfa08c94b85b18a27dd6af7b5fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 2 Jan 2024 08:45:56 +0000 Subject: [PATCH 03/31] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8bd7353..23f376d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] ## Screenshots -![Screenshot of Fluffychat](./doc/screenshots/fluffychat.jpg) +![Screenshot of Fluffychat](./doc/screenshots/screenshot.png) ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 4d5896a..01d44fe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non ## Captures d’écran -![Capture d’écran de Fluffychat](./doc/screenshots/fluffychat.jpg) +![Capture d’écran de Fluffychat](./doc/screenshots/screenshot.png) ## Documentations et ressources From a62642998d5bc5f1372982ca4f08a692dccac552 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 Jan 2024 17:16:08 +0100 Subject: [PATCH 04/31] Upgrade to v1.17.0 Changelog: https://github.com/krille-chan/fluffychat/releases/tag/v1.17.0 --- manifest.toml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/manifest.toml b/manifest.toml index 930e5f4..cba7fa3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,9 +7,9 @@ name = "Fluffychat" description.en = "Matrix messenger client" description.fr = "Client de messagerie Matrix" -version = "1.16.0~ynh1" +version = "1.17.0~ynh1" -maintainers = ["OniriCorpe"] +maintainers = [ "OniriCorpe" ] [upstream] license = "AGPL-3.0-only" @@ -34,32 +34,32 @@ ram.runtime = "50M" [install] - [install.domain] - type = "domain" + [install.domain] + type = "domain" - [install.path] - type = "path" - default = "/fluffychat" + [install.path] + type = "path" + default = "/fluffychat" - [install.init_main_permission] - type = "group" - default = "visitors" + [install.init_main_permission] + type = "group" + default = "visitors" [resources] - [resources.sources] + [resources.sources] - [resources.sources.main] - url = "https://github.com/krille-chan/fluffychat/releases/download/v1.16.0/fluffychat-web.tar.gz" - sha256 = "b7852559895d3a4dd2107f5b8f6814b5d8571a720ea2ec4e1174392fd7267bd1" - in_subdir = 2 + [resources.sources.main] + url = "https://github.com/krille-chan/fluffychat/releases/download/v1.16.0/fluffychat-web.tar.gz" + sha256 = "b7852559895d3a4dd2107f5b8f6814b5d8571a720ea2ec4e1174392fd7267bd1" + in_subdir = 2 - autoupdate.asset = "fluffychat-web.tar.gz" - autoupdate.strategy = "latest_github_release" + autoupdate.asset = "fluffychat-web.tar.gz" + autoupdate.strategy = "latest_github_release" - [resources.install_dir] - owner = "www-data:rx" - group = "www-data:rx" +[resources.install_dir] +owner = "www-data:rx" +group = "www-data:rx" - [resources.permissions] - main.url = "/" +[resources.permissions] +main.url = "/" From 5aba21ca0825238c3eee768e713fc5f25f289d6f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 Jan 2024 19:20:21 +0000 Subject: [PATCH 05/31] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 23f376d..a04fccc 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. -**Shipped version:** 1.16.0~ynh1 +**Shipped version:** 1.17.0~ynh1 **Demo:** https://fluffychat.im/web diff --git a/README_fr.md b/README_fr.md index 01d44fe..deb32e3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. -**Version incluse :** 1.16.0~ynh1 +**Version incluse :** 1.17.0~ynh1 **Démo :** https://fluffychat.im/web From 3cda0934acc43084cc07e9fcfb80a745d68f8570 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 Jan 2024 23:35:54 +0000 Subject: [PATCH 06/31] Auto-update README --- README_fr.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README_fr.md b/README_fr.md index deb32e3..56b900a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,10 +18,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. - **Version incluse :** 1.17.0~ynh1 -**Démo :** https://fluffychat.im/web +**Démo :** ## Captures d’écran @@ -47,4 +46,4 @@ ou sudo yunohost app upgrade fluffychat -u https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** From 99f7a71704cee021b3dd626281c62dabdf1e02eb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 14 Jan 2024 05:16:01 +0100 Subject: [PATCH 07/31] Upgrade to v1.17.1 Changelog: https://github.com/krille-chan/fluffychat/releases/tag/v1.17.1 --- manifest.toml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index cba7fa3..49efac6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Fluffychat" description.en = "Matrix messenger client" description.fr = "Client de messagerie Matrix" -version = "1.17.0~ynh1" +version = "1.17.1~ynh1" maintainers = [ "OniriCorpe" ] @@ -46,12 +46,10 @@ ram.runtime = "50M" default = "visitors" [resources] - [resources.sources] - [resources.sources.main] - url = "https://github.com/krille-chan/fluffychat/releases/download/v1.16.0/fluffychat-web.tar.gz" - sha256 = "b7852559895d3a4dd2107f5b8f6814b5d8571a720ea2ec4e1174392fd7267bd1" + url = "https://github.com/krille-chan/fluffychat/releases/download/v1.17.1/fluffychat-web.tar.gz" + sha256 = "6800fde0284aceeca263c86d5a3871fe44e513dbe90ab8c00fc58a8ea74ff5ad" in_subdir = 2 autoupdate.asset = "fluffychat-web.tar.gz" From 2e91d095a0d54d2f07126b471ee66d76907b9403 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 14 Jan 2024 04:16:03 +0000 Subject: [PATCH 08/31] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a04fccc..5dca146 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. -**Shipped version:** 1.17.0~ynh1 +**Shipped version:** 1.17.1~ynh1 **Demo:** https://fluffychat.im/web diff --git a/README_fr.md b/README_fr.md index 56b900a..eab79a3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. -**Version incluse :** 1.17.0~ynh1 +**Version incluse :** 1.17.1~ynh1 **Démo :** From a4315d1952bb9285ac10714963f7be39fe97028b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Jan 2024 21:31:21 +0100 Subject: [PATCH 09/31] Upgrade to v1.17.2 Changelog: https://github.com/krille-chan/fluffychat/releases/tag/v1.17.2 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 49efac6..fca7614 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Fluffychat" description.en = "Matrix messenger client" description.fr = "Client de messagerie Matrix" -version = "1.17.1~ynh1" +version = "1.17.2~ynh1" maintainers = [ "OniriCorpe" ] From 2589b52c1e428c59b994b834555564951f8eb0da Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Jan 2024 20:31:22 +0000 Subject: [PATCH 10/31] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5dca146..d34945a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. -**Shipped version:** 1.17.1~ynh1 +**Shipped version:** 1.17.2~ynh1 **Demo:** https://fluffychat.im/web diff --git a/README_fr.md b/README_fr.md index eab79a3..451a694 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. -**Version incluse :** 1.17.1~ynh1 +**Version incluse :** 1.17.2~ynh1 **Démo :** From 01b800d43c66394eb81d9cc4d59ec969d2e2d4a2 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 25 Jan 2024 22:14:41 +0100 Subject: [PATCH 11/31] increase client_max_body_size --- conf/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7937e6b..47fe976 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,6 +4,8 @@ location __PATH__/ { # Path to source alias __INSTALL_DIR__/; + client_max_body_size 100M; + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } From 0cdfaf46b830df945ed783ec914fd0dc962f6046 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 25 Jan 2024 23:16:00 +0100 Subject: [PATCH 12/31] remove potential trailing slash to avoid double slashes --- scripts/change_url | 4 +++- scripts/install | 4 +++- scripts/upgrade | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 51db2e9..26cd413 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -20,7 +20,9 @@ ynh_change_url_nginx_config # SPECIFIC MODIFICATIONS #================================================= -ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" +# remove potential trailing slash to avoid double slashes +path_without_trailing_slash=${path%/} +ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 77420f6..c969593 100755 --- a/scripts/install +++ b/scripts/install @@ -19,7 +19,9 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" -ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" +# remove potential trailing slash to avoid double slashes +path_without_trailing_slash=${path%/} +ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" chown -R "www-data:www-data" "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 4b674c7..d0606b0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,9 @@ then # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" - ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" + # remove potential trailing slash to avoid double slashes + path_without_trailing_slash=${path%/} + ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" fi chown -R "www-data:www-data" "$install_dir" From e544d463e5e05f9e5fa7df3a433e45abbc390198 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 25 Jan 2024 23:25:52 +0100 Subject: [PATCH 13/31] rm dstore --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 055dc255932f8055ed7be0d8601aba63622cf4a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&1%~~5Z<+&M%$R8LJkh}u+T#YU<@J; zkOye4N%J0UAEGbPduMjnrN-?olwxLJ_M4rZnPoqT{b7vp!8G1w%w>!@pok3t%^w8E zQCFm4J%}7@OwOZBMbP^Zov%cb<9}oTzg?5XOtI6b`u+Q5>7?xSzVk-2weeun5f4RM zJQD4X!B|y68J5$@AS_1ilOTQsrfs=1HOJnHnFC(mYnxKuz;_qT_9GZNCZ2G1L)H{iN1R3P+6G&TQs+&%4s= z_vc+X+uQ4PW#4--p9{y?dG_k<@$~ZQ)Ah~m=esXo4gVZ|RV|M#F5nv&mWqp@$TO9n zfoBoDh$18ghyh|?4H&Rno3phBYoR3&1H{1nGJyMo1V!{M)&}*~0S#UsalD0y0ye%S z5T!-mVr>vcK)6W-G^yM^F}O(wzqE0_#oC}rXI#$=b?nUCzEHTH9sE*#o<{iK~F$YFs?TED+LUF6hkZ? d#T`&B;Fo9s`W9=0-~pkFfTn>OV&I=L@Dl{_U+@3` From 0fcd8b496acd54d0f5c3993034067053ebaaf736 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 4 Feb 2024 21:31:17 +0100 Subject: [PATCH 14/31] Upgrade to v1.17.3 Changelog: https://github.com/krille-chan/fluffychat/releases/tag/v1.17.3 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index fca7614..765c78c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Fluffychat" description.en = "Matrix messenger client" description.fr = "Client de messagerie Matrix" -version = "1.17.2~ynh1" +version = "1.17.3~ynh1" maintainers = [ "OniriCorpe" ] @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/krille-chan/fluffychat/releases/download/v1.17.1/fluffychat-web.tar.gz" - sha256 = "6800fde0284aceeca263c86d5a3871fe44e513dbe90ab8c00fc58a8ea74ff5ad" + url = "https://github.com/krille-chan/fluffychat/releases/download/v1.17.3/fluffychat-web.tar.gz" + sha256 = "cd88c8d6aaf1c90ddba1b69696eda8212d7d529d2c1f5f6943a589621ae38ca9" in_subdir = 2 autoupdate.asset = "fluffychat-web.tar.gz" From 90d6f7d3a365468b22e5b6754387fa6a792f470a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 4 Feb 2024 20:31:20 +0000 Subject: [PATCH 15/31] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d34945a..2850245 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. -**Shipped version:** 1.17.2~ynh1 +**Shipped version:** 1.17.3~ynh1 **Demo:** https://fluffychat.im/web diff --git a/README_fr.md b/README_fr.md index 451a694..465d5d9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. -**Version incluse :** 1.17.2~ynh1 +**Version incluse :** 1.17.3~ynh1 **Démo :** From e4b52602b43417dafb808affbe3ba92e953c8f2b Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 26 Feb 2024 01:05:10 +0100 Subject: [PATCH 16/31] Upgrade to v1.18.0 (#13) --- README.md | 6 +++--- README_fr.md | 4 ++-- manifest.toml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2850245..36e8d96 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. -**Shipped version:** 1.17.3~ynh1 +**Shipped version:** 1.18.0~ynh1 **Demo:** https://fluffychat.im/web @@ -47,4 +47,4 @@ or sudo yunohost app upgrade fluffychat -u https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 465d5d9..c231c38 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. -**Version incluse :** 1.17.3~ynh1 +**Version incluse :** 1.18.0~ynh1 **Démo :** diff --git a/manifest.toml b/manifest.toml index 765c78c..b3e5ecf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Fluffychat" description.en = "Matrix messenger client" description.fr = "Client de messagerie Matrix" -version = "1.17.3~ynh1" +version = "1.18.0~ynh1" maintainers = [ "OniriCorpe" ] @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/krille-chan/fluffychat/releases/download/v1.17.3/fluffychat-web.tar.gz" - sha256 = "cd88c8d6aaf1c90ddba1b69696eda8212d7d529d2c1f5f6943a589621ae38ca9" + url = "https://github.com/krille-chan/fluffychat/releases/download/v1.18.0/fluffychat-web.tar.gz" + sha256 = "0b9fbc74e1098c3df966dd1b689ec16bef5aa3e83cecb7d3f408a5fab6128cf7" in_subdir = 2 autoupdate.asset = "fluffychat-web.tar.gz" From 42d63d8c6901eff7fd56a404fc3c537c76430c71 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 26 Feb 2024 00:14:29 +0000 Subject: [PATCH 17/31] Auto-update README --- README_fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README_fr.md b/README_fr.md index c231c38..5f3d747 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,11 +16,11 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client d emessagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. +[FluffyChat](https://fluffychat.im) est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. **Version incluse :** 1.18.0~ynh1 -**Démo :** +**Démo :** https://fluffychat.im/web ## Captures d’écran @@ -46,4 +46,4 @@ ou sudo yunohost app upgrade fluffychat -u https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 4f94c55baddd9e4f0511eec9c83b2c9cef88d239 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 01:15:53 +0100 Subject: [PATCH 18/31] line break --- doc/DESCRIPTION.md | 3 ++- doc/DESCRIPTION_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index e894e3f..466edee 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1,2 @@ -FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. +FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). +The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index e54a37d..49e7d83 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1,2 @@ -[FluffyChat](https://fluffychat.im) est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. \ No newline at end of file +FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). +Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. From 0e08dec48848bee8a6811aa3dccc3ce53c843108 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 26 Feb 2024 00:15:58 +0000 Subject: [PATCH 19/31] Auto-update README --- README.md | 3 ++- README_fr.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36e8d96..6e9a476 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. +FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). +The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. **Shipped version:** 1.18.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 5f3d747..50fe452 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -[FluffyChat](https://fluffychat.im) est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. +FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non lucratif et mignon écrit en [Flutter](https://flutter.dev). +Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde. + **Version incluse :** 1.18.0~ynh1 From ec10a22c6865f20ed3abb9672b0c88bab6e7392a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:16:21 +0100 Subject: [PATCH 20/31] add default_matrix_server setting --- config_panel.toml | 26 ++++++++++++++++++++++++++ manifest.toml | 6 ++++++ scripts/install | 13 +++++++++++++ scripts/upgrade | 3 +++ 4 files changed, 48 insertions(+) create mode 100644 config_panel.toml diff --git a/config_panel.toml b/config_panel.toml new file mode 100644 index 0000000..413e937 --- /dev/null +++ b/config_panel.toml @@ -0,0 +1,26 @@ +version = "1.0" + +[main] + +services = [ "__APP__" ] + +name.en = "Config panel" +name.fr = "Panneau de configuration" + +help = "Here you can easily configure some things about your Fluffychat instance." + +#################### +#### FLUFFYCHAT CONFIG +#################### + + [main.fluffychat] + name = "Fluffychat config" + + [main.fluffychat.default_matrix_server] + ask.en = "Default Matrix server?" + ask.fr = "Serveur Matrix par défaut ?" + help.en = "This option changes the default Matrix server on the Fluffychat login page." + help.fr = "Cette option modifie le serveur Matrix renseigné par défaut sur la page de connexion de Fluffychat." + type = "string" + pattern.regexp = '^([-?a-zA-Z0-9]\.?){1,256}[a-zA-Z0-9]{1,6}$' + pattern.error = "Must be a domain name or a sub-domain. Must not start with 'http://' or 'https://'." diff --git a/manifest.toml b/manifest.toml index b3e5ecf..46d585a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -45,6 +45,12 @@ ram.runtime = "50M" type = "group" default = "visitors" + [install.default_matrix_server] + ask.en = "Default Matrix server" + help.en = "Serveur Matrix par défaut" + type = "url" + default = "matrix.org" + [resources] [resources.sources] [resources.sources.main] diff --git a/scripts/install b/scripts/install index c969593..1be7400 100755 --- a/scripts/install +++ b/scripts/install @@ -9,6 +9,16 @@ source _common.sh source /usr/share/yunohost/helpers +#================================================= +# INITIALIZE AND STORE SETTINGS +#================================================= + +# remove the 'https://' part +default_matrix_server=${default_matrix_server#*://} +# remove any trailing slash +default_matrix_server=${default_matrix_server%/} +ynh_app_setting_set --app="$app" --key=default_matrix_server --value="$default_matrix_server" + #================================================= # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC) #================================================= @@ -23,6 +33,9 @@ ynh_setup_source --dest_dir="$install_dir" path_without_trailing_slash=${path%/} ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" +# patching main.dart.js to replace the default matrix server +ynh_replace_string --match_string="$.cmx=\"matrix.org\"" --replace_string="$.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js" + chown -R "www-data:www-data" "$install_dir" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d0606b0..af4fa76 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,6 +27,9 @@ then # remove potential trailing slash to avoid double slashes path_without_trailing_slash=${path%/} ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" + + # patching main.dart.js to replace the default matrix server + ynh_replace_string --match_string="$.cmx=\".*\"" --replace_string="$.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js" fi chown -R "www-data:www-data" "$install_dir" From 7707e5a015af7b1417b80a2f44469474a57de22b Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:18:03 +0100 Subject: [PATCH 21/31] add PRE_UPGRADE --- doc/PRE_UPGRADE.d/1.18.0~ynh1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/PRE_UPGRADE.d/1.18.0~ynh1 diff --git a/doc/PRE_UPGRADE.d/1.18.0~ynh1 b/doc/PRE_UPGRADE.d/1.18.0~ynh1 new file mode 100644 index 0000000..dec075f --- /dev/null +++ b/doc/PRE_UPGRADE.d/1.18.0~ynh1 @@ -0,0 +1,2 @@ +Starting with this update, you can configure Fluffychat using the config panel integrated in Yunohost, you will find it in the web admin interface of your Yunohost by following these steps: +`Applications > Fluffychat > Config Panel` From 0f3901481214302175e50c9055e862a0ad81c0e6 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:19:48 +0100 Subject: [PATCH 22/31] fix upgrade, create 'default_matrix_server' if needed --- scripts/upgrade | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index af4fa76..738de18 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -11,6 +11,12 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) +# if we update from a version prior to the config panel, create new setting +if [ -z "${default_matrix_server:-}" ]; then + default_matrix_server="matrix.org" + ynh_app_setting_set --app="$app" --key=default_matrix_server --value="$default_matrix_server" +fi + #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= From 88e908a9552344c3d4363f01f6a639664e3739c6 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:21:43 +0100 Subject: [PATCH 23/31] fix default_matrix_server help string --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 46d585a..2f4b62e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -47,7 +47,7 @@ ram.runtime = "50M" [install.default_matrix_server] ask.en = "Default Matrix server" - help.en = "Serveur Matrix par défaut" + help.en = "Must be a domain name or a sub-domain. Must not contain a path." type = "url" default = "matrix.org" From f976b473fc0af80943edde4749bb29c957ab418f Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:27:03 +0100 Subject: [PATCH 24/31] warn about "The changes may not appear if you do not clear your browser's cache." --- config_panel.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config_panel.toml b/config_panel.toml index 413e937..2c62897 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -15,6 +15,7 @@ help = "Here you can easily configure some things about your Fluffychat instance [main.fluffychat] name = "Fluffychat config" + help = "The changes may not appear if you do not clear your browser's cache." [main.fluffychat.default_matrix_server] ask.en = "Default Matrix server?" From 4fffeac4d55f0a9f04222339b17ff05b376b4dd6 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:32:37 +0100 Subject: [PATCH 25/31] fix patch 'main.dart.js' regex --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 1be7400..f5e8814 100755 --- a/scripts/install +++ b/scripts/install @@ -34,7 +34,7 @@ path_without_trailing_slash=${path%/} ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" # patching main.dart.js to replace the default matrix server -ynh_replace_string --match_string="$.cmx=\"matrix.org\"" --replace_string="$.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js" +ynh_replace_string --match_string="\$\.cmx=\"matrix.org\"" --replace_string="\$\.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js" chown -R "www-data:www-data" "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 738de18..a4be173 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,7 +35,7 @@ then ynh_replace_string --match_string="" --replace_string="" --target_file="$install_dir/index.html" # patching main.dart.js to replace the default matrix server - ynh_replace_string --match_string="$.cmx=\".*\"" --replace_string="$.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js" + ynh_replace_string --match_string="\$\.cmx=\".*\"" --replace_string="\$\.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js" fi chown -R "www-data:www-data" "$install_dir" From 52b22fd5ef3fd42cfb7af889daf576148c8082aa Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:35:03 +0100 Subject: [PATCH 26/31] add set__default_matrix_server --- scripts/config | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 scripts/config diff --git a/scripts/config b/scripts/config new file mode 100644 index 0000000..939cfdb --- /dev/null +++ b/scripts/config @@ -0,0 +1,41 @@ +#!/bin/bash +# In simple cases, you don't need a config script. + +# With a simple config_panel.toml, you can write in the app settings, in the +# upstream config file or replace complete files (logo ...) and restart services. + +# The config scripts allows you to go further, to handle specific cases +# (validation of several interdependent fields, specific getter/setter for a value, +# display dynamic informations or choices, pre-loading of config type .cube... ). + +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source /usr/share/yunohost/helpers + +ynh_abort_if_errors + +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + +install_dir=$(ynh_app_setting_get --app="$app" --key=install_dir) +default_matrix_server=$(ynh_app_setting_get --app="$app" --key=default_matrix_server) + +#================================================= +# SPECIFIC SETTERS +#================================================= + +set__default_matrix_server() { + + # patching main.dart.js to replace the default matrix server + ynh_replace_string --match_string="\$\.cmx=\".*\"" --replace_string="\$\.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js" + + ynh_app_setting_set --app="$app" --key=default_matrix_server --value="$default_matrix_server" +} + +#================================================= +# GENERIC FINALIZATION +#================================================= +ynh_app_config_run "$1" From f9e1669091b394dbf36ee2abc5a0b2da6841a496 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:43:48 +0100 Subject: [PATCH 27/31] remove example comment --- scripts/config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/config b/scripts/config index 939cfdb..583970e 100644 --- a/scripts/config +++ b/scripts/config @@ -1,12 +1,4 @@ #!/bin/bash -# In simple cases, you don't need a config script. - -# With a simple config_panel.toml, you can write in the app settings, in the -# upstream config file or replace complete files (logo ...) and restart services. - -# The config scripts allows you to go further, to handle specific cases -# (validation of several interdependent fields, specific getter/setter for a value, -# display dynamic informations or choices, pre-loading of config type .cube... ). #================================================= # IMPORT GENERIC HELPERS From e5f0f8e65011b73bc0d40862e79e9379145b7ebc Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 02:47:23 +0100 Subject: [PATCH 28/31] no need for service restart --- config_panel.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 2c62897..2a32a20 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -2,8 +2,6 @@ version = "1.0" [main] -services = [ "__APP__" ] - name.en = "Config panel" name.fr = "Panneau de configuration" From c4a15178a4a9464f799831c4fb1570c40dca1670 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 03:18:19 +0100 Subject: [PATCH 29/31] get__default_matrix_server --- scripts/config | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/config b/scripts/config index 583970e..9501279 100644 --- a/scripts/config +++ b/scripts/config @@ -13,7 +13,17 @@ ynh_abort_if_errors #================================================= install_dir=$(ynh_app_setting_get --app="$app" --key=install_dir) -default_matrix_server=$(ynh_app_setting_get --app="$app" --key=default_matrix_server) + +#================================================= +# SPECIFIC GETTERS +#================================================= + +get__default_matrix_server() { + + default_matrix_server=$(ynh_app_setting_get --app="$app" --key=default_matrix_server) + + echo "$default_matrix_server" +} #================================================= # SPECIFIC SETTERS From 7299693f5ea23cd53aa077e67bb386346298d6cd Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 03:22:58 +0100 Subject: [PATCH 30/31] fix regex --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 2a32a20..1f1f871 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -21,5 +21,5 @@ help = "Here you can easily configure some things about your Fluffychat instance help.en = "This option changes the default Matrix server on the Fluffychat login page." help.fr = "Cette option modifie le serveur Matrix renseigné par défaut sur la page de connexion de Fluffychat." type = "string" - pattern.regexp = '^([-?a-zA-Z0-9]\.?){1,256}[a-zA-Z0-9]{1,6}$' + pattern.regexp = '^([-?a-zA-Z0-9]\.?){1,256}(\.[a-zA-Z0-9]{1,6}){1}$' pattern.error = "Must be a domain name or a sub-domain. Must not start with 'http://' or 'https://'." From e7af1d7f2f760749d80c68b38d7383816b17dbe4 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Feb 2024 03:26:49 +0100 Subject: [PATCH 31/31] fix regex --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 1f1f871..be15513 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -21,5 +21,5 @@ help = "Here you can easily configure some things about your Fluffychat instance help.en = "This option changes the default Matrix server on the Fluffychat login page." help.fr = "Cette option modifie le serveur Matrix renseigné par défaut sur la page de connexion de Fluffychat." type = "string" - pattern.regexp = '^([-?a-zA-Z0-9]\.?){1,256}(\.[a-zA-Z0-9]{1,6}){1}$' + pattern.regexp = '^(?!\.)^(\.?[-a-zA-Z0-9]){1,256}(\.[a-zA-Z0-9]{1,6}){1}$' pattern.error = "Must be a domain name or a sub-domain. Must not start with 'http://' or 'https://'."