From 5cc66e4a1a2b61b70c5e69e6019ddbe64b337e03 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sun, 22 Oct 2023 18:26:57 +1300
Subject: [PATCH] unban

---
 app/templates/user/show_profile.html | 24 ++++++++++++--------
 app/user/routes.py                   | 33 +++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index 6ca82907..fa248dc3 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -98,17 +98,23 @@
                 <div class="card-body">
                     <div class="row">
                         {% if user_access('ban users', current_user.id) %}
-                        <div class="col-4">
-                            <a class="w-100 btn btn-primary confirm_first" href="/u/{{ user.user_name }}/ban">{{ _('Ban') }}</a>
-                        </div>
+                            {% if user.banned %}
+                                <div class="col-4">
+                                    <a class="w-100 btn btn-primary confirm_first" href="/u/{{ user.user_name }}/unban">{{ _('Unban') }}</a>
+                                </div>
+                            {% else %}
+                                <div class="col-4">
+                                    <a class="w-100 btn btn-primary confirm_first" href="/u/{{ user.user_name }}/ban">{{ _('Ban') }}</a>
+                                </div>
+                            {% endif %}
                         {% endif %}
                         {% if user_access('manage users', current_user.id) %}
-                        <div class="col-4">
-                            <a class="w-100 btn btn-primary confirm_first" href="/u/{{ user.user_name }}/delete">{{ _('Delete') }}</a>
-                        </div>
-                        <div class="col-4">
-                            <a class="w-100 btn btn-primary confirm_first" href="/u/{{ user.user_name }}/ban_purge">{{ _('Ban + Purge') }}</a>
-                        </div>
+                            <div class="col-4">
+                                <a class="w-100 btn btn-primary confirm_first" href="/u/{{ user.user_name }}/delete">{{ _('Delete') }}</a>
+                            </div>
+                            <div class="col-4">
+                                <a class="w-100 btn btn-primary confirm_first" href="/u/{{ user.user_name }}/ban_purge">{{ _('Ban + Purge') }}</a>
+                            </div>
                         {% endif %}
                     </div>
                 </div>
diff --git a/app/user/routes.py b/app/user/routes.py
index 2fc33a90..f86d7754 100644
--- a/app/user/routes.py
+++ b/app/user/routes.py
@@ -102,7 +102,32 @@ def ban_profile(actor):
     else:
         abort(401)
 
-    return redirect(f'/u/{actor}')
+    goto = request.args.get('redirect') if 'redirect' in request.args else f'/u/{actor}'
+    return redirect(goto)
+
+
+@bp.route('/u/<actor>/unban', methods=['GET'])
+def unban_profile(actor):
+    if user_access('ban users', current_user.id):
+        actor = actor.strip()
+        user = User.query.filter_by(user_name=actor, deleted=False).first()
+        if user is None:
+            user = User.query.filter_by(ap_id=actor, deleted=False).first()
+            if user is None:
+                abort(404)
+
+        if user.id == current_user.id:
+            flash('You cannot unban yourself.', 'error')
+        else:
+            user.banned = False
+            db.session.commit()
+
+            flash(f'{actor} has been unbanned.')
+    else:
+        abort(401)
+
+    goto = request.args.get('redirect') if 'redirect' in request.args else f'/u/{actor}'
+    return redirect(goto)
 
 
 @bp.route('/u/<actor>/delete', methods=['GET'])
@@ -125,7 +150,8 @@ def delete_profile(actor):
     else:
         abort(401)
 
-    return redirect(f'/u/{actor}')
+    goto = request.args.get('redirect') if 'redirect' in request.args else f'/u/{actor}'
+    return redirect(goto)
 
 
 @bp.route('/u/<actor>/ban_purge', methods=['GET'])
@@ -156,4 +182,5 @@ def ban_purge_profile(actor):
     else:
         abort(401)
 
-    return redirect(f'/u/{actor}')
+    goto = request.args.get('redirect') if 'redirect' in request.args else f'/u/{actor}'
+    return redirect(goto)