diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..2fbfed103b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "files/events"] + path = files/events + url = https://fsdfsd.net/retards/Blizzard diff --git a/files/events b/files/events new file mode 160000 index 0000000000..883cedfa03 --- /dev/null +++ b/files/events @@ -0,0 +1 @@ +Subproject commit 883cedfa0364673621d4bc63af91bb23f59847b7 diff --git a/files/events/__init__.py b/files/events/__init__.py deleted file mode 100644 index 71d2ada39d..0000000000 --- a/files/events/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -from sqlalchemy import inspect - -from files.helpers.const import AWARDS2, AWARDS_DISABLED -from files.__main__ import engine - -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"): - print("[EVENT] Building event table...") - EventUser.__table__.create(bind=engine, checkfirst=True) - -def _populate_awards(): - temp = {x: AWARDS2[x] for x in AWARDS2 if x not in EVENT_AWARDS} - AWARDS2.clear() - AWARDS2.update(EVENT_AWARDS) - AWARDS2.update(temp) - - for award in EVENT_AWARDS: - if award in AWARDS_DISABLED: - AWARDS_DISABLED.remove(award) - -def event_init(): - _build_table() - -_populate_awards() diff --git a/files/events/assets/css/.gitkeep b/files/events/assets/css/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/assets/css/spooky.css b/files/events/assets/css/spooky.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/assets/fonts/.gitkeep b/files/events/assets/fonts/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/assets/images/.gitkeep b/files/events/assets/images/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/assets/images/sidebar/1.webp b/files/events/assets/images/sidebar/1.webp deleted file mode 100644 index 9066f22a3b..0000000000 Binary files a/files/events/assets/images/sidebar/1.webp and /dev/null differ diff --git a/files/events/assets/js/.gitkeep b/files/events/assets/js/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/assets/media/.gitkeep b/files/events/assets/media/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/classes/__init__.py b/files/events/classes/__init__.py deleted file mode 100644 index b8bfb06645..0000000000 --- a/files/events/classes/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .eventuser import EventUser diff --git a/files/events/classes/eventuser.py b/files/events/classes/eventuser.py deleted file mode 100644 index d8e5d14dd9..0000000000 --- a/files/events/classes/eventuser.py +++ /dev/null @@ -1,20 +0,0 @@ -from sqlalchemy import * -from sqlalchemy.orm import relationship - -from files.classes import Base - -class EventUser(Base): - __tablename__ = "event_users" - id = Column(Integer, ForeignKey("users.id"), primary_key=True) - user = relationship("User", primaryjoin="EventUser.id == User.id") - event_music = Column(Boolean, default=True, nullable=False) - - # start event specific columns - - # end event specific columns - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - def __repr__(self): - return f"<{self.__class__.__name__}(id={self.id})>" diff --git a/files/events/helpers/__init__.py b/files/events/helpers/__init__.py deleted file mode 100644 index 3651c24732..0000000000 --- a/files/events/helpers/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .const import * -from .jinja import * diff --git a/files/events/helpers/const.py b/files/events/helpers/const.py deleted file mode 100644 index ddda308dea..0000000000 --- a/files/events/helpers/const.py +++ /dev/null @@ -1,3 +0,0 @@ -EVENT_AWARDS = { - -} diff --git a/files/events/helpers/get.py b/files/events/helpers/get.py deleted file mode 100644 index f9f6e7385b..0000000000 --- a/files/events/helpers/get.py +++ /dev/null @@ -1,15 +0,0 @@ -from typing import Optional, Union -from sqlalchemy.orm import scoped_session - -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) -> Optional[EventUser]: - if target is None: return None - if isinstance(target, User): target = target.id # type: ignore - user = db.get(EventUser, target) - if not user: - user = EventUser(id=target) - db.add(user) - db.flush() - return user diff --git a/files/events/helpers/jinja.py b/files/events/helpers/jinja.py deleted file mode 100644 index 1ff785df3d..0000000000 --- a/files/events/helpers/jinja.py +++ /dev/null @@ -1,8 +0,0 @@ -EVENT_JINJA_CONST = { - "EVENT_BANNER": "banner_rDrama.html", - "EVENT_SIDEBAR": True, - "EVENT_STYLES": "spooky.css", - "EVENT_AWARDS": True, - "EVENT_MUSIC": "music.html", -} - diff --git a/files/events/routes/__init__.py b/files/events/routes/__init__.py deleted file mode 100644 index d33dc9c138..0000000000 --- a/files/events/routes/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .awards import * -from .jinja import * diff --git a/files/events/routes/awards.py b/files/events/routes/awards.py deleted file mode 100644 index c044007028..0000000000 --- a/files/events/routes/awards.py +++ /dev/null @@ -1,9 +0,0 @@ -from flask import g - -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) - event_v = get_or_create_event_user(v, g.db) - - g.db.add(event_author) diff --git a/files/events/routes/jinja.py b/files/events/routes/jinja.py deleted file mode 100644 index f8c89a7a56..0000000000 --- a/files/events/routes/jinja.py +++ /dev/null @@ -1,6 +0,0 @@ -from files.__main__ import app -from files.events import EVENT_JINJA_CONST - -@app.context_processor -def event_constants(): - return EVENT_JINJA_CONST diff --git a/files/events/templates/.gitkeep b/files/events/templates/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/templates/awards.html b/files/events/templates/awards.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/files/events/templates/banner_rDrama.html b/files/events/templates/banner_rDrama.html deleted file mode 100644 index 9c1abdd46f..0000000000 --- a/files/events/templates/banner_rDrama.html +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/files/events/templates/music.html b/files/events/templates/music.html deleted file mode 100644 index 52bb866bf6..0000000000 --- a/files/events/templates/music.html +++ /dev/null @@ -1,24 +0,0 @@ -{% if not (v and v.poor) and (not g.event_v or g.event_v.event_music) and not (sub and sub.name == 'music') %} - {% if not song %} - {% set path = "assets/media/event/music" %} - {% set song = "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' %} - {% endif %} - -{% endif %} diff --git a/files/events/templates/sidebar_rDrama.html b/files/events/templates/sidebar_rDrama.html deleted file mode 100644 index 37836a4150..0000000000 --- a/files/events/templates/sidebar_rDrama.html +++ /dev/null @@ -1,78 +0,0 @@ -
- - {% if sub %} - {% set image = sub.sidebar_url %} - {% else %} - {% set sidebar_path = "assets/images/event/sidebar" %} - {% set selected_image = listdir('files/' + sidebar_path)|random() %} - {% set image = "/" + sidebar_path + "/" + selected_image + '?v=45' %} - {% endif %} - - {% if request.path != '/sidebar' %} - - sidebar image - - {% endif %} - -

- - - - - - - -

- - {% if sub %} - {% if sub.sidebar_html %} -
{{sub.sidebar_html|safe}}
- {% endif %} - {% if v %} - BROWSE {{HOLE_NAME|upper}}S - {% if v.can_create_hole -%} - CREATE {{HOLE_NAME|upper}} - {%- endif %} - {{HOLE_NAME|upper}} LOG - {% if v.mods(sub.name) %} - {{HOLE_NAME|upper}} SETTINGS - {% endif %} - {% endif %} - {{HOLE_NAME|upper}} MODS - {{HOLE_NAME|upper}} EXILEES - {% else %} - - DIRECTORY - Submit Marseys & Art | Info Megathreads - - BROWSE {{HOLE_NAME|upper}}S - {% if v and v.can_create_hole -%} - CREATE {{HOLE_NAME|upper}} - {%- endif %} - -
-

Rules

-
    -
  1. NO RIGHTWING AGENDAPOSTING.
    2. -
  2. Don't post anything illegal.
    3. -
  3. No sexualizing minors even as a “joke”.
    4. -
  4. No doxing.
    5. -
  5. Using alts to game dramacoin will get you banned.
    6. -
  6. Supporting free speech is an immediate ban.
    7. -
  7. Absolutely NO anti-CCP sentiment.
    8. -
- -

All rules can and likely will be ignored at the discretion of the janitorial staff. Be funny, or at least compelling, and pretty much anything legal is welcome.

- -

𝐜𝐚𝐫𝐩 𝐰𝐨𝐳 𝐞𝐫𝐞

-
- {% endif %} - 
-
-
-
-
-
-
-
-