rename collage method

commands/_top.py

@@ -0,0 +1,8 @@
+import nerimity
+
+import bot
+
+def setup(bot: bot.Bot):
+    @bot.command(name="topartists", aliases=["ta","topartist"])
+    @bot.slash_command(name="topartists")
+    def topartists(ctx: nerimity.Context, timeframe)

commands/collage.py

@@ -8,89 +8,123 @@ import utils as u
 # from catbox_async_uploader.catbox_async_uploader.enums import LitterboxDuration
 # from pyzxz import ZeroXZero
 
-def setup(bot: bot.Bot):
-    @bot.command(name="chart", aliases=["c", "chartalbum", "albumchart", "collage"])
-    @bot.slash_command(name="chartalbum", description="Generate an album collage.")
-    async def chartalbum(ctx: nerimity.Context, size: str = "3x3", timeframe: str = "7day", username: str = None):
-        temp_msg = None
+async def send_collage(bot: bot.Bot, ctx: nerimity.Context, entity: str, size: str = "3x3", timeframe: str = "7day", username: str = None):
+    temp_msg = None
 
-        if 'x' not in size:
-            await ctx.send(u.error_msg("Please provide a valid size.\nie `/chartalbum 5x5`"))
-            return
+    if 'x' not in size:
+        await ctx.send(u.error_msg(f"Please provide a valid size.\nie `/chart{entity} 5x5`"))
+        return
+
+    if int(size.split('x')[0]) > 5 or int(size.split('x')[1]) > 5:
+        await ctx.send(u.error_msg("Maximum size allowed is 5x5."))
+        return
+    
+    if not username:
+        try: username = await bot.get_lastfm(ctx.author.id)
+        except Exception as e:
+            print(e)
+            await ctx.send(u.error_msg(f"Unknown database error:\n{e}"))
 
-        if int(size.split('x')[0]) > 5 or int(size.split('x')[1]) > 5:
-            await ctx.send(u.error_msg("Maximum size allowed is 5x5."))
-            return
-        
         if not username:
-            try: username = await bot.get_lastfm(ctx.author.id)
+            await ctx.send(u.error_msg("Please provide a Last.fm username (or set yours with `/setfm`)."))
+            print("returned")
+            return
+
+    if username.startswith("[@:"):
+            mentioned = bot.get_user(username[3:-1])
+            try: username = await bot.get_lastfm(mentioned.id)
             except Exception as e:
                 print(e)
                 await ctx.send(u.error_msg(f"Unknown database error:\n{e}"))
 
             if not username:
-                await ctx.send(u.error_msg("Please provide a Last.fm username (or set yours with `/setfm`)."))
+                await ctx.send(u.error_msg(f"[@:{mentioned.id}] doesn't seem to have an account set. Do so with `/setfm`."))
                 print("returned")
                 return
 
-        if username.startswith("[@:"):
-                mentioned = bot.get_user(username[3:-1])
-                try: username = await bot.get_lastfm(mentioned.id)
-                except Exception as e:
-                    print(e)
-                    await ctx.send(u.error_msg(f"Unknown database error:\n{e}"))
+    match timeframe:
+        case "a" | "all" | "alltime" | "o": timeframe = "overall"
+        case "y" | "year" | "yearly":       timeframe = "12month"
+        case "m" | "month" | "monthly":     timeframe = "1month"
+        case "w" | "week" | "weekly":       timeframe = "7day"
+        case "d" | "day" | "daily":         timeframe = "1day"
 
-                if not username:
-                    await ctx.send(u.error_msg(f"[@:{mentioned.id}] doesn't seem to have an account set. Do so with `/setfm`."))
-                    print("returned")
-                    return
+        case _: "7day"
 
-        match timeframe:
-            case "a" | "all" | "alltime" | "o": timeframe = "overall"
-            case "y" | "year" | "yearly":       timeframe = "12month"
-            case "m" | "month" | "monthly":     timeframe = "1month"
-            case "w" | "week" | "weekly":       timeframe = "7day"
-            case "d" | "day" | "daily":         timeframe = "1day"
+    if timeframe == "1day":
+        await ctx.send(u.error_msg("Daily charts are not yet supported. Sorry!!"))
+        return
 
-            case _: "7day"
+    try:
+        temp_msg = await ctx.send(f"Generating {entity} chart for **{username}**...")
 
-        if timeframe == "1day":
-            await ctx.send(u.error_msg("Daily charts are not yet supported. Sorry!!"))
-            return
+        image = bot.collage_generator.generate(
+            entity   = entity, 
+            username = username,
+            rows     = int(size.split(sep="x")[0]),
+            cols     = int(size.split(sep="x")[1]),
+            period   = timeframe
+        )
 
-        try:
-            temp_msg = await ctx.send(f"Generating album chart for **{username}**...")
+        img_bytes = io.BytesIO()
+        image.save(fp=img_bytes, format="png")
 
-            image = bot.collage_generator.generate(
-                entity   = "album", 
-                username = username,
-                rows     = int(size.split(sep="x")[0]),
-                cols     = int(size.split(sep="x")[1]),
-                period   = timeframe
-            )
+        # link = await bot.catbox_uploader.upload_to_litterbox(
+        #     file_path_or_bytes = img_bytes,
+        #     file_name = "collage.png",
+        #     duration = LitterboxDuration.H12
+        # )
 
-            img_bytes = io.BytesIO()
-            image.save(fp=img_bytes, format="png")
+        # attachment = await u.construct_attachment_from_bytes(
+        #     filename = "chart",
+        #     file_type = "png",
+        #     bytes_arr = img_bytes,
+        # ).upload()
 
-            # link = await bot.catbox_uploader.upload_to_litterbox(
-            #     file_path_or_bytes = img_bytes,
-            #     file_name = "collage.png",
-            #     duration = LitterboxDuration.H12
-            # )
+        link = await bot.zxz.upload_from_bytes(img_bytes.getvalue(), f"{entity}_chart.png")
 
-            # attachment = await u.construct_attachment_from_bytes(
-            #     filename = "chart",
-            #     file_type = "png",
-            #     bytes_arr = img_bytes,
-            # ).upload()
+        await ctx.send(u.good_msg(f"**{size}** {timeframe} {entity} chart for [{username}](https://last.fm/user/{username}) successfully generated:\n{link}"))
 
-            link = await bot.zxz.upload_from_bytes(img_bytes.getvalue(), "chart.png")
+    except Exception as e:
+        print(e)
+        await ctx.send(u.error_msg(f"I crashed and burned while generating the chart:\n`{e}`"))
 
-            await ctx.send(u.good_msg(f"**{size}** {timeframe} chart for [{username}](https://last.fm/user/{username}) successfully generated:\n{link}"))
+    finally: 
+        if temp_msg: temp_msg.delete()
 
-        except Exception as e:
-            print(e)
-            await ctx.send(u.error_msg(f"I crashed and burned while generating the chart:\n`{e}`"))
+def setup(bot: bot.Bot):
+    @bot.command(name="chart", aliases=["c", "chartalbum", "albumchart", "collage"])
+    @bot.slash_command(name="chartalbum", description="Generate an album collage.")
+    async def chartalbum(ctx: nerimity.Context, size: str = "3x3", timeframe: str = "7day", username: str = None):
+        await send_collage(
+            bot       = bot,
+            ctx       = ctx,
+            entity    = "album",
+            size      = size,
+            timeframe = timeframe,
+            username  = username
+        )
 
-        finally: 
-            if temp_msg: temp_msg.delete()
+    @bot.command(name="artistchart", aliases=["ac", "ca", "chartartist", "artistcollage"])
+    @bot.slash_command(name="chartartist", description="Generate an artist collage.")
+    async def chartartist(ctx: nerimity.Context, size: str = "3x3", timeframe: str = "7day", username: str = None):
+        await send_collage(
+            bot       = bot,
+            ctx       = ctx,
+            entity    = "artist",
+            size      = size,
+            timeframe = timeframe,
+            username  = username
+        )
+
+    @bot.command(name="trackchart", aliases=["tc", "ct", "charttrack", "chartracks", "songchart", "chartsong", "trackcollage", "songcollage"])
+    @bot.slash_command(name="charttrack", description="Generate a track/song collage.")
+    async def charttrack(ctx: nerimity.Context, size: str = "3x3", timeframe: str = "7day", username: str = None):
+        await send_collage(
+            bot       = bot,
+            ctx       = ctx,
+            entity    = "track",
+            size      = size,
+            timeframe = timeframe,
+            username  = username
+        )

commands/now_playing.py

@@ -86,8 +86,7 @@ def setup(bot: bot.Bot):
                 cover_art = albumobj.get_cover_image()
 
                 if not cover_art: await ctx.send(u.error_msg(f"**{albumobj.get_name()}** does not seem to have cover art."))
-                else: await ctx.send(f"Here's the cover art for **[{albumobj.get_name()}]({albumobj.get_url()})**:\
-                                    {cover_art}")
+                else: await ctx.send(f"Here's the cover art for **[{albumobj.get_name()}]({albumobj.get_url()})**:\n{cover_art}")
 
             except Exception as e:
                 print(e)