From a08f5e90762068119664d04add3507a9fda5d671 Mon Sep 17 00:00:00 2001
From: LBlend <lblend@protonmail.com>
Date: Wed, 27 Mar 2024 20:36:12 +0100
Subject: [PATCH] remove misc asset folder

move everything to the parent directory
---
 Dockerfile                                          |   2 +-
 src/assets/{misc => }/crab.mp4                      | Bin
 src/assets/{misc => }/heart.png                     | Bin
 src/assets/{misc => }/policy.xml                    |   0
 src/assets/{misc => }/sivert_goodbad.jpg            | Bin
 .../{word_cloud/mask.png => word_cloud_mask.png}    | Bin
 src/cogs/meme.py                                    |   4 ++--
 src/cogs/misc.py                                    |   6 +++---
 src/cogs/word_cloud.py                              |   2 +-
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename src/assets/{misc => }/crab.mp4 (100%)
 rename src/assets/{misc => }/heart.png (100%)
 rename src/assets/{misc => }/policy.xml (100%)
 rename src/assets/{misc => }/sivert_goodbad.jpg (100%)
 rename src/assets/{word_cloud/mask.png => word_cloud_mask.png} (100%)

diff --git a/Dockerfile b/Dockerfile
index 4c05ff1..38bcc99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y imagemagick ffmpeg libsm6 libxext6 grap
 
 COPY . .
 
-RUN mv /app/src/assets/misc/policy.xml /etc/ImageMagick-6/policy.xml
+RUN mv /app/src/assets/policy.xml /etc/ImageMagick-6/policy.xml
 
 VOLUME logs
 
diff --git a/src/assets/misc/crab.mp4 b/src/assets/crab.mp4
similarity index 100%
rename from src/assets/misc/crab.mp4
rename to src/assets/crab.mp4
diff --git a/src/assets/misc/heart.png b/src/assets/heart.png
similarity index 100%
rename from src/assets/misc/heart.png
rename to src/assets/heart.png
diff --git a/src/assets/misc/policy.xml b/src/assets/policy.xml
similarity index 100%
rename from src/assets/misc/policy.xml
rename to src/assets/policy.xml
diff --git a/src/assets/misc/sivert_goodbad.jpg b/src/assets/sivert_goodbad.jpg
similarity index 100%
rename from src/assets/misc/sivert_goodbad.jpg
rename to src/assets/sivert_goodbad.jpg
diff --git a/src/assets/word_cloud/mask.png b/src/assets/word_cloud_mask.png
similarity index 100%
rename from src/assets/word_cloud/mask.png
rename to src/assets/word_cloud_mask.png
diff --git a/src/cogs/meme.py b/src/cogs/meme.py
index 71d6f41..f3a8afa 100644
--- a/src/cogs/meme.py
+++ b/src/cogs/meme.py
@@ -168,7 +168,7 @@ class Meme(commands.Cog):
         await interaction.response.defer()
 
         # Fetch meme template
-        template = Image.open("./src/assets/misc/sivert_goodbad.jpg")
+        template = Image.open("./src/assets/sivert_goodbad.jpg")
 
         # Draw text
         Meme.__draw_text(template, dårlig_tekst, offset=(540, 0))
@@ -223,7 +223,7 @@ class Meme(commands.Cog):
         """
 
         font_path = "DejaVu-Sans-Bold"
-        clip = VideoFileClip("./src/assets/misc/crab.mp4")
+        clip = VideoFileClip("./src/assets/crab.mp4")
 
         top_part = (
             TextClip(top_text, fontsize=60, color="white", stroke_width=2, stroke_color="black", font=font_path)
diff --git a/src/cogs/misc.py b/src/cogs/misc.py
index ee5f1bf..814683e 100644
--- a/src/cogs/misc.py
+++ b/src/cogs/misc.py
@@ -320,8 +320,8 @@ class Misc(commands.Cog):
         user = user.resize((389, 389))
 
         # Prepare heart image
-        heart = Image.open("./src/assets/misc/heart.png")
-        mask = Image.open("./src/assets/misc/heart.png", "r")
+        heart = Image.open("./src/assets/heart.png")
+        mask = Image.open("./src/assets/heart.png", "r")
 
         # Putting it all together
         image = Image.new("RGBA", (1024, 576))
@@ -329,7 +329,7 @@ class Misc(commands.Cog):
         image.paste(user, (635, 94))
         image.paste(heart, (311, 94), mask=mask)
         draw = ImageDraw.Draw(image)
-        font = ImageFont.truetype("./src/assets/fonts/RobotoMono-Medium.ttf", 86)
+        font = ImageFont.truetype("./src/assets/fonts/comic.ttf", 86)
         font_size = font.getbbox(f"{match_percent}%")
         font_size = ((image.size[0] - font_size[2]) / 2, (image.size[1] - font_size[3]) / 2)
         draw.text(font_size, f"{match_percent}%", font=font, fill=(255, 255, 255, 255))
diff --git a/src/cogs/word_cloud.py b/src/cogs/word_cloud.py
index 3aeb791..b4dde71 100644
--- a/src/cogs/word_cloud.py
+++ b/src/cogs/word_cloud.py
@@ -193,7 +193,7 @@ class WordCloud(commands.Cog):
         """
 
         filter_words = set(stopwords.words("norwegian") + stopwords.words("english"))
-        mask = np.array(Image.open("./src/assets/word_cloud/mask.png"))
+        mask = np.array(Image.open("./src/assets/word_cloud_mask.png"))
 
         wc = WCloud(
             max_words=max_words,