Skip to content

Commit 325c81f

Browse files
Added old Pubsub format with try except (#232)
1 parent 538f90a commit 325c81f

File tree

1 file changed

+33
-13
lines changed

1 file changed

+33
-13
lines changed

twitchio/rewards.py

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ class CustomReward:
6767
def __init__(self, http: "TwitchHTTP", obj: dict, channel: "PartialUser"):
6868
self._http = http
6969
self._channel = channel
70-
self._broadcaster_id = obj["broadcaster_id"]
70+
71+
try:
72+
self._broadcaster_id = obj["broadcaster_id"]
73+
except KeyError:
74+
self._broadcaster_id = obj["channel_id"]
7175

7276
self.id = obj["id"]
7377
self.image = obj["image"]["url_1x"] if obj["image"] else obj["default_image"]["url_1x"]
@@ -77,18 +81,34 @@ def __init__(self, http: "TwitchHTTP", obj: dict, channel: "PartialUser"):
7781
self.title = obj["title"]
7882
self.prompt = obj["prompt"]
7983
self.input_required = obj["is_user_input_required"]
80-
self.max_per_stream = (
81-
obj["max_per_stream_setting"]["is_enabled"],
82-
obj["max_per_stream_setting"]["max_per_stream"],
83-
)
84-
self.max_per_user_stream = (
85-
obj["max_per_user_per_stream_setting"]["is_enabled"],
86-
obj["max_per_user_per_stream_setting"]["max_per_user_per_stream"],
87-
)
88-
self.cooldown = (
89-
obj["global_cooldown_setting"]["is_enabled"],
90-
obj["global_cooldown_setting"]["global_cooldown_seconds"],
91-
)
84+
85+
try:
86+
self.max_per_stream = (
87+
obj["max_per_stream_setting"]["is_enabled"],
88+
obj["max_per_stream_setting"]["max_per_stream"]
89+
)
90+
self.max_per_user_stream = (
91+
obj["max_per_user_per_stream_setting"]["is_enabled"],
92+
obj["max_per_user_per_stream_setting"]["max_per_user_per_stream"]
93+
)
94+
self.cooldown = (
95+
obj["global_cooldown_setting"]["is_enabled"],
96+
obj["global_cooldown_setting"]["global_cooldown_seconds"],
97+
)
98+
except KeyError:
99+
self.max_per_stream = (
100+
obj["max_per_stream"]["is_enabled"],
101+
obj["max_per_stream"]["max_per_stream"]
102+
)
103+
self.max_per_user_stream = (
104+
obj["max_per_user_per_stream"]["is_enabled"],
105+
obj["max_per_user_per_stream"]["max_per_user_per_stream"]
106+
)
107+
self.cooldown = (
108+
obj["global_cooldown"]["is_enabled"],
109+
obj["global_cooldown"]["global_cooldown_seconds"],
110+
)
111+
92112
self.paused = obj["is_paused"]
93113
self.in_stock = obj["is_in_stock"]
94114
self.redemptions_skip_queue = obj["should_redemptions_skip_request_queue"]

0 commit comments

Comments
 (0)