sheppy/tmnf-replay-server
1
0
Fork 0
mirror of https://github.com/FAUSheppy/tmnf-replay-server.git synced 2025-12-06 07:01:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: cleanup message & fix user query

Browse Source
This commit is contained in:
Johnathen Sheppard
2024-01-13 04:49:25 +01:00
parent fd61cb12a4
commit c28049b94c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
notifications.py
View File

@@ -10,12 +10,13 @@ def send_notification(app, target_user, mapname, old_replay, new_replay):
return return
# send to event dispatcher # # send to event dispatcher #
message = "Trackmania: Record broken on {}".format(mapname) message = "TM: Record broken on {}\n\n".format(mapname)
message += "Old time: {}".format(old_replay.get_human_readable_time()) message += "Old time: {}\n".format(old_replay.get_human_readable_time())
message += "New time: {}".format(new_replay.get_human_readable_time()) message += "New time: {}\n".format(new_replay.get_human_readable_time())
message += "by {}".format(new_replay.clean_login()) message += "\nby {}".format(new_replay.clean_login())
payload = { "users": [target_user], "msg" : message }
payload = { "users": [user], "msg" : message }
r = requests.post(app.config["DISPATCH_SERVER"] + "/smart-send", r = requests.post(app.config["DISPATCH_SERVER"] + "/smart-send",
json=payload, auth=app.config["DISPATCH_AUTH"]) json=payload, auth=app.config["DISPATCH_AUTH"])

8
server.py
View File

@@ -10,6 +10,7 @@ import datetime
from pygbx import Gbx, GbxType from pygbx import Gbx, GbxType
import tm2020parser import tm2020parser
import notifications
import sqlalchemy import sqlalchemy
from sqlalchemy import Column, Integer, String, Boolean, or_, and_, asc, desc from sqlalchemy import Column, Integer, String, Boolean, or_, and_, asc, desc
@@ -421,12 +422,13 @@ def upload():
def check_replay_trigger(replay): def check_replay_trigger(replay):
map_obj = db.session.get(Map).filter(Map.map_uid == replay.map_uid).first() map_obj = db.session.query(Map).filter(Map.map_uid == replay.map_uid).first()
assert(map_uid)
best = map_obj.get_best_replay() best = map_obj.get_best_replay()
second = map_obj.get_second_best_replay() second = map_obj.get_second_best_replay()
if not second:
return
if replay.filehash != best.filehash: if replay.filehash != best.filehash:
return return