Minor events fixes

ubyssey · Sep 12, 2024 · a326ba0 · a326ba0
1 parent b791ec8
commit a326ba0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/events/models.py b/events/models.py
@@ -615,13 +615,19 @@ async def cs_ubc_create_event(self, ical_component):
         if event.hash == "":
             event.hash = self.hashing(ical_component.get('summary') + str(ical_component.decoded('dtstart')))
 
-        event.description= "<br>" + ical_component.get('description').replace("&amp;", "&")
-        if "<br>Name:" in event.description and "\nTitle" in event.description:
-            if event.description.index("<br>Name:") < event.description.index("\nTitle"):
-                event.description = event.description.replace(event.description[event.description.index("<br>Name:"):event.description.index("\nTitle")], "")
-        if "\nName:" in event.description and "\nTitle" in event.description:
-            if event.description.index("\nName:") < event.description.index("\nTitle"):
-               event.description = event.description.replace(event.description[event.description.index("\nName:"):event.description.index("\nTitle")], "")
+        if ical_component.get('description', False):
+            event.description= "<br>" + ical_component.get('description').replace("&amp;", "&")
+            if "<br>Name:" in event.description and "\nTitle" in event.description:
+                if event.description.index("<br>Name:") < event.description.index("\nTitle"):
+                    event.description = event.description.replace(event.description[event.description.index("<br>Name:"):event.description.index("\nTitle")], "")
+            if "\nName:" in event.description and "\nTitle" in event.description:
+                if event.description.index("\nName:") < event.description.index("\nTitle"):
+                    event.description = event.description.replace(event.description[event.description.index("\nName:"):event.description.index("\nTitle")], "")
+
+            if "Location: " in ical_component.get('description'):
+                s = ical_component.get('description')[ical_component.get('description').index("Location: ") + len("Location: "):]
+                event.location = s[:s.index("\n")]
+
 
         if isinstance(ical_component.decoded('dtstart'), datetime):
             event.start_time=ical_component.decoded('dtstart').astimezone(timezone.get_current_timezone())
@@ -632,12 +638,9 @@ async def cs_ubc_create_event(self, ical_component):
             event.end_time=ical_component.decoded('dtend').astimezone(timezone.get_current_timezone())
         else:
             event.end_time=datetime.combine(ical_component.decoded('dtend'), time(), tzinfo=timezone.get_current_timezone())
-
-        event.location = ical_component.get('location')
-
-        if "Location: " in ical_component.get('description'):
-            s = ical_component.get('description')[ical_component.get('description').index("Location: ") + len("Location: "):]
-            event.location = s[:s.index("\n")]
+
+        if ical_component.get('location', False):
+            event.location = ical_component.get('location')
 
         event.event_url = ical_component.get("url")
         event.email=""

diff --git a/ubyssey/static_src/src/js/components/Events/calendar.jsx b/ubyssey/static_src/src/js/components/Events/calendar.jsx
@@ -455,7 +455,10 @@ function EventsCalendar({events}) {
             <ul>{legend.map((key, i) =>
                 <li key={i} className={slugify(key)}>
                     <button id={slugify(key)} className={"legend-button" + (hidden.includes(slugify(key)) ? " inactive" : "")}
-                    onClick={(e) => toggleCategory(e.target, searchParams, setSearchParams)} title={key}>{key}</button>
+                    onClick={(e) => toggleCategory(e.target, searchParams, setSearchParams)} title={key}
+                    dangerouslySetInnerHTML={
+                        {__html: key}
+                     }></button>
                 </li>
             )}</ul>
         </div>