refactor(project): make pyright & ruff happy
This commit is contained in:
@@ -4,13 +4,11 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import smtplib
|
||||
from email.mime.text import MIMEText
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
import secrets
|
||||
import smtplib
|
||||
import string
|
||||
from datetime import datetime, UTC, timedelta
|
||||
from typing import Optional
|
||||
|
||||
from app.config import settings
|
||||
from app.log import logger
|
||||
@@ -18,28 +16,28 @@ from app.log import logger
|
||||
|
||||
class EmailService:
|
||||
"""邮件发送服务"""
|
||||
|
||||
|
||||
def __init__(self):
|
||||
self.smtp_server = getattr(settings, 'smtp_server', 'localhost')
|
||||
self.smtp_port = getattr(settings, 'smtp_port', 587)
|
||||
self.smtp_username = getattr(settings, 'smtp_username', '')
|
||||
self.smtp_password = getattr(settings, 'smtp_password', '')
|
||||
self.from_email = getattr(settings, 'from_email', 'noreply@example.com')
|
||||
self.from_name = getattr(settings, 'from_name', 'osu! server')
|
||||
|
||||
self.smtp_server = getattr(settings, "smtp_server", "localhost")
|
||||
self.smtp_port = getattr(settings, "smtp_port", 587)
|
||||
self.smtp_username = getattr(settings, "smtp_username", "")
|
||||
self.smtp_password = getattr(settings, "smtp_password", "")
|
||||
self.from_email = getattr(settings, "from_email", "noreply@example.com")
|
||||
self.from_name = getattr(settings, "from_name", "osu! server")
|
||||
|
||||
def generate_verification_code(self) -> str:
|
||||
"""生成8位验证码"""
|
||||
# 只使用数字,避免混淆
|
||||
return ''.join(secrets.choice(string.digits) for _ in range(8))
|
||||
|
||||
return "".join(secrets.choice(string.digits) for _ in range(8))
|
||||
|
||||
async def send_verification_email(self, email: str, code: str, username: str) -> bool:
|
||||
"""发送验证邮件"""
|
||||
try:
|
||||
msg = MIMEMultipart()
|
||||
msg['From'] = f"{self.from_name} <{self.from_email}>"
|
||||
msg['To'] = email
|
||||
msg['Subject'] = "邮箱验证 - Email Verification"
|
||||
|
||||
msg["From"] = f"{self.from_name} <{self.from_email}>"
|
||||
msg["To"] = email
|
||||
msg["Subject"] = "邮箱验证 - Email Verification"
|
||||
|
||||
# HTML 邮件内容
|
||||
html_content = f"""
|
||||
<!DOCTYPE html>
|
||||
@@ -101,15 +99,15 @@ class EmailService:
|
||||
<h1>osu! 邮箱验证</h1>
|
||||
<p>Email Verification</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="content">
|
||||
<h2>你好 {username}!</h2>
|
||||
<p>感谢你注册我们的 osu! 服务器。为了完成账户验证,请输入以下验证码:</p>
|
||||
|
||||
|
||||
<div class="code">{code}</div>
|
||||
|
||||
|
||||
<p>这个验证码将在 <strong>10 分钟后过期</strong>。</p>
|
||||
|
||||
|
||||
<div class="warning">
|
||||
<strong>注意:</strong>
|
||||
<ul>
|
||||
@@ -118,19 +116,19 @@ class EmailService:
|
||||
<li>验证码只能使用一次</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<p>如果你有任何问题,请联系我们的支持团队。</p>
|
||||
|
||||
|
||||
<hr style="border: none; border-top: 1px solid #ddd; margin: 20px 0;">
|
||||
|
||||
|
||||
<h3>Hello {username}!</h3>
|
||||
<p>Thank you for registering on our osu! server. To complete your account verification, please enter the following verification code:</p>
|
||||
|
||||
|
||||
<p>This verification code will expire in <strong>10 minutes</strong>.</p>
|
||||
|
||||
|
||||
<p><strong>Important:</strong> Do not share this verification code with anyone. If you did not request this code, please ignore this email.</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="footer">
|
||||
<p>© 2025 g0v0! Private Server. 此邮件由系统自动发送,请勿回复。</p>
|
||||
<p>This email was sent automatically, please do not reply.</p>
|
||||
@@ -138,26 +136,26 @@ class EmailService:
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
|
||||
msg.attach(MIMEText(html_content, 'html', 'utf-8'))
|
||||
|
||||
""" # noqa: E501
|
||||
|
||||
msg.attach(MIMEText(html_content, "html", "utf-8"))
|
||||
|
||||
# 发送邮件
|
||||
if not settings.enable_email_sending:
|
||||
# 邮件发送功能禁用时只记录日志,不实际发送
|
||||
logger.info(f"[Email Verification] Mock sending verification code to {email}: {code}")
|
||||
return True
|
||||
|
||||
|
||||
with smtplib.SMTP(self.smtp_server, self.smtp_port) as server:
|
||||
if self.smtp_username and self.smtp_password:
|
||||
server.starttls()
|
||||
server.login(self.smtp_username, self.smtp_password)
|
||||
|
||||
|
||||
server.send_message(msg)
|
||||
|
||||
|
||||
logger.info(f"[Email Verification] Successfully sent verification code to {email}")
|
||||
return True
|
||||
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"[Email Verification] Failed to send email: {e}")
|
||||
return False
|
||||
|
||||
Reference in New Issue
Block a user