Adapt the "Last Refresh" filter

As the meaning of `createddate` has changed, we have to adopt another approach which provides similar (but not identical) results.
barijaona · Aug 26, 2024 · bb06760 · bb06760
1 parent 0b979ef
commit bb06760
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 11 deletions.
diff --git a/Vienna/Sources/Application/AppController.m b/Vienna/Sources/Application/AppController.m
@@ -1764,10 +1764,6 @@ -(void)handleFolderNameChange:(NSNotification *)nc
 -(void)handleRefreshStatusChange:(NSNotification *)nc
 {
 	if (self.connecting) {
-		// Save the date/time of this refresh so we do the right thing when
-		// we apply the filter.
-		[[Preferences standardPreferences] setObject:[NSDate date] forKey:MAPref_LastRefreshDate];
-
 		// Toggle the refresh button
 		NSToolbarItem *item = [self toolbarItemWithIdentifier:@"Refresh"];
 		item.action = @selector(cancelAllRefreshesToolbar:);

diff --git a/Vienna/Sources/Main window/ArticleController.m b/Vienna/Sources/Main window/ArticleController.m
@@ -1021,10 +1021,7 @@ - (BOOL)filterArticle:(Article *)article usingMode:(NSInteger)filterMode {
         case VNAFilterUnread:
             return !article.read;
         case VNAFilterLastRefresh: {
-            NSDate *date = article.publicationDate;
-            Preferences *prefs = [Preferences standardPreferences];
-            NSComparisonResult result = [date compare:[prefs objectForKey:MAPref_LastRefreshDate]];
-            return result != NSOrderedAscending;
+            return article.status == ArticleStatusNew || article.status == ArticleStatusUpdated;
         }
         case VNAFilterToday:
             return [NSCalendar.currentCalendar isDateInToday:article.lastUpdate];

diff --git a/Vienna/Sources/Preferences window/Preferences.m b/Vienna/Sources/Preferences window/Preferences.m
@@ -236,7 +236,6 @@ -(NSDictionary *)allocFactoryDefaults
 	defaultValues[MAPref_FilterMode] = [NSNumber numberWithInt:VNAFilterAll];
 	defaultValues[MAPref_MinimumFontSize] = @(MA_Default_MinimumFontSize);
 	defaultValues[MAPref_AutoExpireDuration] = @(MA_Default_AutoExpireDuration);
-	defaultValues[MAPref_LastRefreshDate] = [NSDate distantPast];
 	defaultValues[MAPref_Layout] = [NSNumber numberWithInt:VNALayoutReport];
 	defaultValues[MAPref_NewArticlesNotification] = [NSNumber numberWithInt:0];
 	defaultValues[MAPref_EmptyTrashNotification] = [NSNumber numberWithInt:VNAEmptyTrashWithWarning];

diff --git a/Vienna/Sources/Shared/Constants.h b/Vienna/Sources/Shared/Constants.h
@@ -87,7 +87,6 @@ extern NSString * const MAPref_UseJavaScript;
 extern NSString * const MAPref_CachedArticleGUID;
 extern NSString * const MAPref_ArticleListSortOrders;
 extern NSString * const MAPref_FilterMode;
-extern NSString * const MAPref_LastRefreshDate;
 extern NSString * const MAPref_TabList;
 extern NSString * const MAPref_TabTitleDictionary;
 extern NSString * const MAPref_Layout;

diff --git a/Vienna/Sources/Shared/Constants.m b/Vienna/Sources/Shared/Constants.m
@@ -87,7 +87,6 @@
 NSString * const MAPref_CachedArticleGUID = @"CachedArticleGUID";
 NSString * const MAPref_ArticleListSortOrders = @"ArticleListSortOrders";
 NSString * const MAPref_FilterMode = @"FilterMode";
-NSString * const MAPref_LastRefreshDate = @"LastRefreshDate";
 NSString * const MAPref_TabList = @"TabList";
 NSString * const MAPref_TabTitleDictionary = @"TabTitleDict";
 NSString * const MAPref_Layout = @"Layout";