From 4da61b7922d0b93133a4ef74dd128864da64193f Mon Sep 17 00:00:00 2001
From: Dag <me@dvikan.no>
Date: Sun, 26 Jan 2025 11:16:35 +0100
Subject: [PATCH] chore: prepare 2025-01-26 release (#4424)

---
 README.md              | 32 ++++++++++++++------------------
 config.default.ini.php | 13 ++++---------
 lib/Configuration.php  |  2 +-
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index b3b12f0ea28..b813abf7679 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Requires minimum PHP 7.4.
 |![Screenshot #3](/static/screenshot-3.png?raw=true)|![Screenshot #4](/static/screenshot-4.png?raw=true)|
 |![Screenshot #5](/static/screenshot-5.png?raw=true)|![Screenshot #6](/static/screenshot-6.png?raw=true)|
 
-## A subset of bridges (16/447)
+## A subset of bridges (15/447)
 
 * `CssSelectorBridge`: [Scrape out a feed using CSS selectors](https://rss-bridge.org/bridge01/#bridge-CssSelectorBridge)
 * `FeedMergeBridge`: [Combine multiple feeds into one](https://rss-bridge.org/bridge01/#bridge-FeedMergeBridge)
@@ -44,7 +44,6 @@ Requires minimum PHP 7.4.
 * `ThePirateBayBridge:` [Fetches torrents by search/user/category](https://rss-bridge.org/bridge01/#bridge-ThePirateBayBridge)
 * `TikTokBridge`: [Fetches posts by username](https://rss-bridge.org/bridge01/#bridge-TikTokBridge)
 * `TwitchBridge`: [Fetches videos from channel](https://rss-bridge.org/bridge01/#bridge-TwitchBridge)
-* `VkBridge`: [Fetches posts from user/group](https://rss-bridge.org/bridge01/#bridge-VkBridge)
 * `XPathBridge`: [Scrape out a feed using XPath expressions](https://rss-bridge.org/bridge01/#bridge-XPathBridge)
 * `YoutubeBridge`: [Fetches videos by username/channel/playlist/search](https://rss-bridge.org/bridge01/#bridge-YoutubeBridge)
 * `YouTubeCommunityTabBridge`: [Fetches posts from a channel's community tab](https://rss-bridge.org/bridge01/#bridge-YouTubeCommunityTabBridge)
@@ -72,27 +71,27 @@ useradd --shell /bin/bash --create-home rss-bridge
 
 cd /var/www
 
-# Create folder and change ownership
+# Create folder and change its ownership to rss-bridge
 mkdir rss-bridge && chown rss-bridge:rss-bridge rss-bridge/
 
-# Become user
+# Become rss-bridge
 su rss-bridge
 
-# Fetch latest master
+# Clone master branch into existing folder
 git clone https://github.com/RSS-Bridge/rss-bridge.git rss-bridge/
 cd rss-bridge
 
-# Copy over the default config
+# Copy over the default config (OPTIONAL)
 cp -v config.default.ini.php config.ini.php
 
-# Give full permissions only to owner (rss-bridge)
-chmod 700 -R ./
+# Recursively give full permissions to user/owner
+chmod 700 --recursive ./
 
-# Give read and execute to others (nginx and php-fpm)
+# Give read and execute to others on folder ./static
 chmod o+rx ./ ./static
 
-# Give read to others (nginx)
-chmod o+r -R ./static
+# Recursively give give read to others on folder ./static
+chmod o+r --recursive ./static
 ```
 
 Nginx config:
@@ -110,17 +109,14 @@ server {
     error_log /var/log/nginx/rss-bridge.error.log;
     log_not_found off;
 
-    # Intentionally not setting a root folder here
-
-    # autoindex is off by default but feels good to explicitly turn off
-    autoindex off;
+    # Intentionally not setting a root folder
 
     # Static content only served here
     location /static/ {
         alias /var/www/rss-bridge/static/;
     }
 
-    # Pass off to php-fpm when location is exactly /
+    # Pass off to php-fpm only when location is EXACTLY == /
     location = / {
         root /var/www/rss-bridge/;
         include snippets/fastcgi-php.conf;
@@ -128,12 +124,12 @@ server {
         fastcgi_pass unix:/run/php/rss-bridge.sock;
     }
 
-    # Reduce spam
+    # Reduce log noise
     location = /favicon.ico {
         access_log off;
     }
 
-    # Reduce spam
+    # Reduce log noise
     location = /robots.txt {
         access_log off;
     }
diff --git a/config.default.ini.php b/config.default.ini.php
index 25f3550810f..886878a2c2f 100644
--- a/config.default.ini.php
+++ b/config.default.ini.php
@@ -21,20 +21,15 @@
 ;enabled_bridges[] = ThePirateBay
 ;enabled_bridges[] = TikTokBridge
 ;enabled_bridges[] = Twitch
-;enabled_bridges[] = Vk
 ;enabled_bridges[] = XPathBridge
 ;enabled_bridges[] = Youtube
 ;enabled_bridges[] = YouTubeCommunityTabBridge
 enabled_bridges[] = *
 
-; Defines the timezone used by RSS-Bridge
-; Find a list of supported timezones at
-; https://www.php.net/manual/en/timezones.php
-; timezone = "UTC" (default)
 timezone = "UTC"
 
 ; Display a system message to users.
-message = ""
+;message = "Hello world"
 
 ; Whether to enable debug mode.
 enable_debug_mode = false
@@ -52,12 +47,12 @@
 [http]
 
 ; Operation timeout in seconds
-timeout = 15
+timeout = 5
 
 ; Operation retry count in case of curl error
-retries = 2
+retries = 1
 
-; User agent
+; Curl user agent
 useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0"
 
 ; Max http response size in MB
diff --git a/lib/Configuration.php b/lib/Configuration.php
index c0cfe0c219c..60bf80fbe3f 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -7,7 +7,7 @@
  */
 final class Configuration
 {
-    private const VERSION = '2025-01-02';
+    private const VERSION = '2025-01-26';
 
     private static $config = [];