mirror of
https://github.com/FAUSheppy/tmnf-replay-server.git
synced 2025-12-05 22:51:37 +01:00
fix: cleanup message & fix user query
This commit is contained in:
@@ -10,12 +10,13 @@ def send_notification(app, target_user, mapname, old_replay, new_replay):
|
||||
return
|
||||
|
||||
# send to event dispatcher #
|
||||
message = "Trackmania: Record broken on {}".format(mapname)
|
||||
message += "Old time: {}".format(old_replay.get_human_readable_time())
|
||||
message += "New time: {}".format(new_replay.get_human_readable_time())
|
||||
message += "by {}".format(new_replay.clean_login())
|
||||
message = "TM: Record broken on {}\n\n".format(mapname)
|
||||
message += "Old time: {}\n".format(old_replay.get_human_readable_time())
|
||||
message += "New time: {}\n".format(new_replay.get_human_readable_time())
|
||||
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",
|
||||
json=payload, auth=app.config["DISPATCH_AUTH"])
|
||||
|
||||
@@ -10,6 +10,7 @@ import datetime
|
||||
|
||||
from pygbx import Gbx, GbxType
|
||||
import tm2020parser
|
||||
import notifications
|
||||
|
||||
import sqlalchemy
|
||||
from sqlalchemy import Column, Integer, String, Boolean, or_, and_, asc, desc
|
||||
@@ -421,12 +422,13 @@ def upload():
|
||||
|
||||
def check_replay_trigger(replay):
|
||||
|
||||
map_obj = db.session.get(Map).filter(Map.map_uid == replay.map_uid).first()
|
||||
assert(map_uid)
|
||||
|
||||
map_obj = db.session.query(Map).filter(Map.map_uid == replay.map_uid).first()
|
||||
best = map_obj.get_best_replay()
|
||||
second = map_obj.get_second_best_replay()
|
||||
|
||||
if not second:
|
||||
return
|
||||
|
||||
if replay.filehash != best.filehash:
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user