revi-archive/xygt
1
0
Fork 0
mirror of https://github.com/jackeilles/xygt.git synced 2025-02-21 13:48:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

didnt realise git did that

Browse source
This commit is contained in:
jackeilles 2024-02-26 20:27:03 +00:00
parent 0e7fb3cfcf
commit af502f91b0
No known key found for this signature in database
GPG key ID: 7822D1CB748879A9
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/worker.py
View file

@ -120,8 +120,6 @@ def idInfo(id):
# Return the mongodb info about the file, removing IP if its present # Return the mongodb info about the file, removing IP if its present
return check return check
<<<<<<< HEAD
=======
def userInfo(id): def userInfo(id):
# Grab user entry from userID # Grab user entry from userID
user = Config.users.find_one({"userid": id}) user = Config.users.find_one({"userid": id})
@ -161,7 +159,6 @@ def userInfo(id):
} }
} }
>>>>>>> 3063133 (dict name wrong)
def randomHex(): def randomHex():
hexRand = ''.join(secrets.choice('0123456789abcdef') for _ in range(6)) hexRand = ''.join(secrets.choice('0123456789abcdef') for _ in range(6))
return hexRand return hexRand
@ -194,4 +191,4 @@ def resetIDPass(userid):
Config.users.update_one({"userid": userid}, {"$set": {"idpass": hashedPass}}) Config.users.update_one({"userid": userid}, {"$set": {"idpass": hashedPass}})
return idpass return idpass
except: except:
return False return False