Skip to content

Commit aaef36e

Browse files
RakambdaRakambda
committed
Disable sending M3U8 calls as it seems to not be needed anymore
1 parent 9c8f7d1 commit aaef36e

3 files changed

Lines changed: 24 additions & 22 deletions

File tree

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/miner/Miner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void start(){
122122

123123
scheduledExecutor.scheduleWithFixedDelay(getUpdateStreamInfo(), 0, 2, MINUTES);
124124
scheduledExecutor.scheduleWithFixedDelay(MinerRunnableFactory.createSendSpadeMinutesWatched(this), 0, 1, MINUTES);
125-
scheduledExecutor.scheduleWithFixedDelay(MinerRunnableFactory.createSendM3u8MinutesWatched(this), 0, 15, SECONDS);
125+
// scheduledExecutor.scheduleWithFixedDelay(MinerRunnableFactory.createSendM3u8MinutesWatched(this), 0, 15, SECONDS); // Doesn't seem to be required anymore
126126
scheduledExecutor.scheduleAtFixedRate(MinerRunnableFactory.createChatWebSocketPing(this), 25, 25, SECONDS);
127127
scheduledExecutor.scheduleAtFixedRate(MinerRunnableFactory.createHermesWebSocketPing(this), 1, 1, MINUTES);
128128
scheduledExecutor.scheduleAtFixedRate(syncInventory, 1, 15, MINUTES);

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/runnable/UpdateStreamInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void run(@NonNull Streamer streamer){
5050

5151
updateVideoInfo(streamer);
5252
updateSpadeUrl(streamer);
53-
updateM3u8Url(streamer);
53+
// updateM3u8Url(streamer); // Doesn't seem to be required anymore
5454
updateBanStatus(streamer);
5555
updatePointsContext(streamer);
5656
updateCampaigns(streamer);

‎miner/src/test/java/fr/rakambda/channelpointsminer/miner/runnable/UpdateStreamInfoTest.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import fr.rakambda.channelpointsminer.miner.miner.IMiner;
2020
import fr.rakambda.channelpointsminer.miner.streamer.Streamer;
2121
import fr.rakambda.channelpointsminer.miner.tests.ParallelizableTest;
22+
import org.junit.jupiter.api.Disabled;
2223
import org.mockito.InjectMocks;
2324
import org.mockito.Mock;
2425
import org.mockito.junit.jupiter.MockitoExtension;
@@ -152,7 +153,7 @@ void updateWithDataNotStreaming(){
152153
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
153154
verify(streamer).setChannelPointsContext(channelPointsContextData);
154155
verify(streamer).setSpadeUrl(null);
155-
verify(streamer).setM3u8Url(null);
156+
// verify(streamer).setM3u8Url(null);
156157
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
157158
verify(streamer).setLastUpdated(NOW);
158159
verify(streamer, never()).setChatBanned(anyBoolean());
@@ -182,7 +183,7 @@ void updateWithDataNotStreamingButWasBefore(){
182183
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(null);
183184
verify(streamer).setChannelPointsContext(null);
184185
verify(streamer).setSpadeUrl(null);
185-
verify(streamer).setM3u8Url(null);
186+
// verify(streamer).setM3u8Url(null);
186187
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
187188
verify(streamer).setLastUpdated(NOW);
188189
verify(streamer).setLastOffline(NOW);
@@ -212,7 +213,7 @@ void updateWithNoDataNotStreaming(){
212213
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(null);
213214
verify(streamer).setChannelPointsContext(null);
214215
verify(streamer).setSpadeUrl(null);
215-
verify(streamer).setM3u8Url(null);
216+
// verify(streamer).setM3u8Url(null);
216217
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
217218
verify(streamer).setLastUpdated(NOW);
218219
verify(streamer, never()).setChatBanned(anyBoolean());
@@ -228,7 +229,7 @@ void updateWithDataStreamingAndSpadeAndM3u8UrlPresent(){
228229

229230
when(streamer.isStreaming()).thenReturn(true);
230231
when(streamer.getSpadeUrl()).thenReturn(spadeUrl);
231-
when(streamer.getM3u8Url()).thenReturn(m3u8Url);
232+
// when(streamer.getM3u8Url()).thenReturn(m3u8Url);
232233
when(gqlApi.videoPlayerStreamInfoOverlayChannel(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseVideoPlayer));
233234
when(gqlApi.channelPointsContext(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseChannelPoints));
234235
when(gqlApi.chatRoomBanStatus(STREAMER_ID, ACCOUNT_ID)).thenReturn(Optional.of(gqlResponseChatRoomBanStatus));
@@ -245,7 +246,7 @@ void updateWithDataStreamingAndSpadeAndM3u8UrlPresent(){
245246
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
246247
verify(streamer).setChannelPointsContext(channelPointsContextData);
247248
verify(streamer, never()).setSpadeUrl(any());
248-
verify(streamer, never()).setM3u8Url(any());
249+
// verify(streamer, never()).setM3u8Url(any());
249250
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
250251
verify(streamer).setLastUpdated(NOW);
251252
verify(streamer).setChatBanned(false);
@@ -261,7 +262,7 @@ void updateWithDataStreamingAndChatBanned(){
261262

262263
when(streamer.isStreaming()).thenReturn(true);
263264
when(streamer.getSpadeUrl()).thenReturn(spadeUrl);
264-
when(streamer.getM3u8Url()).thenReturn(m3u8Url);
265+
// when(streamer.getM3u8Url()).thenReturn(m3u8Url);
265266
when(gqlApi.videoPlayerStreamInfoOverlayChannel(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseVideoPlayer));
266267
when(gqlApi.channelPointsContext(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseChannelPoints));
267268
when(gqlApi.chatRoomBanStatus(STREAMER_ID, ACCOUNT_ID)).thenReturn(Optional.of(gqlResponseChatRoomBanStatus));
@@ -280,7 +281,7 @@ void updateWithDataStreamingAndChatBanned(){
280281
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
281282
verify(streamer).setChannelPointsContext(channelPointsContextData);
282283
verify(streamer, never()).setSpadeUrl(any());
283-
verify(streamer, never()).setM3u8Url(any());
284+
// verify(streamer, never()).setM3u8Url(any());
284285
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
285286
verify(streamer).setLastUpdated(NOW);
286287
verify(streamer).setChatBanned(true);
@@ -290,6 +291,7 @@ void updateWithDataStreamingAndChatBanned(){
290291
}
291292

292293
@Test
294+
@Disabled("M3U8 disabled")
293295
void updateWithDataStreamingAndSpadeAndM3u8UrlMissing(){
294296
try(var timeFactory = mockStatic(TimeFactory.class)){
295297
timeFactory.when(TimeFactory::now).thenReturn(NOW);
@@ -351,7 +353,7 @@ void updateWithDataStreamingAndSpadeAndM3u8UrlMissingButDropsNotActivated(){
351353
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
352354
verify(streamer).setChannelPointsContext(channelPointsContextData);
353355
verify(streamer).setSpadeUrl(spadeUrl);
354-
verify(streamer).setM3u8Url(null);
356+
// verify(streamer).setM3u8Url(null);
355357
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
356358
verify(streamer).setLastUpdated(NOW);
357359
verify(streamer).setChatBanned(false);
@@ -383,7 +385,7 @@ void updateWithDataStreamingAndSpadeUrlMissingAndNotReturned(){
383385
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
384386
verify(streamer).setChannelPointsContext(channelPointsContextData);
385387
verify(streamer, never()).setSpadeUrl(any());
386-
verify(streamer, never()).setM3u8Url(null);
388+
// verify(streamer, never()).setM3u8Url(null);
387389
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
388390
verify(streamer).setLastUpdated(NOW);
389391
verify(streamer).setChatBanned(false);
@@ -401,7 +403,7 @@ void updateWithDataStreamingUpdateCampaign(){
401403
when(streamer.isParticipateCampaigns()).thenReturn(true);
402404
when(streamer.isStreamingGame()).thenReturn(true);
403405
when(streamer.getSpadeUrl()).thenReturn(spadeUrl);
404-
when(streamer.getM3u8Url()).thenReturn(m3u8Url);
406+
// when(streamer.getM3u8Url()).thenReturn(m3u8Url);
405407
when(gqlApi.videoPlayerStreamInfoOverlayChannel(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseVideoPlayer));
406408
when(gqlApi.channelPointsContext(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseChannelPoints));
407409
when(gqlApi.dropsHighlightServiceAvailableDrops(STREAMER_ID)).thenReturn(Optional.of(dropsHighlightServiceAvailableDrops));
@@ -419,7 +421,7 @@ void updateWithDataStreamingUpdateCampaign(){
419421
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
420422
verify(streamer).setChannelPointsContext(channelPointsContextData);
421423
verify(streamer, never()).setSpadeUrl(any());
422-
verify(streamer, never()).setM3u8Url(any());
424+
// verify(streamer, never()).setM3u8Url(any());
423425
verify(streamer).setDropsHighlightServiceAvailableDrops(dropsHighlightServiceAvailableDropsData);
424426
verify(streamer).setLastUpdated(NOW);
425427
verify(streamer).setChatBanned(false);
@@ -441,7 +443,7 @@ void updateWithDataStreamingUpdateCampaignDismissibleAndSettingActivated(){
441443
when(streamer.isDismissKnownGlobalCampaigns()).thenReturn(true);
442444
when(streamer.isStreamingGame()).thenReturn(true);
443445
when(streamer.getSpadeUrl()).thenReturn(spadeUrl);
444-
when(streamer.getM3u8Url()).thenReturn(m3u8Url);
446+
// when(streamer.getM3u8Url()).thenReturn(m3u8Url);
445447
when(gqlApi.videoPlayerStreamInfoOverlayChannel(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseVideoPlayer));
446448
when(gqlApi.channelPointsContext(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseChannelPoints));
447449
when(gqlApi.dropsHighlightServiceAvailableDrops(STREAMER_ID)).thenReturn(Optional.of(dropsHighlightServiceAvailableDrops));
@@ -464,7 +466,7 @@ void updateWithDataStreamingUpdateCampaignDismissibleAndSettingActivated(){
464466
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
465467
verify(streamer).setChannelPointsContext(channelPointsContextData);
466468
verify(streamer, never()).setSpadeUrl(any());
467-
verify(streamer, never()).setM3u8Url(any());
469+
// verify(streamer, never()).setM3u8Url(any());
468470
verify(streamer).setDropsHighlightServiceAvailableDrops(dropsHighlightServiceAvailableDropsData);
469471
verify(streamer).setLastUpdated(NOW);
470472
verify(streamer).setChatBanned(false);
@@ -482,7 +484,7 @@ void updateWithDataStreamingUpdateCampaignNoResponse(){
482484
when(streamer.isParticipateCampaigns()).thenReturn(true);
483485
when(streamer.isStreamingGame()).thenReturn(true);
484486
when(streamer.getSpadeUrl()).thenReturn(spadeUrl);
485-
when(streamer.getM3u8Url()).thenReturn(m3u8Url);
487+
// when(streamer.getM3u8Url()).thenReturn(m3u8Url);
486488
when(gqlApi.videoPlayerStreamInfoOverlayChannel(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseVideoPlayer));
487489
when(gqlApi.channelPointsContext(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseChannelPoints));
488490
when(gqlApi.dropsHighlightServiceAvailableDrops(STREAMER_ID)).thenReturn(Optional.empty());
@@ -500,7 +502,7 @@ void updateWithDataStreamingUpdateCampaignNoResponse(){
500502
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
501503
verify(streamer).setChannelPointsContext(channelPointsContextData);
502504
verify(streamer, never()).setSpadeUrl(any());
503-
verify(streamer, never()).setM3u8Url(any());
505+
// verify(streamer, never()).setM3u8Url(any());
504506
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
505507
verify(streamer).setLastUpdated(NOW);
506508
verify(streamer).setChatBanned(false);
@@ -518,7 +520,7 @@ void updateWithDataStreamingUpdateCampaignNotStreamingGame(){
518520
when(streamer.isParticipateCampaigns()).thenReturn(true);
519521
when(streamer.isStreamingGame()).thenReturn(false);
520522
when(streamer.getSpadeUrl()).thenReturn(spadeUrl);
521-
when(streamer.getM3u8Url()).thenReturn(m3u8Url);
523+
// when(streamer.getM3u8Url()).thenReturn(m3u8Url);
522524
when(gqlApi.videoPlayerStreamInfoOverlayChannel(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseVideoPlayer));
523525
when(gqlApi.channelPointsContext(STREAMER_USERNAME)).thenReturn(Optional.of(gqlResponseChannelPoints));
524526
when(gqlApi.chatRoomBanStatus(STREAMER_ID, ACCOUNT_ID)).thenReturn(Optional.of(gqlResponseChatRoomBanStatus));
@@ -535,7 +537,7 @@ void updateWithDataStreamingUpdateCampaignNotStreamingGame(){
535537
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
536538
verify(streamer).setChannelPointsContext(channelPointsContextData);
537539
verify(streamer, never()).setSpadeUrl(any());
538-
verify(streamer, never()).setM3u8Url(any());
540+
// verify(streamer, never()).setM3u8Url(any());
539541
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
540542
verify(streamer).setLastUpdated(NOW);
541543
verify(streamer).setChatBanned(false);
@@ -562,7 +564,7 @@ void updateSeveral(){
562564
verify(streamer, times(2)).setVideoPlayerStreamInfoOverlayChannel(null);
563565
verify(streamer, times(2)).setChannelPointsContext(null);
564566
verify(streamer, times(2)).setSpadeUrl(null);
565-
verify(streamer, times(2)).setM3u8Url(null);
567+
// verify(streamer, times(2)).setM3u8Url(null);
566568
verify(streamer, times(2)).setDropsHighlightServiceAvailableDrops(null);
567569
verify(streamer, times(2)).setLastUpdated(NOW);
568570
verify(streamer, never()).setChatBanned(false);
@@ -594,7 +596,7 @@ void notUpdatingIfNotNeeded(){
594596
verify(streamer, never()).setVideoPlayerStreamInfoOverlayChannel(any());
595597
verify(streamer, never()).setChannelPointsContext(any());
596598
verify(streamer, never()).setSpadeUrl(any());
597-
verify(streamer, never()).setM3u8Url(any());
599+
// verify(streamer, never()).setM3u8Url(any());
598600
verify(streamer, never()).setDropsHighlightServiceAvailableDrops(any());
599601
verify(streamer, never()).setLastUpdated(any());
600602
verify(streamer, never()).setLastOffline(any());
@@ -624,7 +626,7 @@ void updatingIfNotNeededByManuallyLaunched(){
624626
verify(streamer).setVideoPlayerStreamInfoOverlayChannel(videoPlayerStreamInfoOverlayChannelData);
625627
verify(streamer).setChannelPointsContext(channelPointsContextData);
626628
verify(streamer).setSpadeUrl(null);
627-
verify(streamer).setM3u8Url(null);
629+
// verify(streamer).setM3u8Url(null);
628630
verify(streamer).setDropsHighlightServiceAvailableDrops(null);
629631
verify(streamer).setLastUpdated(NOW);
630632
verify(streamer, never()).setChatBanned(anyBoolean());

0 commit comments

Comments
 (0)