diff --git a/extensions/elm_street.py b/extensions/elm_street.py index 72d44eedb88586e4f46ed98c3514602f33a0e852..a3770d1d2e4e96af41dc6d4f725191177a87e90b 100644 --- a/extensions/elm_street.py +++ b/extensions/elm_street.py @@ -2,11 +2,12 @@ import json import os from asyncio import sleep from copy import deepcopy +from os.path import exists from random import SystemRandom from typing import Union import discord -from discord import app_commands, Guild, Interaction, ButtonStyle +from discord import app_commands, Guild, Interaction, ButtonStyle, File from discord.app_commands import Choice from discord.ext import commands, tasks from dotenv import load_dotenv @@ -349,7 +350,12 @@ class ElmStreet(commands.GroupCog, name="elm"): sweets = calculate_sweets(choice) courage = calculate_courage(choice) text = self.apply_sweets_and_courage(text, sweets, courage, interaction.channel_id) - await channel.send(f"```\n{text}\n```") + if image := choice.get("image"): + if exists(f"images/{image}"): + file = File(f"images/{image}") + await channel.send(f"```\n{text}\n```", file=file) + else: + await channel.send(f"```\n{text}\n```") if view: await channel.send("Was wollt ihr als nächstes tun?", view=view) if next := choice.get("next"): diff --git a/data/images/20220928_142617.jpg b/images/20220928_142617.jpg similarity index 100% rename from data/images/20220928_142617.jpg rename to images/20220928_142617.jpg diff --git a/data/images/20220928_143119.jpg b/images/20220928_143119.jpg similarity index 100% rename from data/images/20220928_143119.jpg rename to images/20220928_143119.jpg diff --git a/data/images/20220928_143134.jpg b/images/20220928_143134.jpg similarity index 100% rename from data/images/20220928_143134.jpg rename to images/20220928_143134.jpg diff --git a/data/images/20220928_151142.jpg b/images/20220928_151142.jpg similarity index 100% rename from data/images/20220928_151142.jpg rename to images/20220928_151142.jpg diff --git a/data/images/20220928_151227.jpg b/images/20220928_151227.jpg similarity index 100% rename from data/images/20220928_151227.jpg rename to images/20220928_151227.jpg diff --git a/data/images/20220928_151233.jpg b/images/20220928_151233.jpg similarity index 100% rename from data/images/20220928_151233.jpg rename to images/20220928_151233.jpg diff --git a/data/images/20220928_151251.jpg b/images/20220928_151251.jpg similarity index 100% rename from data/images/20220928_151251.jpg rename to images/20220928_151251.jpg diff --git a/data/images/20220928_151535.jpg b/images/20220928_151535.jpg similarity index 100% rename from data/images/20220928_151535.jpg rename to images/20220928_151535.jpg diff --git a/data/images/20220928_152325.jpg b/images/20220928_152325.jpg similarity index 100% rename from data/images/20220928_152325.jpg rename to images/20220928_152325.jpg diff --git a/data/images/20220928_152359.jpg b/images/20220928_152359.jpg similarity index 100% rename from data/images/20220928_152359.jpg rename to images/20220928_152359.jpg diff --git a/data/images/20220928_152754.jpg b/images/20220928_152754.jpg similarity index 100% rename from data/images/20220928_152754.jpg rename to images/20220928_152754.jpg diff --git a/data/images/20220928_152812.jpg b/images/20220928_152812.jpg similarity index 100% rename from data/images/20220928_152812.jpg rename to images/20220928_152812.jpg diff --git a/data/images/20220928_152925.jpg b/images/20220928_152925.jpg similarity index 100% rename from data/images/20220928_152925.jpg rename to images/20220928_152925.jpg diff --git a/data/images/20220928_153911.jpg b/images/20220928_153911.jpg similarity index 100% rename from data/images/20220928_153911.jpg rename to images/20220928_153911.jpg diff --git a/data/images/20220928_154705.jpg b/images/20220928_154705.jpg similarity index 100% rename from data/images/20220928_154705.jpg rename to images/20220928_154705.jpg diff --git a/data/images/20220928_155339.jpg b/images/20220928_155339.jpg similarity index 100% rename from data/images/20220928_155339.jpg rename to images/20220928_155339.jpg diff --git a/data/images/20220928_160658.jpg b/images/20220928_160658.jpg similarity index 100% rename from data/images/20220928_160658.jpg rename to images/20220928_160658.jpg diff --git a/data/images/20220928_184010.jpg b/images/20220928_184010.jpg similarity index 100% rename from data/images/20220928_184010.jpg rename to images/20220928_184010.jpg diff --git a/data/images/Midjourney-Herbsthaus1_.png b/images/Midjourney-Herbsthaus1_.png similarity index 100% rename from data/images/Midjourney-Herbsthaus1_.png rename to images/Midjourney-Herbsthaus1_.png diff --git a/data/images/Midjourney-Herbsthaus2.png b/images/Midjourney-Herbsthaus2.png similarity index 100% rename from data/images/Midjourney-Herbsthaus2.png rename to images/Midjourney-Herbsthaus2.png diff --git a/data/images/Midjourney-Herbsthaus3.png b/images/Midjourney-Herbsthaus3.png similarity index 100% rename from data/images/Midjourney-Herbsthaus3.png rename to images/Midjourney-Herbsthaus3.png diff --git a/data/images/Midjourney-Tuergesicht.png b/images/Midjourney-Tuergesicht.png similarity index 100% rename from data/images/Midjourney-Tuergesicht.png rename to images/Midjourney-Tuergesicht.png