diff --git a/package.json b/package.json index 57324a68..f455e39b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "that-us", - "version": "3.13.7", + "version": "3.13.8", "description": "THAT.us website", "main": "index.js", "type": "module", diff --git a/src/_components/activities/List.svelte b/src/_components/activities/List.svelte index f5108535..e54dfb6c 100644 --- a/src/_components/activities/List.svelte +++ b/src/_components/activities/List.svelte @@ -87,23 +87,27 @@ $: primaryCategorySort = activitiesFiltered.filter( (activity) => - (activity.category == 'FAMILY' ? family : false) || - (activity.category == 'PROFESSIONAL' ? professional : false) || - activities.category == null + (activity.category === 'FAMILY' ? family : false) || + (activity.category === 'PROFESSIONAL' ? professional : false) || + activities.category === null ); $: activitiesLocationCategoryFiltered = primaryCategorySort.filter( (activity) => - (activity.type == 'REGULAR' ? regular : false) || - (activity.type == 'KEYNOTE' ? keynote : false) || - (activity.type == 'WORKSHOP' ? workshop : false) || - (activity.type == 'OPEN_SPACE' ? openSpace : false) + (activity.type === 'REGULAR' ? regular : false) || + (activity.type === 'KEYNOTE' ? keynote : false) || + (activity.type === 'WORKSHOP' ? workshop : false) || + (activity.type === 'OPEN_SPACE' ? openSpace : false) ); $: activitiesTaggedFiltered = selectedFilterTerms.length > 0 - ? activitiesLocationCategoryFiltered.filter((activity) => - selectedFilterTerms.some((tag) => activity.tags.some((t) => t.toLowerCase() === tag)) + ? activitiesLocationCategoryFiltered.filter( + (activity) => + selectedFilterTerms.some((tag) => activity.tags.some((t) => t.toLowerCase() === tag)) || + selectedFilterTerms.some((tag) => + activity.communities.some((c) => c.toLowerCase() === tag.replace('@', '')) + ) ) : activitiesLocationCategoryFiltered;