fix(match): delayed and subtitled time compatibility

3 files changed, 83 insertions, 77 deletions

diff --git a/src/lib/Database/userBadges.ts b/src/lib/Database/userBadges.ts
index c29f06d5..3ce88d29 100644
--- a/src/lib/Database/userBadges.ts
+++ b/src/lib/Database/userBadges.ts
@@ -2,97 +2,101 @@ import { databaseTimeToDate } from '$lib/Utility/time';
 import supabase from './supabase';
 
 export interface Badge {
-  post?: string;
-  image?: string;
-  description?: string | null;
-  id?: number;
-  time?: string;
-  category?: string | null;
-  hidden?: boolean;
-  source?: string | null;
-  designer?: string | null;
-  shadow_hidden?: boolean;
+	post?: string;
+	image?: string;
+	description?: string | null;
+	id?: number;
+	time?: string;
+	category?: string | null;
+	hidden?: boolean;
+	source?: string | null;
+	designer?: string | null;
+	shadow_hidden?: boolean;
 }
 
 export const getUserBadges = async (userId: number): Promise<Badge[]> => {
-  const { data, error } = await supabase.from('user_badges').select('*').eq('user_id', userId);
+	const { data, error } = await supabase.from('user_badges').select('*').eq('user_id', userId);
 
-  if (error) return [];
+	if (error) return [];
 
-  return data.sort((a, b) =>
-    databaseTimeToDate((a as Badge).time ?? '').getTime() >
-      databaseTimeToDate((b as Badge).time ?? '').getTime()
-      ? -1
-      : 1
-  ) as Badge[];
+	return data.sort((a, b) =>
+		databaseTimeToDate((a as Badge).time ?? '').getTime() >
+		databaseTimeToDate((b as Badge).time ?? '').getTime()
+			? -1
+			: 1
+	) as Badge[];
 };
 
 export const addUserBadge = async (userId: number, badge: Badge) => {
-  const { post, image, description, time, category, hidden, source, designer } = badge;
+	const { post, image, description, time, category, hidden, source, designer } = badge;
 
-  if (post === undefined || image === undefined) return;
+	if (post === undefined || image === undefined) return;
 
-  if (time) {
-    await supabase.from('user_badges').insert({
-      user_id: userId,
-      post,
-      image,
-      description,
-      time,
-      category,
-      hidden,
-      source,
-      designer
-    });
-  } else {
-    await supabase
-      .from('user_badges')
-      .insert({ user_id: userId, post, image, description, category, hidden, source, designer });
-  }
+	if (time) {
+		await supabase.from('user_badges').insert({
+			user_id: userId,
+			post,
+			image,
+			description,
+			time,
+			category,
+			hidden,
+			source,
+			designer
+		});
+	} else {
+		await supabase
+			.from('user_badges')
+			.insert({ user_id: userId, post, image, description, category, hidden, source, designer });
+	}
 };
 
 export const removeUserBadge = async (userId: number, id: number) => {
-  if (!isNaN(id)) await supabase.from('user_badges').delete().eq('id', id).eq('user_id', userId);
+	if (!isNaN(id)) await supabase.from('user_badges').delete().eq('id', id).eq('user_id', userId);
 };
 
 export const updateUserBadge = async (userId: number, id: number, badge: Badge) => {
-  if (badge.post === undefined || badge.image === undefined) return;
+	if (badge.post === undefined || badge.image === undefined) return;
 
-  await supabase
-    .from('user_badges')
-    .update({
-      post: badge.post,
-      image: badge.image,
-      description: badge.description,
-      category: badge.category,
-      time: badge.time,
-      hidden: badge.hidden,
-      source: badge.source,
-      designer: badge.designer
-    })
-    .eq('id', id)
-    .eq('user_id', userId);
+	await supabase
+		.from('user_badges')
+		.update({
+			post: badge.post,
+			image: badge.image,
+			description: badge.description,
+			category: badge.category,
+			time: badge.time,
+			hidden: badge.hidden,
+			source: badge.source,
+			designer: badge.designer
+		})
+		.eq('id', id)
+		.eq('user_id', userId);
 };
 
 export const renameCategory = async (userId: number, oldName: string, newName: string) =>
-  await supabase
-    .from('user_badges')
-    .update({ category: newName })
-    .eq('category', oldName)
-    .eq('user_id', userId);
+	await supabase
+		.from('user_badges')
+		.update({ category: newName })
+		.eq('category', oldName)
+		.eq('user_id', userId);
 
 export const removeAllUserBadges = async (userId: number) =>
-  await supabase.from('user_badges').delete().eq('user_id', userId);
+	await supabase.from('user_badges').delete().eq('user_id', userId);
 
 export const migrateCategory = async (userId: number, oldName: string, newName: string) =>
-  await supabase
-    .from('user_badges')
-    .update({ category: newName })
-    .eq('category', oldName)
-    .eq('user_id', userId);
+	await supabase
+		.from('user_badges')
+		.update({ category: newName })
+		.eq('category', oldName)
+		.eq('user_id', userId);
 
 export const setShadowHidden = async (userId: number, shadowHide: boolean) =>
-  await supabase.from('user_badges').update({ shadow_hidden: shadowHide }).eq('user_id', userId);
+	await supabase.from('user_badges').update({ shadow_hidden: shadowHide }).eq('user_id', userId);
 
 export const setShadowHiddenBadge = async (userId: number, id: number, shadowHide: boolean) =>
-  await supabase.from('user_badges').update({ shadow_hidden: shadowHide }).eq('id', id).eq('user_id', userId);
+	await supabase
+		.from('user_badges')
+		.update({ shadow_hidden: shadowHide })
+		.eq('id', id)
+		.eq('user_id', userId);
diff --git a/src/lib/List/Anime/CleanAnimeList.svelte b/src/lib/List/Anime/CleanAnimeList.svelte
index 60d46a07..c55de6d7 100644
--- a/src/lib/List/Anime/CleanAnimeList.svelte
+++ b/src/lib/List/Anime/CleanAnimeList.svelte
@@ -140,11 +140,7 @@
 				{#if !completed}
 					[{anime.nextAiringEpisode?.episode === -1
 						? '?'
-						: (anime.nextAiringEpisode?.episode || 1) -
-						  ((anime.nextAiringEpisode?.airingAt || 999) <
-						  (anime.nextAiringEpisode?.nativeAiringAt || 0)
-								? 2
-								: 1)}]
+						: (anime.nextAiringEpisode?.episode || 1) - 1}]
 					<span class:countdown={$settings.displayCountdownRightAligned}>
 						<AiringTime originalAnime={anime} {subsPlease} />
 					</span>
diff --git a/src/lib/Media/Anime/Airing/Subtitled/match.ts b/src/lib/Media/Anime/Airing/Subtitled/match.ts
index d8534090..b5cdc7d7 100644
--- a/src/lib/Media/Anime/Airing/Subtitled/match.ts
+++ b/src/lib/Media/Anime/Airing/Subtitled/match.ts
@@ -142,6 +142,7 @@ export const injectAiringTime = (anime: Media, subsPlease: SubsPlease | null) =>
 	if (season() !== anime.season) return anime;
 
 	const airingAt = anime.nextAiringEpisode?.airingAt;
+	const now = new Date();
 	// const nativeUntilAiring = airingAt
 	// 	? Math.round((airingAt - Date.now() / 1000) * 100) / 100
 	// 	: undefined;
@@ -180,13 +181,18 @@ export const injectAiringTime = (anime: Media, subsPlease: SubsPlease | null) =>
 		}
 	}
 
-	if (
-		airingAt &&
-		nativeTime.getTime() !== time.getTime() &&
-		nativeTime.getTime() - time.getTime() > 24 * 60 * 60 * 1000 &&
-		nativeTime.getTime() - Date.now() < 7 * 24 * 60 * 60 * 1000
-	)
+	if (now >= nativeTime && now < time) {
 		nextEpisode -= 1;
+	}
+
+	if (nativeTime.getTime() - now.getTime() > 7 * 24 * 60 * 60 * 1000) {
+		const beforeTime = time;
+
+		time = nativeTime;
+
+		time.setHours(beforeTime.getHours());
+		time.setMinutes(beforeTime.getMinutes());
+	}
 
 	return {
 		...anime,