From 32a0d6e1e261d0c970db7351f28b668cd39da773 Mon Sep 17 00:00:00 2001
From: Ushie <ushiekane@gmail.com>
Date: Tue, 3 Jun 2025 02:23:08 +0300
Subject: [PATCH] fix: Only show non-archived announcements

---
 src/routes/announcements/AnnouncementBanner.svelte | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/routes/announcements/AnnouncementBanner.svelte b/src/routes/announcements/AnnouncementBanner.svelte
index 0440929..69f8f7c 100644
--- a/src/routes/announcements/AnnouncementBanner.svelte
+++ b/src/routes/announcements/AnnouncementBanner.svelte
@@ -6,6 +6,7 @@
 	import { browser } from '$app/environment';
 	import { createQuery } from '@tanstack/svelte-query';
 	import { queries } from '$data/api';
+	import moment from 'moment';
 
 	let latestUnreadAnnouncement: ResponseAnnouncement | undefined = undefined;
 
@@ -13,8 +14,12 @@
 
 	$: {
 		if ($query.data?.announcements && $query.data.announcements.length > 0) {
-			const announcement = $query.data.announcements[0];
-			if (!$read_announcements.has(announcement.id)) {
+			const nonArchived = $query.data.announcements.filter(
+				(a) => !a.archived_at || moment(a.archived_at).isAfter(moment())
+			);
+			const announcement = nonArchived[0];
+
+			if (announcement && !$read_announcements.has(announcement.id)) {
 				latestUnreadAnnouncement = announcement;
 			} else {
 				latestUnreadAnnouncement = undefined;