diff --git a/README.md b/README.md index d1e961c..d34945a 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,16 @@ 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.17.1~ynh1 +**Shipped version:** 1.17.2~ynh1 **Demo:** https://fluffychat.im/web ## 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 2405b1b..5741b39 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,14 +18,13 @@ 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.1~ynh1 +**Version incluse :** 1.17.2~ynh1 **Démo :** https://fluffychat.im/web ## Captures d’écran -![Capture d’écran de Fluffychat](./doc/screenshots/fluffychat.jpg) +![Capture d’écran de Fluffychat](./doc/screenshots/screenshot.png) ## Documentations et ressources 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; } diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000..b5e9f00 Binary files /dev/null and b/doc/.DS_Store differ diff --git a/doc/ADMIN.md b/doc/ADMIN.md deleted file mode 100644 index f35b3f6..0000000 --- a/doc/ADMIN.md +++ /dev/null @@ -1 +0,0 @@ -The app install dir is `__INSTALL_DIR__` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md deleted file mode 100644 index 838270a..0000000 --- a/doc/ADMIN_fr.md +++ /dev/null @@ -1 +0,0 @@ -Le dossier d'install de l'app est `__INSTALL_DIR__` diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index f042dcc..e894e3f 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -[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. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 4a97b72..e54a37d 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -[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](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 diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md deleted file mode 100644 index 1452cfc..0000000 --- a/doc/POST_INSTALL.md +++ /dev/null @@ -1,5 +0,0 @@ -The app url is - -The app install dir is `__INSTALL_DIR__` - -The app id is `__ID__` diff --git a/doc/screenshots/fluffychat.jpg b/doc/screenshots/fluffychat.jpg deleted file mode 100644 index 9f1a720..0000000 Binary files a/doc/screenshots/fluffychat.jpg and /dev/null differ diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png new file mode 100644 index 0000000..00e127c Binary files /dev/null and b/doc/screenshots/screenshot.png differ diff --git a/manifest.toml b/manifest.toml index 359dfcc..07026cd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -4,12 +4,12 @@ packaging_format = 2 id = "fluffychat" name = "Fluffychat" -description.en = "A cute [matrix] client written in Flutter. " -description.fr = "Un client [matrix] mignon écrit en Flutter." +description.en = "Matrix messenger client" +description.fr = "Client de messagerie Matrix" -version = "1.17.1~ynh1" +version = "1.17.2~ynh1" -maintainers = ["OniriCorpe"] +maintainers = [ "OniriCorpe" ] [upstream] license = "AGPL-3.0-only" @@ -20,53 +20,47 @@ code = "https://github.com/krille-chan/fluffychat" fund = "https://ko-fi.com/krille" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "70M" ram.build = "50M" ram.runtime = "50M" [install] -[install.domain] -# this is a generic question - ask strings are automatically handled by YunoHost's core -type = "domain" -[install.path] -# this is a generic question - ask strings are automatically handled by YunoHost's core -type = "path" -default = "/example" + [install.domain] + type = "domain" -[install.init_main_permission] -# this is a generic question - ask strings are automatically handled by YunoHost's core -# This won't be saved as setting and will instead be used to initialize the SSOwat permission -type = "group" -default = "visitors" + [install.path] + type = "path" + default = "/fluffychat" + + [install.init_main_permission] + type = "group" + default = "visitors" [resources] -# See the packaging documentation for the full set -# of explanation regarding the behavior and properties for each of those -[resources.sources] -[resources.sources.main] -# This will pre-fetch the asset which can then be deployed during the install/upgrade scripts with : -# ynh_setup_source --dest_dir="$install_dir" -# You can also define other assets than "main" and add --source_id="foobar" in the previous command -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" -autoupdate.strategy = "latest_github_release" + [resources.sources] + + [resources.sources.main] + + url = "https://github.com/krille-chan/fluffychat/releases/download/v1.17.2/fluffychat-web.tar.gz" + sha256 = "302e24cbc0be8b6e02609da80f408245f75518e7c455acd84afea098c63e4ed5" + in_subdir = 2 + + autoupdate.asset = "fluffychat-web.tar.gz" + autoupdate.strategy = "latest_github_release" [resources.install_dir] -# This will create/remove the install dir as /var/www/$app -# and store the corresponding setting $install_dir owner = "www-data:rx" group = "www-data:rx" [resources.permissions] -# This will configure SSOwat permission for $domain/$path/ -# The initial allowed group of user is configured via the init_main_permission question (public=visitors, private=all_users) main.url = "/" diff --git a/scripts/backup b/scripts/backup index 230e9ab..52eea5b 100755 --- a/scripts/backup +++ b/scripts/backup @@ -15,11 +15,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_print_info --message="Declaring files to be backed up..." -### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs -### to be backuped and not an actual copy of any file. The actual backup that -### creates and fills the archive with the files happens in the core after this -### script is called. Hence ynh_backups calls take basically 0 seconds to run. - #================================================= # BACKUP THE APP MAIN DIR #================================================= 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 9dd4c50..c969593 100755 --- a/scripts/install +++ b/scripts/install @@ -19,11 +19,10 @@ 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" -# $install_dir will automatically be initialized with some decent -# permission by default ... however, you may need to recursively reapply -# ownership to all files such as after the ynh_setup_source step chown -R "www-data:www-data" "$install_dir" #================================================= diff --git a/scripts/remove b/scripts/remove index 85c4e89..ad629d0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,6 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= - ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 4aa45f8..cd7a2ea 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,9 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -# $install_dir will automatically be initialized with some decent -# permissions by default ... however, you may need to recursively reapply -# ownership to all files such as after the ynh_setup_source step chown -R "www-data:www-data" "$install_dir" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3870c7d..d0606b0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,21 +9,8 @@ source _common.sh source /usr/share/yunohost/helpers -### This helper will compare the version of the currently installed app and the version of the upstream package. -### $upgrade_type can have 2 different values -### - UPGRADE_APP if the upstream app version has changed -### - UPGRADE_PACKAGE if only the YunoHost package has changed -### ynh_check_app_version_changed will stop the upgrade if the app is up to date. -### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -#ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= @@ -37,12 +24,11 @@ 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 -# $install_dir will automatically be initialized with some decent -# permissions by default ... however, you may need to recursively reapply -# ownership to all files such as after the ynh_setup_source step chown -R "www-data:www-data" "$install_dir" #=================================================