Merge 42e954428b into e986baa0aa

chore: release 3.9.0

lib/modules/home/sections/recent.dart

@@ -9,7 +9,7 @@ import 'package:spotube/provider/history/recent.dart';
 
 class HomeRecentlyPlayedSection extends HookConsumerWidget {
   const HomeRecentlyPlayedSection({super.key});
-
+    
   @override
   Widget build(BuildContext context, ref) {
     final history = ref.watch(recentlyPlayedItems);
@@ -20,17 +20,20 @@ class HomeRecentlyPlayedSection extends HookConsumerWidget {
       return const SizedBox();
     }
 
+    final uniqueItems = <dynamic>{};
+    final filteredItems = [
+      for (final item in historyData)
+        if (item.playlist != null && item.playlist?.id != null && uniqueItems.add(item.playlist!.id!))
+          item.playlist
+        else if (item.album != null && item.album?.id != null && uniqueItems.add(item.album?.id))
+          item.album
+    ];
+
     return Skeletonizer(
       enabled: history.isLoading,
       child: HorizontalPlaybuttonCardView(
         title: Text(context.l10n.recently_played),
-        items: [
+        items: filteredItems,
-          for (final item in historyData)
-            if (item.playlist != null)
-              item.playlist
-            else if (item.album != null)
-              item.album
-        ],
         hasNextPage: false,
         isLoadingNextPage: false,
         onFetchMore: () {},

lib/services/sourced_track/sources/youtube.dart

@@ -251,19 +251,18 @@ class YoutubeSourcedTrack extends SourcedTrack {
             .map((YoutubeVideoInfo videoInfo) {
               final ytWords = videoInfo.title
                   .toLowerCase()
-                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                  .replaceAll(RegExp(r'[^\p{L}\p{N}\p{Z}]+', unicode: true), '')
-                  .split(RegExp(r'\s+'))
+                  .split(RegExp(r'\p{Z}+', unicode: true))
                   .where((item) => item.isNotEmpty);
               final spWords = track.name!
                   .toLowerCase()
-                  .replaceAll(RegExp(r'\((.*)\)'), '')
+                  .replaceAll(RegExp(r'[^\p{L}\p{N}\p{Z}]+', unicode: true), '')
-                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                  .split(RegExp(r'\p{Z}+', unicode: true))
-                  .split(RegExp(r'\s+'))
                   .where((item) => item.isNotEmpty);
-              // Word match to filter out unrelated results
+              // Single word and duration match with 3 second tolerance
-              final matchCount =
+              if (ytWords.any((word) => spWords.contains(word)) &&
-                  ytWords.where((word) => spWords.contains(word)).length;
+                  (videoInfo.duration - track.duration!)
-              if (matchCount > spWords.length ~/ 2) {
+                      .abs().inMilliseconds <= 3000) {
                 return videoInfo;
               }
               return null;