From 658eefe42afb5fb1842cd5e50f2b89c65f39dace Mon Sep 17 00:00:00 2001
From: nyaadev <nyaadev@users.noreply.github.com>
Date: Tue, 6 Feb 2018 23:05:37 +0100
Subject: [PATCH] fix uncommon exception in report system fix html style issue
 in admin box on user page

---
 nyaa/templates/user.html |  6 ++---
 nyaa/views/admin.py      | 56 ++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/nyaa/templates/user.html b/nyaa/templates/user.html
index 5bd567b..a04243b 100644
--- a/nyaa/templates/user.html
+++ b/nyaa/templates/user.html
@@ -104,21 +104,21 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-md-4 text-left">
+							<div class="col-md-3 text-left">
 								{% if not user.is_banned %}
 								{{ ban_form.ban_user(value="Ban User", class="btn btn-danger") }}
 								{% else %}
 								<button type="button" class="btn btn-danger disabled">Already banned</button>
 								{% endif %}
 							</div>
-							<div class="col-md-4 text-center">
+							<div class="col-md-3 text-center">
 								{% if not ipbanned %}
 								{{ ban_form.ban_userip(value="Ban User+IP", class="btn btn-danger") }}
 								{% else %}
 								<button type="button" class="btn btn-danger disabled">Already IP banned</button>
 								{% endif %}
 							</div>
-							<div class="col-md-4 text-right">
+							<div class="col-md-6 text-right">
 								{% if g.user.is_superadmin %}
 								{{ ban_form.nuke(value="\U0001F4A3 Nuke Torrents", class="btn btn-danger") }}
 								{% else %}
diff --git a/nyaa/views/admin.py b/nyaa/views/admin.py
index 0d36343..27a58e3 100644
--- a/nyaa/views/admin.py
+++ b/nyaa/views/admin.py
@@ -76,40 +76,40 @@ def view_reports():
         report_id = report_action.report.data
         torrent = models.Torrent.by_id(torrent_id)
         report = models.Report.by_id(report_id)
-        report_user = models.User.by_id(report.user_id)
 
         if not torrent or not report or report.status != 0:
             flask.abort(404)
+
+        report_user = models.User.by_id(report.user_id)
+        log = 'Report #{}: {} [#{}]({}), reported by [{}]({})'
+        if action == 'delete':
+            torrent.deleted = True
+            report.status = 1
+            log = log.format(report_id, 'Deleted', torrent_id,
+                             flask.url_for('torrents.view', torrent_id=torrent_id),
+                             report_user.username,
+                             flask.url_for('users.view_user', user_name=report_user.username))
+        elif action == 'hide':
+            log = log.format(report_id, 'Hid', torrent_id,
+                             flask.url_for('torrents.view', torrent_id=torrent_id),
+                             report_user.username,
+                             flask.url_for('users.view_user', user_name=report_user.username))
+            torrent.hidden = True
+            report.status = 1
         else:
-            log = 'Report #{}: {} [#{}]({}), reported by [{}]({})'
-            if action == 'delete':
-                torrent.deleted = True
-                report.status = 1
-                log = log.format(report_id, 'Deleted', torrent_id,
-                                 flask.url_for('torrents.view', torrent_id=torrent_id),
-                                 report_user.username,
-                                 flask.url_for('users.view_user', user_name=report_user.username))
-            elif action == 'hide':
-                log = log.format(report_id, 'Hid', torrent_id,
-                                 flask.url_for('torrents.view', torrent_id=torrent_id),
-                                 report_user.username,
-                                 flask.url_for('users.view_user', user_name=report_user.username))
-                torrent.hidden = True
-                report.status = 1
-            else:
-                log = log.format(report_id, 'Closed', torrent_id,
-                                 flask.url_for('torrents.view', torrent_id=torrent_id),
-                                 report_user.username,
-                                 flask.url_for('users.view_user', user_name=report_user.username))
-                report.status = 2
+            log = log.format(report_id, 'Closed', torrent_id,
+                             flask.url_for('torrents.view', torrent_id=torrent_id),
+                             report_user.username,
+                             flask.url_for('users.view_user', user_name=report_user.username))
+            report.status = 2
 
-            adminlog = models.AdminLog(log=log, admin_id=flask.g.user.id)
-            db.session.add(adminlog)
+        adminlog = models.AdminLog(log=log, admin_id=flask.g.user.id)
+        db.session.add(adminlog)
 
-            models.Report.remove_reviewed(torrent_id)
-            db.session.commit()
-            flask.flash('Closed report #{}'.format(report.id), 'success')
-            return flask.redirect(flask.url_for('admin.reports'))
+        models.Report.remove_reviewed(torrent_id)
+        db.session.commit()
+        flask.flash('Closed report #{}'.format(report.id), 'success')
+        return flask.redirect(flask.url_for('admin.reports'))
 
     return flask.render_template('reports.html',
                                  reports=reports,