fix conflict

2021-06-25 20:33:22 -05:00
parent 34f6c5db10 462ba84809
commit 2a32e56873
7 changed files with 35 additions and 14 deletions
--- a/discord/sticker.py
+++ b/discord/sticker.py
@@ -76,7 +76,7 @@ class Sticker(Hashable):
        self.id = int(data['id'])
        self.name = data['name']
        self.description = data['description']
-        self.pack_id = int(data['pack_id'])
+        self.pack_id = int(data.get('pack_id', 0))
        self.format = try_enum(StickerType, data['format_type'])
        self.image = data['asset']