ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Added find_user function

Browse source
This commit is contained in:
Steffo 2017-03-29 09:44:32 +02:00
parent 60f10fa72e
commit 03dc07ff9b
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
database.py
View file

@ -71,17 +71,12 @@ def login(username, password, enable_exceptions=False):
# Create a new session # Create a new session
session = Session() session = Session()
# Find the matching user # Find the matching user
users = session.query(User).filter_by(username=username).all() db_user = session.query(User).filter_by(username=username).first()
# No user with a matching username found # Verify that the user exists
if len(users) == 0: if db_user is not None:
if enable_exceptions:
raise NoUsersMatchingError("No users with the specified username found.")
else:
return session, None return session, None
db_user = users[0]
# Test the password and return the session and the user if successful # Test the password and return the session and the user if successful
if bcrypt.hashpw(password.encode("utf8"), db_user.password) == db_user.password: if bcrypt.hashpw(password.encode("utf8"), db_user.password) == db_user.password:
# TODO: Maybe there's a better way to do this?
return session, db_user return session, db_user
else: else:
if enable_exceptions: if enable_exceptions:
@ -93,6 +88,16 @@ def login(username, password, enable_exceptions=False):
def init_royal_db(): def init_royal_db():
create_user("test", "test", True) create_user("test", "test", True)
def find_user(username):
"""Find the user with the specified username and return the session and the user object."""
# Create a new session
session = Session()
# Find the matching user
db_user = session.query(User).filter_by(username=username).first()
# Return the session and the user
return session, db_user
session = Session() session = Session()
# Generate the database if it's empty # Generate the database if it's empty
if session.query(User).first() is None: if session.query(User).first() is None:

6
grandbot.py
View file

@ -540,10 +540,8 @@ Sintassi: `/toggleroyal <username>`"""
if len(arguments) != 1: if len(arguments) != 1:
await update.message.reply(bot, "⚠ Sintassi del comando non valida.\n`/toggleroyal <username>`", parse_mode="Markdown") await update.message.reply(bot, "⚠ Sintassi del comando non valida.\n`/toggleroyal <username>`", parse_mode="Markdown")
return return
# Create a new database session # Find the specified user
session = database.Session() session, user = database.find_user(arguments[0])
# Find the user
user = session.query(database.User).filter_by(username=arguments[0]).first()
# Check if the user exists # Check if the user exists
if user is None: if user is None:
await update.message.reply(bot, "⚠ L'utente specificato non esiste.") await update.message.reply(bot, "⚠ L'utente specificato non esiste.")