Skip to content

fix: 3462 - Update subscriber tier on subscription event. #3463

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

Closed
A-iko wants to merge 1 commit into from
+72 −0
Closed

fix: 3462 - Update subscriber tier on subscription event. #3463

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
7 changes: 7 additions & 0 deletions src/backend/chat/chat-listeners/twitch-chat-listeners.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
});

streamerChatClient.onResub(async (_channel, _user, subInfo, msg) => {
twitchRolesManager.upsertSubscriber({
id: subInfo.userId,
username: msg.userInfo.userName,
displayName: msg.userInfo.displayName,
subTier: subInfo.plan
});

try {
if (subInfo.message != null && subInfo.message.length > 0) {
const firebotChatMessage = await chatHelpers.buildFirebotChatMessage(msg, subInfo.message);
Expand Down
40 changes: 40 additions & 0 deletions src/backend/roles/twitch-roles-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,49 @@ class TwitchRolesManager extends TypedEmitter<Events> {
return this._subscribers;
}

upsertSubscriber(subscriber: Subscriber): void {
if (!subscriber?.id) {
return;
}

const normalizedSubscriber: Subscriber = {
id: subscriber.id,
username: subscriber.username,
displayName: subscriber.displayName,
subTier: this.getRoleForSubTier(subscriber.subTier)
};

const existingSubscriber = this._subscribers.find(s => s.id === subscriber.id);

if (existingSubscriber == null) {
this._subscribers.push(normalizedSubscriber);
this.emit("viewer-role-updated", subscriber.id, "sub", "added");
if (normalizedSubscriber.subTier) {
this.emit("viewer-role-updated", subscriber.id, normalizedSubscriber.subTier, "added");
}
return;
}

const previousSubTier = existingSubscriber.subTier;
existingSubscriber.username = normalizedSubscriber.username;
existingSubscriber.displayName = normalizedSubscriber.displayName;
existingSubscriber.subTier = normalizedSubscriber.subTier;

if (previousSubTier !== normalizedSubscriber.subTier) {
if (previousSubTier) {
this.emit("viewer-role-updated", subscriber.id, previousSubTier, "removed");
}

if (normalizedSubscriber.subTier) {
this.emit("viewer-role-updated", subscriber.id, normalizedSubscriber.subTier, "added");
}
}
}

private getRoleForSubTier(tier: string): string {
let role = "";
switch (tier) {
case "Prime":
case "1000":
role = "tier1";
break;
Expand Down
25 changes: 25 additions & 0 deletions src/backend/streaming-platforms/twitch/api/eventsub/eventsub-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,12 @@ class TwitchEventSubClient {

case "resub":
case "sub":
twitchRolesManager.upsertSubscriber({
id: event.chatterId,
username: event.chatterName,
displayName: event.chatterDisplayName,
subTier: event.isPrime ? "Prime" : event.tier
});
TwitchEventHandlers.sub.triggerSub(
event.chatterName,
event.chatterId,
Expand All @@ -826,6 +832,12 @@ class TwitchEventSubClient {
break;

case "sub_gift":
twitchRolesManager.upsertSubscriber({
id: event.recipientId,
username: event.recipientName,
displayName: event.recipientDisplayName,
subTier: event.tier
});
await TwitchEventHandlers.giftSub.triggerSubGift(
event.chatterDisplayName ?? "An Anonymous Gifter",
event.chatterName,
Expand All @@ -845,6 +857,13 @@ class TwitchEventSubClient {
// IRC chat included this in the event payload. EventSub does not.
const upgradeTier = (await (await event.getBroadcaster()).getSubscriber(event.chatterId)).tier;

twitchRolesManager.upsertSubscriber({
id: event.chatterId,
username: event.chatterName,
displayName: event.chatterDisplayName,
subTier: upgradeTier
});

TwitchEventHandlers.giftSub.triggerSubGiftUpgrade(
event.chatterName,
event.chatterId,
Expand All @@ -857,6 +876,12 @@ class TwitchEventSubClient {
break;

case "prime_paid_upgrade":
twitchRolesManager.upsertSubscriber({
id: event.chatterId,
username: event.chatterName,
displayName: event.chatterDisplayName,
subTier: event.tier
});
TwitchEventHandlers.sub.triggerPrimeUpgrade(
event.chatterName,
event.chatterId,
Expand Down