Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse "read-notifications" message #390

Merged
merged 1 commit into from
Jan 1, 2023
Merged

Parse "read-notifications" message #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...rc/main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/IPubSubMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
@JsonSubTypes.Type(value = WatchPartyVod.class, name = "watchparty-vod"),
@JsonSubTypes.Type(value = CommunityMomentStart.class, name = "active"),
@JsonSubTypes.Type(value = ActiveMultipliersUpdated.class, name = "active-multipliers-updated"),
@JsonSubTypes.Type(value = ReadNotifications.class, name = "read-notifications"),
})
@EqualsAndHashCode
@ToString
Expand Down
25 changes: 25 additions & 0 deletions ...main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/ReadNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package fr.rakambda.channelpointsminer.miner.api.ws.data.message;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.readnotifications.ReadNotificationsData;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;

@JsonTypeName("read-notifications")
@Getter
@EqualsAndHashCode(callSuper = true)
@ToString
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ReadNotifications extends IPubSubMessage{
@JsonProperty("data")
@NotNull
private ReadNotificationsData data;
}
31 changes: 31 additions & 0 deletions ...channelpointsminer/miner/api/ws/data/message/readnotifications/ReadNotificationsData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package fr.rakambda.channelpointsminer.miner.api.ws.data.message.readnotifications;

import com.fasterxml.jackson.annotation.JsonProperty;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.NotificationSummary;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;
import java.util.LinkedList;
import java.util.List;

@NoArgsConstructor
@AllArgsConstructor
@Getter
@EqualsAndHashCode
@ToString
@Builder
public class ReadNotificationsData{
@JsonProperty("notification_ids")
@NotNull
private List<String> notificationIds = new LinkedList<>();
@JsonProperty("display_type")
@NotNull
private String displayType;
@JsonProperty("summary")
@NotNull
private NotificationSummary summary;
}
10 changes: 9 additions & 1 deletion miner/src/main/java/fr/rakambda/channelpointsminer/miner/handler/ClaimMomentHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
import fr.rakambda.channelpointsminer.miner.log.LogContext;
import fr.rakambda.channelpointsminer.miner.miner.IMiner;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;

@Log4j2
@RequiredArgsConstructor
public class ClaimMomentHandler extends PubSubMessageHandlerAdapter{
private final IMiner miner;
Expand All @@ -28,7 +30,13 @@ public void onCommunityMomentStart(@NotNull Topic topic, @NotNull CommunityMomen
.filter(response -> !response.isError())
.map(GQLResponse::getData)
.map(CommunityMomentCalloutClaimData::getMoment)
.filter(moment -> Objects.isNull(moment.getError()))
.filter(moment -> {
if(Objects.isNull(moment.getError())){
return true;
}
log.error("Failed to claim moment due to `{}`", moment.getError());
return false;
})
.map(moment -> new ClaimedMomentEvent(miner, channelId, username, streamer, TimeFactory.now()))
.ifPresent(miner::onEvent);
}
Expand Down
3 changes: 3 additions & 0 deletions ...c/main/java/fr/rakambda/channelpointsminer/miner/handler/PubSubMessageHandlerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.PredictionUpdated;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.RaidGoV2;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.RaidUpdateV2;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.ReadNotifications;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.StreamDown;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.StreamUp;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.UpdateSummary;
Expand Down Expand Up @@ -82,6 +83,8 @@ public void onUpdateSummary(@NotNull Topic topic, @NotNull UpdateSummary message

public void onCommunityMomentStart(@NotNull Topic topic, @NotNull CommunityMomentStart message){}

public void onReadNotifications(@NotNull Topic topic, @NotNull ReadNotifications message){}

@Override
public void handle(@NotNull Topic topic, @NotNull IPubSubMessage message){
for(var clazz : ClassWalker.range(message.getClass(), IPubSubMessage.class)){
Expand Down
10 changes: 8 additions & 2 deletions miner/src/main/java/fr/rakambda/channelpointsminer/miner/runnable/SyncInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package fr.rakambda.channelpointsminer.miner.runnable;

import fr.rakambda.channelpointsminer.miner.streamer.Streamer;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.GQLResponse;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.inventory.InventoryData;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.Inventory;
Expand All @@ -11,6 +10,7 @@
import fr.rakambda.channelpointsminer.miner.factory.TimeFactory;
import fr.rakambda.channelpointsminer.miner.log.LogContext;
import fr.rakambda.channelpointsminer.miner.miner.IMiner;
import fr.rakambda.channelpointsminer.miner.streamer.Streamer;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -80,7 +80,13 @@ private void claimDrop(@NotNull TimeBasedDrop timeBasedDrop){
}

miner.getGqlApi().dropsPageClaimDropRewards(dropInstanceId.get())
.filter(r -> !r.isError())
.filter(r -> {
if(!r.isError()){
return true;
}
log.error("Failed to claim drop due to `{}` | {}", r.getError(), r.getErrors());
return false;
})
.map(r -> new DropClaimedEvent(miner, timeBasedDrop, TimeFactory.now()))
.ifPresent(miner::onEvent);
}
Expand Down
51 changes: 51 additions & 0 deletions ...a/fr/rakambda/channelpointsminer/miner/api/ws/TwitchPubSubWebSocketClientMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.RaidCancelV2;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.RaidGoV2;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.RaidUpdateV2;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.ReadNotifications;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.UpdateSummary;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.ViewCount;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.WatchPartyVod;
Expand All @@ -39,6 +40,7 @@
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionmade.PredictionMadeData;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionresult.PredictionResultData;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.predictionupdated.PredictionUpdatedData;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.readnotifications.ReadNotificationsData;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.ActiveMultipliers;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.Claim;
import fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype.CommunityPointsMultiplier;
Expand Down Expand Up @@ -761,6 +763,55 @@ void onActiveMultipliersUpdated(WebsocketMockServer server){
verify(listener, timeout(MESSAGE_TIMEOUT)).onWebSocketMessage(expected);
}

@Test
void onReadNotifications(WebsocketMockServer server){
server.send(TestUtils.getAllResourceContent("api/ws/readNotifications.json"));

var expected = MessageResponse.builder()
.data(MessageData.builder()
.topic(Topic.builder()
.name(ONSITE_NOTIFICATIONS)
.target("123456789")
.build())
.message(ReadNotifications.builder()
.data(ReadNotificationsData.builder()
.notificationIds(List.of("notification-id"))
.displayType("VIEWER")
.summary(NotificationSummary.builder()
.unseenViewCount(5)
.lastSeenAt(ZonedDateTime.of(2021, 1, 1, 19, 41, 56, 957079333, UTC))
.viewerUnreadCount(8)
.creatorUnreadCount(1)
.summariesByDisplayType(Map.of(
NotificationDisplayType.CREATOR, NotificationSummaryByDisplayType.builder()
.unreadSummary(Summary.builder()
.count(5)
.lastReadAll(ZonedDateTime.of(2021, 1, 1, 20, 41, 56, 957079333, UTC))
.build())
.unseenSummary(Summary.builder()
.count(6)
.lastSeen(ZonedDateTime.of(2021, 1, 1, 21, 41, 56, 957079333, UTC))
.build())
.build(),
NotificationDisplayType.VIEWER, NotificationSummaryByDisplayType.builder()
.unreadSummary(Summary.builder()
.count(7)
.lastReadAll(ZonedDateTime.of(2021, 1, 1, 22, 41, 56, 957079333, UTC))
.build())
.unseenSummary(Summary.builder()
.count(8)
.lastSeen(ZonedDateTime.of(2021, 1, 1, 23, 41, 56, 957079333, UTC))
.build())
.build()
))
.build())
.build())
.build())
.build())
.build();
verify(listener, timeout(MESSAGE_TIMEOUT)).onWebSocketMessage(expected);
}

@BeforeEach
void setUp(WebsocketMockServer server) throws InterruptedException{
var uri = URI.create("ws://127.0.0.1:" + server.getPort());
Expand Down
7 changes: 7 additions & 0 deletions miner/src/test/resources/api/ws/readNotifications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type" : "MESSAGE",
"data" : {
"topic" : "onsite-notifications.123456789",
"message" : "{\"type\":\"read-notifications\",\"data\":{\"notification_ids\":[\"notification-id\"],\"display_type\":\"VIEWER\",\"summary\":{\"unseen_view_count\":5,\"last_seen_at\":\"2021-01-01T19:41:56.957079333Z\",\"viewer_unread_count\":8,\"creator_unread_count\":1,\"summaries_by_display_type\":{\"CREATOR\":{\"unread_summary\":{\"count\":5,\"last_read_all\":\"2021-01-01T20:41:56.957079333Z\"},\"unseen_summary\":{\"count\":6,\"last_seen\":\"2021-01-01T21:41:56.957079333Z\"}},\"VIEWER\":{\"unread_summary\":{\"count\":7,\"last_read_all\":\"2021-01-01T22:41:56.957079333Z\"},\"unseen_summary\":{\"count\":8,\"last_seen\":\"2021-01-01T23:41:56.957079333Z\"}}}}}}"
}
}