Skip to content

Commit 050bb42

Browse files
committed
Add display_name to PartialUser
1 parent 65d4518 commit 050bb42

21 files changed

+327
-169
lines changed

twitchio/models/bits.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class BitLeaderboardUser:
9898
__slots__ = ("user", "rank", "score")
9999

100100
def __init__(self, data: BitsLeaderboardResponseData, *, http: HTTPClient) -> None:
101-
self.user: PartialUser = PartialUser(data["user_id"], data["user_login"], http=http)
101+
self.user: PartialUser = PartialUser(data["user_id"], data["user_login"], data["user_name"], http=http)
102102
self.rank: int = int(data["rank"])
103103
self.score: int = int(data["score"])
104104

@@ -277,7 +277,9 @@ class ExtensionTransaction:
277277
def __init__(self, data: ExtensionTransactionsResponseData, *, http: HTTPClient) -> None:
278278
self.id: str = data["id"]
279279
self.timestamp: datetime.datetime = parse_timestamp(data["timestamp"])
280-
self.broadcaster = PartialUser(data["broadcaster_id"], data["broadcaster_login"], http=http)
280+
self.broadcaster = PartialUser(
281+
data["broadcaster_id"], data["broadcaster_login"], data["broadcaster_name"], http=http
282+
)
281283
self.user = PartialUser(data["user_id"], data["user_login"], http=http)
282284
self.product_type: str = data["product_type"]
283285
self.product_data: ExtensionProductData = ExtensionProductData(data["product_data"])

twitchio/models/channel_points.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ class CustomReward:
144144

145145
def __init__(self, data: CustomRewardsResponseData, *, http: HTTPClient) -> None:
146146
self._http: HTTPClient = http
147-
self.broadcaster: PartialUser = PartialUser(data["broadcaster_id"], data["broadcaster_login"], http=self._http)
147+
self.broadcaster: PartialUser = PartialUser(
148+
data["broadcaster_id"], data["broadcaster_login"], data["broadcaster_name"], http=self._http
149+
)
148150
self._image: CustomRewardsResponseImage | None = data.get("image")
149151
self.id: str = data["id"]
150152
self.title: str = data["title"]
@@ -415,7 +417,7 @@ def __init__(
415417
self.redeemed_at: datetime.datetime = parse_timestamp(data["redeemed_at"])
416418
self.reward: CustomReward = parent_reward
417419
self._http: HTTPClient = http
418-
self.user: PartialUser = PartialUser(data["user_id"], data["user_login"], http=self._http)
420+
self.user: PartialUser = PartialUser(data["user_id"], data["user_login"], data["broadcaster_name"], http=self._http)
419421

420422
def __repr__(self) -> str:
421423
return f"<CustomRewardRedemption id={self.id} status={self.status} redeemed_at={self.redeemed_at}>"

twitchio/models/channels.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ChannelEditor:
6868
__slots__ = ("user", "created_at")
6969

7070
def __init__(self, data: ChannelEditorsResponseData, *, http: HTTPClient) -> None:
71-
self.user = PartialUser(data["user_id"], data["user_name"], http=http)
71+
self.user = PartialUser(data["user_id"], data["user_name"].lower(), data["user_name"], http=http)
7272
self.created_at = parse_timestamp(data["created_at"])
7373

7474
def __repr__(self) -> str:
@@ -90,7 +90,9 @@ class FollowedChannelsEvent:
9090
__slots__ = ("broadcaster", "followed_at")
9191

9292
def __init__(self, data: FollowedChannelsResponseData, *, http: HTTPClient) -> None:
93-
self.broadcaster = PartialUser(data["broadcaster_id"], data["broadcaster_login"], http=http)
93+
self.broadcaster = PartialUser(
94+
data["broadcaster_id"], data["broadcaster_login"], data["broadcaster_name"], http=http
95+
)
9496
self.followed_at = parse_timestamp(data["followed_at"])
9597

9698
def __repr__(self) -> str:
@@ -133,7 +135,7 @@ class ChannelFollowerEvent:
133135
__slots__ = ("user", "followed_at")
134136

135137
def __init__(self, data: ChannelFollowersResponseData, *, http: HTTPClient) -> None:
136-
self.user = PartialUser(data["user_id"], data["user_login"], http=http)
138+
self.user = PartialUser(data["user_id"], data["user_login"], data["user_name"], http=http)
137139
self.followed_at = parse_timestamp(data["followed_at"])
138140

139141
def __repr__(self) -> str:
@@ -201,7 +203,7 @@ class ChannelInfo:
201203
)
202204

203205
def __init__(self, data: ChannelInformationResponseData, *, http: HTTPClient) -> None:
204-
self.user = PartialUser(data["broadcaster_id"], data["broadcaster_name"], http=http)
206+
self.user = PartialUser(data["broadcaster_id"], data["broadcaster_name"], data["broadcaster_name"], http=http)
205207
self.game_id: str = data["game_id"]
206208
self.game_name: str = data["game_name"]
207209
self.title: str = data["title"]

twitchio/models/charity.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ class CharityCampaign:
7272

7373
def __init__(self, data: CharityCampaignResponseData, *, http: HTTPClient) -> None:
7474
self.id: str = data["id"]
75-
self.broadcaster: PartialUser = PartialUser(data["broadcaster_id"], data["broadcaster_login"], http=http)
75+
self.broadcaster: PartialUser = PartialUser(
76+
data["broadcaster_id"], data["broadcaster_login"], data["broadcaster_name"], http=http
77+
)
7678
self.name: str = data["charity_name"]
7779
self.description: str = data["charity_description"]
7880
self.logo: Asset = Asset(data["charity_logo"], http=http, dimensions=(100, 100))
@@ -138,6 +140,6 @@ class CharityDonation:
138140
def __init__(self, data: CharityCampaignDonationsResponseData, *, http: HTTPClient) -> None:
139141
self._http: HTTPClient = http
140142
self.id: str = data["id"]
141-
self.user: PartialUser = PartialUser(data["user_id"], data["user_login"], http=http)
143+
self.user: PartialUser = PartialUser(data["user_id"], data["user_login"], data["user_name"], http=http)
142144
self.campaign_id: str = data["campaign_id"]
143145
self.amount: CharityValues = CharityValues(data["amount"])

twitchio/models/chat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class ChatterColor:
104104
__slots__ = ("user", "_colour")
105105

106106
def __init__(self, data: UserChatColorResponseData, *, http: HTTPClient) -> None:
107-
self.user = PartialUser(data["user_id"], data["user_login"], http=http)
107+
self.user = PartialUser(data["user_id"], data["user_login"], data["user_name"], http=http)
108108
self._colour: Colour = Colour.from_hex(data["color"])
109109

110110
def __repr__(self) -> str:

twitchio/models/clips.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,12 @@ def __init__(self, data: ClipsResponseData, *, http: HTTPClient) -> None:
103103
self.id: str = data["id"]
104104
self.url: str = data["url"]
105105
self.embed_url: str = data["embed_url"]
106-
self.broadcaster: PartialUser = PartialUser(data["broadcaster_id"], data["broadcaster_name"], http=http)
107-
self.creator: PartialUser = PartialUser(data["creator_id"], data["creator_name"], http=http)
106+
self.broadcaster: PartialUser = PartialUser(
107+
data["broadcaster_id"], data["broadcaster_name"].lower(), data["broadcaster_name"], http=http
108+
)
109+
self.creator: PartialUser = PartialUser(
110+
data["creator_id"], data["creator_name"].lower(), data["creator_name"], http=http
111+
)
108112
self.video_id: str = data["video_id"]
109113
self.game_id: str = data["game_id"]
110114
self.language: str = data["language"]

0 commit comments

Comments
 (0)