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

Removed more login stuff

Browse source
This commit is contained in:
Steffo 2017-04-20 10:08:39 +02:00
parent c5ecb4ad16
commit f7a8fda245
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
database.py
View file

@ -25,10 +25,8 @@ class User(Base):
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
username = Column(String, unique=True, nullable=False) username = Column(String, unique=True, nullable=False)
password = Column(String, nullable=False) password = Column(String, nullable=False)
royal = Column(Boolean, nullable=False)
telegram_id = Column(Integer, unique=True) telegram_id = Column(Integer, unique=True)
discord_id = Column(Integer, unique=True) discord_id = Column(Integer, unique=True)
diario_entries = relationship("Diario")
def __str__(self): def __str__(self):
return self.username return self.username
@ -43,7 +41,6 @@ class Diario(Base):
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
text = Column(String, nullable=False) text = Column(String, nullable=False)
date = Column(DateTime, nullable=False) date = Column(DateTime, nullable=False)
author = Column(Integer, ForeignKey("members.id"))
def __repr__(self): def __repr__(self):
return f"<Diario {self.date} {self.text}>" return f"<Diario {self.date} {self.text}>"
@ -51,14 +48,14 @@ class Diario(Base):
Base.metadata.create_all(engine) Base.metadata.create_all(engine)
def create_user(username, password, royal=False): def create_user(username, password):
"""Create a new user and add it to the database.""" """Create a new user and add it to the database."""
# Create a new session # Create a new session
session = Session() session = Session()
# Hash the password with bcrypt # Hash the password with bcrypt
hashed_password = bcrypt.hashpw(password.encode("utf8"), bcrypt.gensalt()) hashed_password = bcrypt.hashpw(password.encode("utf8"), bcrypt.gensalt())
# Create a new user # Create a new user
new_member = User(username=username, password=hashed_password, royal=royal) new_member = User(username=username, password=hashed_password)
# Add the newly created member to the session # Add the newly created member to the session
session.add(new_member) session.add(new_member)
# Commit the changes # Commit the changes
@ -101,10 +98,6 @@ def login(username, password, enable_exceptions=False):
return session, None return session, None
def init_royal_db():
create_user("test", "test", True)
def find_user(username): def find_user(username):
"""Find the user with the specified username and return the session and the user object.""" """Find the user with the specified username and return the session and the user object."""
# Create a new session # Create a new session
@ -128,15 +121,19 @@ def migrate_diario():
session.commit() session.commit()
def new_diario_entry(dt, text, author): def new_diario_entry(dt, text):
# Create a new session # Create a new session
session = Session() session = Session()
# Create a new diario entry # Create a new diario entry
entry = Diario() entry = Diario()
entry.date = dt entry.date = dt
entry.text = text entry.text = text
entry.author = author.id
# Add the entry to the database # Add the entry to the database
session.add(entry) session.add(entry)
# Commit the change # Commit the change
session.commit() session.commit()
session = Session()
if len(session.query(User).all()) < 1:
# Look! A plaintext password!
create_user("steffo", "v3n0m-sn4k3")

2
royalbot.py
View file

@ -98,7 +98,7 @@ Sintassi: `{symbol}diario <frase>`"""
# Prepare the text # Prepare the text
text = " ".join(arguments).strip() text = " ".join(arguments).strip()
# Add the new entry # Add the new entry
database.new_diario_entry(find_date(thing), text, user) database.new_diario_entry(find_date(thing), text)
# Answer on Telegram # Answer on Telegram
await answer(bot, thing, "✅ Aggiunto al diario!") await answer(bot, thing, "✅ Aggiunto al diario!")