From f7a8fda24537dd09f1955048c9ab29f3b89c59b2 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Thu, 20 Apr 2017 10:08:39 +0200
Subject: [PATCH] Removed more login stuff

---
 database.py | 19 ++++++++-----------
 royalbot.py |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/database.py b/database.py
index 6bc0051a..ab156156 100644
--- a/database.py
+++ b/database.py
@@ -25,10 +25,8 @@ class User(Base):
     id = Column(Integer, primary_key=True)
     username = Column(String, unique=True, nullable=False)
     password = Column(String, nullable=False)
-    royal = Column(Boolean, nullable=False)
     telegram_id = Column(Integer, unique=True)
     discord_id = Column(Integer, unique=True)
-    diario_entries = relationship("Diario")
 
     def __str__(self):
         return self.username
@@ -43,7 +41,6 @@ class Diario(Base):
     id = Column(Integer, primary_key=True)
     text = Column(String, nullable=False)
     date = Column(DateTime, nullable=False)
-    author = Column(Integer, ForeignKey("members.id"))
 
     def __repr__(self):
         return f"<Diario {self.date} {self.text}>"
@@ -51,14 +48,14 @@ class Diario(Base):
 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 session
     session = Session()
     # Hash the password with bcrypt
     hashed_password = bcrypt.hashpw(password.encode("utf8"), bcrypt.gensalt())
     # 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
     session.add(new_member)
     # Commit the changes
@@ -101,10 +98,6 @@ def login(username, password, enable_exceptions=False):
             return session, None
 
 
-def init_royal_db():
-    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
@@ -128,15 +121,19 @@ def migrate_diario():
     session.commit()
 
 
-def new_diario_entry(dt, text, author):
+def new_diario_entry(dt, text):
     # Create a new session
     session = Session()
     # Create a new diario entry
     entry = Diario()
     entry.date = dt
     entry.text = text
-    entry.author = author.id
     # Add the entry to the database
     session.add(entry)
     # Commit the change
     session.commit()
+
+session = Session()
+if len(session.query(User).all()) < 1:
+    # Look! A plaintext password!
+    create_user("steffo", "v3n0m-sn4k3")
\ No newline at end of file
diff --git a/royalbot.py b/royalbot.py
index f6d1e35d..62b29ec6 100644
--- a/royalbot.py
+++ b/royalbot.py
@@ -98,7 +98,7 @@ Sintassi: `{symbol}diario <frase>`"""
     # Prepare the text
     text = " ".join(arguments).strip()
     # Add the new entry
-    database.new_diario_entry(find_date(thing), text, user)
+    database.new_diario_entry(find_date(thing), text)
     # Answer on Telegram
     await answer(bot, thing, "✅ Aggiunto al diario!")