From 644e46ff75b5c1b6ba745d7abc860f9fa5a650fe Mon Sep 17 00:00:00 2001
From: madkarmaa <madkarma99@gmail.com>
Date: Wed, 4 Sep 2024 18:25:18 +0200
Subject: [PATCH] feat: filter ann by channel

+ revert queries lib to v4
---
 package-lock.json                         | 22 ++++++----------------
 package.json                              |  2 +-
 src/layout/Announcements/CardsList.svelte |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ede3a122..44556157 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
 				"@tanstack/query-core": "^4.36.1",
 				"@tanstack/query-persist-client-core": "^4.36.1",
 				"@tanstack/query-sync-storage-persister": "^4.36.1",
-				"@tanstack/svelte-query": "^5.54.1",
+				"@tanstack/svelte-query": "^4.36.1",
 				"datetrigger": "^1.1.1",
 				"moment": "^2.30.1"
 			},
@@ -1524,29 +1524,19 @@
 			}
 		},
 		"node_modules/@tanstack/svelte-query": {
-			"version": "5.54.1",
-			"resolved": "https://registry.npmjs.org/@tanstack/svelte-query/-/svelte-query-5.54.1.tgz",
-			"integrity": "sha512-Vf2tkXj6a23gxm+vduzkm1anqH1rxj9HcYen1v9yNAzMAmBkWgGh5pcOTTj0D4Vdz1YpiP4RdbWAqlkPvHE17g==",
+			"version": "4.36.1",
+			"resolved": "https://registry.npmjs.org/@tanstack/svelte-query/-/svelte-query-4.36.1.tgz",
+			"integrity": "sha512-5fj79QuAu5HuS6G/fairU6ywgILXfs4TGl3+Xc9+MBlmB1aPoQBvGsgJrNyhqvXQcnxro8wDNyZOH8S+Qitycw==",
 			"license": "MIT",
 			"dependencies": {
-				"@tanstack/query-core": "5.54.1"
+				"@tanstack/query-core": "4.36.1"
 			},
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/tannerlinsley"
 			},
 			"peerDependencies": {
-				"svelte": "^3.54.0 || ^4.0.0 || ^5.0.0-next.0"
-			}
-		},
-		"node_modules/@tanstack/svelte-query/node_modules/@tanstack/query-core": {
-			"version": "5.54.1",
-			"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.54.1.tgz",
-			"integrity": "sha512-hKS+WRpT5zBFip21pB6Jx1C0hranWQrbv5EJ7qPoiV5MYI3C8rTCqWC9DdBseiPT1JgQWh8Y55YthuYZNiw3Xw==",
-			"license": "MIT",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/tannerlinsley"
+				"svelte": ">=3 <5"
 			}
 		},
 		"node_modules/@types/cookie": {
diff --git a/package.json b/package.json
index 1d275ab9..80c22663 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
 		"@tanstack/query-core": "^4.36.1",
 		"@tanstack/query-persist-client-core": "^4.36.1",
 		"@tanstack/query-sync-storage-persister": "^4.36.1",
-		"@tanstack/svelte-query": "^5.54.1",
+		"@tanstack/svelte-query": "^4.36.1",
 		"datetrigger": "^1.1.1",
 		"moment": "^2.30.1"
 	}
diff --git a/src/layout/Announcements/CardsList.svelte b/src/layout/Announcements/CardsList.svelte
index 234e6b4b..30fa3bea 100644
--- a/src/layout/Announcements/CardsList.svelte
+++ b/src/layout/Announcements/CardsList.svelte
@@ -20,7 +20,7 @@
 
 <div class="announcements-list">
 	<Query {query} let:data>
-		{#each data.announcements as ann (ann.id)}
+		{#each channel ? data.announcements.filter((a) => a.channel === channel) : data.announcements as ann (ann.id)}
 			<AnnouncementCard title={ann.title} author={ann.author} created_at={ann.createdAt.value}>
 				<svelte:fragment slot="channel">
 					<ChannelChip channel={ann.channel} />