From 8ac831f6c90ac4328d98b924932c6fa6a0579d77 Mon Sep 17 00:00:00 2001 From: phixxy Date: Wed, 17 Jan 2024 19:51:40 -0800 Subject: [PATCH] meme fix --- plugins/meme.py | 8 +------- sparkytron3000.py | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/meme.py b/plugins/meme.py index d4afe91..4de4247 100644 --- a/plugins/meme.py +++ b/plugins/meme.py @@ -109,14 +109,8 @@ async def meme(ctx): try: topic = ctx.message.content.split(" ", maxsplit=1)[1] + await ctx.send(f'Generating {topic} meme') link, filepath = await generate_random_meme(topic) - '''channel_vars = await get_channel_config(ctx.channel.id) - try: - if channel_vars["ftp_enabled"]: - await update_meme_webpage(filepath) - except Exception as error: - print("COULDN'T UPLOAD TO FTP!") - await handle_error(error)''' await ctx.send(link) except Exception as error: await handle_error(error) diff --git a/sparkytron3000.py b/sparkytron3000.py index 6a7e4b5..4f3b469 100644 --- a/sparkytron3000.py +++ b/sparkytron3000.py @@ -263,8 +263,6 @@ async def delete_derp_files(server_folder): print("Couldn't delete", filename) async def meme_handler(folder): - if folder[:-1] != '/': - folder += '/' for file in os.listdir(folder): filepath = folder + file await update_meme_webpage(filepath)