events: initialize event_v properly

pull/31/head
justcool393 2022-11-29 14:35:28 -06:00
parent 67bfe5a5bd
commit 03e7b4c6a2
3 changed files with 7 additions and 3 deletions

View File

@ -1,10 +1,11 @@
from typing import Union
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) -> EventUser:
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:

View File

@ -1,4 +1,4 @@
{% if not (v and v.poor) and (not event_v or event_v.event_music) and not (sub and sub.name == 'music') %}
{% 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' %}

View File

@ -80,6 +80,9 @@ def get_logged_in_user():
abort(403)
g.v = v
if HOLIDAY_EVENT:
from files.events.helpers.get import get_or_create_event_user
g.event_v = get_or_create_event_user(v, g.db)
if v:
v.poor = session.get('poor')