Skip to content

Commit cc94947

Browse files
RakambdaRakambda
committed
Post merge
1 parent 4061f1a commit cc94947

7 files changed

Lines changed: 88 additions & 97 deletions

File tree

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/pubsub/data/message/subtype/PointGain.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ public class PointGain{
2020
private int totalPoints;
2121
@JsonProperty("reason_code")
2222
@NotNull
23-
private PointReasonCode reasonCode;
23+
private String reasonCode;
2424
}

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/pubsub/data/message/subtype/PointReasonCode.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/pubsub/TwitchPubSubWebSocketClientMessageTest.java‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
package fr.rakambda.channelpointsminer.miner.api.ws;
22

3-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.ClaimAvailable;
4-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.CommunityMomentStart;
5-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.CreateNotification;
6-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.DropClaim;
7-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.DropProgress;
8-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.PointsEarned;
9-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.PointsSpent;
10-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.PredictionMade;
11-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.PredictionResult;
12-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.PredictionUpdated;
13-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.RaidUpdateV2;
14-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.claimavailable.ClaimAvailableData;
15-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.communitymoment.CommunityMomentStartData;
16-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.createnotification.CreateNotificationData;
17-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.createnotification.Notification;
18-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.dropclaim.DropClaimData;
19-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.dropprogress.DropProgressData;
20-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.Balance;
21-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.PointsEarnedData;
22-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsspent.PointsSpentData;
23-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionmade.PredictionMadeData;
24-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionresult.PredictionResultData;
25-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionupdated.PredictionUpdatedData;
26-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Claim;
27-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PointGain;
28-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Prediction;
29-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultPayload;
30-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultType;
31-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Raid;
32-
import fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.Topic;
33-
import fr.rakambda.channelpointsminer.miner.api.ws.data.response.MessageData;
34-
import fr.rakambda.channelpointsminer.miner.api.ws.data.response.MessageResponse;
3+
import fr.rakambda.channelpointsminer.miner.api.pubsub.ITwitchPubSubWebSocketListener;
4+
import fr.rakambda.channelpointsminer.miner.api.pubsub.TwitchPubSubWebSocketClient;
5+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.ClaimAvailable;
6+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.CommunityMomentStart;
7+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.CreateNotification;
8+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.DropClaim;
9+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.DropProgress;
10+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.PointsEarned;
11+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.PointsSpent;
12+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.PredictionMade;
13+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.PredictionResult;
14+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.PredictionUpdated;
15+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.RaidUpdateV2;
16+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.claimavailable.ClaimAvailableData;
17+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.communitymoment.CommunityMomentStartData;
18+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.createnotification.CreateNotificationData;
19+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.createnotification.Notification;
20+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.dropclaim.DropClaimData;
21+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.dropprogress.DropProgressData;
22+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.Balance;
23+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.PointsEarnedData;
24+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsspent.PointsSpentData;
25+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.predictionmade.PredictionMadeData;
26+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.predictionresult.PredictionResultData;
27+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.predictionupdated.PredictionUpdatedData;
28+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Claim;
29+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PointGain;
30+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Prediction;
31+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultPayload;
32+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultType;
33+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Raid;
34+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.Topic;
35+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.response.MessageData;
36+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.response.MessageResponse;
3537
import fr.rakambda.channelpointsminer.miner.tests.TestUtils;
3638
import fr.rakambda.channelpointsminer.miner.tests.WebsocketMockServer;
3739
import fr.rakambda.channelpointsminer.miner.tests.WebsocketMockServerExtension;
@@ -44,12 +46,12 @@
4446
import java.net.MalformedURLException;
4547
import java.net.URI;
4648
import java.time.ZonedDateTime;
47-
import static fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.TopicName.COMMUNITY_MOMENTS_CHANNEL_V1;
48-
import static fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.TopicName.COMMUNITY_POINTS_USER_V1;
49-
import static fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.TopicName.ONSITE_NOTIFICATIONS;
50-
import static fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.TopicName.PREDICTIONS_USER_V1;
51-
import static fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.TopicName.RAID;
52-
import static fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.TopicName.USER_DROP_EVENTS;
49+
import static fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.TopicName.COMMUNITY_MOMENTS_CHANNEL_V1;
50+
import static fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.TopicName.COMMUNITY_POINTS_USER_V1;
51+
import static fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.TopicName.ONSITE_NOTIFICATIONS;
52+
import static fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.TopicName.PREDICTIONS_USER_V1;
53+
import static fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.TopicName.RAID;
54+
import static fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.TopicName.USER_DROP_EVENTS;
5355
import static java.time.ZoneOffset.UTC;
5456
import static org.mockito.Mockito.timeout;
5557
import static org.mockito.Mockito.verify;

‎miner/src/test/java/fr/rakambda/channelpointsminer/miner/database/DatabaseEventHandlerTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package fr.rakambda.channelpointsminer.miner.database;
22

3-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.Balance;
4-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.PointsEarnedData;
5-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsspent.PointsSpentData;
6-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionresult.PredictionResultData;
7-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Badge;
8-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Event;
9-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.EventStatus;
10-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Outcome;
11-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PointGain;
12-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Prediction;
13-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Predictor;
3+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.Balance;
4+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.PointsEarnedData;
5+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsspent.PointsSpentData;
6+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.predictionresult.PredictionResultData;
7+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Badge;
8+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Event;
9+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.EventStatus;
10+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Outcome;
11+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PointGain;
12+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Prediction;
13+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Predictor;
1414
import fr.rakambda.channelpointsminer.miner.event.impl.ChatMessageEvent;
1515
import fr.rakambda.channelpointsminer.miner.event.impl.EventUpdatedEvent;
1616
import fr.rakambda.channelpointsminer.miner.event.impl.PointsEarnedEvent;

‎miner/src/test/java/fr/rakambda/channelpointsminer/miner/log/discord/DiscordMessageBuilderEmbedTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
import fr.rakambda.channelpointsminer.miner.api.discord.data.Footer;
77
import fr.rakambda.channelpointsminer.miner.api.discord.data.Webhook;
88
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.TimeBasedDrop;
9-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.Balance;
10-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.PointsEarnedData;
11-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsspent.PointsSpentData;
12-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionresult.PredictionResultData;
13-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Event;
14-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Outcome;
15-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.OutcomeColor;
16-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PointGain;
17-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Prediction;
18-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultPayload;
19-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultType;
20-
import fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.Topic;
9+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.Balance;
10+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.PointsEarnedData;
11+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsspent.PointsSpentData;
12+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.predictionresult.PredictionResultData;
13+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Event;
14+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Outcome;
15+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.OutcomeColor;
16+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PointGain;
17+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Prediction;
18+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultPayload;
19+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultType;
20+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.Topic;
2121
import fr.rakambda.channelpointsminer.miner.config.MessageEventConfiguration;
2222
import fr.rakambda.channelpointsminer.miner.event.impl.ClaimAvailableEvent;
2323
import fr.rakambda.channelpointsminer.miner.event.impl.ClaimMomentEvent;

‎miner/src/test/java/fr/rakambda/channelpointsminer/miner/log/discord/DiscordMessageBuilderMessageTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import fr.rakambda.channelpointsminer.miner.api.discord.data.Webhook;
44
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.TimeBasedDrop;
5-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.Balance;
6-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.PointsEarnedData;
7-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsspent.PointsSpentData;
8-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionresult.PredictionResultData;
9-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Event;
10-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Outcome;
11-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.OutcomeColor;
12-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PointGain;
13-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Prediction;
14-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultPayload;
15-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultType;
16-
import fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.Topic;
5+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.Balance;
6+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.PointsEarnedData;
7+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsspent.PointsSpentData;
8+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.predictionresult.PredictionResultData;
9+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Event;
10+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Outcome;
11+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.OutcomeColor;
12+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PointGain;
13+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Prediction;
14+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultPayload;
15+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultType;
16+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.Topic;
1717
import fr.rakambda.channelpointsminer.miner.config.MessageEventConfiguration;
1818
import fr.rakambda.channelpointsminer.miner.event.impl.ClaimAvailableEvent;
1919
import fr.rakambda.channelpointsminer.miner.event.impl.ClaimMomentEvent;

‎miner/src/test/java/fr/rakambda/channelpointsminer/miner/log/telegram/TelegramMessageBuilderMessageTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.TimeBasedDrop;
44
import fr.rakambda.channelpointsminer.miner.api.telegram.data.Message;
5-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.Balance;
6-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsearned.PointsEarnedData;
7-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.pointsspent.PointsSpentData;
8-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionresult.PredictionResultData;
9-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Event;
10-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Outcome;
11-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.OutcomeColor;
12-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PointGain;
13-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Prediction;
14-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultPayload;
15-
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultType;
16-
import fr.rakambda.channelpointsminer.miner.api.ws.data.request.topic.Topic;
5+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.Balance;
6+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsearned.PointsEarnedData;
7+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.pointsspent.PointsSpentData;
8+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.predictionresult.PredictionResultData;
9+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Event;
10+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Outcome;
11+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.OutcomeColor;
12+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PointGain;
13+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.Prediction;
14+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultPayload;
15+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.message.subtype.PredictionResultType;
16+
import fr.rakambda.channelpointsminer.miner.api.pubsub.data.request.topic.Topic;
1717
import fr.rakambda.channelpointsminer.miner.config.MessageEventConfiguration;
1818
import fr.rakambda.channelpointsminer.miner.event.impl.ClaimAvailableEvent;
1919
import fr.rakambda.channelpointsminer.miner.event.impl.ClaimMomentEvent;

0 commit comments

Comments
 (0)