1
0
SongZihuan 3 жил өмнө
parent
commit
06494b3f34
10 өөрчлөгдсөн 28 нэмэгдсэн , 15 устгасан
  1. 1 1
      core/blog.py
  2. 5 2
      core/comment.py
  3. 7 4
      core/file.py
  4. 5 2
      core/msg.py
  5. 5 2
      core/user.py
  6. 1 0
      send_email/__init__.py
  7. 1 1
      view/auth.py
  8. 1 1
      view/docx.py
  9. 1 1
      view/file.py
  10. 1 1
      view/msg.py

+ 1 - 1
core/blog.py

@@ -24,7 +24,7 @@ def load_blog_by_id(blog_id) -> "Optional[BlogArticle]":
     if len(blog) == 0:
         return None
 
-    auth = core.user.User.load_user_by_id(blog[0])
+    auth = core.user.load_user_by_id(blog[0])
     if auth is None:
         return None
 

+ 5 - 2
core/comment.py

@@ -1,4 +1,4 @@
-from sql.comment import read_comment, create_comment, get_user_comment_count
+from sql.comment import read_comment, create_comment, get_user_comment_count, delete_comment
 import core.user
 
 
@@ -22,5 +22,8 @@ class Comment:
     def get_user_comment_count(auth: "core.user"):
         return get_user_comment_count(auth.get_user_id())
 
-    def create_comment(self):
+    def create(self):
         return create_comment(self.blog_id, self.auth.get_user_id(), self.context)
+
+    def delete(self):
+        return delete_comment(self.comment_id)

+ 7 - 4
core/file.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from sql.file import get_file_id_by_name, create_file, get_file_list, read_file
+from sql.file import get_file_id_by_name, create_file, get_file_list, read_file, delete_file
 
 
 def load_file_by_name(name: str) -> "Optional[File]":
@@ -20,9 +20,6 @@ class File:
     def get_file_list():
         return get_file_list()
 
-    def create_file(self):
-        return create_file(self.name, self.describe)
-
     @staticmethod
     def get_blog_file(blog_id: int):
         file = read_file(blog_id)
@@ -30,3 +27,9 @@ class File:
         for i in file:
             file_list.append(File(i[1], i[2], i[0]))
         return file_list
+
+    def create(self):
+        return create_file(self.name, self.describe)
+
+    def delete(self):
+        return delete_file(self.id)

+ 5 - 2
core/msg.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from sql.msg import read_msg, get_msg_count, create_msg, get_user_msg_count
+from sql.msg import read_msg, get_msg_count, create_msg, get_user_msg_count, delete_msg
 import core.user
 
 
@@ -26,5 +26,8 @@ class Message:
             return get_msg_count()
         return get_user_msg_count(auth.get_user_id())
 
-    def create_msg(self):
+    def create(self):
         return create_msg(self.auth.get_user_id(), self.context, self.secret)
+
+    def delete(self):
+        return delete_msg(self.msg_id)

+ 5 - 2
core/user.py

@@ -4,7 +4,7 @@ from itsdangerous import TimedJSONWebSignatureSerializer as Serializer
 from typing import Optional
 
 from configure import conf
-from sql.user import read_user, check_role, get_user_email, create_user, get_role_name
+from sql.user import read_user, check_role, get_user_email, create_user, get_role_name, delete_user
 import core.blog
 import core.comment
 import core.msg
@@ -120,5 +120,8 @@ class User(UserMixin):
     def check_role(self, operate: str):
         return check_role(self.role, operate)
 
-    def create_user(self):
+    def create(self):
         return create_user(self.email, self.passwd_hash)
+
+    def delete(self):
+        return delete_user(self.id)

+ 1 - 0
send_email/__init__.py

@@ -4,6 +4,7 @@ from configure import conf
 
 
 def send_msg(title: str, mail: Mail, to, template, **kwargs):
+    """ 邮件发送 """
     message = Message(conf['email_prefix'] + title, sender=f"HBlog Admin <{conf['email_sender']}>", recipients=[to])
     message.body = render_template("email-msg/" + f"{template}.txt", **kwargs)
     mail.send(message)

+ 1 - 1
view/auth.py

@@ -93,7 +93,7 @@ def confirm_page():
         abort(404)
         return
 
-    User(token[0], token[1], None, None).create_user()
+    User(token[0], token[1], None, None).create()
     flash(f"用户{token[0]}认证完成")
     return redirect(url_for("base.index_page"))
 

+ 1 - 1
view/docx.py

@@ -90,7 +90,7 @@ def comment_page(blog: int):
             return
 
         context = form.context.data
-        if Comment(None, blog, auth, context).create_comment():
+        if Comment(None, blog, auth, context).create():
             flash("评论成功")
         else:
             flash("评论失败")

+ 1 - 1
view/file.py

@@ -35,7 +35,7 @@ def create_file_page():
             abort(403)
             return
 
-        if File(form.name.data, form.describe.data, None).create_file():
+        if File(form.name.data, form.describe.data, None).create():
             flash(f"创建归档 {form.name.data} 成功")
         else:
             flash(f"创建归档 {form.name.data} 失败")

+ 1 - 1
view/msg.py

@@ -49,7 +49,7 @@ def write_page():
 
         context = form.context.data
         secret = form.secret.data
-        if Message(None, auth, context, secret, None).create_msg():
+        if Message(None, auth, context, secret, None).create():
             flash("留言成功")
         else:
             flash("留言失败")