From de01a8d3ea5b3943fee4e95853ef278eb4bd8537 Mon Sep 17 00:00:00 2001
From: Snakes <duolsm@outlook.com>
Date: Tue, 29 Nov 2022 14:36:02 -0500
Subject: [PATCH] Move events to files.events.

Also fix EventUser primaryjoin that carppaged literally everything.
---
 events/assets/css/css                               |   1 -
 events/assets/fonts/fonts                           |   1 -
 events/assets/images/images                         |   1 -
 events/assets/js/js                                 |   1 -
 events/assets/media/media                           |   1 -
 events/templates/templates                          |   1 -
 files/__main__.py                                   |   2 +-
 files/assets/css/event                              |   2 +-
 files/assets/fonts/event                            |   2 +-
 files/assets/images/event                           |   2 +-
 files/assets/js/event                               |   2 +-
 files/assets/media/event                            |   2 +-
 {events => files/events}/__init__.py                |   6 +++---
 {events => files/events}/assets/css/banner.css      |   0
 {events => files/events}/assets/css/spooky.css      |   0
 .../events}/assets/fonts/DoubleFeature.woff         | Bin
 .../events}/assets/fonts/Jo_wrote_a_lovesong.woff   | Bin
 .../events}/assets/fonts/SpecialElite-Regular.woff  | Bin
 .../events}/assets/fonts/Unutterable.woff           | Bin
 .../events}/assets/fonts/XTypewriter-Regular.woff   | Bin
 .../events}/assets/images/blood-anim.webp           | Bin
 .../events}/assets/images/cobweb-bl.webp            | Bin
 .../events}/assets/images/cobweb-tr.webp            | Bin
 {events => files/events}/assets/images/eye.webp     | Bin
 .../events}/assets/images/jumpscares/1.webp         | Bin
 {events => files/events}/assets/images/machete.webp | Bin
 .../events}/assets/images/sidebar/1.webp            | Bin
 .../events}/assets/images/skeletons/skeleton1.webp  | Bin
 {events => files/events}/assets/images/smoke.webp   | Bin
 .../events}/assets/images/zombies/1.webp            | Bin
 {events => files/events}/assets/js/banner.js        |   0
 {events => files/events}/assets/js/blood.js         |   0
 {events => files/events}/assets/js/bones.js         |   0
 {events => files/events}/assets/js/eye-tracking.js  |   0
 {events => files/events}/assets/js/flashlight.js    |   0
 {events => files/events}/assets/js/fog.js           |   0
 {events => files/events}/assets/js/haunted.js       |   0
 {events => files/events}/assets/js/jumpscare.js     |   0
 {events => files/events}/assets/js/sketch.js        |   0
 {events => files/events}/assets/js/trickortreat.js  |   0
 .../events}/assets/media/Spooky_Scary_Skeletons.mp3 | Bin
 .../events}/assets/media/ghostbusters.mp3           | Bin
 .../events}/assets/media/haunted/thunder1.mp3       | Bin
 .../events}/assets/media/haunted/thunder2.mp3       | Bin
 .../assets/media/jumpscares/scream_test_1.mp3       | Bin
 .../events}/assets/media/music/CARPENTER_MASTER.mp3 | Bin
 {events => files/events}/classes/__init__.py        |   0
 {events => files/events}/classes/eventuser.py       |   2 +-
 {events => files/events}/helpers/__init__.py        |   0
 {events => files/events}/helpers/const.py           |   0
 {events => files/events}/helpers/get.py             |   2 +-
 {events => files/events}/helpers/jinja.py           |   0
 {events => files/events}/routes/__init__.py         |   0
 {events => files/events}/routes/awards.py           |   2 +-
 {events => files/events}/routes/jinja.py            |   2 +-
 {events => files/events}/routes/routes.py           |   0
 {events => files/events}/templates/awards.html      |   0
 .../events}/templates/banner_rDrama.html            |   0
 {events => files/events}/templates/music.html       |   0
 .../events}/templates/sidebar_rDrama.html           |   0
 {events => files/events}/templates/spider.html      |   0
 files/routes/awards.py                              |   2 +-
 files/templates/event                               |   2 +-
 63 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 120000 events/assets/css/css
 delete mode 120000 events/assets/fonts/fonts
 delete mode 120000 events/assets/images/images
 delete mode 120000 events/assets/js/js
 delete mode 120000 events/assets/media/media
 delete mode 120000 events/templates/templates
 rename {events => files/events}/__init__.py (85%)
 rename {events => files/events}/assets/css/banner.css (100%)
 rename {events => files/events}/assets/css/spooky.css (100%)
 rename {events => files/events}/assets/fonts/DoubleFeature.woff (100%)
 rename {events => files/events}/assets/fonts/Jo_wrote_a_lovesong.woff (100%)
 rename {events => files/events}/assets/fonts/SpecialElite-Regular.woff (100%)
 rename {events => files/events}/assets/fonts/Unutterable.woff (100%)
 rename {events => files/events}/assets/fonts/XTypewriter-Regular.woff (100%)
 rename {events => files/events}/assets/images/blood-anim.webp (100%)
 rename {events => files/events}/assets/images/cobweb-bl.webp (100%)
 rename {events => files/events}/assets/images/cobweb-tr.webp (100%)
 rename {events => files/events}/assets/images/eye.webp (100%)
 rename {events => files/events}/assets/images/jumpscares/1.webp (100%)
 rename {events => files/events}/assets/images/machete.webp (100%)
 rename {events => files/events}/assets/images/sidebar/1.webp (100%)
 rename {events => files/events}/assets/images/skeletons/skeleton1.webp (100%)
 rename {events => files/events}/assets/images/smoke.webp (100%)
 rename {events => files/events}/assets/images/zombies/1.webp (100%)
 rename {events => files/events}/assets/js/banner.js (100%)
 rename {events => files/events}/assets/js/blood.js (100%)
 rename {events => files/events}/assets/js/bones.js (100%)
 rename {events => files/events}/assets/js/eye-tracking.js (100%)
 rename {events => files/events}/assets/js/flashlight.js (100%)
 rename {events => files/events}/assets/js/fog.js (100%)
 rename {events => files/events}/assets/js/haunted.js (100%)
 rename {events => files/events}/assets/js/jumpscare.js (100%)
 rename {events => files/events}/assets/js/sketch.js (100%)
 rename {events => files/events}/assets/js/trickortreat.js (100%)
 rename {events => files/events}/assets/media/Spooky_Scary_Skeletons.mp3 (100%)
 rename {events => files/events}/assets/media/ghostbusters.mp3 (100%)
 rename {events => files/events}/assets/media/haunted/thunder1.mp3 (100%)
 rename {events => files/events}/assets/media/haunted/thunder2.mp3 (100%)
 rename {events => files/events}/assets/media/jumpscares/scream_test_1.mp3 (100%)
 rename {events => files/events}/assets/media/music/CARPENTER_MASTER.mp3 (100%)
 rename {events => files/events}/classes/__init__.py (100%)
 rename {events => files/events}/classes/eventuser.py (85%)
 rename {events => files/events}/helpers/__init__.py (100%)
 rename {events => files/events}/helpers/const.py (100%)
 rename {events => files/events}/helpers/get.py (87%)
 rename {events => files/events}/helpers/jinja.py (100%)
 rename {events => files/events}/routes/__init__.py (100%)
 rename {events => files/events}/routes/awards.py (96%)
 rename {events => files/events}/routes/jinja.py (70%)
 rename {events => files/events}/routes/routes.py (100%)
 rename {events => files/events}/templates/awards.html (100%)
 rename {events => files/events}/templates/banner_rDrama.html (100%)
 rename {events => files/events}/templates/music.html (100%)
 rename {events => files/events}/templates/sidebar_rDrama.html (100%)
 rename {events => files/events}/templates/spider.html (100%)

diff --git a/events/assets/css/css b/events/assets/css/css
deleted file mode 120000
index 58a0c94e7..000000000
--- a/events/assets/css/css
+++ /dev/null
@@ -1 +0,0 @@
-../../../events/assets/css
\ No newline at end of file
diff --git a/events/assets/fonts/fonts b/events/assets/fonts/fonts
deleted file mode 120000
index 178051058..000000000
--- a/events/assets/fonts/fonts
+++ /dev/null
@@ -1 +0,0 @@
-../../../events/assets/fonts
\ No newline at end of file
diff --git a/events/assets/images/images b/events/assets/images/images
deleted file mode 120000
index ebf988df9..000000000
--- a/events/assets/images/images
+++ /dev/null
@@ -1 +0,0 @@
-../../../events/assets/images
\ No newline at end of file
diff --git a/events/assets/js/js b/events/assets/js/js
deleted file mode 120000
index 090decd95..000000000
--- a/events/assets/js/js
+++ /dev/null
@@ -1 +0,0 @@
-../../../events/assets/js
\ No newline at end of file
diff --git a/events/assets/media/media b/events/assets/media/media
deleted file mode 120000
index 746b4be86..000000000
--- a/events/assets/media/media
+++ /dev/null
@@ -1 +0,0 @@
-../../../events/assets/media
\ No newline at end of file
diff --git a/events/templates/templates b/events/templates/templates
deleted file mode 120000
index f8e189d46..000000000
--- a/events/templates/templates
+++ /dev/null
@@ -1 +0,0 @@
-../../events/templates
\ No newline at end of file
diff --git a/files/__main__.py b/files/__main__.py
index 67dd4f640..ae70d18d9 100644
--- a/files/__main__.py
+++ b/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()
 
diff --git a/files/assets/css/event b/files/assets/css/event
index 58a0c94e7..809b0c4bb 120000
--- a/files/assets/css/event
+++ b/files/assets/css/event
@@ -1 +1 @@
-../../../events/assets/css
\ No newline at end of file
+../../events/assets/css
\ No newline at end of file
diff --git a/files/assets/fonts/event b/files/assets/fonts/event
index 178051058..fa7ac2ce6 120000
--- a/files/assets/fonts/event
+++ b/files/assets/fonts/event
@@ -1 +1 @@
-../../../events/assets/fonts
\ No newline at end of file
+../../events/assets/fonts
\ No newline at end of file
diff --git a/files/assets/images/event b/files/assets/images/event
index ebf988df9..4ee15241b 120000
--- a/files/assets/images/event
+++ b/files/assets/images/event
@@ -1 +1 @@
-../../../events/assets/images
\ No newline at end of file
+../../events/assets/images
\ No newline at end of file
diff --git a/files/assets/js/event b/files/assets/js/event
index 090decd95..7e146b4d9 120000
--- a/files/assets/js/event
+++ b/files/assets/js/event
@@ -1 +1 @@
-../../../events/assets/js
\ No newline at end of file
+../../events/assets/js
\ No newline at end of file
diff --git a/files/assets/media/event b/files/assets/media/event
index 746b4be86..a651b69d4 120000
--- a/files/assets/media/event
+++ b/files/assets/media/event
@@ -1 +1 @@
-../../../events/assets/media
\ No newline at end of file
+../../events/assets/media
\ No newline at end of file
diff --git a/events/__init__.py b/files/events/__init__.py
similarity index 85%
rename from events/__init__.py
rename to files/events/__init__.py
index df6ca3212..71d2ada39 100644
--- a/events/__init__.py
+++ b/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"):
diff --git a/events/assets/css/banner.css b/files/events/assets/css/banner.css
similarity index 100%
rename from events/assets/css/banner.css
rename to files/events/assets/css/banner.css
diff --git a/events/assets/css/spooky.css b/files/events/assets/css/spooky.css
similarity index 100%
rename from events/assets/css/spooky.css
rename to files/events/assets/css/spooky.css
diff --git a/events/assets/fonts/DoubleFeature.woff b/files/events/assets/fonts/DoubleFeature.woff
similarity index 100%
rename from events/assets/fonts/DoubleFeature.woff
rename to files/events/assets/fonts/DoubleFeature.woff
diff --git a/events/assets/fonts/Jo_wrote_a_lovesong.woff b/files/events/assets/fonts/Jo_wrote_a_lovesong.woff
similarity index 100%
rename from events/assets/fonts/Jo_wrote_a_lovesong.woff
rename to files/events/assets/fonts/Jo_wrote_a_lovesong.woff
diff --git a/events/assets/fonts/SpecialElite-Regular.woff b/files/events/assets/fonts/SpecialElite-Regular.woff
similarity index 100%
rename from events/assets/fonts/SpecialElite-Regular.woff
rename to files/events/assets/fonts/SpecialElite-Regular.woff
diff --git a/events/assets/fonts/Unutterable.woff b/files/events/assets/fonts/Unutterable.woff
similarity index 100%
rename from events/assets/fonts/Unutterable.woff
rename to files/events/assets/fonts/Unutterable.woff
diff --git a/events/assets/fonts/XTypewriter-Regular.woff b/files/events/assets/fonts/XTypewriter-Regular.woff
similarity index 100%
rename from events/assets/fonts/XTypewriter-Regular.woff
rename to files/events/assets/fonts/XTypewriter-Regular.woff
diff --git a/events/assets/images/blood-anim.webp b/files/events/assets/images/blood-anim.webp
similarity index 100%
rename from events/assets/images/blood-anim.webp
rename to files/events/assets/images/blood-anim.webp
diff --git a/events/assets/images/cobweb-bl.webp b/files/events/assets/images/cobweb-bl.webp
similarity index 100%
rename from events/assets/images/cobweb-bl.webp
rename to files/events/assets/images/cobweb-bl.webp
diff --git a/events/assets/images/cobweb-tr.webp b/files/events/assets/images/cobweb-tr.webp
similarity index 100%
rename from events/assets/images/cobweb-tr.webp
rename to files/events/assets/images/cobweb-tr.webp
diff --git a/events/assets/images/eye.webp b/files/events/assets/images/eye.webp
similarity index 100%
rename from events/assets/images/eye.webp
rename to files/events/assets/images/eye.webp
diff --git a/events/assets/images/jumpscares/1.webp b/files/events/assets/images/jumpscares/1.webp
similarity index 100%
rename from events/assets/images/jumpscares/1.webp
rename to files/events/assets/images/jumpscares/1.webp
diff --git a/events/assets/images/machete.webp b/files/events/assets/images/machete.webp
similarity index 100%
rename from events/assets/images/machete.webp
rename to files/events/assets/images/machete.webp
diff --git a/events/assets/images/sidebar/1.webp b/files/events/assets/images/sidebar/1.webp
similarity index 100%
rename from events/assets/images/sidebar/1.webp
rename to files/events/assets/images/sidebar/1.webp
diff --git a/events/assets/images/skeletons/skeleton1.webp b/files/events/assets/images/skeletons/skeleton1.webp
similarity index 100%
rename from events/assets/images/skeletons/skeleton1.webp
rename to files/events/assets/images/skeletons/skeleton1.webp
diff --git a/events/assets/images/smoke.webp b/files/events/assets/images/smoke.webp
similarity index 100%
rename from events/assets/images/smoke.webp
rename to files/events/assets/images/smoke.webp
diff --git a/events/assets/images/zombies/1.webp b/files/events/assets/images/zombies/1.webp
similarity index 100%
rename from events/assets/images/zombies/1.webp
rename to files/events/assets/images/zombies/1.webp
diff --git a/events/assets/js/banner.js b/files/events/assets/js/banner.js
similarity index 100%
rename from events/assets/js/banner.js
rename to files/events/assets/js/banner.js
diff --git a/events/assets/js/blood.js b/files/events/assets/js/blood.js
similarity index 100%
rename from events/assets/js/blood.js
rename to files/events/assets/js/blood.js
diff --git a/events/assets/js/bones.js b/files/events/assets/js/bones.js
similarity index 100%
rename from events/assets/js/bones.js
rename to files/events/assets/js/bones.js
diff --git a/events/assets/js/eye-tracking.js b/files/events/assets/js/eye-tracking.js
similarity index 100%
rename from events/assets/js/eye-tracking.js
rename to files/events/assets/js/eye-tracking.js
diff --git a/events/assets/js/flashlight.js b/files/events/assets/js/flashlight.js
similarity index 100%
rename from events/assets/js/flashlight.js
rename to files/events/assets/js/flashlight.js
diff --git a/events/assets/js/fog.js b/files/events/assets/js/fog.js
similarity index 100%
rename from events/assets/js/fog.js
rename to files/events/assets/js/fog.js
diff --git a/events/assets/js/haunted.js b/files/events/assets/js/haunted.js
similarity index 100%
rename from events/assets/js/haunted.js
rename to files/events/assets/js/haunted.js
diff --git a/events/assets/js/jumpscare.js b/files/events/assets/js/jumpscare.js
similarity index 100%
rename from events/assets/js/jumpscare.js
rename to files/events/assets/js/jumpscare.js
diff --git a/events/assets/js/sketch.js b/files/events/assets/js/sketch.js
similarity index 100%
rename from events/assets/js/sketch.js
rename to files/events/assets/js/sketch.js
diff --git a/events/assets/js/trickortreat.js b/files/events/assets/js/trickortreat.js
similarity index 100%
rename from events/assets/js/trickortreat.js
rename to files/events/assets/js/trickortreat.js
diff --git a/events/assets/media/Spooky_Scary_Skeletons.mp3 b/files/events/assets/media/Spooky_Scary_Skeletons.mp3
similarity index 100%
rename from events/assets/media/Spooky_Scary_Skeletons.mp3
rename to files/events/assets/media/Spooky_Scary_Skeletons.mp3
diff --git a/events/assets/media/ghostbusters.mp3 b/files/events/assets/media/ghostbusters.mp3
similarity index 100%
rename from events/assets/media/ghostbusters.mp3
rename to files/events/assets/media/ghostbusters.mp3
diff --git a/events/assets/media/haunted/thunder1.mp3 b/files/events/assets/media/haunted/thunder1.mp3
similarity index 100%
rename from events/assets/media/haunted/thunder1.mp3
rename to files/events/assets/media/haunted/thunder1.mp3
diff --git a/events/assets/media/haunted/thunder2.mp3 b/files/events/assets/media/haunted/thunder2.mp3
similarity index 100%
rename from events/assets/media/haunted/thunder2.mp3
rename to files/events/assets/media/haunted/thunder2.mp3
diff --git a/events/assets/media/jumpscares/scream_test_1.mp3 b/files/events/assets/media/jumpscares/scream_test_1.mp3
similarity index 100%
rename from events/assets/media/jumpscares/scream_test_1.mp3
rename to files/events/assets/media/jumpscares/scream_test_1.mp3
diff --git a/events/assets/media/music/CARPENTER_MASTER.mp3 b/files/events/assets/media/music/CARPENTER_MASTER.mp3
similarity index 100%
rename from events/assets/media/music/CARPENTER_MASTER.mp3
rename to files/events/assets/media/music/CARPENTER_MASTER.mp3
diff --git a/events/classes/__init__.py b/files/events/classes/__init__.py
similarity index 100%
rename from events/classes/__init__.py
rename to files/events/classes/__init__.py
diff --git a/events/classes/eventuser.py b/files/events/classes/eventuser.py
similarity index 85%
rename from events/classes/eventuser.py
rename to files/events/classes/eventuser.py
index fa3cca068..b134dd33d 100644
--- a/events/classes/eventuser.py
+++ b/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)
diff --git a/events/helpers/__init__.py b/files/events/helpers/__init__.py
similarity index 100%
rename from events/helpers/__init__.py
rename to files/events/helpers/__init__.py
diff --git a/events/helpers/const.py b/files/events/helpers/const.py
similarity index 100%
rename from events/helpers/const.py
rename to files/events/helpers/const.py
diff --git a/events/helpers/get.py b/files/events/helpers/get.py
similarity index 87%
rename from events/helpers/get.py
rename to files/events/helpers/get.py
index d50808939..e8db19aca 100644
--- a/events/helpers/get.py
+++ b/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:
diff --git a/events/helpers/jinja.py b/files/events/helpers/jinja.py
similarity index 100%
rename from events/helpers/jinja.py
rename to files/events/helpers/jinja.py
diff --git a/events/routes/__init__.py b/files/events/routes/__init__.py
similarity index 100%
rename from events/routes/__init__.py
rename to files/events/routes/__init__.py
diff --git a/events/routes/awards.py b/files/events/routes/awards.py
similarity index 96%
rename from events/routes/awards.py
rename to files/events/routes/awards.py
index 2dccdd0df..70b9ef50f 100644
--- a/events/routes/awards.py
+++ b/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)
diff --git a/events/routes/jinja.py b/files/events/routes/jinja.py
similarity index 70%
rename from events/routes/jinja.py
rename to files/events/routes/jinja.py
index 4217430ee..f8c89a7a5 100644
--- a/events/routes/jinja.py
+++ b/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():
diff --git a/events/routes/routes.py b/files/events/routes/routes.py
similarity index 100%
rename from events/routes/routes.py
rename to files/events/routes/routes.py
diff --git a/events/templates/awards.html b/files/events/templates/awards.html
similarity index 100%
rename from events/templates/awards.html
rename to files/events/templates/awards.html
diff --git a/events/templates/banner_rDrama.html b/files/events/templates/banner_rDrama.html
similarity index 100%
rename from events/templates/banner_rDrama.html
rename to files/events/templates/banner_rDrama.html
diff --git a/events/templates/music.html b/files/events/templates/music.html
similarity index 100%
rename from events/templates/music.html
rename to files/events/templates/music.html
diff --git a/events/templates/sidebar_rDrama.html b/files/events/templates/sidebar_rDrama.html
similarity index 100%
rename from events/templates/sidebar_rDrama.html
rename to files/events/templates/sidebar_rDrama.html
diff --git a/events/templates/spider.html b/files/events/templates/spider.html
similarity index 100%
rename from events/templates/spider.html
rename to files/events/templates/spider.html
diff --git a/files/routes/awards.py b/files/routes/awards.py
index 66be1feac..dda6b15d7 100644
--- a/files/routes/awards.py
+++ b/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)
 
diff --git a/files/templates/event b/files/templates/event
index f8e189d46..bfac8cddf 120000
--- a/files/templates/event
+++ b/files/templates/event
@@ -1 +1 @@
-../../events/templates
\ No newline at end of file
+../events/templates
\ No newline at end of file