injectlib/YYeTsBot
1
0
Fork 0
mirror of https://github.com/tgbot-collection/YYeTsBot.git synced 2025-11-25 03:15:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update comment api

Browse Source
This commit is contained in:
BennyThink
2021-06-22 20:01:10 +08:00
parent 0a01000b51
commit fc91bffdb1
4 changed files with 90 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
API.md
View File

@@ -276,69 +276,49 @@
* inner_size: 内嵌评论数量，默认5 * inner_size: 内嵌评论数量，默认5
* inner_page: 内嵌评论当前页，默认1 * inner_page: 内嵌评论当前页，默认1
返回 返回 楼中楼评论
普通评论
```json ```json
{ {
"data": [ "data": [
{ {
"username": "Benny", "username": "Benny",
"date": "2021-06-17 10:54:19", "date": "2021-06-22 18:26:42",
"browser": "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.13; rv:85.1) Gecko/20100101 Firefox/85.1", "browser": "PostmanRuntime/7.28.0",
"content": "test", "content": "父评论benny",
"resource_id": 233, "resource_id": 233,
"id": "60cab95baa7f515ea291392b", "type": "parent",
"children": [], "id": "60d1bae2d87ce6e9a2934a0f"
"children_count": 0
}
],
"count": 1,
"resource_id": 233
}
```
楼中楼
```json
{
"data": [
{
"username": "Benny",
"date": "2021-06-17 10:54:19",
"browser": "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.13; rv:85.1) Gecko/20100101 Firefox/85.1",
"content": "test",
"resource_id": 233,
"id": "60cab95baa7f515ea291392b"
}, },
{ {
"username": "Benny", "username": "Benny",
"date": "2021-06-15 10:54:19", "date": "2021-06-22 18:24:44",
"browser": "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.13; rv:85.1) Gecko/20100101 Firefox/85.1", "browser": "PostmanRuntime/7.28.0",
"content": "test8888", "content": "父评论benny",
"resource_id": 233, "resource_id": 233,
"id": "60cab95baa7f515ea2988888", "type": "parent",
"ack": false,
"children": [ "children": [
{ {
"username": "Alex", "username": "admin",
"date": "2021-05-31 16:58:21", "date": "2021-06-22 18:25:12",
"browser": "PostmanRuntime/7.28.0", "browser": "PostmanRuntime/7.28.0",
"content": "评论17", "content": "admin子评2论2",
"id": "60c838a12a5620b7e4ba5dfc", "resource_id": 233,
"resource_id": 233 "type": "child",
"id": "60d1ba88d87ce6e9a2934a0c"
}, },
{ {
"username": "Paul", "username": "admin",
"date": "2021-05-22 16:58:21", "date": "2021-06-22 18:25:08",
"browser": "PostmanRuntime/7.28.0", "browser": "PostmanRuntime/7.28.0",
"content": "评论14", "content": "admin子评论2",
"id": "60c838a12a5620b7e4ba1111", "resource_id": 233,
"resource_id": 233 "type": "child",
"id": "60d1ba84d87ce6e9a2934a0a"
} }
], ],
"children_count": 2 "id": "60d1ba6cd87ce6e9a2934a08"
} }
], ],
"count": 2, "count": 2,
@@ -396,22 +376,15 @@
* DELETE `/api/comment`，提交json数据 * DELETE `/api/comment`，提交json数据
删除子评论
```json ```json
{ {
"parent_id": "60cab935e9f929e09c91392a", "comment_id": "60cab935e9f929e09c91392a"
"child_id": "60cab935e9f929e09c91392a1111111"
} }
``` ```
不用关心comment_id是子评论还是父评论，会自动删除
删除父评论
```json
{
"parent_id": "60cab935e9f929e09c91392a"
}
```
返回被删除的数量,HTTP 200表示删除成功，404表示未找到这条留言 返回被删除的数量,HTTP 200表示删除成功，404表示未找到这条留言

93
yyetsweb/Mongo.py
View File

@@ -106,48 +106,55 @@ class BlacklistMongoResource(BlacklistResource):
class CommentMongoResource(CommentResource, Mongo): class CommentMongoResource(CommentResource, Mongo):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.page = 1 self.inner_page = 1
self.size = 5 self.inner_size = 5
self.projection = {"ip": False, "parent_id": False}
def convert_objectid(self, data): @staticmethod
final_data = [] def convert_objectid(data):
# change _id to id, remove _id
for item in data: for item in data:
item["id"] = str(item["_id"]) item["id"] = str(item["_id"])
item.pop("_id") item.pop("_id")
final_data.append(item) for child in item.get("children", []):
# legacy issues child["id"] = str(child["_id"])
if item.get("children") is None: child.pop("_id")
item["children"] = []
# 嵌套评论同样也要支持分页 def find_children(self, parent_data):
# 新评论在上 for item in parent_data:
item["children"].reverse() children_ids = item.get("children", [])
item["children_count"] = len(item["children"]) condition = {"_id": {"$in": children_ids}, "deleted_at": {"$exists": False}, "type": "child"}
item["children"] = item["children"][(self.page - 1) * self.size: self.page * self.size] children_data = self.db["comment"].find(condition, self.projection) \
return final_data .sort("_id", pymongo.DESCENDING).limit(self.inner_size).skip((self.inner_page - 1) * self.inner_size)
children_data = list(children_data)
if children_data:
item["children"] = []
item["children"].extend(children_data)
def get_comment(self, resource_id: int, page: int, size: int, **kwargs) -> dict: def get_comment(self, resource_id: int, page: int, size: int, **kwargs) -> dict:
inner_page = kwargs.get("inner_page", 1) self.inner_page = kwargs.get("inner_page", 1)
inner_size = kwargs.get("inner_size", 5) self.inner_size = kwargs.get("inner_size", 5)
self.page = inner_page condition = {"resource_id": resource_id, "deleted_at": {"$exists": False}, "type": {"$ne": "child"}}
self.size = inner_size
condition = {"resource_id": resource_id, "deleted_at": {"$exists": False}}
if resource_id == -1: if resource_id == -1:
condition.pop("resource_id") condition.pop("resource_id")
count = self.db["comment"].count_documents(condition) count = self.db["comment"].count_documents(condition)
data = self.db["comment"].find(condition, projection={"ip": False}) \ data = self.db["comment"].find(condition, self.projection) \
.sort("_id", pymongo.DESCENDING).limit(size).skip((page - 1) * size) .sort("_id", pymongo.DESCENDING).limit(size).skip((page - 1) * size)
data = list(data)
self.find_children(data)
self.convert_objectid(data)
return { return {
"data": self.convert_objectid(list(data)), "data": data,
"count": count, "count": count,
"resource_id": resource_id "resource_id": resource_id
} }
def add_comment(self, captcha: str, captcha_id: int, content: str, resource_id: int, def add_comment(self, captcha: str, captcha_id: int, content: str, resource_id: int,
ip: str, username: str, browser: str, comment_id=None) -> dict: ip: str, username: str, browser: str, parent_comment_id=None) -> dict:
returned = {"status_code": 0, "message": ""} returned = {"status_code": 0, "message": ""}
verify_result = CaptchaResource().verify_code(captcha, captcha_id) verify_result = CaptchaResource().verify_code(captcha, captcha_id)
# verify_result["status"] = 1
if not verify_result["status"]: if not verify_result["status"]:
returned["status_code"] = HTTPStatus.BAD_REQUEST returned["status_code"] = HTTPStatus.BAD_REQUEST
returned["message"] = verify_result["message"] returned["message"] = verify_result["message"]
@@ -159,8 +166,8 @@ class CommentMongoResource(CommentResource, Mongo):
returned["message"] = "资源不存在" returned["message"] = "资源不存在"
return returned return returned
if comment_id: if parent_comment_id:
exists = self.db["comment"].find_one({"_id": ObjectId(comment_id)}) exists = self.db["comment"].find_one({"_id": ObjectId(parent_comment_id)})
if not exists: if not exists:
returned["status_code"] = HTTPStatus.NOT_FOUND returned["status_code"] = HTTPStatus.NOT_FOUND
returned["message"] = "评论不存在" returned["message"] = "评论不存在"
@@ -174,29 +181,37 @@ class CommentMongoResource(CommentResource, Mongo):
"content": content, "content": content,
"resource_id": resource_id "resource_id": resource_id
} }
if comment_id is None: if parent_comment_id is None:
# 普通评论 basic_comment["type"] = "parent"
basic_comment["children"] = []
self.db["comment"].insert_one(basic_comment)
else: else:
# 嵌套评论 basic_comment["type"] = "child"
object_id = uuid.uuid1().hex # 无论什么评论，都要插入一个新的document
basic_comment["id"] = object_id inserted_id: str = self.db["comment"].insert_one(basic_comment).inserted_id
self.db["comment"].find_one_and_update({"_id": ObjectId(comment_id)},
{"$push": {"children": basic_comment}} if parent_comment_id is not None:
# 对父评论的子评论，需要给父评论加children id
self.db["comment"].find_one_and_update({"_id": ObjectId(parent_comment_id)},
{"$push": {"children": inserted_id}}
)
self.db["comment"].find_one_and_update({"_id": ObjectId(inserted_id)},
{"$set": {"parent_id": ObjectId(parent_comment_id)}}
) )
returned["status_code"] = HTTPStatus.CREATED returned["status_code"] = HTTPStatus.CREATED
returned["message"] = "评论成功" returned["message"] = "评论成功"
return returned return returned
def delete_comment(self, parent_id: str, child_id: str = None): def delete_comment(self, comment_id):
current_time = ts_date() current_time = ts_date()
if child_id is None: count = self.db["comment"].update_one({"_id": ObjectId(comment_id), "deleted_at": {"$exists": False}},
count = self.db["comment"].update_one({"_id": ObjectId(parent_id), "deleted_at": {"$exists": False}}, {"$set": {"deleted_at": current_time}}).modified_count
{"$set": {"deleted_at": current_time}}).modified_count # 找到子评论，全部标记删除
parent_data = self.db["comment"].find_one({"_id": ObjectId(comment_id)})
if parent_data:
child_ids = parent_data.get("children", [])
else: else:
count = self.db["comment"].update_one({"_id": ObjectId(parent_id), "deleted_at": {"$exists": False}}, child_ids = []
{"$pull": {"children": {"id": child_id}}}).modified_count count += self.db["comment"].update_many({"_id": {"$in": child_ids}, "deleted_at": {"$exists": False}},
{"$set": {"deleted_at": current_time}}).modified_count
returned = {"status_code": 0, "message": "", "count": -1} returned = {"status_code": 0, "message": "", "count": -1}
if count == 0: if count == 0:

2
yyetsweb/database.py
View File

@@ -152,7 +152,7 @@ class CommentResource:
username: str, browser: str, comment_id=None) -> dict: username: str, browser: str, comment_id=None) -> dict:
pass pass
def delete_comment(self, parent_id: str, child_id: str = None): def delete_comment(self, comment_id:str):
pass pass

11
yyetsweb/handler.py
View File

@@ -151,11 +151,13 @@ class UserHandler(BaseHandler):
self.write(resp) self.write(resp)
@gen.coroutine @gen.coroutine
@web.authenticated
def patch(self): def patch(self):
resp = yield self.add_remove_fav() resp = yield self.add_remove_fav()
self.write(resp) self.write(resp)
@gen.coroutine @gen.coroutine
@web.authenticated
def get(self): def get(self):
resp = yield self.get_user_info() resp = yield self.get_user_info()
self.write(resp) self.write(resp)
@@ -222,6 +224,7 @@ class UserLikeHandler(BaseHandler):
return {"LIKE": self.instance.get_user_like(username)} return {"LIKE": self.instance.get_user_like(username)}
@gen.coroutine @gen.coroutine
@web.authenticated
def get(self): def get(self):
resp = yield self.like_data() resp = yield self.like_data()
self.write(resp) self.write(resp)
@@ -295,11 +298,10 @@ class CommentHandler(BaseHandler):
# payload = {"id": "obj_id"} # payload = {"id": "obj_id"}
payload = json.loads(self.request.body) payload = json.loads(self.request.body)
username = self.get_current_user() username = self.get_current_user()
parent_id = payload["parent_id"] comment_id = payload["comment_id"]
child_id = payload.get("child_id")
if self.instance.is_admin(username): if self.instance.is_admin(username):
result = self.instance.delete_comment(parent_id, child_id) result = self.instance.delete_comment(comment_id)
self.set_status(result["status_code"]) self.set_status(result["status_code"])
return result return result
else: else:
@@ -312,11 +314,13 @@ class CommentHandler(BaseHandler):
self.write(resp) self.write(resp)
@gen.coroutine @gen.coroutine
@web.authenticated
def post(self): def post(self):
resp = yield self.add_comment() resp = yield self.add_comment()
self.write(resp) self.write(resp)
@gen.coroutine @gen.coroutine
@web.authenticated
def delete(self): def delete(self):
resp = yield self.delete_comment() resp = yield self.delete_comment()
self.write(resp) self.write(resp)
@@ -356,6 +360,7 @@ class AnnouncementHandler(BaseHandler):
self.write(resp) self.write(resp)
@gen.coroutine @gen.coroutine
@web.authenticated
def post(self): def post(self):
resp = yield self.add_announcement() resp = yield self.add_announcement()
self.write(resp) self.write(resp)