diff --git a/README.md b/README.md
index 83a7ee1..5b8bcb0 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,8 @@ Inspired by the Invidious project.
- Mobile support (responsive design)
-**Shipped version:** 2022.06.23~ynh1
+**Shipped version:** 2022.09.20~ynh1 *(:warning: This is the `testing` branch. The [`master` branch](https://github.com/YunoHost-Apps/nitter_ynh/tree/master) used in the catalog is currently on version 2022.06.23\~ynh1.)*
+
**Demo:** https://nitter.net/
@@ -44,6 +45,10 @@ Inspired by the Invidious project.
This app requires a dedicated root domain.
Nitter config file is stored in `/var/www/nitter/nitter.conf` (for the first instance, subsequent installs will go in `nitter__2`, `nitter__3`, etc). Users can override the defaults and set custom settings at `https://instance-domain.tld/settings`.
+## :red_circle: Antifeatures
+
+- **Non-free Network Services**: Promotes or depends entirely on a non-free network service.
+
## Documentation and resources
* Official app website:
diff --git a/README_fr.md b/README_fr.md
index ede0536..dfbf80b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -29,7 +29,8 @@ Nitter est une interface alternative pour Twitter qui est plus rapide que le sit
- Support mobile (conception réactive)
-**Version incluse :** 2022.06.23~ynh1
+**Version incluse :** 2022.09.20~ynh1 *(:warning: Il s'agit de la branche `testing`. La [branche `master`](https://github.com/YunoHost-Apps/nitter_ynh/tree/master) utilisée dans le catalogue est actuellement en 2022.06.23\~ynh1.)*
+
**Démo :** https://nitter.net/
@@ -44,6 +45,10 @@ Nitter est une interface alternative pour Twitter qui est plus rapide que le sit
Cette application nécéssite un domaine dedié.
Le ficher de configuration de Nitter se trouve à `/var/www/nitter/nitter.conf` (pour la première installation, les prochaines installations iront dans `nitter__2`, `nitter__3`, etc). Les utilisateurs peuvent modifier les paramétres par défaut en visitant `https://instance-domain.tld/settings`.
+## :red_circle: Fonctions indésirables
+
+- **Non-free Network Services**: Promotes or depends entirely on a non-free network service.
+
## Documentations et ressources
* Site officiel de l'app :
diff --git a/conf/app.src b/conf/app.src
index 697dc19..2490078 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/zedeus/nitter/tarball/81ec41328d5684dd395f584254d723abee213ac0
-SOURCE_SUM=d1ec37ae2f755a52d37331d1a441fa14bbd947bb38b8fb79f05abfc3e904b551
+SOURCE_URL=https://github.com/zedeus/nitter/tarball/2ac3afa5b273a502d7632e9346c7c3bc9283fb48
+SOURCE_SUM=f91af4af3698125d3667d79ffc1384f931a48b893d627b9a19054adaf13285fd
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=81ec41328d5684dd395f584254d723abee213ac0
+SOURCE_FILENAME=2ac3afa5b273a502d7632e9346c7c3bc9283fb48
SOURCE_EXTRACT=true
diff --git a/config_panel.toml b/config_panel.toml
index 8a941de..3600fb9 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -4,41 +4,52 @@ version = "1.0"
name = "Nitter configuration"
services = ["__APP__"]
- [main.config]
- name = "Configuration Options"
+[main.config]
+name = "Configuration Options"
- [main.config.title]
- ask = "Default title"
- type = "string"
- default = "Nitter"
- help = "Choose a default title for this instance"
- bind = "title:__FINALPATH__/nitter.conf"
+[main.config.title]
+ask = "Default title"
+type = "string"
+default = "Nitter"
+help = "Choose a default title for this instance"
+bind = "title:__FINALPATH__/nitter.conf"
- [main.config.theme]
- ask = "Default theme"
- type = "select"
- choices = ["Auto", "Black", "Mastodon", "Nitter", "Pleroma", "Twitter", "Twitter dark"]
- default = "Auto"
- help = "Choose a default theme for this instance"
- bind = "theme:__FINALPATH__/nitter.conf"
+[main.config.theme]
+ask = "Default theme"
+type = "select"
+choices = [
+ "Auto",
+ "Auto (Twitter)",
+ "Black",
+ "Dracula",
+ "Mastodon",
+ "Nitter",
+ "Pleroma",
+ "Twitter",
+ "Twitter dark",
+]
+default = "Auto"
+help = "Choose a default theme for this instance"
+bind = "theme:__FINALPATH__/nitter.conf"
- [main.config.replace_reddit]
- ask = "Libreddit instance"
- type = "string"
- default = "https://libredd.it/"
- help = "Replace Reddit links with a Libreddit instance"
- bind = "replaceReddit:__FINALPATH__/nitter.conf"
+[main.config.replace_youtube]
+ask = "Piped/Invidious instance"
+type = "string"
+default = "https://invidious.fdn.fr/"
+help = "Replace YouTube links with a Piped or Invidious instance"
+bind = "replaceYouTube:__FINALPATH__/nitter.conf"
- [main.config.replace_instagram]
- ask = "Bibliogram instance"
- type = "string"
- default = "https://bibliogram.art/"
- help = "Replace Instagram links with a Bibliogram instance"
- bind = "replaceInstagram:__FINALPATH__/nitter.conf"
+[main.config.replace_reddit]
+ask = "Teddit/Libreddit instance"
+type = "string"
+default = "https://libredd.it/"
+help = "Replace Reddit links with a Teddit or Libreddit instance"
+bind = "replaceReddit:__FINALPATH__/nitter.conf"
+
+[main.config.replace_instagram]
+ask = "Bibliogram instance"
+type = "string"
+default = "https://bibliogram.art/"
+help = "Replace Instagram links with a Bibliogram instance"
+bind = "replaceInstagram:__FINALPATH__/nitter.conf"
- [main.config.replace_youtube]
- ask = "Invidious instance"
- type = "string"
- default = "https://invidious.fdn.fr/"
- help = "Replace YouTube links with an Invidious instance"
- bind = "replaceYouTube:__FINALPATH__/nitter.conf"
diff --git a/manifest.json b/manifest.json
index c555abd..3096c90 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
"en": "Alternative front-end for Twitter that respects your privacy",
"fr": "Interface alternative pour Twitter qui respecte votre vie privée"
},
- "version": "2022.06.23~ynh1",
+ "version": "2022.09.20~ynh1",
"url": "https://github.com/zedeus/nitter",
"upstream": {
"license": "AGPL-3.0-only",
diff --git a/scripts/upgrade b/scripts/upgrade
index 7ca5665..531c0fb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -75,7 +75,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]; then
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" --source_id="app"
- ynh_setup_source --dest_dir="$final_path/nim-installation" --source_id=$YNH_ARCH --keep="$final_path/nitter.conf"
+ ynh_setup_source --dest_dir="$final_path/nim-installation" --source_id=$YNH_ARCH --keep="nitter.conf"
fi
chmod 750 "$final_path"