diff --git a/conf/nitter.conf b/conf/nitter.conf index aa29c72..917b6a2 100644 --- a/conf/nitter.conf +++ b/conf/nitter.conf @@ -35,6 +35,6 @@ replaceTwitter = "__DOMAIN__" replaceYouTube = "__REPLACE_YOUTUBE__" replaceReddit = "__REPLACE_REDDIT__" replaceInstagram = "__REPLACE_INSTAGRAM__" -proxyVideos = __PROXY_VIDEOS__ -hlsPlayback = __HLS_PLAYBACK__ -infiniteScroll = __INFINITE_SCROLL__ +proxyVideos = true +hlsPlayback = true +infiniteScroll = false diff --git a/manifest.json b/manifest.json index ee02d1b..78014be 100644 --- a/manifest.json +++ b/manifest.json @@ -115,45 +115,6 @@ "en": "You can choose to rewrite Reddit links in tweets to point to a Libreddit instance. Use https://libredd.it/ or install Libreddit on your server! Users can override this setting.", "fr": "Vous pouvez choisir de réécrire les liens Instagram dans les tweets pour pointer vers une instance Bibliogram. Choisissez https://libredd.it/ ou installez Libreddit sur votre serveur! Les utilisateurs peuvent modifier ce paramétre." } - }, - { - "name": "proxy_videos", - "type": "boolean", - "default": true, - "ask": { - "en": "Proxy Twitter videos through Nitter by default", - "fr": "Retransmettre les vidéos Twitter via le serveur par défaut" - }, - "help": { - "en": "Users can override this setting", - "fr": "Les utilisateurs peuvent modifier ce paramétre" - } - }, - { - "name": "hls_playback", - "type": "boolean", - "default": true, - "ask": { - "en": "Enable HLS video playback by default", - "fr": "Activer la lecture des videos HLS par défaut" - }, - "help": { - "en": "Requires Javascript. Users can override this setting.", - "fr": "Cette fonctionalité requiert Javascript. Les utilisateurs peuvent modifier ce paramétre." - } - }, - { - "name": "infinite_scroll", - "type": "boolean", - "default": false, - "ask": { - "en": "Enable infinite scrolling by default", - "fr": "Activer le défilement infini par défaut" - }, - "help": { - "en": "Experimental, requires Javascript. Users can override this setting.", - "fr": "Cette fonctionalité est expérimentale et requiert Javascript. Les utilisateurs peuvent modifier ce paramétre." - } } ] } diff --git a/scripts/install b/scripts/install index 28213da..b0e7aed 100755 --- a/scripts/install +++ b/scripts/install @@ -28,22 +28,6 @@ theme=$YNH_APP_ARG_THEME replace_youtube=$YNH_APP_ARG_REPLACE_YOUTUBE replace_instagram=$YNH_APP_ARG_REPLACE_INSTAGRAM replace_reddit=$YNH_APP_ARG_REPLACE_REDDIT - -if [ $YNH_APP_ARG_PROXY_VIDEOS -eq 1 ]; then - proxy_videos="true" -else - proxy_videos="false" -fi -if [ $YNH_APP_ARG_HLS_PLAYBACK -eq 1 ]; then - hls_playback="true" -else - hls_playback="false" -fi -if [ $YNH_APP_ARG_INFINITE_SCROLL -eq 1 ]; then - infinite_scroll="true" -else - infinite_scroll="false" -fi hmac_key=$(ynh_string_random --length=64) app=$YNH_APP_INSTANCE_NAME @@ -71,9 +55,6 @@ ynh_app_setting_set --app=$app --key=theme --value=$theme ynh_app_setting_set --app=$app --key=replace_youtube --value=$replace_youtube ynh_app_setting_set --app=$app --key=replace_instagram --value=$replace_instagram ynh_app_setting_set --app=$app --key=replace_reddit --value=$replace_reddit -ynh_app_setting_set --app=$app --key=proxy_videos --value=$proxy_videos -ynh_app_setting_set --app=$app --key=hls_playback --value=$hls_playback -ynh_app_setting_set --app=$app --key=infinite_scroll --value=$infinite_scroll ynh_app_setting_set --app=$app --key=hmac_key --value=$hmac_key #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 06a7aea..6736ef6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,11 +26,7 @@ theme=$(ynh_app_setting_get --app=$app --key=theme) replace_youtube=$(ynh_app_setting_get --app=$app --key=replace_youtube) replace_instagram=$(ynh_app_setting_get --app=$app --key=replace_instagram) replace_reddit=$(ynh_app_setting_get --app=$app --key=replace_reddit) -proxy_videos=$(ynh_app_setting_get --app=$app --key=proxy_videos) -hls_playback=$(ynh_app_setting_get --app=$app --key=hls_playback) -infinite_scroll=$(ynh_app_setting_get --app=$app --key=infinite_scroll) hmac_key=$(ynh_app_setting_get --app=$app --key=hmac_key) -architecture=$YNH_ARCH #================================================= # CHECK VERSION @@ -72,7 +68,7 @@ then # Download, check integrity, uncompress and patch the source from app.src mv "$final_path/nitter.conf" "$final_path/nitter.conf.bak" ynh_setup_source --dest_dir="$final_path" --source_id="app" - ynh_setup_source --dest_dir="$final_path/nim-installation" --source_id="$architecture" + ynh_setup_source --dest_dir="$final_path/nim-installation" --source_id=$YNH_ARCH mv "$final_path/nitter.conf.bak" "$final_path/nitter.conf" fi