Added auto_clear_notifications feature control flag

Selbi182 · Aug 25, 2024 · 3cb7be0 · 3cb7be0
1 parent a5564b8
commit 3cb7be0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 36 deletions.
diff --git a/DEV_MODE.ini b/DEV_MODE.ini
diff --git a/src/main/java/spotify/bot/properties/FeatureControl.java b/src/main/java/spotify/bot/properties/FeatureControl.java
@@ -40,6 +40,9 @@ public class FeatureControl {
   @Value("${spotify.discovery.crawl.feature.auto_purger:#{true}}")
   private boolean enableAutoPurger;
 
+  @Value("${spotify.discovery.crawl.feature.auto_clear_notifications:#{true}}")
+  private boolean autoClearNotifications;
+
   private final DiscoveryBotLogger logger;
 
   FeatureControl(DiscoveryBotLogger logger) {
@@ -93,4 +96,8 @@ public boolean isForwarderEnabled() {
   public boolean isAutoPurgeEnabled() {
     return enableAutoPurger;
   }
+
+  public boolean isAutoClearNotifications() {
+    return autoClearNotifications;
+  }
 }
diff --git a/src/main/java/spotify/bot/service/CachedArtistService.java b/src/main/java/spotify/bot/service/CachedArtistService.java
@@ -59,7 +59,7 @@ public CachedArtistsContainer getFollowedArtistsIds() throws SQLException, Illeg
       List<Artist> newFollowedArtists = followedArtist.stream()
         .filter(a -> !cachedArtists.contains(a.getId()))
         .collect(Collectors.toList());
-      List<String> newFollowedArtistsIds = followedArtist.stream()
+      List<String> newFollowedArtistsIds = newFollowedArtists.stream()
         .map(Artist::getId)
         .collect(Collectors.toList());
 

diff --git a/src/main/java/spotify/bot/service/DiscoveryAlbumService.java b/src/main/java/spotify/bot/service/DiscoveryAlbumService.java
@@ -65,7 +65,7 @@ public List<AlbumSimplified> getAllAlbumsOfArtists(List<String> followedArtists,
       results.addAll(albumIdsOfSingleArtist);
       if (showProgress) {
         done++;
-        log.info(done + " / " + followedArtists.size());
+        log.debug(done + " / " + followedArtists.size());
       }
     }
     return results;

diff --git a/src/main/java/spotify/controller/MiscController.java b/src/main/java/spotify/controller/MiscController.java
@@ -47,7 +47,7 @@ public class MiscController implements SchedulingConfigurer {
 
   @Override
   public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-    if (featureControl.isPlaylistMetaEnabled()) {
+    if (featureControl.isAutoClearNotifications() && featureControl.isPlaylistMetaEnabled()) {
       taskRegistrar.addFixedDelayTask(this::clearNewIndicatorScheduler, CLEAR_NOTIFIERS_INTERVAL);
     }
   }

diff --git a/templates/application.properties b/templates/application.properties
@@ -38,3 +38,4 @@
 #spotify.discovery.crawl.feature.initial_crawl = false
 #spotify.discovery.crawl.feature.forwarder = false
 #spotify.discovery.crawl.feature.auto_purger = false
+#spotify.discovery.crawl.feature.auto_clear_notifications = false