Merge pull request #24 from JvPeek/develop

Develop

discord_bot/bot.py

@@ -3,7 +3,7 @@
 import sys
 import json
 import re
-from typing import Optional
+from typing import Optional, List
 from dataclasses import dataclass
 
 import discord
@@ -20,7 +20,7 @@
 tree = app_commands.CommandTree(client)
 github: Github
 repo: Repository
-allowed_roles:list[int]|None = None
+allowed_roles: List[int]|None = None
 
 state_file_path = "./state.json"
 state = {}
@@ -29,7 +29,7 @@
 class SaveSongModal(ui.Modal, title="Save Song"):
 
     song_title = ui.TextInput(label="Song title")
-    file_name = ui.TextInput(label="Song name")
+    file_name = ui.TextInput(label="Command name")
     author = ui.TextInput(label="Song author")
     #notation = ui.Select(options=[SelectOption(label="Modern (bongo+)", value="bongo+"), SelectOption(label="legacy", value="bongo+")])
     notation = ui.TextInput(label="Song notation")
@@ -65,7 +65,7 @@ async def on_submit(self, interaction: Interaction) -> None:
         print(self.extras)
         print(interaction.message)
         file_name = self.file_name.value.strip().replace(".json", "").replace(".", "")
-        file_name = re.sub(r"\s+", "_", file_name).replace("/", "").replace("\\", "")
+        file_name = re.sub(r"\s+", "_", file_name).replace("/", "").replace("\\", "").lower()
         file_name += ".json"
         notation = self.notation.value
         if notation == "modern" or notation == "default" or notation == "bongo":
@@ -122,7 +122,7 @@ def parse_song(message: discord.Message):
             notation = "bongo+"
 
         pass
-    return Song(title, title.replace(" ", "_"), message.author.name, notation, notes)
+    return Song(title, title.replace(" ", "_").lower(), message.author.name, notation, notes)
 
 
 
@@ -236,7 +236,7 @@ def read_state():
     global state
     global state_file_path
     if not os.path.isfile(state_file_path):
-        state = {"last_time": None, "msgs": []}
+        state = {"last_time": None, "msgs": set()}
         return
     with open(state_file_path, "r") as state_file:
         state_data = json.load(state_file)

src/bongocat.js

@@ -325,7 +325,7 @@ async function playFromGithub(song, user)
   let dedications = song.match(userRegex)?.map(s => s.replace("@", ""));
   song = song.replaceAll(userRegex, ""); //remove usernames from string
   song = song.trim().replaceAll(/\s+/g, "_").replace(/\.json$/, "").replaceAll(".", ""); //remove whitespaces, remove dots
-
+  song = song.toLowerCase();
   song += ".json";
 
   console.log("Playing", song, "from github for", user);