Skip to content

Commit b9bf892

Browse files
authored
Rely solely on stream up/down events again (#1136)
## Pull Request Etiquette ### Checklist - [x] Tests have been added in relevant areas - [x] Corresponding changes made to the documentation (README.adoc) <!-- (if irrelevant check the box too) --> ### Type of change Internal change <!-- Choose one from "Bug fix" / "New Feature" / "Breaking change" / "Internal change" --> ## Description <!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
1 parent 0468086 commit b9bf892

2 files changed

Lines changed: 27 additions & 19 deletions

File tree

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,25 @@ public void onStreamDown(@NonNull Topic topic, @NonNull StreamDown message){
4343
streamDown(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), message.getServerTime(), true);
4444
}
4545

46-
@Override
47-
public void onBroadcastSettingsUpdate(@NonNull Topic topic, @NonNull BroadcastSettingsUpdate message){
48-
var streamerId = message.getChannelId();
49-
var streamer = miner.getStreamerById(streamerId);
50-
51-
var status = miner.getGqlApi().withIsStreamLive(streamerId);
52-
var streaming = status.map(GQLResponse::getData).map(d -> Objects.nonNull(d.getUser().getStream()));
53-
var memoryStreaming = streamer.map(Streamer::isStreaming).orElse(false);
54-
55-
// Fire event only if we know the current streaming status, and it is different from what we currently have in memory (i.e. the stream status changed and not just some parameters)
56-
var fireEvent = streaming.isPresent() && streaming.get() != memoryStreaming;
57-
58-
if(streaming.orElseGet(() -> !memoryStreaming)){
59-
streamUp(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now(), fireEvent);
60-
}
61-
else{
62-
streamDown(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now(), fireEvent);
63-
}
64-
}
46+
// @Override
47+
// public void onBroadcastSettingsUpdate(@NonNull Topic topic, @NonNull BroadcastSettingsUpdate message){
48+
// var streamerId = message.getChannelId();
49+
// var streamer = miner.getStreamerById(streamerId);
50+
//
51+
// var status = miner.getGqlApi().withIsStreamLive(streamerId);
52+
// var streaming = status.map(GQLResponse::getData).map(d -> Objects.nonNull(d.getUser().getStream()));
53+
// var memoryStreaming = streamer.map(Streamer::isStreaming).orElse(false);
54+
//
55+
// // Fire event only if we know the current streaming status, and it is different from what we currently have in memory (i.e. the stream status changed and not just some parameters)
56+
// var fireEvent = streaming.isPresent() && streaming.get() != memoryStreaming;
57+
//
58+
// if(streaming.orElseGet(() -> !memoryStreaming)){
59+
// streamUp(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now(), fireEvent);
60+
// }
61+
// else{
62+
// streamDown(streamerId, streamer.orElse(null), streamer.map(Streamer::getUsername).orElse(null), TimeFactory.now(), fireEvent);
63+
// }
64+
// }
6565

6666
private void streamUp(@NonNull String streamerId, @Nullable Streamer streamer, @Nullable String username, @NonNull Instant serverTime, boolean fireEvent){
6767
updateStream(streamerId, streamer);

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import fr.rakambda.channelpointsminer.miner.streamer.Streamer;
1919
import fr.rakambda.channelpointsminer.miner.streamer.StreamerSettings;
2020
import fr.rakambda.channelpointsminer.miner.tests.ParallelizableTest;
21+
import org.junit.jupiter.api.Disabled;
2122
import org.mockito.InjectMocks;
2223
import org.mockito.Mock;
2324
import org.mockito.junit.jupiter.MockitoExtension;
@@ -166,6 +167,7 @@ void streamDownUnknown(){
166167
verify(chatClient, never()).leave(any());
167168
}
168169

170+
@Disabled("Rely on stream up/down")
169171
@Test
170172
void broadcastSettingsUpdateAndNotStreamingFromGql(){
171173
try(var timeFactory = mockStatic(TimeFactory.class)){
@@ -189,6 +191,7 @@ void broadcastSettingsUpdateAndNotStreamingFromGql(){
189191
}
190192
}
191193

194+
@Disabled("Rely on stream up/down")
192195
@Test
193196
void broadcastSettingsUpdateAndStreamingFromGql(){
194197
try(var timeFactory = mockStatic(TimeFactory.class)){
@@ -210,6 +213,7 @@ void broadcastSettingsUpdateAndStreamingFromGql(){
210213
}
211214
}
212215

216+
@Disabled("Rely on stream up/down")
213217
@Test
214218
void broadcastSettingsUpdateAndNotStreamingFromGqlButStateDidNotChange(){
215219
try(var timeFactory = mockStatic(TimeFactory.class)){
@@ -232,6 +236,7 @@ void broadcastSettingsUpdateAndNotStreamingFromGqlButStateDidNotChange(){
232236
}
233237
}
234238

239+
@Disabled("Rely on stream up/down")
235240
@Test
236241
void broadcastSettingsUpdateAndStreamingFromGqlButStateDidNotChange(){
237242
try(var timeFactory = mockStatic(TimeFactory.class)){
@@ -254,6 +259,7 @@ void broadcastSettingsUpdateAndStreamingFromGqlButStateDidNotChange(){
254259
}
255260
}
256261

262+
@Disabled("Rely on stream up/down")
257263
@Test
258264
void broadcastSettingsUpdateAndNotStreamingFromMemory(){
259265
try(var timeFactory = mockStatic(TimeFactory.class)){
@@ -276,6 +282,7 @@ void broadcastSettingsUpdateAndNotStreamingFromMemory(){
276282
}
277283
}
278284

285+
@Disabled("Rely on stream up/down")
279286
@Test
280287
void broadcastSettingsUpdateAndStreamingFromMemory(){
281288
try(var timeFactory = mockStatic(TimeFactory.class)){
@@ -299,6 +306,7 @@ void broadcastSettingsUpdateAndStreamingFromMemory(){
299306
}
300307
}
301308

309+
@Disabled("Rely on stream up/down")
302310
@Test
303311
void broadcastSettingsUpdateAndUnknown(){
304312
try(var timeFactory = mockStatic(TimeFactory.class)){

0 commit comments

Comments
 (0)