Fix 500 on some pages

royalnet/database/tables/__init__.py

@@ -1,4 +1,4 @@
-from .royals import User
+from .users import User
 from .telegram import Telegram
 from .diario import Diario
 from .aliases import Alias

royalnet/database/tables/activekvgroups.py

@@ -5,7 +5,7 @@ from sqlalchemy import Column, \
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
 # noinspection PyUnresolvedReferences
-from .royals import User
+from .users import User
 # noinspection PyUnresolvedReferences
 from .keygroups import Keygroup
 

royalnet/database/tables/aliases.py

@@ -5,7 +5,7 @@ from sqlalchemy import Column, \
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
 # noinspection PyUnresolvedReferences
-from .royals import User
+from .users import User
 
 
 class Alias:

royalnet/database/tables/bios.py

@@ -4,7 +4,7 @@ from sqlalchemy import Column, \
                        ForeignKey
 from sqlalchemy.orm import relationship, backref
 from sqlalchemy.ext.declarative import declared_attr
-from .royals import User
+from .users import User
 
 
 class Bio:

royalnet/database/tables/diario.py

@@ -9,7 +9,7 @@ from sqlalchemy import Column, \
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
 # noinspection PyUnresolvedReferences
-from .royals import User
+from .users import User
 
 
 class Diario:

royalnet/database/tables/discord.py

@@ -6,7 +6,7 @@ from sqlalchemy import Column, \
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
 # noinspection PyUnresolvedReferences
-from .royals import User
+from .users import User
 
 
 class Discord:

royalnet/database/tables/medalawards.py

@@ -4,7 +4,7 @@ from sqlalchemy import Column, \
                        ForeignKey
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import relationship
-from .royals import User
+from .users import User
 from .medals import Medal
 
 

royalnet/database/tables/mmdecisions.py

@@ -4,7 +4,7 @@ from sqlalchemy import Column, \
                        ForeignKey
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
-from .royals import User
+from .users import User
 from .mmevents import MMEvent
 
 

royalnet/database/tables/mmevents.py

@@ -9,7 +9,7 @@ from sqlalchemy import Column, \
                        BigInteger
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
-from .royals import User
+from .users import User
 if typing.TYPE_CHECKING:
     from .mmdecisions import MMDecision
     from .mmresponse import MMResponse

royalnet/database/tables/mmresponse.py

@@ -4,7 +4,7 @@ from sqlalchemy import Column, \
                        ForeignKey
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
-from .royals import User
+from .users import User
 from .mmevents import MMEvent
 
 

royalnet/database/tables/reminders.py

@@ -7,7 +7,7 @@ from sqlalchemy import Column, \
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
 # noinspection PyUnresolvedReferences
-from .royals import User
+from .users import User
 
 
 class Reminder:

royalnet/database/tables/telegram.py

@@ -6,7 +6,7 @@ from sqlalchemy import Column, \
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declared_attr
 # noinspection PyUnresolvedReferences
-from .royals import User
+from .users import User
 
 
 class Telegram:

royalnet/database/tables/triviascores.py

@@ -3,7 +3,7 @@ from sqlalchemy import Column, \
                        ForeignKey
 from sqlalchemy.orm import relationship, backref
 from sqlalchemy.ext.declarative import declared_attr
-from .royals import User
+from .users import User
 
 
 class TriviaScore:

royalnet/database/tables/wikirevisions.py

@@ -9,7 +9,7 @@ from sqlalchemy.ext.declarative import declared_attr
 # noinspection PyUnresolvedReferences
 from .wikipages import WikiPage
 # noinspection PyUnresolvedReferences
-from .royals import User
+from .users import User
 
 
 class WikiRevision:

royalnet/web/royalprints/login/__init__.py

@@ -25,7 +25,7 @@ def login_done():
     fd = f.request.form
     if "username" not in fd:
         return error(400, "Nessun username inserito.")
-    royal_user = alchemy_session.query(alchemy.Royal).filter_by(username=fd["username"]).one_or_none()
+    royal_user = alchemy_session.query(alchemy.User).filter_by(username=fd["username"]).one_or_none()
     if royal_user is None:
         return error(404, "L'username inserito non corrisponde a nessun account registrato.")
     if "password" not in fd:

royalnet/web/royalprints/newaccount/__init__.py

@@ -23,7 +23,7 @@ def login_index():
             return error(400, "Non è stato inserito nessun username.")
         if "password" not in fd:
             return error(400, "Non è stata inserita nessuna password.")
-        royal = alchemy_session.query(alchemy.Royal).filter_by(username=fd["username"]).one_or_none()
+        royal = alchemy_session.query(alchemy.User).filter_by(username=fd["username"]).one_or_none()
         if royal is not None:
             return error(403, "Esiste già un utente con quell'username.")
         alias = alchemy_session.query(alchemy.Alias).filter_by(alias=fd["username"]).one_or_none()

royalnet/web/royalprints/profile/__init__.py

@@ -18,14 +18,14 @@ rp = Royalprint("profile", __name__, url_prefix="/profile", template_folder=tmpl
 @rp.route("/")
 def profile_index():
     alchemy, alchemy_session = f.current_app.config["ALCHEMY"], f.current_app.config["ALCHEMY_SESSION"]
-    royals = alchemy_session.query(alchemy.Royal).order_by(alchemy.Royal.username).all()
+    royals = alchemy_session.query(alchemy.User).order_by(alchemy.User.username).all()
     return f.render_template("profile_index.html", royals=royals)
 
 
 @rp.route("/<username>")
 def profile_page(username):
     alchemy, alchemy_session = f.current_app.config["ALCHEMY"], f.current_app.config["ALCHEMY_SESSION"]
-    royal = alchemy_session.query(alchemy.Royal).filter_by(username=username).one_or_none()
+    royal = alchemy_session.query(alchemy.User).filter_by(username=username).one_or_none()
     if royal is None:
         return error(404, "Non esiste nessun utente con l'username richiesto.")
     if royal.bio is not None and royal.bio.contents != "":
@@ -43,7 +43,7 @@ def profile_editbio(username):
     if "royal" not in f.session:
         return error(403, "Devi aver effettuato il login per modificare una bio.")
     alchemy, alchemy_session = f.current_app.config["ALCHEMY"], f.current_app.config["ALCHEMY_SESSION"]
-    royal = alchemy_session.query(alchemy.Royal).filter_by(username=username).one_or_none()
+    royal = alchemy_session.query(alchemy.User).filter_by(username=username).one_or_none()
     if not (f.session["royal"]["uid"] == royal.uid or f.session["royal"]["role"] == "Admin"):
         return error(403, "Non sei autorizzato a modificare questa pagina bio.")