Added separate background fetching: Fixes image corruption issue. Adds rarity background to leaks.

Author: Developer-Mike

bot_helpers/image_helper.py

@@ -18,6 +18,11 @@ def from_url(url, size=512, mode='RGBA'):
 
         return Image.new(mode, (size, size), (0, 0, 0, 0))
 
+def with_background(image, background):
+    background = background.resize(image.size)
+    background.paste(image, (0, 0), image)
+    return background
+
 def from_path(path, size=512):
     image = Image.open(path).convert('RGBA')
 

bot_helpers/rarity_helper.py

@@ -0,0 +1,25 @@
+from bot_helpers import image_helper
+
+RARITY_COLORS = {
+    "Common": "https://media.fortniteapi.io/images/rarities/v2/rarity_common.png",
+    "Epic": "https://media.fortniteapi.io/images/rarities/v2/rarity_epic.png",
+    "Legendary": "https://media.fortniteapi.io/images/rarities/v2/rarity_legendary.png",
+    "Mythic": "https://media.fortniteapi.io/images/rarities/v2/rarity_mythic.png",
+    "Rare": "https://media.fortniteapi.io/images/rarities/v2/rarity_rare.png",
+    "Transcendent": "https://media.fortniteapi.io/images/rarities/v2/rarity_transcendent.png",
+    "Uncommon": "https://media.fortniteapi.io/images/rarities/v2/rarity_uncommon.png",
+
+    "CUBESeries": "https://media.fortniteapi.io/images/rarities/v2/T-Cube-Background.png",
+    "DCUSeries": "https://media.fortniteapi.io/images/rarities/v2/T-BlackMonday-Background.png",
+    "FrozenSeries": "https://media.fortniteapi.io/images/rarities/v2/T_Ui_LavaSeries_Frozen.png",
+    "CreatorCollabSeries": "https://media.fortniteapi.io/images/rarities/v2/T_Ui_CreatorsCollab_Bg.png",
+    "LavaSeries": "https://media.fortniteapi.io/images/rarities/v2/T_Ui_LavaSeries_Bg.png",
+    "MarvelSeries": "https://media.fortniteapi.io/images/rarities/v2/Marvel.png",
+    "PlatformSeries": "https://media.fortniteapi.io/images/rarities/v2/platformseries.png",
+    "ShadowSeries": "https://media.fortniteapi.io/images/rarities/v2/T_Ui_LavaSeries_Shadow.png",
+    "SlurpSeries": "https://media.fortniteapi.io/images/rarities/v2/Slurp.png",
+    "ColumbusSeries": "https://media.fortniteapi.io/images/rarities/v2/ColumbusSeries.png"
+}
+
+def get_background(rarity):
+    return image_helper.from_url(RARITY_COLORS[rarity], mode='RGB')

leaks/leaks.py

@@ -2,7 +2,7 @@
 from PIL import Image, ImageFont, ImageDraw
 from datetime import datetime
 
-from bot_helpers import exception_helper, image_helper, request_helper, post_helper, strings_helper
+from bot_helpers import exception_helper, image_helper, request_helper, post_helper, strings_helper, rarity_helper
 import constants
 
 class LeaksModule:
@@ -24,7 +24,7 @@ def register(self, schedule):
 
     @exception_helper.catch_exceptions()
     def update(self):
-        leaks_json = request_helper.io_request(self._API_LEAKS_URL, {"fields": "id,name,type,images"})
+        leaks_json = request_helper.io_request(self._API_LEAKS_URL, {"fields": "id,name,type,images,rarity,series"})
         leaks_date = self._parse_leaks_date(leaks_json)
         new_items = self._get_newly_leaked_items(leaks_json)
         if len(new_items) == 0: return
@@ -77,8 +77,13 @@ def _generate_icons(self, leaks_json, new_items):
                 continue
 
             # Item Image
-            item_background_url = leak_item['images']['background']
-            icon_image = image_helper.from_url(item_background_url, mode='RGB')
+            item_icon = image_helper.from_url(leak_item['images']['icon'])
+
+            rarity_id = leak_item['rarity']['id']
+            if leak_item['series'] is not None: rarity_id = leak_item['series']['id']
+            item_background = rarity_helper.get_background(rarity_id)
+
+            icon_image = image_helper.with_background(item_icon, item_background)
 
             #Overlay
             icon_image.paste(overlay_image, (0, 0), overlay_image)

main.py

@@ -8,8 +8,9 @@
 for module in modules:
     module.register(schedule)
     print("Initialized module: " + module.__class__.__name__)
-    
-# schedule.run_all()
+print("All modules initialized. Waiting for updates...")
+
+schedule.run_all()
 
 while True:
     schedule.run_pending()

shop/shop.py

@@ -2,7 +2,7 @@
 from PIL import Image, ImageFont, ImageDraw
 from datetime import datetime, timedelta
 
-from bot_helpers import exception_helper, image_helper, request_helper, post_helper, strings_helper
+from bot_helpers import exception_helper, image_helper, request_helper, post_helper, strings_helper, rarity_helper
 import constants
 
 class ShopModule:
@@ -71,7 +71,16 @@ def _generate_icons(self, shop_json, shop_date):
         new_badge = image_helper.from_path(os.path.join(constants.ASSETS_PATH, "new_badge.png"))
 
         for offer_i, offer_json in enumerate(shop_offers_json):
-            item_background_url = offer_json['displayAssets'][0]['background']
+            display_asset = offer_json['displayAssets'][0]
+            item_icon = image_helper.from_url(display_asset['url'])
+
+            item_background_url = display_asset["background_texture"]
+            if item_background_url is None:
+                rarity_id = offer_json['rarity']['id']
+                if offer_json['series'] is not None: rarity_id = offer_json['series']['id']
+                item_background = rarity_helper.get_background(rarity_id)
+            else:
+                item_background = image_helper.from_url(item_background_url)
 
             is_bundle = offer_json['mainType'] == "bundle"
             main_id = ("bundle_" if is_bundle else "") + offer_json['mainId']
@@ -96,7 +105,7 @@ def _generate_icons(self, shop_json, shop_date):
                 days_gone = None
 
             #Save Background
-            icon_image = image_helper.from_url(item_background_url, mode='RGB')
+            icon_image = image_helper.with_background(item_icon, item_background)
 
             #Overlay
             icon_image.paste(overlay_image, (0, 0), overlay_image)

version.txt

@@ -1 +1 @@
-1.1.2
+1.2.0