Move events to files.events.

Also fix EventUser primaryjoin that carppaged literally everything.

events/assets/css/css

@@ -1 +0,0 @@
-../../../events/assets/css

events/assets/fonts/fonts

@@ -1 +0,0 @@
-../../../events/assets/fonts

events/assets/images/images

@@ -1 +0,0 @@
-../../../events/assets/images

events/assets/js/js

@@ -1 +0,0 @@
-../../../events/assets/js

events/assets/media/media

@@ -1 +0,0 @@
-../../../events/assets/media

events/templates/templates

@@ -1 +0,0 @@
-../../events/templates

files/__main__.py

@@ -86,7 +86,7 @@ elif app.config['SERVICE'] == Service.CHAT:
 	from files.routes.chat import *
 
 if FEATURES['HOLIDAY_EVENT']:
-	from events import *
+	from files.events import *
 	if app.config['SERVICE'] == Service.RDRAMA:
 		event_init()
 

files/assets/css/event

@@ -1 +1 @@
-../../../events/assets/css
+../../events/assets/css

files/assets/fonts/event

@@ -1 +1 @@
-../../../events/assets/fonts
+../../events/assets/fonts

files/assets/images/event

@@ -1 +1 @@
-../../../events/assets/images
+../../events/assets/images

files/assets/js/event

@@ -1 +1 @@
-../../../events/assets/js
+../../events/assets/js

files/assets/media/event

@@ -1 +1 @@
-../../../events/assets/media
+../../events/assets/media

files/events/__init__.py

@@ -3,9 +3,9 @@ from sqlalchemy import inspect
 from files.helpers.const import AWARDS2, AWARDS_DISABLED
 from files.__main__ import engine
 
-from events.classes import *
-from events.helpers import *
-from events.routes import *
+from files.events.classes import *
+from files.events.helpers import *
+from files.events.routes import *
 
 def _build_table():
 	if not inspect(engine).has_table(EventUser.__table__.name, schema="public"):

files/events/classes/eventuser.py

@@ -6,7 +6,7 @@ from files.classes import Base
 class EventUser(Base):
 	__tablename__ = "event"
 	id = Column(Integer, ForeignKey("users.id"), primary_key=True)
-	user = relationship("User", primaryjoin="users", lazy="joined")
+	user = relationship("User", primaryjoin="EventUser.id == User.id", lazy="joined")
 
 	#event specific columns
 	hw_zombie = Column(Integer, default=0, nullable=False)

files/events/helpers/get.py

@@ -1,7 +1,7 @@
 from typing import Union
 from sqlalchemy.orm import scoped_session
 
-from events.classes.eventuser import EventUser
+from files.events.classes.eventuser import EventUser
 from files.classes.user import User
 
 def get_or_create_event_user(target:Union[int, User], db:scoped_session) -> EventUser:

files/events/routes/awards.py

@@ -3,7 +3,7 @@ from files.classes.award import AwardRelationship
 from files.helpers.alerts import send_repeatable_notification
 from files.helpers.useractions import badge_grant
 
-from events.helpers.get import get_or_create_event_user
+from files.events.helpers.get import get_or_create_event_user
 
 def award_thing_event(v, kind, author):
 	event_author = get_or_create_event_user(author, g.db)

files/events/routes/jinja.py

@@ -1,5 +1,5 @@
 from files.__main__ import app
-from events import EVENT_JINJA_CONST
+from files.events import EVENT_JINJA_CONST
 
 @app.context_processor
 def event_constants():

files/routes/awards.py

@@ -391,7 +391,7 @@ def award_thing(v, thing_type, id):
 		else: author.spider = int(time.time()) + 86400
 		badge_grant(user=author, badge_id=179, notify=False)
 	elif FEATURES['HOLIDAY_EVENT']:
-		from events import EVENT_AWARDS, award_thing_event
+		from files.events import EVENT_AWARDS, award_thing_event
 		if kind in EVENT_AWARDS:
 			award_thing_event(v, kind, author)
 

files/templates/event

@@ -1 +1 @@
-../../events/templates
+../events/templates