Merge pull request #1984 from avrae/nightly

Merging Nightly to Master

cogs5e/models/homebrew/bestiary.py

@@ -415,7 +415,7 @@ def _monster_factory_bestiary_builder(data, bestiary_name):
         la_per_round=data["la_per_round"],
         attacks=attacks,
         proper=data["proper"],
-        image_url="",
+        image_url=data["image_url"],
         spellcasting=spellcasting,
         homebrew=True,
         source=bestiary_name,

cogs5e/sheets/dicecloudv2.py

@@ -133,7 +133,7 @@ async def load_character(self, ctx, args):
         race = None
         subrace = None
         background = None
-        for prop in self._by_type.get("folder") + self._by_type.get("feature") + self._by_type.get("note"):
+        for prop in self._by_type["folder"] + self._by_type["feature"] + self._by_type["note"]:
             if race is None and "race" in prop["tags"]:
                 race = prop.get("name")
             elif subrace is None and "subrace" in prop["tags"]:
@@ -200,7 +200,7 @@ async def get_character(self):
 
         # keep track of which properties' parents weren't registered by the time we reach them
         orphans = collections.defaultdict(lambda: [])  # :'(
-        for prop in self.character_data.get("creatureProperties"):
+        for prop in self.character_data.get("creatureProperties", []):
             # if a property is marked for removal, skip it
             if prop.get("removed"):
                 continue
@@ -255,7 +255,7 @@ def _parse_attributes(self) -> (int, int, {str: int}, BaseStats, [Skill], [dict]
         consumables = []
 
         # we iterate over all attributes here so we don't have to loop over it multiple times
-        for attr in self._by_type.get("attribute"):
+        for attr in self._by_type["attribute"]:
             if attr.get("inactive") or attr.get("overridden"):
                 continue
             try:
@@ -365,7 +365,7 @@ def get_levels(self) -> Levels:
 
         # setup a default dict for collecting class levels
         levels = collections.defaultdict(lambda: 0)
-        for level in self._by_type.get("class"):
+        for level in self._by_type["class"]:
             try:
                 var_name = level["variableName"]
                 # BloodHunter rather than bloodHunter

dbot.py

@@ -5,6 +5,7 @@
 import sys
 import time
 import traceback
+import gc
 
 
 from redis import asyncio as redis
@@ -118,6 +119,9 @@ def __init__(self, prefix, description=None, **options):
         self.glclient = GameLogClient(self)
         self.glclient.init()
 
+        # lock for garbage collection
+        self.gc_lock = asyncio.Lock()
+
     async def setup_rdb(self):
         return RedisIO(await redis.from_url(url=config.REDIS_URL))
 
@@ -274,7 +278,13 @@ async def on_ready():
 
 @bot.event
 async def on_resumed():
-    log.info("resumed.")
+    if bot.gc_lock.locked():
+        return
+
+    async with bot.gc_lock:
+        await asyncio.sleep(2.0)  # Wait for 2 seconds
+        collected = gc.collect()  # Perform garbage collection
+        log.info(f"Garbage collector: collected {collected} objects.")
 
 
 @bot.listen("on_command_error")

requirements.txt

@@ -7,7 +7,7 @@ d20==1.1.2
 aiobotocore==2.1.0
 redis==4.6.0
 cachetools==4.2.2
-disnake~=2.7.0
+disnake~=2.9.1
 gspread==3.7.0
 httplib2==0.19.0
 launchdarkly-server-sdk==7.2.0