From d63f1bf642673817b826189cafde1dec7d2b4c99 Mon Sep 17 00:00:00 2001
From: hole-thu <hole_thu@riseup.net>
Date: Wed, 15 Dec 2021 01:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=88=A0=E4=B8=BB=E6=A5=BC?=
 =?UTF-8?q?=E5=86=99=E6=97=A5=E5=BF=97=20&=20=E6=90=9C=E7=B4=A2=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E8=A2=AB=E5=88=A0=E9=99=A4=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hole.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hole.py b/hole.py
index 4ee9721..b2962cb 100644
--- a/hole.py
+++ b/hole.py
@@ -151,7 +151,7 @@ def search():
         Post.search_text.like("%{}%".format(keywords))
     ).filter(
         Post.id.notin_(tag_pids)
-    ).order_by(
+    ).filter_by(deleted=False).order_by(
         Post.id.desc()
     ).limit(pagesize).offset((page - 1) * pagesize).all()
 
@@ -381,7 +381,7 @@ def delete():
 
     obj_type = request.form.get('type')
     obj_id = get_num(request.form.get('id'))
-    note = request.form.get('note')
+    note = request.form.get('note', '')
 
     if note and len(note) > 100:
         abort(422)
@@ -401,6 +401,11 @@ def delete():
             Attention.query.filter_by(pid=obj.id).delete()
             TagRecord.query.filter_by(pid=obj.id).delete()
             db.session.delete(obj)
+            db.session.add(Syslog(
+                log_type='SELF DELETE POST',
+                log_detail=f"pid={obj_id}\n{note}",
+                name_hash=hash_name(u.name)
+            ))
         else:
             obj.deleted = True
     elif u.name in app.config.get('ADMINS'):