Skip to content

Commit dfaf8c7

Browse files
committed
Update emotes in eventsub messages to handle None
1 parent cfa7bbe commit dfaf8c7

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

twitchio/models/eventsub_.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,7 +1883,8 @@ def __init__(self, payload: ChannelSubscribeMessageEvent, *, http: HTTPClient) -
18831883
self.cumulative_months: int = int(payload["cumulative_months"])
18841884
self.streak_months: int | None = int(payload["streak_months"]) if payload["streak_months"] is not None else None
18851885
self.text: str = payload["message"]["text"]
1886-
self.emotes: list[SubscribeEmote] = [SubscribeEmote(emote) for emote in payload.get("message", {}).get("emotes", [])]
1886+
emotes = payload.get("message", {}).get("emotes", [])
1887+
self.emotes: list[SubscribeEmote] = [SubscribeEmote(emote) for emote in emotes] if emotes is not None else []
18871888

18881889
def __repr__(self) -> str:
18891890
return f"<ChannelSubscriptionMessage broadcaster={self.broadcaster} user={self.user} text={self.text}>"
@@ -2721,7 +2722,8 @@ def __init__(self, payload: ChannelPointsAutoRewardRedemptionEvent, *, http: HTT
27212722
self.user: PartialUser = PartialUser(payload["user_id"], payload["user_login"], payload["user_name"], http=http)
27222723
self.id: str = payload["id"]
27232724
self.text: str = payload["message"]["text"]
2724-
self.emotes: list[ChannelPointsEmote] = [ChannelPointsEmote(emote) for emote in payload["message"]["emotes"]]
2725+
emotes = payload.get("message", {}).get("emotes", [])
2726+
self.emotes: list[ChannelPointsEmote] = [ChannelPointsEmote(emote) for emote in emotes] if emotes is not None else []
27252727
self.user_input: str | None = payload.get("user_input")
27262728
self.redeemed_at: datetime.datetime = parse_timestamp(payload["redeemed_at"])
27272729

twitchio/types_/eventsub.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ class BaseEmoteData(TypedDict):
620620

621621
class BaseMessageData(TypedDict):
622622
text: str
623-
emotes: list[BaseEmoteData]
623+
emotes: list[BaseEmoteData] | None
624624

625625

626626
class SubscribeEmoteData(BaseEmoteData): ...

0 commit comments

Comments
 (0)