Do not fire start/stop log events from broadcast settings as it may not be true (streamer can just change the stream settings)

Author: Rakambda

miner/src/main/java/fr/rakambda/channelpointsminer/miner/handler/StreamStartEndHandler.java

@@ -32,14 +32,14 @@ public class StreamStartEndHandler extends PubSubMessageHandlerAdapter{
 	public void onStreamUp(@NotNull Topic topic, @NotNull StreamUp message){
 		var streamerId = topic.getTarget();
 		var streamer = miner.getStreamerById(streamerId);
-		streamUp(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), message.getServerTime());
+		streamUp(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), message.getServerTime(), true);
 	}
 
 	@Override
 	public void onStreamDown(@NotNull Topic topic, @NotNull StreamDown message){
 		var streamerId = topic.getTarget();
 		var streamer = miner.getStreamerById(streamerId);
-		streamDown(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), message.getServerTime());
+		streamDown(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), message.getServerTime(), true);
 	}
 
 	@Override
@@ -48,28 +48,32 @@ public void onBroadcastSettingsUpdate(@NotNull Topic topic, @NotNull BroadcastSe
 		var streamer = miner.getStreamerById(streamerId);
 
 		if(streamer.map(Streamer::isStreaming).orElse(true)){
-			streamDown(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now());
+			streamDown(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now(), false);
 		}
 		else{
-			streamUp(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now());
+			streamUp(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now(), false);
 		}
 	}
 
-	private void streamUp(@NotNull String streamerId, @Nullable Streamer streamer, @Nullable String username, @NotNull Instant serverTime){
+	private void streamUp(@NotNull String streamerId, @Nullable Streamer streamer, @Nullable String username, @NotNull Instant serverTime, boolean fireEvent){
 		updateStream(streamerId, streamer);
 		Optional.ofNullable(streamer)
 				.filter(s -> s.getSettings().isJoinIrc())
 				.map(Streamer::getUsername)
 				.ifPresent(miner.getChatClient()::join);
-		eventManager.onEvent(new StreamUpEvent(streamerId, username, streamer, serverTime));
+		if(fireEvent){
+			eventManager.onEvent(new StreamUpEvent(streamerId, username, streamer, serverTime));
+		}
 	}
 
-	private void streamDown(@NotNull String streamerId, @Nullable Streamer streamer, @Nullable String username, @NotNull Instant serverTime){
+	private void streamDown(@NotNull String streamerId, @Nullable Streamer streamer, @Nullable String username, @NotNull Instant serverTime, boolean fireEvent){
 		updateStream(streamerId, streamer);
 		Optional.ofNullable(streamer)
 				.map(Streamer::getUsername)
 				.ifPresent(miner.getChatClient()::leave);
-		eventManager.onEvent(new StreamDownEvent(streamerId, username, streamer, serverTime));
+		if(fireEvent){
+			eventManager.onEvent(new StreamDownEvent(streamerId, username, streamer, serverTime));
+		}
 	}
 
 	private void updateStream(@Nullable String streamerId, @Nullable Streamer streamer){

miner/src/test/java/fr/rakambda/channelpointsminer/miner/handler/StreamStartEndHandlerTest.java

@@ -162,7 +162,7 @@ void broadcastSettingsUpdateAndNotStreaming(){
 			assertDoesNotThrow(() -> tested.handle(topic, broadcastSettingsUpdateMessage));
 
 			verify(miner).updateStreamerInfos(streamer);
-			verify(eventManager).onEvent(new StreamUpEvent(STREAMER_ID, STREAMER_NAME, streamer, NOW));
+			verify(eventManager, never()).onEvent(any());
 			verify(chatClient, never()).join(any());
 		}
 	}
@@ -184,7 +184,7 @@ void broadcastSettingsUpdateAndStreaming(){
 			assertDoesNotThrow(() -> tested.handle(topic, broadcastSettingsUpdateMessage));
 
 			verify(miner).updateStreamerInfos(streamer);
-			verify(eventManager).onEvent(new StreamDownEvent(STREAMER_ID, STREAMER_NAME, streamer, NOW));
+			verify(eventManager, never()).onEvent(any());
 			verify(chatClient).leave(STREAMER_NAME);
 		}
 	}
@@ -199,7 +199,7 @@ void broadcastSettingsUpdateAndUnknown(){
 			assertDoesNotThrow(() -> tested.handle(topic, broadcastSettingsUpdateMessage));
 
 			verify(miner, never()).schedule(any(Runnable.class), anyLong(), any());
-			verify(eventManager).onEvent(new StreamDownEvent(STREAMER_ID, null, null, NOW));
+			verify(eventManager, never()).onEvent(any());
 			verify(chatClient, never()).leave(STREAMER_NAME);
 		}
 	}