diff --git a/events/models.py b/events/models.py index 3cf7634ea..fa40d5a22 100644 --- a/events/models.py +++ b/events/models.py @@ -322,7 +322,7 @@ async def gothunderbirds_create_event(self, ical_component): ) else: event = await self.filter(event_url=ical_component.get('url')).afirst() - if event.update_mode != 2: + if event.update_mode == 0: # Go Thunderbirds is unqiue because the events are updated after they pass to include the result return None @@ -343,7 +343,7 @@ async def gothunderbirds_create_event(self, ical_component): event.description=" ".join(ical_component.get('description').split(" ")[0:-1]) - splitDesc = ical_component.get('description').split(" ") + splitDesc = ical_component.get('description').replace("[W] ", "").replace("[L] ", "").split("\n")[0].split(" ") i = 0 while splitDesc[i][0].isupper(): i = i + 1 diff --git a/ubyssey/static_src/src/js/components/Events/calendar.jsx b/ubyssey/static_src/src/js/components/Events/calendar.jsx index 73768d335..f53922bad 100644 --- a/ubyssey/static_src/src/js/components/Events/calendar.jsx +++ b/ubyssey/static_src/src/js/components/Events/calendar.jsx @@ -178,7 +178,7 @@ function displayEventTime(start, end) { function eventsTags(event) { var tags = []; - if (event.host != null) { + if (event.host != null && event.host != "") { tags.push(slugify(event.host)); } tags.push(slugify(event.category)); @@ -322,7 +322,7 @@ function EventsCalendar({events}) { } function getHosts(hosts, event) { - if (event.host != null) { + if (event.host != null && event.host != "") { if (!(hosts.includes(event.host))) { hosts.push(event.host); }