From ad3300f45addf4a36cf9301e0720cf425031a60a Mon Sep 17 00:00:00 2001
From: VITAS <github.v@52k.de>
Date: Sat, 8 Apr 2023 09:59:34 +0200
Subject: [PATCH 01/12]  Display all activated Games in overview

---
 templates/index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 194e3cc0..b0eacedb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -34,9 +34,7 @@ <h3>Games</h3>
         <div class="container">
             <div class="row">
                 {%- for game in games  -%}
-                    {%- if game.mod_count() > 0 -%}
                         {% include "game-box.html" %}
-                    {%- endif -%}
                 {%- endfor -%}
             </div>
         </div>

From 4d308781a659e95d9f45365d33d3f9443e9baee9 Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Sat, 8 Apr 2023 18:28:20 -0500
Subject: [PATCH 02/12] Fix admin user deletion on profile

---
 KerbalStuff/blueprints/api.py  |  2 +-
 frontend/coffee/profile.coffee | 24 ++++++++++++++++++++----
 templates/view_profile.html    |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/KerbalStuff/blueprints/api.py b/KerbalStuff/blueprints/api.py
index 70b134e3..e24d53ba 100644
--- a/KerbalStuff/blueprints/api.py
+++ b/KerbalStuff/blueprints/api.py
@@ -592,7 +592,7 @@ def delete(username: str) -> Tuple[Dict[str, Any], int]:
     if user == current_user:
         logout_user()
 
-    return {"error": False}, 400
+    return {"error": False}, 200
 
 
 @api.route('/api/mod/<int:mod_id>/update-bg', methods=['POST'])
diff --git a/frontend/coffee/profile.coffee b/frontend/coffee/profile.coffee
index 900bf878..b7cc2998 100644
--- a/frontend/coffee/profile.coffee
+++ b/frontend/coffee/profile.coffee
@@ -1,5 +1,6 @@
-editor = new Editor()
-editor.render()
+if $('textarea').length
+    editor = new Editor()
+    editor.render()
 
 # Background Uploading
 window.upload_bg = (files, box) ->
@@ -138,6 +139,21 @@ $('#delete-account-form').submit((e) ->
     xhr.send(form)
 )
 
+$('#confirm-delete-account').on 'show.bs.modal', (evt) ->
+    # Disable final Delete button on modal open
+    $(evt.target).find('input[type=submit]').prop('disabled', true)
+    # Clear username confirmation text box on modal open
+    $(evt.target).find('input[type=text]').val('')
+
+$('#confirm-delete-account').on 'shown.bs.modal', (evt) ->
+    # Focus text box on modal open
+    $(evt.target).find('input[type=text]').focus()
+
+$('#username').on 'input', (evt) ->
+    # Enable/disable final Delete button on confirmation text box change
+    $('#confirm-delete-account').find('input[type=submit]').prop('disabled',
+        evt.target.value != evt.target.dataset.username)
+
 deleteAccountModalDialog = () ->
     $('#delete-account-form').trigger('reset')
     error_message_display = $('#delete-account-error-message')
@@ -150,7 +166,7 @@ deleteAccountModalDialog = () ->
     for button in buttons
         button.removeAttribute('disabled')
 
-$('#delete-account').on('hidden.bs.modal', deleteAccountModalDialog)
+$('#confirm-delete-account').on('hidden.bs.modal', deleteAccountModalDialog)
 
 $('#check-all-updates'      ).on('click', () -> $('[id^=updates-]'    ).prop('checked', true))
 $('#uncheck-all-updates'    ).on('click', () -> $('[id^=updates-]'    ).prop('checked', false))
@@ -171,4 +187,4 @@ $('#save-changes').on 'click', () ->
         $('#overall-error').hide()
     else
         $('#overall-error').show()
-    return allValid
\ No newline at end of file
+    return allValid
diff --git a/templates/view_profile.html b/templates/view_profile.html
index ae08db8b..33acb899 100644
--- a/templates/view_profile.html
+++ b/templates/view_profile.html
@@ -252,7 +252,7 @@ <h4 class="modal-title">Delete User Account</h4>
                     <div class="form-group">
                         <label for="username">Username</label>
                         <input type="text" id="username" placeholder="Enter the user's username to confirm" class="form-control"
-                               name="username">
+                               name="username" data-username="{{profile.username}}">
                     </div>
                 </div>
                 <div class="modal-footer">

From e649d0f67fb1f1d494802a87a8312e107767bd34 Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Sat, 8 Apr 2023 19:34:43 -0500
Subject: [PATCH 03/12] Preserve admin user search after user deletion

---
 KerbalStuff/blueprints/admin.py | 4 +++-
 templates/admin-users.html      | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/KerbalStuff/blueprints/admin.py b/KerbalStuff/blueprints/admin.py
index 50735433..4b8da06e 100644
--- a/KerbalStuff/blueprints/admin.py
+++ b/KerbalStuff/blueprints/admin.py
@@ -145,9 +145,11 @@ def delete_user(user_id: int) -> Union[str, werkzeug.wrappers.Response]:
         abort(404)
     db.delete(user)
     db.commit()
+    query = request.form.get('query', '')
     return redirect(url_for('admin.users',
                             page=request.form.get('page', 1),
-                            show_non_public=(request.form.get('show_non_public', '').lower() in TRUE_STR)))
+                            show_non_public=(request.form.get('show_non_public', '').lower() in TRUE_STR),
+                            query=query))
 
 
 @admin.route("/admin/locked_mods/<int:page>")
diff --git a/templates/admin-users.html b/templates/admin-users.html
index 76c19134..26391cb3 100644
--- a/templates/admin-users.html
+++ b/templates/admin-users.html
@@ -98,6 +98,7 @@ <h4 class="modal-title">Delete User</h4>
                         <input type="submit" id="btn-delete-{{user.id}}" class="btn btn-danger" value="Delete" disabled>
                         <input type="hidden" name="page" value="{{page}}">
                         <input type="hidden" name="show_non_public" value="{{show_non_public}}">
+                        <input type="hidden" name="query" value="{{query}}">
                     </div>
                 </form>
             </div>

From 622731ec485473a4d02761ebfd78a82b1ab1990c Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Sat, 8 Apr 2023 17:54:30 -0500
Subject: [PATCH 04/12] Show add-mod button instead of empty game sections

---
 KerbalStuff/blueprints/anonymous.py |  4 +++-
 templates/game.html                 | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/KerbalStuff/blueprints/anonymous.py b/KerbalStuff/blueprints/anonymous.py
index d6157b6b..ccba6435 100644
--- a/KerbalStuff/blueprints/anonymous.py
+++ b/KerbalStuff/blueprints/anonymous.py
@@ -9,7 +9,7 @@
     get_featured_mods, get_top_mods, get_new_mods, get_updated_mods, sendfile
 from ..config import _cfg
 from ..database import db
-from ..objects import Featured, Mod, ModVersion, User
+from ..objects import Featured, Mod, ModVersion, User, ModList
 from ..search import apply_search_to_query
 
 anonymous = Blueprint('anonymous', __name__)
@@ -29,6 +29,7 @@ def game(gameshort: str) -> str:
     recent = get_updated_mods(ga.id, 6)
     user_count = User.query.count()
     mod_count = ga.mod_count()
+    pack_count = ModList.query.filter(ModList.game_id == ga.id, ModList.mods.any()).count()
     following = sorted(filter(lambda m: m.game_id == ga.id, current_user.following),
                        key=lambda m: m.updated, reverse=True)[:6] if current_user else list()
     return render_template("game.html",
@@ -41,6 +42,7 @@ def game(gameshort: str) -> str:
                            recent=recent,
                            user_count=user_count,
                            mod_count=mod_count,
+                           pack_count=pack_count,
                            yours=following)
 
 
diff --git a/templates/game.html b/templates/game.html
index 8047aa07..3146cc63 100644
--- a/templates/game.html
+++ b/templates/game.html
@@ -28,6 +28,7 @@
 <div class="header" style="background-image: url({{ background }});
     background-position: 0 {% if ga.bgOffsetY %}{{ ga.bgOffsetY }}px{% else %}0{% endif %};"></div>
 {%- endif -%}
+{% if mod_count > 0 %}
 {% if user and len(yours) >= 1 %}
     <div class="well" style="margin-bottom: 0;">
         <div class="container main-cat">
@@ -112,6 +113,7 @@ <h3>Most Popular</h3>
         {% endfor %}
     </div>
 </div>
+{% if pack_count > 0 %}
 <div class="container">
     <div class="row">
         <div class="col-md-12">
@@ -122,6 +124,23 @@ <h3>Most Popular</h3>
         </div>
     </div>
 </div>
+{% endif %}
+{% else %}
+<div class="well">
+    <div class="container lead">
+        <div class="row centered">
+            <div class="col-md-4 col-md-offset-4">
+                There are no mods for {{ga.name}} yet.
+            </div>
+        </div>
+        <div class="row centered">
+            <div class="col-md-4 col-md-offset-4">
+                <a class="btn btn-lg btn-block btn-primary" href="/create/mod">Be the first to add one!</a>
+            </div>
+        </div>
+    </div>
+</div>
+{% endif %}
 {% endblock %}
 {% block scripts %}
     <script>

From 511e4ee69dd5faa9e2e8f20829ca711f699be9c3 Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Sun, 9 Apr 2023 08:44:38 -0500
Subject: [PATCH 05/12] Show how many mods use each notification

---
 KerbalStuff/objects.py             | 4 ++++
 templates/admin-notifications.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/KerbalStuff/objects.py b/KerbalStuff/objects.py
index 9a9ac027..5b375686 100644
--- a/KerbalStuff/objects.py
+++ b/KerbalStuff/objects.py
@@ -295,6 +295,10 @@ class Notification(Base):  # type: ignore
     add_url = Column(Unicode(1024))
     change_url = Column(Unicode(1024))
 
+    def mod_count(self) -> int:
+        return EnabledNotification.query.filter(
+            EnabledNotification.notification_id == self.id).count()
+
     def __repr__(self) -> str:
         return f'<Notification {self.id} {self.name}>'
 
diff --git a/templates/admin-notifications.html b/templates/admin-notifications.html
index 5e88476e..750db6d4 100644
--- a/templates/admin-notifications.html
+++ b/templates/admin-notifications.html
@@ -20,7 +20,7 @@ <h3>{{game.name}}</h3>
                 {% for notif in notifs %}
                     <div class="row">
                         <div class="col-md-7 col-md-offset-1">
-                            <span class="glyphicon glyphicon-link"></span> {{notif.name}}
+                            <span class="glyphicon glyphicon-link"></span> {{notif.name}} <span class="text-muted">({{notif.mod_count()}} mods)</span>
                             {% if notif.builds_url %}
                                 <div class="text-muted col-md-offset-1">
                                     <span class="glyphicon glyphicon-check"></span>

From 80f1fbe0a5669d7b387adb3b33ba24b260f577cb Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Sun, 9 Apr 2023 10:51:35 -0500
Subject: [PATCH 06/12] Send co-authors to CKAN as POST form lists

---
 KerbalStuff/notification.py | 23 +++++++++--------------
 KerbalStuff/objects.py      |  3 +++
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/KerbalStuff/notification.py b/KerbalStuff/notification.py
index 6a1e5f0f..5d12f877 100644
--- a/KerbalStuff/notification.py
+++ b/KerbalStuff/notification.py
@@ -21,6 +21,7 @@ def send_add_notification(notif: EnabledNotification) -> None:
         protocol = _cfg('protocol')
         domain = _cfg('domain')
         site_name = _cfg('site-name')
+        authors = notif.mod.all_authors()
         if protocol and domain and site_name:
             storage = _cfg('storage')
             site_base_url = protocol + "://" + domain
@@ -28,16 +29,18 @@ def send_add_notification(notif: EnabledNotification) -> None:
                      {'name': notif.mod.name,
                       'id': notif.mod.id,
                       'license': notif.mod.license,
-                      **user_fields(notif.mod.user),
-                      'shared_authors': [user_fields(sh.user)
-                                         for sh in notif.mod.shared_authors
-                                         if sh.accepted],
+                      'username': [user.username for user in authors],
+                      'user_github': [user.githubUsername for user in authors],
+                      'user_forum_id': [user.forumId for user in authors],
+                      'user_forum_username': [user.forumUsername for user in authors],
+                      'email': [user.email for user in authors],
+                      'user_url': [site_base_url + url_for("profile.view_profile",
+                                                           username=user.username)
+                                   for user in authors],
                       'short_description': notif.mod.short_description,
                       'description': notif.mod.description,
                       'external_link': notif.mod.external_link,
                       'source_link': notif.mod.source_link,
-                      'user_url': site_base_url + url_for("profile.view_profile",
-                                                          username=notif.mod.user.username),
                       'mod_url': site_base_url + url_for('mods.mod',
                                                          mod_name=notif.mod.name,
                                                          mod_id=notif.mod.id),
@@ -47,14 +50,6 @@ def send_add_notification(notif: EnabledNotification) -> None:
                                         None)})
 
 
-def user_fields(user: User) -> Dict[str, str]:
-    return {'username': user.username,
-            'user_github': user.githubUsername,
-            'user_forum_id': user.forumId,
-            'user_forum_username': user.forumUsername,
-            'email': user.email}
-
-
 def send_change_notifications(mod: Mod, event_type: str, force: bool = False) -> None:
     for notif in mod.enabled_notifications:
         send_change_notification(notif, event_type, force)
diff --git a/KerbalStuff/objects.py b/KerbalStuff/objects.py
index 9a9ac027..f9df719e 100644
--- a/KerbalStuff/objects.py
+++ b/KerbalStuff/objects.py
@@ -279,6 +279,9 @@ def background_url(self, protocol: Optional[str], cdn_domain: Optional[str]) ->
         else:
             return url_for('mods.mod_background', mod_id=self.id, mod_name=self.name)
 
+    def all_authors(self) -> List[User]:
+        return [self.user, *[sh.user for sh in self.shared_authors if sh.accepted]]
+
     def __repr__(self) -> str:
         return '<Mod %r %r>' % (self.id, self.name)
 

From 7cd37a3d6dcfbee8716ce64fe1716bd49dd30dec Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Sat, 8 Apr 2023 19:21:57 -0500
Subject: [PATCH 07/12] Add Steam, Discord, and Youtube to profile

---
 KerbalStuff/blueprints/profile.py             |  6 +-
 KerbalStuff/objects.py                        |  3 +
 .../2023_04_08_19_02_56-ba0c9afb6cb0.py       | 26 +++++++++
 frontend/coffee/profile.coffee                |  4 +-
 templates/admin-users.html                    |  3 +
 templates/profile.html                        | 51 +++++++++++++++++
 templates/view_profile.html                   | 55 +++++++++++++++++++
 7 files changed, 145 insertions(+), 3 deletions(-)
 create mode 100644 alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py

diff --git a/KerbalStuff/blueprints/profile.py b/KerbalStuff/blueprints/profile.py
index 810bf7f0..28984143 100644
--- a/KerbalStuff/blueprints/profile.py
+++ b/KerbalStuff/blueprints/profile.py
@@ -113,7 +113,8 @@ def profile(username: str) -> Union[str, werkzeug.wrappers.Response]:
         descr = request.form.get('description', '')
         if descr and len(descr) > 10000:
             abort(400)
-        for key in ['ksp-forum-user', 'kerbalx', 'github', 'twitter', 'reddit', 'irc-nick']:
+        for key in ['ksp-forum-user', 'kerbalx', 'github', 'twitter',
+                    'reddit', 'irc-nick', 'steam', 'discord', 'youtube']:
             val = request.form.get(key, '')
             if val and len(val) > 128:
                 abort(400)
@@ -128,6 +129,9 @@ def profile(username: str) -> Union[str, werkzeug.wrappers.Response]:
         profile.twitterUsername = request.form.get('twitter')
         profile.redditUsername = request.form.get('reddit')
         profile.ircNick = request.form.get('irc-nick')
+        profile.steamUsername = request.form.get('steam')
+        profile.discordUsername = request.form.get('discord')
+        profile.youtubeUsername = request.form.get('youtube')
         bgOffsetX = request.form.get('bg-offset-x')
         bgOffsetY = request.form.get('bg-offset-y')
         profile.dark_theme = False
diff --git a/KerbalStuff/objects.py b/KerbalStuff/objects.py
index 9a9ac027..55b489f2 100644
--- a/KerbalStuff/objects.py
+++ b/KerbalStuff/objects.py
@@ -76,6 +76,9 @@ class User(Base):  # type: ignore
     twitterUsername = Column(String(128), default='')
     redditUsername = Column(String(128), default='')
     ircNick = Column(String(128), default='')
+    steamUsername = Column(String(128), default='')
+    discordUsername = Column(String(128), default='')
+    youtubeUsername = Column(String(128), default='')
     location = Column(String(128), default='')
     confirmation = Column(String(128))
     passwordReset = Column(String(128))
diff --git a/alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py b/alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py
new file mode 100644
index 00000000..a50d6f45
--- /dev/null
+++ b/alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py
@@ -0,0 +1,26 @@
+"""Add steamUsername, discordUsername, and youtubeUsername columns to user
+
+Revision ID: ba0c9afb6cb0
+Revises: f7d352d49c2b
+Create Date: 2023-04-09 00:02:54.923875
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'ba0c9afb6cb0'
+down_revision = 'f7d352d49c2b'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade() -> None:
+    op.add_column('user', sa.Column('steamUsername', sa.String(length=128), nullable=True))
+    op.add_column('user', sa.Column('discordUsername', sa.String(length=128), nullable=True))
+    op.add_column('user', sa.Column('youtubeUsername', sa.String(length=128), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column('user', 'youtubeUsername')
+    op.drop_column('user', 'discordUsername')
+    op.drop_column('user', 'steamUsername')
diff --git a/frontend/coffee/profile.coffee b/frontend/coffee/profile.coffee
index 900bf878..8eb92211 100644
--- a/frontend/coffee/profile.coffee
+++ b/frontend/coffee/profile.coffee
@@ -159,7 +159,7 @@ $('#uncheck-all-autoupdates').on('click', () -> $('[id^=autoupdates-]').prop('ch
 
 $('#save-changes').on 'click', () ->
     allValid = true
-    for fieldSelector in ['#kerbalx', '#github', '#twitter', '#reddit', '#irc-nick']
+    for fieldSelector in ['#kerbalx', '#github', '#twitter', '#reddit', '#irc-nick', '#steam', '#discord', '#youtube']
         field = $(fieldSelector)
         group = field.parents('.form-group')
         if /^[A-Za-z0-9._-]*$/.test(field.val())
@@ -171,4 +171,4 @@ $('#save-changes').on 'click', () ->
         $('#overall-error').hide()
     else
         $('#overall-error').show()
-    return allValid
\ No newline at end of file
+    return allValid
diff --git a/templates/admin-users.html b/templates/admin-users.html
index 76c19134..43ef6397 100644
--- a/templates/admin-users.html
+++ b/templates/admin-users.html
@@ -61,6 +61,9 @@
                         {% if user.twitterUsername %}<span class="text-muted">Twitter:</span> {{ user.twitterUsername }}<br/>{% endif %}
                         {% if user.redditUsername %}<span class="text-muted">Reddit:</span> {{ user.redditUsername }}<br/>{% endif %}
                         {% if user.ircNick %}<span class="text-muted">IRC:</span> {{ user.ircNick }}<br/>{% endif %}
+                        {% if user.steamUsername %}<span class="text-muted">Steam:</span> {{ user.steamUsername }}<br/>{% endif %}
+                        {% if user.discordUsername %}<span class="text-muted">Discord:</span> {{ user.discordUsername }}<br/>{% endif %}
+                        {% if user.youtubeUsername %}<span class="text-muted">YouTube:</span> {{ user.youtubeUsername }}<br/>{% endif %}
                     </td>
                     <td><div style="max-height: 6em; overflow: auto;">
                         {{ user.description | markdown | bleach }}
diff --git a/templates/profile.html b/templates/profile.html
index 6cb4e46b..a76475c6 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -141,6 +141,57 @@ <h2 style="margin-top: -20px; padding-bottom: 10px;" class="form-group">
                                 </div>
                             </div>
                         </div>
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner" style="background: #F5F5F5;">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2 style="margin-top: -20px; padding-bottom: 10px;" class="form-group">
+                                        <span class="text-muted">
+                                            Steam user:
+                                        </span>
+                                        <input type="text" class="form-control" id="steam" name="steam"
+                                            value="{% if profile.steamUsername %}{{ profile.steamUsername }}{% endif %}" />
+                                        <span class="help-block">Just enter your alphanumeric nickname</span>
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner" style="background: #F5F5F5;">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2 style="margin-top: -20px; padding-bottom: 10px;" class="form-group">
+                                        <span class="text-muted">
+                                            Discord user:
+                                        </span>
+                                        <input type="text" class="form-control" id="discord" name="discord"
+                                            value="{% if profile.discordUsername %}{{ profile.discordUsername }}{% endif %}" />
+                                        <span class="help-block">Just enter your alphanumeric nickname</span>
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner" style="background: #F5F5F5;">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2 style="margin-top: -20px; padding-bottom: 10px;" class="form-group">
+                                        <span class="text-muted">
+                                            YouTube user:
+                                        </span>
+                                        <input type="text" class="form-control" id="youtube" name="youtube"
+                                            value="{% if profile.youtubeUsername %}{{ profile.youtubeUsername }}{% endif %}" />
+                                        <span class="help-block">Just enter your alphanumeric nickname</span>
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
diff --git a/templates/view_profile.html b/templates/view_profile.html
index ae08db8b..18bfc51c 100644
--- a/templates/view_profile.html
+++ b/templates/view_profile.html
@@ -167,6 +167,61 @@ <h2>
                             </div>
                         </div>
                         {% endif %}
+                        {% if profile.steamUsername %}
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2>
+                                        <span class="text-muted">
+                                            Steam:
+                                        </span>
+                                        <!-- Not a link because Steam usernames are anonymous (the profile URL has a long integer) -->
+                                        {{ profile.steamUsername }}
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
+                        {% endif %}
+                        {% if profile.discordUsername %}
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2>
+                                        <span class="text-muted">
+                                            Discord:
+                                        </span>
+                                        <!-- Not a link because Discord profiles aren't accessble by browser -->
+                                        {{ profile.discordUsername }}
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
+                        {% endif %}
+                        {% if profile.youtubeUsername %}
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2>
+                                        <span class="text-muted">
+                                            YouTube:
+                                        </span>
+                                        <a target="_blank" href="https://www.youtube.com/user/{{profile.youtubeUsername}}">
+                                            {{ profile.youtubeUsername }}
+                                        </a>
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
+                        {% endif %}
                     </div>
                 </div>
 

From cca15a51067700c9ff8fa4b4122149889bdf8d3c Mon Sep 17 00:00:00 2001
From: VITAS <github.v@52k.de>
Date: Mon, 10 Apr 2023 09:21:20 +0200
Subject: [PATCH 08/12] Added Matrix Chat Option to Profiles

---
 KerbalStuff/blueprints/profile.py              |  3 ++-
 KerbalStuff/objects.py                         |  1 +
 .../2023_04_08_19_02_56-ba0c9afb6cb0.py        |  2 ++
 frontend/coffee/profile.coffee                 |  2 +-
 templates/admin-users.html                     |  1 +
 templates/profile.html                         | 17 +++++++++++++++++
 templates/view_profile.html                    | 18 ++++++++++++++++++
 7 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/KerbalStuff/blueprints/profile.py b/KerbalStuff/blueprints/profile.py
index 28984143..1cb66f60 100644
--- a/KerbalStuff/blueprints/profile.py
+++ b/KerbalStuff/blueprints/profile.py
@@ -114,7 +114,7 @@ def profile(username: str) -> Union[str, werkzeug.wrappers.Response]:
         if descr and len(descr) > 10000:
             abort(400)
         for key in ['ksp-forum-user', 'kerbalx', 'github', 'twitter',
-                    'reddit', 'irc-nick', 'steam', 'discord', 'youtube']:
+                    'reddit', 'irc-nick', 'steam', 'matrix', 'discord', 'youtube']:
             val = request.form.get(key, '')
             if val and len(val) > 128:
                 abort(400)
@@ -130,6 +130,7 @@ def profile(username: str) -> Union[str, werkzeug.wrappers.Response]:
         profile.redditUsername = request.form.get('reddit')
         profile.ircNick = request.form.get('irc-nick')
         profile.steamUsername = request.form.get('steam')
+        profile.matrixUsername = request.form.get('matrix')
         profile.discordUsername = request.form.get('discord')
         profile.youtubeUsername = request.form.get('youtube')
         bgOffsetX = request.form.get('bg-offset-x')
diff --git a/KerbalStuff/objects.py b/KerbalStuff/objects.py
index 3e747502..f34665e4 100644
--- a/KerbalStuff/objects.py
+++ b/KerbalStuff/objects.py
@@ -77,6 +77,7 @@ class User(Base):  # type: ignore
     redditUsername = Column(String(128), default='')
     ircNick = Column(String(128), default='')
     steamUsername = Column(String(128), default='')
+    matrixUsername = Column(String(128), default='')
     discordUsername = Column(String(128), default='')
     youtubeUsername = Column(String(128), default='')
     location = Column(String(128), default='')
diff --git a/alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py b/alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py
index a50d6f45..dcd1a069 100644
--- a/alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py
+++ b/alembic/versions/2023_04_08_19_02_56-ba0c9afb6cb0.py
@@ -16,11 +16,13 @@
 
 def upgrade() -> None:
     op.add_column('user', sa.Column('steamUsername', sa.String(length=128), nullable=True))
+    op.add_column('user', sa.Column('matrixUsername', sa.String(length=128), nullable=True))
     op.add_column('user', sa.Column('discordUsername', sa.String(length=128), nullable=True))
     op.add_column('user', sa.Column('youtubeUsername', sa.String(length=128), nullable=True))
 
 
 def downgrade() -> None:
     op.drop_column('user', 'youtubeUsername')
+    op.drop_column('user', 'matrixUsername')
     op.drop_column('user', 'discordUsername')
     op.drop_column('user', 'steamUsername')
diff --git a/frontend/coffee/profile.coffee b/frontend/coffee/profile.coffee
index 3b3ae31f..e1e3a035 100644
--- a/frontend/coffee/profile.coffee
+++ b/frontend/coffee/profile.coffee
@@ -175,7 +175,7 @@ $('#uncheck-all-autoupdates').on('click', () -> $('[id^=autoupdates-]').prop('ch
 
 $('#save-changes').on 'click', () ->
     allValid = true
-    for fieldSelector in ['#kerbalx', '#github', '#twitter', '#reddit', '#irc-nick', '#steam', '#discord', '#youtube']
+    for fieldSelector in ['#kerbalx', '#github', '#twitter', '#reddit', '#irc-nick', '#steam', '#matrix', '#discord', '#youtube']
         field = $(fieldSelector)
         group = field.parents('.form-group')
         if /^[A-Za-z0-9._-]*$/.test(field.val())
diff --git a/templates/admin-users.html b/templates/admin-users.html
index dc7b3cbb..d0a03b98 100644
--- a/templates/admin-users.html
+++ b/templates/admin-users.html
@@ -62,6 +62,7 @@
                         {% if user.redditUsername %}<span class="text-muted">Reddit:</span> {{ user.redditUsername }}<br/>{% endif %}
                         {% if user.ircNick %}<span class="text-muted">IRC:</span> {{ user.ircNick }}<br/>{% endif %}
                         {% if user.steamUsername %}<span class="text-muted">Steam:</span> {{ user.steamUsername }}<br/>{% endif %}
+                        {% if user.matrixUsername %}<span class="text-muted">Matrix:</span> {{ user.matrixUsername }}<br/>{% endif %}
                         {% if user.discordUsername %}<span class="text-muted">Discord:</span> {{ user.discordUsername }}<br/>{% endif %}
                         {% if user.youtubeUsername %}<span class="text-muted">YouTube:</span> {{ user.youtubeUsername }}<br/>{% endif %}
                     </td>
diff --git a/templates/profile.html b/templates/profile.html
index a76475c6..d78be16d 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -158,6 +158,23 @@ <h2 style="margin-top: -20px; padding-bottom: 10px;" class="form-group">
                                 </div>
                             </div>
                         </div>
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner" style="background: #F5F5F5;">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2 style="margin-top: -20px; padding-bottom: 10px;" class="form-group">
+                                        <span class="text-muted">
+                                            Matrix user:
+                                        </span>
+                                        <input type="text" class="form-control" id="matrix" name="matrix"
+                                            value="{% if profile.matrixUsername %}{{ profile.matrixUsername }}{% endif %}" />
+                                        <span class="help-block">Just enter your alphanumeric nickname</span>
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
                         <div class="timeline-entry">
                             <div class="timeline-entry-inner" style="background: #F5F5F5;">
                                 <div class="timeline-icon">
diff --git a/templates/view_profile.html b/templates/view_profile.html
index acbd835c..3b7e8ef2 100644
--- a/templates/view_profile.html
+++ b/templates/view_profile.html
@@ -185,6 +185,24 @@ <h2>
                             </div>
                         </div>
                         {% endif %}
+                        {% if profile.matrixUsername %}
+                        <div class="timeline-entry">
+                            <div class="timeline-entry-inner">
+                                <div class="timeline-icon">
+                                    <span class="glyphicon glyphicon-link"></span>
+                                </div>
+                                <div class="timeline-label">
+                                    <h2>
+                                        <span class="text-muted">
+                                            Matrix:
+                                        </span>
+                                        <!-- Not a link because Matrix profiles aren't accessble by browser -->
+                                        {{ profile.matrixUsername }}
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
+                        {% endif %}
                         {% if profile.discordUsername %}
                         <div class="timeline-entry">
                             <div class="timeline-entry-inner">

From bfa4e29548d8e4caa63888046143597229b0515e Mon Sep 17 00:00:00 2001
From: David <87927264+Rexicon226@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:23:59 -0700
Subject: [PATCH 09/12] Update index.scss
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤔
---
 frontend/styles/index.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/styles/index.scss b/frontend/styles/index.scss
index ef2e117e..1c93abeb 100644
--- a/frontend/styles/index.scss
+++ b/frontend/styles/index.scss
@@ -24,7 +24,6 @@
     }
 
     h3 {
-        margin-top: 0;
         padding-top: 0;
         font-size: 23pt;
         margin-top: 20px;

From 8c18e628802d58d85a5cb42fb87de75dab1979a2 Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Fri, 14 Apr 2023 10:24:13 -0500
Subject: [PATCH 10/12] Make sure JNO versions aren't empty

---
 KerbalStuff/notification.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/KerbalStuff/notification.py b/KerbalStuff/notification.py
index 5d12f877..884e68d8 100644
--- a/KerbalStuff/notification.py
+++ b/KerbalStuff/notification.py
@@ -83,7 +83,11 @@ def import_game_versions(notif: Notification) -> None:
 def game_versions_from_notif(url: str, fmt: str, argument: str) -> Iterable[str]:
     resp = requests.get(url)
     if fmt == 'plain_current':
-        yield resp.text
+        # Prune leading and trailing spaces
+        val = resp.text.strip()
+        # Make sure it's not empty
+        if val:
+            yield val
     elif fmt == 'json_list':
         yield from resp.json()
     elif fmt == 'json_nested_dict_values':

From 5e12670b60d008947496a7304d208f365516fbeb Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Fri, 14 Apr 2023 23:40:53 -0500
Subject: [PATCH 11/12] Support tables in markdown

---
 KerbalStuff/common.py    |  9 ++++++++-
 KerbalStuff/kerbdown.py  | 13 ++++++++++++-
 requirements-backend.txt |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/KerbalStuff/common.py b/KerbalStuff/common.py
index b2990678..1e40bd28 100644
--- a/KerbalStuff/common.py
+++ b/KerbalStuff/common.py
@@ -11,6 +11,7 @@
 import bleach
 import werkzeug.wrappers
 from bleach_allowlist import bleach_allowlist
+from bleach.css_sanitizer import CSSSanitizer
 from flask import jsonify, redirect, request, Response, abort, session, send_file, make_response, current_app
 from flask_login import current_user
 from markupsafe import Markup
@@ -34,11 +35,17 @@ def allow_iframe_attr(tagname: str, attrib: str, val: str) -> bool:
             attrib in EmbedInlineProcessor.IFRAME_ATTRIBS)
 
 
-cleaner = bleach.Cleaner(tags=bleach_allowlist.markdown_tags + ['iframe'],
+cleaner = bleach.Cleaner(tags=list({*bleach_allowlist.markdown_tags,
+                                    *bleach_allowlist.print_tags,
+                                    'iframe'}),
                          attributes={  # type: ignore[arg-type]
                              **bleach_allowlist.markdown_attrs,
+                             **bleach_allowlist.print_attrs,
+                             'th': ['style'],
+                             'td': ['style'],
                              'iframe': allow_iframe_attr
                          },
+                         css_sanitizer=CSSSanitizer(),
                          filters=[bleach.linkifier.LinkifyFilter])
 
 
diff --git a/KerbalStuff/kerbdown.py b/KerbalStuff/kerbdown.py
index c386ae6b..8b081615 100644
--- a/KerbalStuff/kerbdown.py
+++ b/KerbalStuff/kerbdown.py
@@ -1,10 +1,11 @@
 import urllib.parse
 from urllib.parse import parse_qs, urlparse
-from typing import Dict, Any, Match, Tuple, Optional
+from typing import List, Dict, Any, Match, Tuple, Optional
 
 from flask import url_for
 from markdown import Markdown
 from markdown.extensions import Extension
+from markdown.extensions.tables import TableProcessor
 from markdown.inlinepatterns import InlineProcessor
 from xml.etree import ElementTree
 from markdown.util import AtomicString
@@ -106,6 +107,13 @@ def _profileModCount(user: User) -> int:
                     if m is not None and m.published])
 
 
+class StyledTableProcessor(TableProcessor):
+    def run(self, parent: ElementTree.Element, blocks: List[str]) -> None:
+        super().run(parent, blocks)
+        for table in parent.findall('table'):
+            table.attrib['class'] = 'table-condensed table-bordered'
+
+
 class KerbDown(Extension):
     def __init__(self, **kwargs: str) -> None:
         super().__init__(**kwargs) # type: ignore[arg-type]
@@ -116,4 +124,7 @@ def extendMarkdown(self, md: Markdown) -> None:
         # BUG: the base method signature is INVALID, it's a bug in flask-markdown
         md.inlinePatterns.register(EmbedInlineProcessor(md, self.config), 'embed', 200)
         md.inlinePatterns.register(AtUsernameProcessor(md, self.config), 'atuser', 200)
+        md.parser.blockprocessors.register(StyledTableProcessor(md.parser,
+                                                                {'use_align_attribute': False}),
+                                           'styled_table', 75)
         md.registerExtension(self)
diff --git a/requirements-backend.txt b/requirements-backend.txt
index 898de04d..7d5ce27a 100644
--- a/requirements-backend.txt
+++ b/requirements-backend.txt
@@ -29,6 +29,7 @@ requests
 requests-oauthlib
 SQLAlchemy>=1.4,<2 # 1.4 shows deprecation warnings for 2.0, 2.0 would break our backend as of now
 SQLAlchemy-Utils
+tinycss2
 urllib3
 user_agents
 Werkzeug

From 1e25cb7bdca2f8603288fcbf93c71ab954bc6af8 Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Fri, 8 Dec 2023 12:22:48 -0600
Subject: [PATCH 12/12] New forum URLs, drop broken modules, delete OAuth

---
 Dockerfile                            |   2 +-
 KerbalStuff/app.py                    |  21 +-
 KerbalStuff/blueprints/login_oauth.py | 303 --------------------------
 KerbalStuff/blueprints/profile.py     |   9 +-
 KerbalStuff/common.py                 |  15 +-
 KerbalStuff/custom_json.py            |  12 +-
 KerbalStuff/purge.py                  |   6 +-
 README_DOCKERFILE.md                  |  11 +
 config.ini.example                    |   7 -
 docker-compose.yml                    |   3 -
 oauth.md                              |  49 -----
 requirements-backend.txt              |   6 +-
 templates/index.html                  |  14 --
 templates/layout.html                 |  11 -
 templates/login.html                  |  12 -
 templates/profile.html                |  84 -------
 templates/register-oauth.html         |  57 -----
 templates/register.html               |  17 --
 18 files changed, 42 insertions(+), 597 deletions(-)
 delete mode 100644 KerbalStuff/blueprints/login_oauth.py
 delete mode 100644 oauth.md
 delete mode 100644 templates/register-oauth.html

diff --git a/Dockerfile b/Dockerfile
index fd45ad1a..43cf39c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8 as backend-dev
+FROM python:3.10 as backend-dev
 ENV PYTHONUNBUFFERED=1
 RUN useradd -m -d /opt/spacedock -s /bin/bash spacedock
 RUN pip3 install --upgrade pip setuptools wheel pip-licenses
diff --git a/KerbalStuff/app.py b/KerbalStuff/app.py
index 6de11f4a..4b91624f 100644
--- a/KerbalStuff/app.py
+++ b/KerbalStuff/app.py
@@ -14,11 +14,10 @@
 import werkzeug.wrappers
 from flask import Flask, render_template, g, url_for, Response, request
 from flask_login import LoginManager, current_user
-from flaskext.markdown import Markdown
+from markupsafe import Markup
 from werkzeug.exceptions import HTTPException, InternalServerError, NotFound
 from flask.typing import ResponseReturnValue
 from jinja2 import ChainableUndefined
-from pymdownx.emoji import gemoji, to_alt
 
 from .blueprints.accounts import accounts
 from .blueprints.admin import admin
@@ -26,18 +25,16 @@
 from .blueprints.api import api
 from .blueprints.blog import blog, get_all_announcement_posts, get_non_member_announcement_posts
 from .blueprints.lists import lists
-from .blueprints.login_oauth import list_defined_oauths, login_oauth
 from .blueprints.mods import mods
 from .blueprints.profile import profiles
 from .middleware.session_interface import OnlyLoggedInSessionInterface
 from .celery import update_from_github
-from .common import first_paragraphs, many_paragraphs, json_output, jsonify_exception, dumb_object, sanitize_text
+from .common import first_paragraphs, many_paragraphs, json_output, jsonify_exception, dumb_object, sanitize_text, markdown_renderer
 from .config import _cfg, _cfgb, _cfgd, _cfgi, site_logger
 from .custom_json import CustomJSONEncoder
 from .database import db
 from .helpers import is_admin, following_mod
-from .kerbdown import KerbDown
-from .objects import User, BlogPost
+from .objects import User
 
 app = Flask(__name__, template_folder='../templates')
 # https://flask.palletsprojects.com/en/1.1.x/security/#set-cookie-options
@@ -59,15 +56,9 @@
 app.jinja_env.filters['bleach'] = sanitize_text
 app.jinja_env.auto_reload = app.debug
 app.secret_key = _cfg("secret-key")
-app.json_encoder = CustomJSONEncoder
+app.json_encoder = CustomJSONEncoder  # type: ignore[attr-defined]
 app.session_interface = OnlyLoggedInSessionInterface()
-Markdown(app, extensions=[KerbDown(), 'fenced_code', 'pymdownx.emoji'],
-         extension_configs={'pymdownx.emoji': {
-            # GitHub's emojis
-            'emoji_index': gemoji,
-            # Unicode output
-            'emoji_generator': to_alt
-         }})
+app.jinja_env.filters['markdown'] = lambda md: Markup(markdown_renderer.convert(md))
 login_manager = LoginManager(app)
 
 prof_dir = _cfg('profile-dir')
@@ -95,7 +86,6 @@ def load_user(username: str) -> User:
 
 app.register_blueprint(profiles)
 app.register_blueprint(accounts)
-app.register_blueprint(login_oauth)
 app.register_blueprint(anonymous)
 app.register_blueprint(blog)
 app.register_blueprint(admin)
@@ -320,7 +310,6 @@ def inject() -> Dict[str, Any]:
         'any': any,
         'following_mod': following_mod,
         'admin': is_admin(),
-        'oauth_providers': list_defined_oauths(),
         'dumb_object': dumb_object,
         'first_visit': first_visit,
         'request': request,
diff --git a/KerbalStuff/blueprints/login_oauth.py b/KerbalStuff/blueprints/login_oauth.py
deleted file mode 100644
index 6b0d4703..00000000
--- a/KerbalStuff/blueprints/login_oauth.py
+++ /dev/null
@@ -1,303 +0,0 @@
-import binascii
-import os
-from collections import OrderedDict
-from typing import List, Dict, Optional, Union, Tuple, Any
-import werkzeug.wrappers
-
-from flask import Blueprint, render_template, request, redirect, session, jsonify, url_for, \
-    current_app
-from flask_login import current_user, login_user
-from flask_oauthlib.client import OAuth, OAuthRemoteApp
-
-from .accounts import check_username_for_registration, \
-    check_email_for_registration
-from ..config import _cfg
-from ..database import db
-from ..email import send_confirmation
-from ..objects import User, UserAuth
-
-login_oauth = Blueprint('login_oauth', __name__)
-
-
-# Python doesn't like OrderedDict with brackets, but mypy is fine with it
-DEFINED_OAUTHS: Optional['OrderedDict[str, Dict[str, Any]]'] = None
-
-
-def list_connected_oauths(user: User) -> List[str]:
-    return [a.provider for a in UserAuth.query.filter(UserAuth.user_id == user.id)]
-
-
-def list_defined_oauths() -> 'OrderedDict[str, Dict[str, Any]]':
-    global DEFINED_OAUTHS
-    if DEFINED_OAUTHS is not None:
-        return DEFINED_OAUTHS
-    master_list = OrderedDict()
-    master_list['github'] = {
-        'full_name': 'GitHub',
-        'icon': 'github',
-    }
-    master_list['google'] = {
-        'full_name': 'Google',
-        'icon': 'google',
-    }
-    master_list['facebook'] = {
-        'full_name': 'Facebook',
-        'icon': 'facebook-official',
-    }
-    for p in list(master_list.keys()):
-        if not is_oauth_provider_configured(p):
-            del master_list[p]
-    DEFINED_OAUTHS = master_list
-    return DEFINED_OAUTHS
-
-
-def is_oauth_provider_configured(provider: str) -> bool:
-    if provider == 'github':
-        return bool(_cfg('gh-oauth-id')) and bool(_cfg('gh-oauth-secret'))
-    if provider == 'google':
-        return (bool(_cfg('google-oauth-id')) and
-                bool(_cfg('google-oauth-secret')))
-    return False
-
-
-def get_github_oath() -> Tuple[str, OAuthRemoteApp]:
-    github = get_oauth_provider('github')
-    resp = github.authorized_response()
-    if resp is None:
-        raise Exception(
-            f"Access denied: reason={request.args['error']} error={request.args['error_description']}")
-    session['github_token'] = (resp['access_token'], '')
-    gh_info = github.get('user').data
-    return gh_info['login'], github
-
-
-def _connect_with_oauth_finalize(remote_user: str, provider: str) -> Union[str, werkzeug.wrappers.Response]:
-    if not current_user:
-        return 'Trying to associate an account, but not logged in?'
-    auth = UserAuth.query.filter(UserAuth.provider == provider,
-                                 UserAuth.remote_user == remote_user).first()
-    if auth:
-        if auth.user_id == current_user.id:
-            # You're already set up.
-            return redirect('/profile/%s/edit' % current_user.username)
-        # This account is already connected with some user.
-        full_name = list_defined_oauths()[provider]['full_name']
-        return 'Your %s account is already connected to a SpaceDock account.' % full_name
-    auth = UserAuth(user_id=current_user.id,
-                    remote_user=remote_user,
-                    provider=provider)
-    db.add(auth)
-    db.flush()  # So that /profile will display currectly
-    return redirect('/profile/%s/edit' % current_user.username)
-
-
-@login_oauth.route("/login-oauth", methods=['GET', 'POST'])
-def login_with_oauth() -> Union[str, werkzeug.wrappers.Response]:
-    if request.method == 'GET':
-        return redirect('/login')
-    provider = request.form.get('provider', '')
-    if not is_oauth_provider_configured(provider):
-        return 'This install is not configured for login with %s' % provider
-    oauth = get_oauth_provider(provider)
-    callback = "{}://{}{}".format(_cfg("protocol"), _cfg("domain"),
-                                  url_for('.login_with_oauth_authorized_' + provider))
-    return oauth.authorize(callback=callback)
-
-
-@login_oauth.route("/connect-oauth", methods=['POST'])
-def connect_with_oauth() -> Union[str, werkzeug.wrappers.Response]:
-    provider = request.form.get('provider', '')
-    if not is_oauth_provider_configured(provider):
-        return 'This install is not configured for login with %s' % provider
-    oauth = get_oauth_provider(provider)
-    callback = "{}://{}{}".format(_cfg("protocol"), _cfg("domain"),
-                                  url_for('.connect_with_oauth_authorized_' + provider))
-    return oauth.authorize(callback=callback)
-
-
-@login_oauth.route("/disconnect-oauth", methods=['POST'])
-def disconnect_oauth() -> werkzeug.wrappers.Response:
-    provider = request.form.get('provider')
-    assert provider in list_defined_oauths()  # This is a quick and dirty form of sanitation.
-    auths = UserAuth.query.filter(UserAuth.provider == provider,
-                                  UserAuth.user_id == current_user.id).all()
-    for auth in auths:
-        db.delete(auth)
-    db.flush()  # So that /profile will display currectly
-    return redirect('/profile/%s/edit' % current_user.username)
-
-
-@login_oauth.route("/oauth/github/connect")
-def connect_with_oauth_authorized_github() -> Union[str, werkzeug.wrappers.Response]:
-    gh_user, _ = get_github_oath()
-    return _connect_with_oauth_finalize(gh_user, 'github')
-
-
-@login_oauth.route("/oauth/google/connect")
-def connect_with_oauth_authorized_google() -> Union[str, werkzeug.wrappers.Response]:
-    if 'code' not in request.args:
-        # Got here in some strange scenario.
-        return redirect('/')
-    google = get_oauth_provider('google')
-    resp = google.authorized_response()
-    if resp is None:
-        return 'Access denied: reason=%s error=%s' % (
-            request.args['error'],
-            request.args['error_description']
-        )
-    if 'error' in resp:
-        return jsonify(resp)
-    session['google_token'] = (resp['access_token'], '')
-    google_info = google.get('userinfo')
-    google_info = google_info.data
-    google_user = google_info['id']  # This is a long number.
-    return _connect_with_oauth_finalize(google_user, 'google')
-
-
-@login_oauth.route("/oauth/github/login")
-def login_with_oauth_authorized_github() -> Union[str, werkzeug.wrappers.Response]:
-    gh_user, github = get_github_oath()
-    auth = UserAuth.query.filter(
-        UserAuth.provider == 'github',
-        UserAuth.remote_user == gh_user).first()
-    if auth:
-        user = User.query.filter(User.id == auth.user_id).first()
-        if user.confirmation:
-            return redirect('/account-pending')
-        login_user(user, remember=True)
-        return redirect('/')
-    else:
-        emails = github.get('user/emails', [])
-        emails = emails.data
-        emails = [e['email'] for e in emails if e['primary']]
-        if emails:
-            email = emails[0]
-        else:
-            email = ''
-        return render_register_with_oauth('github', gh_user, gh_user, email)
-
-
-@login_oauth.route("/oauth/google/login")
-def login_with_oauth_authorized_google() -> Union[str, werkzeug.wrappers.Response]:
-    if 'code' not in request.args:
-        # Got here in some strange scenario.
-        return redirect('/')
-    google = get_oauth_provider('google')
-    resp = google.authorized_response()
-
-    if resp is None:
-        return 'Access denied: reason=%s error=%s' % (
-            request.args['error'],
-            request.args['error_description']
-        )
-    if 'error' in resp:
-        return jsonify(resp.error)
-    session['google_token'] = (resp['access_token'], '')
-    google_info = google.get('userinfo')
-    google_info = google_info.data
-    google_user = google_info['id']  # This is a long number.
-    auth = UserAuth.query.filter(
-        UserAuth.provider == 'google',
-        UserAuth.remote_user == google_user).first()
-    if auth:
-        user = User.query.filter(User.id == auth.user_id).first()
-        if user.confirmation:
-            return redirect('/account-pending')
-        login_user(user, remember=True)
-        return redirect('/')
-    else:
-        email = google_info['email']
-        username = email[:email.find('@')]
-        return render_register_with_oauth('google', google_user, username, email)
-
-
-@login_oauth.route("/register-oauth", methods=['POST'])
-def register_with_oauth_authorized() -> Union[str, werkzeug.wrappers.Response]:
-    """
-    This endpoint should be called after authorizing with oauth, by the user.
-    """
-    email = request.form.get('email', '')
-    username = request.form.get('username', '')
-    provider = request.form.get('provider', '')
-    remote_user = request.form.get('remote_user', '')
-    good = True
-    if check_username_for_registration(username):
-        good = False
-    if check_email_for_registration(email):
-        good = False
-    if good:
-        password = binascii.b2a_hex(os.urandom(99))
-        user = User(username=username, email=email)
-        user.set_password(str(password))
-        user.create_confirmation()
-        db.add(user)
-        db.flush()  # to get an ID.
-        auth = UserAuth(user_id=user.id,
-                        remote_user=remote_user,
-                        provider=provider)
-        db.add(auth)
-        db.commit()  # Commit before trying to email
-        send_confirmation(user)
-        return redirect("/account-pending")
-    return render_register_with_oauth(provider, remote_user, username, email)
-
-
-def render_register_with_oauth(provider: str, remote_user: str, username: str, email: str) -> str:
-    provider_info = list_defined_oauths()[provider]
-    parameters = {
-        'email': email, 'username': username,
-        'provider': provider,
-        'provider_full_name': provider_info['full_name'],
-        'provider_icon': provider_info['icon'],
-        'remote_user': remote_user
-    }
-    error = check_username_for_registration(username)
-    if error:
-        parameters['usernameError'] = error
-    error = check_email_for_registration(email)
-    if error:
-        parameters['emailError'] = error
-    return render_template('register-oauth.html', **parameters)
-
-
-def get_oauth_provider(provider: str) -> OAuthRemoteApp:
-    oauth = OAuth(current_app)
-    if provider == 'github':
-        github = oauth.remote_app(
-            'github',
-            consumer_key=_cfg('gh-oauth-id'),
-            consumer_secret=_cfg('gh-oauth-secret'),
-            request_token_params={'scope': 'user:email'},
-            base_url='https://api.github.com/',
-            request_token_url=None,
-            access_token_method='POST',
-            access_token_url='https://github.com/login/oauth/access_token',
-            authorize_url='https://github.com/login/oauth/authorize'
-        )
-
-        @github.tokengetter
-        def get_github_oauth_token() -> str:
-            return session.get('github_token', '')
-
-        return github
-
-    if provider == 'google':
-        google = oauth.remote_app(
-            'google',
-            consumer_key=_cfg('google-oauth-id'),
-            consumer_secret=_cfg('google-oauth-secret'),
-            request_token_params={'scope': 'email'},
-            base_url='https://www.googleapis.com/oauth2/v1/',
-            request_token_url=None,
-            access_token_method='POST',
-            access_token_url='https://accounts.google.com/o/oauth2/token',
-            authorize_url='https://accounts.google.com/o/oauth2/auth',
-        )
-
-        @google.tokengetter
-        def get_google_oauth_token() -> str:
-            return session.get('google_token', '')
-
-        return google
-
-    raise Exception('This OAuth provider was not implemented: ' + provider)
diff --git a/KerbalStuff/blueprints/profile.py b/KerbalStuff/blueprints/profile.py
index 1cb66f60..89ccc8a1 100644
--- a/KerbalStuff/blueprints/profile.py
+++ b/KerbalStuff/blueprints/profile.py
@@ -6,7 +6,6 @@
 from flask import Blueprint, render_template, abort, request, redirect
 from flask_login import current_user
 
-from .login_oauth import list_connected_oauths, list_defined_oauths
 from ..common import loginrequired, with_session, sendfile, TRUE_STR
 from ..config import _cfg
 from ..objects import User, Following
@@ -14,7 +13,7 @@
 profiles = Blueprint('profile', __name__)
 
 FORUM_PROFILE_URL_PATTERN = re.compile(
-    r'^(?P<prefix>https?://)?forum.kerbalspaceprogram.com/index.php\?/profile/(?P<id>[0-9]+)-(?P<name>[^/]+)')
+    r'^(?P<prefix>https?://)?forum.kerbalspaceprogram.com(/index.php\?)?/profile/(?P<id>[0-9]+)-(?P<name>[^/]+)')
 
 
 @profiles.route("/profile/<username>")
@@ -88,17 +87,11 @@ def profile(username: str) -> Union[str, werkzeug.wrappers.Response]:
         if current_user != profile and not current_user.admin:
             abort(403)
 
-        extra_auths = list_connected_oauths(profile)
-        oauth_providers = list_defined_oauths()
-        for provider in oauth_providers:
-            oauth_providers[provider]['has_auth'] = provider in extra_auths
-
         following = sorted(Following.query.filter(Following.user_id == profile.id),
                            key=lambda fol: fol.mod.name.lower())
 
         parameters = {
             'profile': profile,
-            'oauth_providers': oauth_providers,
             'hide_login': current_user != profile,
             'following': following,
             'background': profile.background_url(_cfg('protocol'), _cfg('cdn-domain')),
diff --git a/KerbalStuff/common.py b/KerbalStuff/common.py
index 1e40bd28..c1cac67b 100644
--- a/KerbalStuff/common.py
+++ b/KerbalStuff/common.py
@@ -17,7 +17,8 @@
 from markupsafe import Markup
 from werkzeug.exceptions import HTTPException
 from sqlalchemy.orm import Query
-from markdown import markdown
+from markdown import Markdown
+from pymdownx.emoji import gemoji, to_alt
 
 from .config import _cfg
 from .custom_json import CustomJSONEncoder
@@ -61,9 +62,19 @@ def sanitize_text(text: str) -> Markup:
     return Markup(cleaner.clean(text))
 
 
+markdown_renderer = Markdown(
+    extensions=[KerbDown(), 'fenced_code', 'pymdownx.emoji'],
+    extension_configs={'pymdownx.emoji': {
+       # GitHub's emojis
+       'emoji_index': gemoji,
+       # Unicode output
+       'emoji_generator': to_alt,
+}})
+
+
 def render_markdown(md: Optional[str]) -> Optional[Markup]:
     # The Markdown class is not thread-safe, sadly
-    return None if not md else sanitize_text(markdown(md, extensions=[KerbDown(), 'fenced_code']))
+    return None if not md else sanitize_text(markdown_renderer.convert(md))
 
 
 def dumb_object(model):  # type: ignore
diff --git a/KerbalStuff/custom_json.py b/KerbalStuff/custom_json.py
index 04bee479..f83ed1cd 100644
--- a/KerbalStuff/custom_json.py
+++ b/KerbalStuff/custom_json.py
@@ -1,15 +1,15 @@
 from datetime import datetime, timezone
 from typing import Any
 
-from flask.json import JSONEncoder
+from json import JSONEncoder
 
 
 class CustomJSONEncoder(JSONEncoder):
-    def default(self, obj: Any) -> Any:
-        if isinstance(obj, datetime):
-            return obj.astimezone(timezone.utc).isoformat()
+    def default(self, o: Any) -> Any:
+        if isinstance(o, datetime):
+            return o.astimezone(timezone.utc).isoformat()
         try:
-            return list(obj)
+            return list(o)
         except TypeError:
             pass
-        return super().default(obj)
+        return super().default(o)
diff --git a/KerbalStuff/purge.py b/KerbalStuff/purge.py
index d71a608e..7878f668 100644
--- a/KerbalStuff/purge.py
+++ b/KerbalStuff/purge.py
@@ -29,7 +29,9 @@ def purge_download(download_path: str) -> None:
             connection.create_connection = _orig_create_connection
 
 
-def create_connection_cdn_purge(address: Tuple[str, Union[str, int, None]], *args: str, **kwargs: int) -> socket:
+def create_connection_cdn_purge(address: Tuple[str, int],
+                                *args: str,
+                                **kwargs: int) -> socket:
     # Taken from https://stackoverflow.com/a/22614367
     host, port = address
 
@@ -41,4 +43,4 @@ def create_connection_cdn_purge(address: Tuple[str, Union[str, int, None]], *arg
 
     global _orig_create_connection
     assert callable(_orig_create_connection)
-    return _orig_create_connection((host, port), *args, **kwargs)
+    return _orig_create_connection((host, port), *args, **kwargs)  # type: ignore[arg-type]
diff --git a/README_DOCKERFILE.md b/README_DOCKERFILE.md
index 1ab16f80..9e9709c6 100644
--- a/README_DOCKERFILE.md
+++ b/README_DOCKERFILE.md
@@ -1,29 +1,37 @@
 # How to use the Dockerfile
+
 It should be assumed that all commands should be run from the project root, unless otherwise noted.
 Additionally, depending on your platform and how you've setup Docker, `docker` commands might need to be run as the `root` user or prefaced with `sudo` to work properly.
 
 ## Quickstart
+
 ```sh
 ./start-server.sh
 ```
+
 Admin Credentials: admin:development
 
 User Credentials: user:development
 
 ## Install Docker
+
 See <https://www.docker.com/> for instructions on installing Docker for your platform.
 
 ## Configure, Build, and Run
+
 The launch script will automatically copy the `config.ini.example`, `alembic.ini.example` and `logging.ini.example` to `config.ini`, `alembic.ini` and `logging.ini`, respectively.
 If you wish to provide your own, copy them like below and edit as you will.
+
 ```sh
 cp config.ini.example config.ini && cp alembic.ini.example alembic.ini && cp logging.ini.example logging.ini
 ```
 
 To create all the required containers and startup SpaceDock, run
+
 ```sh
 ./start-server.sh
 ```
+
 This will automatically link `./` to `/opt/spacedock` in the backend container, as well as `./spacedock-db` into the database container and `./storage` into the frontend container.
 This means that changes you make locally to files in your project folder will be instantly synced to and reflected in the container (however CSS and JS files need to be rebuilt before the changes take effect).
 This will also forward port 5080 of the nginx container to port 5080 of your host, so you'll be able to browse to your local server.
@@ -42,6 +50,7 @@ To interact with a container using the `docker` command, you need to use the con
 To interact using `docker-compose`, you need to use the service name and be in the repository directory or any subdirectory.
 
 ## Connecting
+
 If you are on macOS or another environment that requires the use of docker-machine, then you must connect to the local server via that docker machine rather than localhost.
 
 To find out the correct IP to use in your browser, use `docker-machine ip`. You can then browse to port 5080 of that IP and all should be well.
@@ -51,10 +60,12 @@ Admin Credentials: admin:development
 User Credentials: user:development
 
 ## Starting and Stopping
+
 If you want to stop your container without losing any data, you can simply do `docker-compose stop`.
 Then, to start it back up, do `docker-compose up`.
 
 ## Odd and Ends
+
 ```sh
 docker-compose exec backend /bin/bash # Start a bash shell in the backend container
 ```
diff --git a/config.ini.example b/config.ini.example
index 11b795fb..e471b224 100644
--- a/config.ini.example
+++ b/config.ini.example
@@ -94,13 +94,6 @@ hook_repository=KSP-SpaceDock/SpaceDock
 hook_branch=master
 restart_command=systemd-restart.sh
 
-# Various services you can plug in
-# GitHub (Login)
-gh-oauth-id=
-gh-oauth-secret=
-# Google (Login)
-google-oauth-id=
-google-oauth-secret=
 # Ads
 project_wonderful_id=
 # Analytics
diff --git a/docker-compose.yml b/docker-compose.yml
index 4870a6bc..e49e003d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,7 +52,6 @@ services:
       - 9999:9999
     volumes:
       - ./:/opt/spacedock
-      - /dev/log:/dev/log
     links:
       - db
       - celery
@@ -74,8 +73,6 @@ services:
       --loglevel=DEBUG
       --concurrency=1
       -B
-    volumes:
-      - /dev/log:/dev/log
     links:
       - redis
     networks:
diff --git a/oauth.md b/oauth.md
deleted file mode 100644
index 6edff2b0..00000000
--- a/oauth.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# How to configure OAuth
-
-All OAuth integrations require that you have a "domain" configured.
-
-In addition, you'll need to register an Application with each OAuth partner
-(Provider), and update a shared secret in `config.ini`.
-
-## GitHub
-
-Go to Settings -> (select the relevant Organization if applicable) ->
-Applications -> Developer Applications -> Register New Application.
-
-The first three fields are public information, and the last one - "Authorization
- callback URL" - is where GitHub will send users after the login. Set it to:
-
-    <protocol>://<domain>/oauth/github/
-
-For example, for KerbalStuff.com, it would be `https://kerbalstuff.com/oauth/github/`.
-
-Once you register, you'll get a "Client ID" and "Client Secret"; Set these values
-in config.ini as `gh-oauth-id` and `gh-oauth-secret` respectively.
-
-## Google
-
-For google, the domain name has to end with ".com" or something like that, so
-testing will be somewhat harder.
-(Looks like it does like http://127.0.0.1:8080/, so maybe you're in luck)
-
-Visit https://console.developers.google.com/, and create a new project.
-
-Then:
--> Use Google API
--> (sidenav): Credentials
--> OAuth consent screen
--> Product name
--> [SAVE]
--> (sidenav): Credentials
--> Credentials
--> New Credentials -> OAuth Client ID
--> web application
--> name: kerbalstuff
--> Authorized JavaScript origins: Leave blank
--> Authorized redirect uris: Add these two:
-
-    <protocol>://<domain>/oauth/google/login
-    <protocol>://<domain>/oauth/google/connect
-
-Set the Client ID (something-somethingsomething.apps.googleusercontent.com) as
-`google-oauth-id` and Client Secret as `google-oauth-secret` in the config.
diff --git a/requirements-backend.txt b/requirements-backend.txt
index 7d5ce27a..6b607249 100644
--- a/requirements-backend.txt
+++ b/requirements-backend.txt
@@ -8,15 +8,12 @@ dnspython
 flameprof
 Flask
 Flask-Login
-Flask-Markdown
-Flask-OAuthlib
 future
 GitPython
 gunicorn
 Jinja2
-Markdown
+markdown
 MarkupSafe
-oauthlib
 packaging
 Pillow
 psycopg2-binary
@@ -26,7 +23,6 @@ pymdown-extensions
 python-daemon
 redis
 requests
-requests-oauthlib
 SQLAlchemy>=1.4,<2 # 1.4 shows deprecation warnings for 2.0, 2.0 would break our backend as of now
 SQLAlchemy-Utils
 tinycss2
diff --git a/templates/index.html b/templates/index.html
index b0eacedb..4be1a1de 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -166,20 +166,6 @@ <h1>Register</h1>
                          <li>Replace the "Log In" link with a "Log Out" link</li>
                          <li>And <sup>not</sup> much more!</li>
                       </ul>
-                   </div>
-                    {% for provider in oauth_providers %}
-                      {% set provider_icon = oauth_providers[provider].icon %}
-                      {% set provider_full_name = oauth_providers[provider].full_name %}
-                        <p>
-                          <form action="/login-oauth" method="POST">
-                            <input type="hidden" name="provider" value="{{provider}}">
-                            <button type="submit" class="btn btn-register btn-lg">
-                              <i class="fa fa-{{provider_icon}}"></i> Register using {{provider_full_name}}
-                            </button>
-                          </form>
-                        </p>
-                    {% endfor %}
-                </div>
              </div>
         </div>
 
diff --git a/templates/layout.html b/templates/layout.html
index 95eebcf4..505684ee 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -257,17 +257,6 @@ <h4 class="modal-title" id="myModalLabel">Login</h4>
                                 </label>
                             </div>
                             <input type="hidden" name="return_to" value="{{ request.path }}">
-                            {% for provider in oauth_providers %}
-                                {% set provider_icon = oauth_providers[provider].icon %}
-                                {% set provider_full_name = oauth_providers[provider].full_name %}
-                                <form action="/login-oauth" method="POST">
-                                    <input type="hidden" name="provider" value="{{ provider }}">
-                                    <button type="submit" value="" class="btn btn-primary">
-                                        <i class="fa fa-{{ provider_icon }}"></i> Log In
-                                        using {{ provider_full_name }}
-                                    </button>
-                                </form>
-                            {% endfor %}
                             <a href="{{ url_for("accounts.forgot_password") }}">
                                 <span class="glyphicon glyphicon-question-sign"></span> Forgot
                                 Password
diff --git a/templates/login.html b/templates/login.html
index 719e9bb1..3ed10114 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -52,18 +52,6 @@ <h1>Log In to {{ site_name }}</h1>
             <p>Have you <a href="/forgot-password">forgotten your password</a>?</p>
             <p>Or maybe you want to <a href="/register">create a new account</a>?</p>
             <p>If you run into any trouble, please <a href="mailto:{{ support_mail }}">get in touch</a>.</p>
-            {% for provider in oauth_providers %}
-                {% set provider_icon = oauth_providers[provider].icon %}
-                {% set provider_full_name = oauth_providers[provider].full_name %}
-                <form action="/login-oauth" method="POST">
-                    <p>
-                        <input type="hidden" name="provider" value="{{provider}}">
-                        Or <button type="submit" class="btn btn-primary">
-                            <i class="fa fa-{{provider_icon}}"></i> Log In using {{provider_full_name}}
-                        </button>
-                    </p>
-                </form>
-            {% endfor %}
         </div>
     </div>
 </div>
diff --git a/templates/profile.html b/templates/profile.html
index d78be16d..66d23b2b 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -291,91 +291,7 @@ <h2>Delete User Account</h2>
     </div>
 </div>
 
-<div class="container lead">
-    <div class="row">
-        <div class="col-md-12">
-            <h2>Connected Accounts</h2>
-        </div>
-
-    </div>
-</div>
-<div>
-    <div class="info-list">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-6">
-                  <div class="timeline-centered">
-                  {% if not oauth_providers %}
-                    <em>No services configured.</em>
-                  {% endif %}
-                  {% for provider in oauth_providers %}
-                    {% set provider_icon = oauth_providers[provider].icon %}
-                    {% set provider_full_name = oauth_providers[provider].full_name %}
-                    {% set auth = oauth_providers[provider].has_auth %}
-
-                      <div class="timeline-entry">
-                        <div class="timeline-entry-inner">
-                          <div class="timeline-icon">
-                            <span class="fa fa-{{provider_icon}}"></span>
-
-                          </div>
-                          <div class="timeline-label">
-                            <h2 style="margin-top: -10px; margin-bottom: 0;">
-                              {% if auth %}
-                                <button data-toggle="modal" data-target="#confirm-disconnect-{{provider}}" class="btn btn-default btn-sm">
-                                  Disconnect your {{provider_full_name}} account
-                                </button>
-                              {% else %}
-                                <form action="/connect-oauth" method="POST">
-                                  <input type="hidden" name="provider" value="{{provider}}">
-                                  <button type="submit" class="btn btn-default btn-sm">
-                                    Connect your {{provider_full_name}} account
-                                  </button>
-                                </form>
-                              {% endif %}
-                            </h2>
-                          </div>
-                        </div>
-                      </div>
-                  {% endfor %}
-                  </div>
-                </div>
-                <div class="col-md-6">
-                    <p>
-                        Connecting your account on another service allows you to log in with that service.
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 {% endif %}
-{% for provider in oauth_providers %}
-  {% set provider_icon = oauth_providers[provider].icon %}
-  {% set provider_full_name = oauth_providers[provider].full_name %}
-<div class="modal fade" id="confirm-disconnect-{{provider}}" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-              <h4 class="modal-title">Disconnect Account: {{provider_full_name}}</h4>
-            </div>
-            <div class="modal-body">
-              <p>This action will disconnect your {{provider_full_name}} account from your {{ site_name }} account.</p>
-              <p>If you have no alternative way to login, you may lose your {{ site_name }} account.</p>
-              <p>Are you sure you with to continue?</p>
-            </div>
-            <div class="modal-footer">
-              <form action="/disconnect-oauth" method="POST">
-                <input type="hidden" name="provider" value="{{provider}}">
-                <a href="#" class="btn btn-default" data-dismiss="modal">Cancel</a>
-                <input type="submit" class="btn btn-primary" value="Disconnect {{provider_full_name}}">
-              </form>
-            </div>
-        </div>
-    </div>
-</div>
-{% endfor %}
 <div class="modal fade" id="change-password" tabindex="-1" role="dialog">
     <div class="modal-dialog">
         <div class="modal-content">
diff --git a/templates/register-oauth.html b/templates/register-oauth.html
deleted file mode 100644
index a8d23a32..00000000
--- a/templates/register-oauth.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends "layout.html" %}
-{% block styles %}
-<link rel="stylesheet" type="text/css" href="/static/stylesheet.css" />
-{% endblock %}
-{% block body %}
-<div class="well">
-    <div class="container">
-        <h1>Register for {{ site_name }}</h1>
-    </div>
-</div>
-<div class="container">
-    <div class="row">
-        <form class="form-horizontal col-md-6" role="form" action="/register-oauth" method="POST">
-            <input type="hidden" name="provider" value="{{provider}}">
-            <input type="hidden" name="remote_user" value="{{remote_user}}">
-            <div class="form-group{% if emailError %} has-error{% endif %}">
-                <label for="email" class="col-sm-2 control-label">Email</label>
-                <div class="col-sm-10">
-                    <input type="email" class="form-control" id="email" placeholder="Email" name="email" value="{{ email }}">
-                    {% if emailError %}
-                    <span class="text-danger">{{ emailError }}</span>
-                    {% endif %}
-                </div>
-            </div>
-            <div class="form-group{% if usernameError %} has-error{% endif %}">
-                <label for="username" class="col-sm-2 control-label">Username</label>
-                <div class="col-sm-10">
-                    <input type="text" class="form-control" id="username" placeholder="Username" name="username" value="{{ username }}">
-                    {% if usernameError %}
-                    <span class="text-danger">{{ usernameError }}</span>
-                    {% endif %}
-                </div>
-            </div>
-
-            <div class="form-group">
-                <div class="col-sm-10 col-sm-offset-2">
-                    <button type="submit" class="btn btn-primary">
-                    <i class="fa fa-{{provider_icon}}"></i>
-                    Register with {{provider_full_name}}
-                    </button>
-                    <a href="/" class="btn btn-link">Nevermind</a>
-                </div>
-            </div>
-        </form>
-        <div class="col-md-6">
-            <p>This will create a new account for you, which you can log-in to using your {{provider_full_name}} account.</p>
-            <p>If you already have an account:</p>
-            <ul>
-                <li>Use the <a href="/login">LOG IN</a> page to log-in.</li>
-                <li>If you forgot your password, use the <a href="/forgot-password">Forgot Password</a> link.</li>
-                <li>Then Edit your Profile to connect your {{provider_full_name}} account.</li>
-            </ul>
-            <p>If you run into any trouble, please <a href="mailto:{{ support_mail }}">get in touch</a>.</p>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/templates/register.html b/templates/register.html
index 63e7a3b1..543f7ffe 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -66,23 +66,6 @@ <h1>Register for {{ site_name }}</h1>
                 </div>
             </form>
             <hr>
-            {%- if oauth_providers -%}
-                <div style="text-align:center; padding-bottom: 10px">OR</div>
-                {% for provider in oauth_providers %}
-                    {% set provider_icon = oauth_providers[provider].icon %}
-                    {% set provider_full_name = oauth_providers[provider].full_name %}
-                    <div class="col-sm-10 col-sm-offset-2">
-                        <p>
-                            <form action="/login-oauth" method="POST">
-                                <input type="hidden" name="provider" value="{{provider}}">
-                                <button type="submit" class="btn btn-primary btn-lg">
-                                    <i class="fa fa-{{provider_icon}}"></i> Register using {{provider_full_name}}
-                                </button>
-                            </form>
-                        </p>
-                  </div>
-                {% endfor %}
-            {%- endif -%}
         </div>
 
         <div class="col-md-6">