Leahnaya/DeathGarden_API_Rebirth
0
0
Fork 0
mirror of https://github.com/wolfswolke/DeathGarden_API_Rebirth.git synced 2026-04-18 21:18:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added unread messages as a DB Value and for that to be returned to the Client.

Browse Source
This commit is contained in:
ZKWolf 2023-09-06 20:17:55 +02:00
parent 9b0c2da292
commit 5b8a44ce38
2 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/endpoints/user_handeling.py
View File

@ -398,7 +398,11 @@ def messages_count():
userid = session_manager.get_user_id(session_cookie)
try:
return jsonify({"Count": 2})
unread_message_ids = mongo.get_data_with_list(login=userid, login_steam=False, items={"unread_msg_ids"}, server=mongo_host, db=mongo_db, collection=mongo_collection)
if unread_message_ids is None:
return jsonify({"Count": 0})
else:
return jsonify({"Count": len(unread_message_ids["unread_msg_ids"])})
except TimeoutError:
return jsonify({"status": "error"})
except Exception as e:
@ -414,15 +418,35 @@ def messages_list():
try:
if request.method == "GET":
limit = request.args.get("limit")
output = json.load(open(os.path.join(app.root_path, "json", "placeholders", "messages.json"), "r"))
return jsonify(output)
return jsonify({"messages": []}) # from dbd
unread_message_ids = mongo.get_data_with_list(login=userid, login_steam=False, items={"unread_msg_ids"},
server=mongo_host, db=mongo_db, collection=mongo_collection)
ids = []
for items in unread_message_ids.get("unread_msg_ids", []):
ids.append(str(items))
json_file_path = os.path.join(app.root_path, "json", "placeholders", "messages.json")
with open(json_file_path, "r") as json_file:
data = json.load(json_file)
messages = []
for message_id in ids:
messages.extend(data.get(message_id, []))
if limit:
messages = messages[:int(limit)]
return jsonify({"messages": messages})
elif request.method == "DELETE":
return jsonify("", 204)
except TimeoutError:
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="messages_list", message=e)
logger.graylog_logger(level="error", handler="messages_list", message=str(e))
return jsonify({"messages": []})
@app.route("/api/v1/messages/v2/markAs", methods=["POST"])

49
src/json/placeholders/messages.json
View File

@ -1,29 +1,30 @@
{
"Messages":[
"1": [
{
"Received":1687192383,
"Flag":"Reliable",
"Message":{
"Title":"Message from the Rebirth Team.",
"Body":"Welcome to Project Deathgarden Rebirth! The goal of this Project is to rebuild the Deathgarden API. For more Info visit our Github Repo!"
"Received": 1687192383,
"Flag": "Reliable",
"Message": {
"Title": "Message from the Rebirth Team.",
"Body": "Welcome to Project Deathgarden Rebirth! The goal of this Project is to rebuild the Deathgarden API. For more Info visit our Github Repo!"
},
"Tag":"Direct",
"ExpireAt":1787192383,
"Origin":"Warning",
"RecipientId":"6969696969696969"
},
{
"Received":1687192385,
"Flag":"Reliable",
"Message":{
"Title":"Message from the Rebirth Team.",
"Body":"This is a Info. The Matchmaking is not currently working. We are trying to get it working Asap though!"
},
"Tag":"Direct",
"ExpireAt":1787192383,
"Origin":"Warning",
"RecipientId":"420420420420"
"Tag": "Direct",
"ExpireAt": 1787192383,
"Origin": "Warning",
"RecipientId": "1"
}
],
"NetPage":"None"
}
"2": [
{
"Received": 1687192385,
"Flag": "Reliable",
"Message": {
"Title": "Message from the Rebirth Team.",
"Body": "This is a Info. The Matchmaking is not currently working. We are trying to get it working Asap though!"
},
"Tag": "Direct",
"ExpireAt": 1787192383,
"Origin": "Warning",
"RecipientId": "2"
}
]
}