Merge pull request #26 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -5,4 +5,6 @@
 - [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_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # ProxiTok for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Working status](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Working status](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
 
 [![Install ProxiTok with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
 
@@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
 - RSS Feed for user, trending and tag (just add /rss to the url)
 
 
-**Shipped version:** 2.4.9.2~ynh1
+**Shipped version:** 2.5.0.0~ynh1
 
 **Demo:** <https://proxitok.herokuapp.com/>
 

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # ProxiTok para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
 
 [![Instalar ProxiTok con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
 
@@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
 - RSS Feed for user, trending and tag (just add /rss to the url)
 
 
-**Versión actual:** 2.4.9.2~ynh1
+**Versión actual:** 2.5.0.0~ynh1
 
 **Demo:** <https://proxitok.herokuapp.com/>
 

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # ProxiTok YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
 
 [![Instalatu ProxiTok YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
 
@@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
 - RSS Feed for user, trending and tag (just add /rss to the url)
 
 
-**Paketatutako bertsioa:** 2.4.9.2~ynh1
+**Paketatutako bertsioa:** 2.5.0.0~ynh1
 
 **Demoa:** <https://proxitok.herokuapp.com/>
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # ProxiTok pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
 
 [![Installer ProxiTok avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
 
@@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
 - RSS Feed for user, trending and tag (just add /rss to the url)
 
 
-**Version incluse :** 2.4.9.2~ynh1
+**Version incluse :** 2.5.0.0~ynh1
 
 **Démo :** <https://proxitok.herokuapp.com/>
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # ProxiTok para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
 
 [![Instalar ProxiTok con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
 
@@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
 - RSS Feed for user, trending and tag (just add /rss to the url)
 
 
-**Versión proporcionada:** 2.4.9.2~ynh1
+**Versión proporcionada:** 2.5.0.0~ynh1
 
 **Demo:** <https://proxitok.herokuapp.com/>
 

README_id.md

@@ -0,0 +1,59 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# ProxiTok untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+
+[![Pasang ProxiTok dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang ProxiTok 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
+
+Use Tiktok with an alternative frontend, inspired by Nitter.
+
+### Features
+
+- Privacy: All requests made to TikTok are server-side, so you will never connect to their servers
+- See user's feed
+- See trending and discovery tab
+- See tags
+- See video by id
+- Themes
+- RSS Feed for user, trending and tag (just add /rss to the url)
+
+
+**Versi terkirim:** 2.5.0.0~ynh1
+
+**Demo:** <https://proxitok.herokuapp.com/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada ProxiTok](./doc/screenshots/screenshot.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://proxitok.herokuapp.com>
+- Depot kode aplikasi hulu: <https://github.com/pablouser1/ProxiTok>
+- Gudang YunoHost: <https://apps.yunohost.org/app/proxitok>
+- Laporkan bug: <https://github.com/YunoHost-Apps/proxitok_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade proxitok -u https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -0,0 +1,59 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# ProxiTok для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+
+[![Установите ProxiTok с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить ProxiTok быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Use Tiktok with an alternative frontend, inspired by Nitter.
+
+### Features
+
+- Privacy: All requests made to TikTok are server-side, so you will never connect to their servers
+- See user's feed
+- See trending and discovery tab
+- See tags
+- See video by id
+- Themes
+- RSS Feed for user, trending and tag (just add /rss to the url)
+
+
+**Поставляемая версия:** 2.5.0.0~ynh1
+
+**Демо-версия:** <https://proxitok.herokuapp.com/>
+
+## Снимки экрана
+
+![Снимок экрана ProxiTok](./doc/screenshots/screenshot.png)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://proxitok.herokuapp.com>
+- Репозиторий кода главной ветки приложения: <https://github.com/pablouser1/ProxiTok>
+- Магазин YunoHost: <https://apps.yunohost.org/app/proxitok>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/proxitok_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade proxitok -u https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 ProxiTok
 
-[![集成程度](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![工作状态](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg)
 
 [![使用 YunoHost 安装 ProxiTok](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok)
 
@@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
 - RSS Feed for user, trending and tag (just add /rss to the url)
 
 
-**分发版本：** 2.4.9.2~ynh1
+**分发版本：** 2.5.0.0~ynh1
 
 **演示：** <https://proxitok.herokuapp.com/>
 

manifest.toml

@@ -5,7 +5,7 @@ name = "ProxiTok"
 description.en = "Alternative frontend for TikTok"
 description.fr = "Frontend alternatif à TikTok"
 
-version = "2.4.9.2~ynh1"
+version = "2.5.0.0~ynh1"
 
 maintainers = []
 
@@ -16,7 +16,7 @@ demo = "https://proxitok.herokuapp.com/"
 code = "https://github.com/pablouser1/ProxiTok"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.27"
 architectures = "all"
 multi_instance = true
 ldap = false
@@ -35,8 +35,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.4.9.2.tar.gz"
+        url = "https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.5.0.0.tar.gz"
-        sha256 = "f39f3d2a720569b4967fb58bf35e08948231deaecc237bf37bae6927b6b69d3c"
+        sha256 = "c0f23873519ed0cff9eeadeb212a64a672d7a7ab548386ef9b463c75b19fc743"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
@@ -51,4 +51,4 @@ ram.runtime = "50M"
     api.protected = true
 
     [resources.apt]
-    packages = "php8.2-xml php8.2-zip php8.2-redis php8.2-mbstring php8.2-curl"
+    packages = "php8.3-xml, php8.3-zip, php8.3-redis, php8.3-mbstring, php8.3-curl"

scripts/backup

@@ -27,10 +27,6 @@ ynh_backup --src_path="$install_dir"
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# BACKUP THE PHP-FPM CONFIGURATION
-#=================================================
-
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================

scripts/change_url

@@ -9,7 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================

scripts/install

@@ -9,23 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-fpm_footprint="low"
-fpm_free_footprint=0
-fpm_usage="low"
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=1
-
-ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
-ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
-ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -42,7 +25,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -52,7 +35,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/.env" --destination="$install_dir/.env"
+ynh_add_config --template=".env" --destination="$install_dir/.env"
 
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"

scripts/upgrade

@@ -9,46 +9,13 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
-
-# If fpm_footprint doesn't exist, create it
-if [ -z "$fpm_footprint" ]; then
-    fpm_footprint=low
-    ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
-fi
-
-# If fpm_free_footprint doesn't exist, create it
-if [ -z "$fpm_free_footprint" ]; then
-    fpm_free_footprint=0
-    ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
-fi
-
-# If fpm_usage doesn't exist, create it
-if [ -z "$fpm_usage" ]; then
-    fpm_usage=low
-    ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
-fi
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Download, check integrity, uncompress and patch the source from app.src
-then
+ynh_setup_source --dest_dir="$install_dir" #--keep=".env"
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" #--keep=".env"
-fi
 
 chown -R $app:www-data "$install_dir"
 
@@ -58,7 +25,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -68,7 +35,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/.env" --destination="$install_dir/.env"
+ynh_add_config --template=".env" --destination="$install_dir/.env"
 
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"