DengDai/pt_blacklist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 优化代码结构

Browse Source
This commit is contained in:
DengDai
2025-11-24 13:40:58 +08:00
parent aa516a8d71
commit 148fc78014
8 changed files with 69 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/forms.py
View File

@@ -44,7 +44,7 @@ class ReportForm(FlaskForm):
# render_kw={"placeholder": "例如：some.site.com"}
# )
reported_pt_site = SelectField('违规站点', validators=[DataRequired()])
reported_uid = StringField(
reported_username = StringField(
'被举报的用户名',
validators=[Optional(), Length(max=50)],
render_kw={"placeholder": "可选"}

71
app/models.py
View File

@@ -2,12 +2,16 @@ from datetime import datetime
from flask_login import UserMixin
from werkzeug.security import generate_password_hash, check_password_hash
from app import db, login_manager
class PartnerSite(db.Model):
__tablename__ = 'partner_sites'
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(100), unique=True, nullable=False, index=True)
name = db.Column(db.String(100), unique=True, nullable=False, index=True)
url = db.Column(db.String(255), nullable=True)
is_active = db.Column(db.Boolean, default=True, nullable=False, index=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def __repr__(self):
return f'<PartnerSite {self.name}>'
class User(UserMixin, db.Model):
@@ -16,13 +20,13 @@ class User(UserMixin, db.Model):
username = db.Column(db.String(64), unique=True, index=True, nullable=False)
email = db.Column(db.String(120), unique=True, index=True, nullable=False)
password_hash = db.Column(db.String(256))
role = db.Column(db.String(20), default='user', index=True) # 'user', 'admin', 'trusted_user'
status = db.Column(db.String(20), default='pending', index=True) # 'pending', 'active'
role = db.Column(db.String(16), default='user', index=True) # 'user', 'admin', 'trust_user'
status = db.Column(db.String(16), default='pending', index=True) # 'pending', 'active', 'disabled'
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
pt_site = db.Column(db.String(100)) # 注册时填写的站点
uid = db.Column(db.String(50)) # 注册时填写的 UID
reports = db.relationship('Report', backref='reporter', lazy='dynamic')
# comments = db.relationship('Comment', backref='author', lazy='dynamic')
comments = db.relationship('Comment', back_populates='author', lazy='dynamic')
def set_password(self, password):
self.password_hash = generate_password_hash(password)
@@ -39,19 +43,23 @@ def load_user(user_id):
class Report(db.Model):
__tablename__ = 'reports'
__table_args__ = (
db.Index('idx_report_status_created', 'status', 'created_at'),
)
id = db.Column(db.Integer, primary_key=True)
reporter_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
reporter_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), nullable=False)
reported_pt_site = db.Column(db.String(100), nullable=False)
reported_uid = db.Column(db.String(50))
reported_username = db.Column(db.String(50))
reported_email = db.Column(db.String(120), index=True, nullable=False)
reason_category = db.Column(db.String(50), nullable=False) # e.g., 'cheating', 'trading', 'spam'
reason_category = db.Column(db.String(16), nullable=False) # 'cheating', 'trading', 'spam', 'abusive', 'radio', 'other'
description = db.Column(db.Text, nullable=False)
status = db.Column(db.String(20), index=True, default='pending') # 'pending', 'in_review', 'approved', 'rejected'
status = db.Column(db.String(16), index=True, default='pending') # 'pending', 'approved', 'rejected', 'revoked', 'overturned'
created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
comments = db.relationship('Comment', backref='report', lazy='dynamic', cascade='all, delete-orphan')
evidences = db.relationship('Evidence', backref='report', lazy='dynamic', cascade="all, delete-orphan")
blacklist_entry = db.relationship('Blacklist', backref='report', uselist=False) # one-to-one
evidences = db.relationship('Evidence', backref='report', lazy='dynamic', cascade='all, delete-orphan')
blacklist_entry = db.relationship('Blacklist', backref='report', uselist=False)
def __repr__(self):
return f'<Report {self.id}>'
@@ -59,16 +67,22 @@ class Report(db.Model):
class Evidence(db.Model):
__tablename__ = 'evidences'
id = db.Column(db.Integer, primary_key=True)
report_id = db.Column(db.Integer, db.ForeignKey('reports.id'), nullable=False)
file_url = db.Column(db.String(512), nullable=False) # 存储OSS或本地路径
file_type = db.Column(db.String(20)) # 'image', 'zip', 'text'
report_id = db.Column(db.Integer, db.ForeignKey('reports.id', ondelete='CASCADE'), nullable=False)
file_url = db.Column(db.String(1024), nullable=False) # 存储OSS或本地路径
file_type = db.Column(db.String(16)) # 'image', 'zip', 'text', 'image_url'
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def __repr__(self):
return f'<Evidence {self.id} for Report {self.report_id}>'
class Blacklist(db.Model):
__tablename__ = 'blacklist'
__table_args__ = (
db.Index('idx_blacklist_email_status', 'normalized_email', 'status'),
db.Index('idx_blacklist_username_status', 'username', 'status'),
)
id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(64), index=True)
email = db.Column(db.String(120), index=True)
@@ -76,42 +90,43 @@ class Blacklist(db.Model):
pt_site = db.Column(db.String(100), index=True)
uid = db.Column(db.String(50))
report_id = db.Column(db.Integer, db.ForeignKey('reports.id'), unique=True) # 确保一个举报只对应一个黑名单条目
status = db.Column(db.String(20), default='active', index=True) # 'active', 'appealed_ok', 'expired'
status = db.Column(db.String(16), default='active', index=True) # 'active', 'revoked', 'expired'
created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
appeals = db.relationship('Appeal', backref='blacklist_entry', lazy='dynamic')
def __repr__(self):
return f'<Blacklist {self.normalized_email} on {self.pt_site}>'
class Comment(db.Model):
__tablename__ = 'comments'
id = db.Column(db.Integer, primary_key=True)
body = db.Column(db.Text)
timestamp = db.Column(db.DateTime, index=True, default=datetime.utcnow)
author_id = db.Column(db.Integer, db.ForeignKey('users.id'))
report_id = db.Column(db.Integer, db.ForeignKey('reports.id'))
# author = db.relationship('User') # 方便地通过 comment.author 访问用户
created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow)
author_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'))
report_id = db.Column(db.Integer, db.ForeignKey('reports.id', ondelete='CASCADE'))
author = db.relationship('User', back_populates='comments')
class Appeal(db.Model):
__tablename__ = 'appeals'
id = db.Column(db.Integer, primary_key=True)
reason = db.Column(db.Text, nullable=False) # 用户最初的申诉理由
status = db.Column(db.String(64), nullable=False, default='awaiting_admin_reply') # 状态: awaiting_admin_reply, awaiting_user_reply, closed_approved, closed_rejected
status = db.Column(db.String(32), nullable=False, default='awaiting_admin_reply', index=True) # 'awaiting_admin_reply', 'awaiting_user_reply', 'approved', 'rejected'
created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# 关系
appealer_id = db.Column(db.Integer, db.ForeignKey('users.id')) # 申诉人
blacklist_entry_id = db.Column(db.Integer, db.ForeignKey('blacklist.id')) # 关联的黑名单条目
appealer_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) # 申诉人
blacklist_entry_id = db.Column(db.Integer, db.ForeignKey('blacklist.id', ondelete='SET NULL')) # 关联的黑名单条目
messages = db.relationship('AppealMessage', backref='appeal', lazy='dynamic', cascade='all, delete-orphan')
appealer = db.relationship('User', backref='appeals')
def __repr__(self):
return f'<Appeal {self.id}>'
class AppealMessage(db.Model):
__tablename__ = 'appeal_messages'
id = db.Column(db.Integer, primary_key=True)
body = db.Column(db.Text, nullable=False)
timestamp = db.Column(db.DateTime, index=True, default=datetime.utcnow)
# 关系
author_id = db.Column(db.Integer, db.ForeignKey('users.id')) # 消息发送者
appeal_id = db.Column(db.Integer, db.ForeignKey('appeals.id'))
created_at = db.Column(db.DateTime, index=True, default=datetime.utcnow)
author_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) # 消息发送者
appeal_id = db.Column(db.Integer, db.ForeignKey('appeals.id', ondelete='CASCADE'))
author = db.relationship('User', backref='appeal_messages')
def __repr__(self):
return f'<AppealMessage {self.id}>'

16
app/routes.py
View File

@@ -53,7 +53,7 @@ def create_report():
new_report = Report(
reporter_id=current_user.id,
reported_pt_site=form.reported_pt_site.data,
reported_uid=form.reported_uid.data,
reported_username=form.reported_username.data,
reported_email=form.reported_email.data,
reason_category=form.reason_category.data,
description=form.description.data,
@@ -133,7 +133,7 @@ def report_detail(report_id):
flash('你的审核建议已成功提交。', 'success')
return redirect(url_for('main.report_detail', report_id=report.id))
comments = report.comments.order_by(Comment.timestamp.desc()).all()
comments = report.comments.order_by(Comment.created_at.desc()).all()
return render_template(
'admin/report_detail.html',
@@ -160,9 +160,9 @@ def process_report(report_id, action):
email=report.reported_email,
normalized_email=normalize_email(report.reported_email),
pt_site=report.reported_pt_site,
uid=report.reported_uid,
uid=report.reported_username,
report_id=report.id,
username=report.reported_uid or None
username=report.reported_username or None
)
db.session.add(new_blacklist_entry)
flash('举报已批准，并已将相关信息添加到黑名单。', 'success')
@@ -324,7 +324,7 @@ def appeal_detail(appeal_id):
db.session.commit()
flash('消息已发送。', 'success')
return redirect(url_for('main.appeal_detail', appeal_id=appeal.id))
messages = appeal.messages.order_by(AppealMessage.timestamp.asc()).all()
messages = appeal.messages.order_by(AppealMessage.created_at.asc()).all()
return render_template('appeal_detail.html', appeal=appeal, messages=messages, form=form)
@main.route('/admin/appeals')
@login_required
@@ -351,7 +351,7 @@ def decide_appeal(appeal_id):
if action == 'approve':
# 批准申诉：删除黑名单记录，更新申诉状态
blacklist_entry = appeal.blacklist_entry
blacklist_entry.status = 'revoked' # 将黑名单条目状态改为“已撤销”
blacklist_entry.status = 'revoked' # 将黑名单条目状态改为"已撤销"
appeal.status = 'approved' # 同时更新申诉本身的状态
if blacklist_entry.report:
# 使用 'overturned' (已推翻) 可能比 'revoked' 更能描述 Report 的状态
@@ -367,9 +367,13 @@ def decide_appeal(appeal_id):
elif action == 'reject':
# 驳回申诉：仅更新申诉状态
appeal.status = 'rejected'
db.session.add(appeal)
flash(f'已驳回申诉 #{appeal.id}。', 'info')
else:
flash('无效操作。', 'danger')
return redirect(url_for('main.appeal_list'))
db.session.commit()
return redirect(url_for('main.appeal_list'))
@main.route('/admin/sites', methods=['GET', 'POST'])

4
app/templates/admin/report_detail.html
View File

@@ -11,7 +11,7 @@
<div class="card-body">
<ul class="list-group list-group-flush">
<li class="list-group-item"><strong>被举报邮箱:</strong> {{ report.reported_email }}</li>
<li class="list-group-item"><strong>被举报用户名:</strong> {{ report.reported_uid or 'N/A' }}</li>
<li class="list-group-item"><strong>被举报用户名:</strong> {{ report.reported_username or 'N/A' }}</li>
<li class="list-group-item"><strong>所属站点:</strong> {{ report.reported_pt_site }}</li>
<li class="list-group-item"><strong>举报理由:</strong> {{ report.reason_category }}</li>
<li class="list-group-item"><strong>举报人:</strong> {{ report.reporter.username }}</li>
@@ -69,7 +69,7 @@
<div class="p-2 bg-light rounded">
<p class="small mb-0">{{ comment.body | safe }}</p>
</div>
<small class="text-muted">{{ comment.timestamp.strftime('%Y-%m-%d %H:%M') }}</small>
<small class="text-muted">{{ comment.created_at.strftime('%Y-%m-%d %H:%M') }}</small>
</div>
</div>
{% else %}

20
app/templates/appeal_detail.html
View File

@@ -11,9 +11,9 @@
<div class="card-body">
<p><strong>申诉ID:</strong> #{{ appeal.id }}</p>
<p><strong>申诉人:</strong> {{ appeal.appealer.username }}</p>
<p><strong>状态:</strong>
<span class="badge
{% if 'closed' in appeal.status %} bg-secondary
<p><strong>状态:</strong>
<span class="badge
{% if appeal.status in ['approved', 'rejected'] %} bg-secondary
{% elif 'user' in appeal.status %} bg-warning text-dark
{% else %} bg-info text-dark {% endif %}">
{{ appeal.status }}
@@ -26,7 +26,7 @@
</div>
</div>
{% if current_user.role=='admin' and appeal.status not in ['closed_approved', 'closed_rejected'] %}
{% if current_user.role=='admin' and appeal.status not in ['approved', 'rejected'] %}
<div class="card shadow-sm mb-4">
<div class="card-header"><h5 class="mb-0">管理员操作</h5></div>
<div class="card-body text-center d-grid gap-2">
@@ -64,12 +64,12 @@
{% for message in messages %}
<div class="message mb-3 {% if message.author_id == appeal.appealer_id %}user-message{% else %}admin-message{% endif %}">
<div class="message-header">
{% if message.author_id.role == 'admin' %}
<strong>{{ message.author_id.username }} (管理员)</strong>
<small>{{ message.timestamp.strftime('%Y-%m-%d %H:%M') }}</small>
{% if message.author.role == 'admin' %}
<strong>{{ message.author.username }} (管理员)</strong>
<small>{{ message.created_at.strftime('%Y-%m-%d %H:%M') }}</small>
{% else %}
<strong>{{ message.author_id.username }}</strong>
<small>{{ message.timestamp.strftime('%Y-%m-%d %H:%M') }}</small>
<strong>{{ message.author.username }}</strong>
<small>{{ message.created_at.strftime('%Y-%m-%d %H:%M') }}</small>
{% endif %}
</div>
<div class="message-body">
@@ -79,7 +79,7 @@
{% endfor %}
</div>
{% if appeal.status not in ['closed_approved', 'closed_rejected'] %}
{% if appeal.status not in ['approved', 'rejected'] %}
<div class="card-footer">
<form method="POST">
{{ form.hidden_tag() }}

6
app/templates/create_report.html
View File

@@ -21,9 +21,9 @@
{% for error in form.reported_pt_site.errors %}<div class="invalid-feedback d-block">{{ error }}</div>{% endfor %}
</div>
<div class="col-md-6 mb-3">
{{ form.reported_uid.label(class="form-label") }}
{{ form.reported_uid(class="form-control") }}
{% for error in form.reported_uid.errors %}<div class="invalid-feedback d-block">{{ error }}</div>{% endfor %}
{{ form.reported_username.label(class="form-label") }}
{{ form.reported_username(class="form-control") }}
{% for error in form.reported_username.errors %}<div class="invalid-feedback d-block">{{ error }}</div>{% endfor %}
</div>
</div>
<div class="mb-3">