Refactor file paths to use 'private' directory instead of 'ScratchOn_private', change root to the ScratchOn folder directly.

Author: Fluffyscratch

.gitignore

@@ -3,4 +3,6 @@
 __pycache__/
 # Hide environment variables
 *.env
-scratchblocks
+
+scratchblocks
+private

chatbot.py

@@ -40,7 +40,7 @@ def answer(query: str, username: str):
 
 
 # Setup scratch connection (temporarily ignored to avoid bugs with Scratch API)
-# with open("ScratchOn_private/password.txt") as f:
+# with open("private/password.txt") as f:
 #    session = sa.login(username="_Scratch-On_", password=f.readlines()[0])
 
 # profile = session.connect_linked_user()

commands/experimental_commands.py

@@ -42,7 +42,7 @@ async def toggle_ping(interact: discord.Interaction):
         found = False
         i = -1
 
-        with open("ScratchOn_private/dcusers.txt") as file:
+        with open("private/dcusers.txt") as file:
             for item in file.readlines():
                 i += 1
                 if item.strip() == target:
@@ -52,14 +52,14 @@ async def toggle_ping(interact: discord.Interaction):
         print(i)
 
         if found:
-            with open("ScratchOn_private/scusers.txt") as file:
+            with open("private/scusers.txt") as file:
                 s_user = file.readlines()[i]
             print(s_user)
             target = s_user
             found = False
             i = 0
 
-            with open("ScratchOn_private/users2ping.txt") as file:
+            with open("private/users2ping.txt") as file:
                 for item in file.readlines():
                     i += 1
                     if item.strip() == target:
@@ -77,7 +77,7 @@ async def toggle_ping(interact: discord.Interaction):
                     )
                 )
             else:
-                with open("ScratchOn_private/users2ping.txt", "a+") as file:
+                with open("private/users2ping.txt", "a+") as file:
                     file.write(f"{s_user}\n")
                     update_pings()
                     await interact.response.send_message(

commands/project_commands.py

@@ -179,12 +179,12 @@ async def s_download(interact: discord.Interaction, project: str):
     id = "".join(filter(str.isdigit, project))
     await interact.response.defer()
     proj = scratch.get_project(id)
-    proj.download(filename="project.sb3", dir="ScratchOn_private")
+    proj.download(filename="project.sb3", dir="private")
 
     await interact.followup.send(
         file=discord.File(
-            fp="ScratchOn_private/project.sb3", filename=f"{proj.title}.sb3"
+            fp="private/project.sb3", filename=f"{proj.title}.sb3"
         )
     )
 
-    os.remove(path="ScratchOn_private/project.sb3")
+    os.remove(path="private/project.sb3")

commands/user_commands.py

@@ -40,12 +40,12 @@ async def s_profile(interact: discord.Interaction, user: str):
         else:
             rank = "<:ScratchCat:1330547949721223238> Scratcher"
 
-        with open("ScratchOn_private/scusers.txt") as f:
+        with open("private/scusers.txt") as f:
             lines = [line.rstrip("\n") for line in f]
             if usr.name in lines:
                 idx = lines.index(usr.name)
                 binded = (
-                    open("ScratchOn_private/dcusers.txt").readlines()[idx].rstrip("\n")
+                    open("private/dcusers.txt").readlines()[idx].rstrip("\n")
                 )
             else:
                 binded = "*No binded account found*"
@@ -114,7 +114,7 @@ async def bind(interact: discord.Interaction, username: str):
     found = False
 
     # Check if user is already binded
-    with open("ScratchOn_private/dcusers.txt") as file:
+    with open("private/dcusers.txt") as file:
         for item in file.readlines():
             if item.strip() == target:
                 found = True
@@ -150,9 +150,9 @@ async def bind(interact: discord.Interaction, username: str):
     v = pending_verifiers[user_id]
     if v.check():
         # Store binding
-        with open("ScratchOn_private/dcusers.txt", "a") as file:
+        with open("private/dcusers.txt", "a") as file:
             file.write(f"{str(interact.user)}\n")
-        with open("ScratchOn_private/scusers.txt", "a") as file:
+        with open("private/scusers.txt", "a") as file:
             file.write(f"{str(username)}\n")
 
         # Remove verifier from memory

database.py

@@ -5,7 +5,7 @@
 import duckdb
 
 # Database connection
-db = duckdb.connect("ScratchOn_private/ScratchOn.duckdb")
+db = duckdb.connect("private/ScratchOn.duckdb")
 
 # Initialize table
 db.execute("""CREATE TABLE IF NOT EXISTS ScratchOn (

main.py

@@ -25,7 +25,7 @@
 
 def main():
     """Run the bot."""
-    with open("ScratchOn_private/token.txt") as f:
+    with open("private/token.txt") as f:
         token = f.readlines()[0].strip()
     bot.run(token)
 

services/blockbits.py

@@ -10,7 +10,7 @@
 
 
 # Login to Scratch (temporarily ignored to avoid bugs with Scratch API)
-# with open("ScratchOn_private/password.txt") as f:
+# with open("private/password.txt") as f:
 #    session = sa.login(username="_Scratch-On_", password=f.readlines()[0])
 
 # Connect to the Blockbit project's cloud variables

services/scratchblocks.py

@@ -5,11 +5,11 @@
 import os
 from pyppeteer import launch
 
-TEMPLATE_PATH = "ScratchOn/scratchblocks_template.html"
+TEMPLATE_PATH = "scratchblocks_template.html"
 
 
 async def render_blocks_image(
-    code: str, style: str, output_path: str = "ScratchOn_private/blocks.png"
+    code: str, style: str, output_path: str = "private/blocks.png"
 ) -> str:
     """
     Renders scratchblocks code to an image.
@@ -35,15 +35,15 @@ async def render_blocks_image(
     # Update scratchblocks path
     html = html.replace(
         "scratchblocks/build/scratchblocks.min.js",
-        "../ScratchOn_private/scratchblocks/build/scratchblocks.min.js",
+        "../private/scratchblocks/build/scratchblocks.min.js",
     )
     html = html.replace(
         "scratchblocks/build/translations-all.js",
-        "../ScratchOn_private/scratchblocks/build/translations-all.js",
+        "../private/scratchblocks/build/translations-all.js",
     )
 
     # Save modified HTML to a temporary file
-    temp_path = "ScratchOn_private/temp_scratchblocks.html"
+    temp_path = "private/temp_scratchblocks.html"
     with open(temp_path, "w", encoding="utf-8") as f:
         f.write(html)
 

topGG.py

@@ -325,7 +325,7 @@ async def sync_commands(self, guild_id: Optional[int] = None) -> int:
             return 0
 
 
-def attach_to_bot(bot: commands.Bot, env_path: str = "ScratchOn/TopGG.env"):
+def attach_to_bot(bot: commands.Bot, env_path: str = "TopGG.env"):
     """Attach Top.gg integration to an existing `commands.Bot` instance.
 
     This will: