From 4a09996278109f617e47273f1339f8bdc6847dd8 Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 09:42:25 +0200
Subject: [PATCH 1/8] Update README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 18bcd86..c10f55c 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Yotter is possible thanks to several open-source projects that are listed on the
 * [Privacy and Security](#privacy)
 * [Public instances](#public-instances)
 * [Self hosting](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md)
+    * [Update the server](#update-the-server)
     * [Configure server](#configure-the-server)
 * [Contributing and contact](#contributing)
 * [Powered by](#powered-by)
@@ -74,6 +75,8 @@ I always recommend self-hosting, as you will be the only person with access to t
 | https://yotter.xyz  |Germany| Limited (50 users)|
 | https://yotter.kavin.rocks/  |India| Limited (50 users)|
 
+## Update the server
+[SEE THIS FILE](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md#updating-the-server)
 ## Configure the server
 You will find in the root folder of the project a file named `yotter-config.json`. This is the global config file for the Yotter server.
 
@@ -86,6 +89,8 @@ Currently available config is:
 * **nginxVideoStream**: Wether or not to use Nginx as streaming engine. It is recommended for public instances. [See this link]()
 * **maintenance_mode**: Activates a message on the server warning users of maintenance mode.
 * **show_admin_message**: Shows a message from the admin with title as `admin_message_title` and body as `admin_message`
+* **admin_user**: Username of the admin user.
+* **max_old_user_days**: Maximum days for a user to be inactive, otherwise will be deleted if admin uses the action.
 
 # Contributing
 Contributors are always welcome. You can help in many ways: Coding, organizing, designing, [donating](#donate), maintaining... You choose what you want to help with!

From ba56cba9dd7bd4974291c5ca15d69b5bdd46396a Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 09:43:50 +0200
Subject: [PATCH 2/8] Update SELF-HOSTING.md

---
 SELF-HOSTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SELF-HOSTING.md b/SELF-HOSTING.md
index cfe0450..23fb866 100644
--- a/SELF-HOSTING.md
+++ b/SELF-HOSTING.md
@@ -80,7 +80,7 @@ If after the MySQL-server installation you have not been prompted to create a pa
 * `pip install cryptography`
 * `pip install -r requirements.txt`
 
-> You can edit the `yotter-config.json` file
+> You can edit the `yotter-config.json` file. [Check out all the options here](https://github.com/ytorg/Yotter/blob/dev-indep/README.md#configure-the-server)
 
 5. Install gunicorn (production web server for Python apps) and pymysql:
 `pip install gunicorn pymysql`
@@ -219,7 +219,7 @@ Updating the server should always be pretty easy. These steps need to be run on
 (venv) $ pip install -r requirements.txt
 (venv) $ sudo supervisorctl start yotter
 ```
-
+* **IMPORTANT**: Make sure you have all set up on `yotter-config.json` once you finish the update.
 ## Other configurations
 
 ### Removing log-in restrictions

From 42f7c3184efe5c4191dc70c53fd04fe60e4dc794 Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 09:45:09 +0200
Subject: [PATCH 3/8] Update SELF-HOSTING.md

---
 SELF-HOSTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SELF-HOSTING.md b/SELF-HOSTING.md
index 23fb866..628c650 100644
--- a/SELF-HOSTING.md
+++ b/SELF-HOSTING.md
@@ -47,7 +47,7 @@ Now you should be logged in. Make sure to set up a good password. It is recommen
 git clone https://github.com/ytorg/Yotter && cd Yotter
 docker-compose up -d
 ```
-3. Configure Nginx
+3. Configure Nginx with a reverse proxy (Instructions coming soon)
 
 ### Manual installation
 

From 281e6202d67ccd8336a2135ff76e44a646ceef73 Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 09:46:10 +0200
Subject: [PATCH 4/8] Update README.md

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c10f55c..2a66d14 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Yotter is possible thanks to several open-source projects that are listed on the
 * [Privacy and Security](#privacy)
 * [Public instances](#public-instances)
 * [Self hosting](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md)
-    * [Update the server](#update-the-server)
+    * [Update the server](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md#updating-the-server)
     * [Configure server](#configure-the-server)
 * [Contributing and contact](#contributing)
 * [Powered by](#powered-by)
@@ -75,8 +75,6 @@ I always recommend self-hosting, as you will be the only person with access to t
 | https://yotter.xyz  |Germany| Limited (50 users)|
 | https://yotter.kavin.rocks/  |India| Limited (50 users)|
 
-## Update the server
-[SEE THIS FILE](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md#updating-the-server)
 ## Configure the server
 You will find in the root folder of the project a file named `yotter-config.json`. This is the global config file for the Yotter server.
 

From 98f66b85e21704d08604f6942d1d2f1d76e86c9b Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 09:48:06 +0200
Subject: [PATCH 5/8] Update yotter.xyz instance

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2a66d14..6a21321 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ I always recommend self-hosting, as you will be the only person with access to t
 # Public Instances
 | name |server location|registrations?|
 | ------------ | ------------ | ------------ |
-| https://yotter.xyz  |Germany| Limited (50 users)|
+| https://yotter.xyz  |Germany| Limited (60 users)|
 | https://yotter.kavin.rocks/  |India| Limited (50 users)|
 
 ## Configure the server

From 31b6e177505e69c1fa4e48584bb3986b3e3913c2 Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 09:51:23 +0200
Subject: [PATCH 6/8] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1b12af..25e8fcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@
 - Play tweet videos from Parasitter.
 - Create following lists.
 
+## [0.2.6] - 2020.09.20
+### How to update
+See [UPDATE](https://github.com/ytorg/Yotter/blob/dev-indep/SELF-HOSTING.md#updating-the-server) if you are on a manual installation. Docker can be updated normally. 
+
+## Added
+- [x] Admin tools - Delete inactive users.
+
+## Changed
+- [x] Database character limits.
+
 ## [0.2.5] - 2020.09.10
 ### How to update
 1. `sudo supervisorctl stop yotter`

From 37fa630c235116435442b4b3382ba009c147d3b5 Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 10:48:39 +0200
Subject: [PATCH 7/8] Fix IMPORTANT typo. Do `git pull`!

---
 app/routes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes.py b/app/routes.py
index 40e98e6..ddfa019 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -307,7 +307,7 @@ def watch():
     
     # Use nginx
     try:
-        url = info['video']['url'].replace(hostName, config['serverName'])+"&hostname="+hostName
+        url = info['video']['url'].replace(hostName, config['serverName'])+"?hostname="+hostName
     except:
         url = "#"
 

From 113f7b1f158f27411a84a228ae499da7e1d042ad Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sun, 20 Sep 2020 10:54:10 +0200
Subject: [PATCH 8/8] Update routes.py

---
 app/routes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes.py b/app/routes.py
index ddfa019..40e98e6 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -307,7 +307,7 @@ def watch():
     
     # Use nginx
     try:
-        url = info['video']['url'].replace(hostName, config['serverName'])+"?hostname="+hostName
+        url = info['video']['url'].replace(hostName, config['serverName'])+"&hostname="+hostName
     except:
         url = "#"