From ac66606135ea7ca3c6322adcc12b8cf7ae5fe31f Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Wed, 9 Sep 2020 03:45:00 +0200
Subject: [PATCH] Including networks in filter count. Preserving query between
 date ranges. Allowing --latest to be used without --last.

---
 assets/components/filters/channel-filter.vue | 4 ++--
 assets/components/filters/filter-bar.vue     | 6 +++---
 src/updates.js                               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/components/filters/channel-filter.vue b/assets/components/filters/channel-filter.vue
index 57f09769..8df6c133 100644
--- a/assets/components/filters/channel-filter.vue
+++ b/assets/components/filters/channel-filter.vue
@@ -4,9 +4,9 @@
 			<Icon icon="antenna" />
 
 			<div
-				v-if="selectedChannels.length > 0"
+				v-if="selectedChannels.length + selectedNetworks.length > 0"
 				class="filter-applied"
-			>{{ selectedChannels.length }} {{ selectedChannels.length > 1 ? 'channels' : 'channel' }}</div>
+			>{{ selectedChannels.length + selectedNetworks.length }} {{ selectedChannels.length + selectedNetworks.length > 1 ? 'channels' : 'channel' }}</div>
 
 			<div
 				v-else
diff --git a/assets/components/filters/filter-bar.vue b/assets/components/filters/filter-bar.vue
index c1ec3505..3ab64f8e 100644
--- a/assets/components/filters/filter-bar.vue
+++ b/assets/components/filters/filter-bar.vue
@@ -2,19 +2,19 @@
 	<div class="filter-bar noselect">
 		<div class="sort">
 			<router-link
-				:to="{ params: { range: 'latest', pageNumber: 1 } }"
+				:to="{ params: { range: 'latest', pageNumber: 1 }, query: $route.query }"
 				:class="{ active: $route.name === 'latest' || range === 'latest' }"
 				class="range range-button"
 			>Latest</router-link>
 
 			<router-link
-				:to="{ params: { range: 'upcoming', pageNumber: 1 } }"
+				:to="{ params: { range: 'upcoming', pageNumber: 1 }, query: $route.query }"
 				:class="{ active: $route.name === 'upcoming' || range === 'upcoming' }"
 				class="range-button"
 			>Upcoming</router-link>
 
 			<router-link
-				:to="{ params: { range: 'new', pageNumber: 1 } }"
+				:to="{ params: { range: 'new', pageNumber: 1 }, query: $route.query }"
 				:class="{ active: $route.name === 'new' || range === 'new' }"
 				class="range-button"
 			>New</router-link>
diff --git a/src/updates.js b/src/updates.js
index 7e7375ca..2df75da1 100644
--- a/src/updates.js
+++ b/src/updates.js
@@ -111,7 +111,7 @@ async function scrapeReleases(scraper, entity, preData, upcoming = false, page =
 }
 
 async function scrapeLatestReleases(scraper, entity, preData) {
-	if (!argv.latest || !scraper.fetchLatest) {
+	if ((!argv.latest && !argv.last) || !scraper.fetchLatest) {
 		return emptyReleases;
 	}