Update app.py

app.py

@@ -15,10 +15,6 @@ import streamlit as st
 from huggingface_hub import AsyncInferenceClient, login
 import time
 import os
-from discord import app_commands
-import requests
-from discord.ext.commands import is_owner, Context, has_permissions
-from typing import Optional
 
 launch_time = datetime.datetime.utcnow()
 
@@ -102,8 +98,8 @@ def ec(x, fd="<|image|>", sd="<|image|>"):
 
 intents = discord.Intents.default()
 intents.message_content = True
+
 client = discord.Client(intents=intents)
-tree = app_commands.CommandTree(client)
 
 @client.event
 async def on_ready():
@@ -113,7 +109,6 @@ async def on_ready():
     else:
         print(f"Logged in as {client.user}")
         presence.start()
-        synced = await client.tree.sync()
 
 
 @client.event
@@ -203,75 +198,6 @@ or
 --setup #general
 ```"""
 
-info = requests.get("https://raw.githubusercontent.com/aryananumula/lr/main/info.json").content
-bannedUsers = json.loads(info)["bannedUsers"]
-imageModel = json.loads(info)["imageModel"]
-userTimes = json.loads(info)["userTimes"]
-
-@client.tree.command()
-@is_owner()
-async def sync(ctx: Context) -> None:
-    synced = await client.tree.sync()
-    await ctx.reply("{} commands synced".format(len(synced)))
-
-@client.tree.command(
-    description="Starts the conversation with Lyre.",
-    guild=discord.Object(id=1079318749116641320)
-)
-@app_commands.describe(
-    channel='The channel to start the conversation in. Defaults to the channel it was called in.',
-)
-@has_permissions(manage_channels=True, manage_messages=True)
-async def start(ctx: discord.Interaction, channel: Optional[discord.AppCommandOptionType.channel]=None):
-    if channel == None:
-        chping = f"<#{ctx.channel_id}>"
-        with open(f"{guild_name}.guild", "a") as f:
-            f.write(f"{ctx.channel_id}\n")
-    else:
-        chping = f"<#{channel.id}>"
-        with open(f"{guild_name}.guild", "a") as f:
-            f.write(f"{channel.id}\n")
-    ctx.response.send_message(f"Started a conversation in {chping}")
-
-@start.error
-async def start_error(error, ctx):
-    if isinstance(error, commands.MissingPermissions):
-        ctx.response.send_message(f"Missing permissions in {chping}")
-
-@client.tree.command(
-    description="Ends the conversation with Lyre.",
-    guild=discord.Object(id=1079318749116641320)
-)
-@app_commands.describe(
-    channel='The channel to end the conversation in. Defaults to the channel it was called in.',
-)
-@has_permissions(manage_channels=True, manage_messages=True)
-async def end(ctx: discord.Interaction, channel: Optional[discord.AppCommandOptionType.channel]=None):
-    if channel == None:
-        chping = f"<#{ctx.channel_id}>"
-        with open(f"{guild_name}.guild", "r") as f:
-            k = f.read().split("\n")
-        cid = message.channel.id
-        if str(cid) in k:
-            k.remove(str(cid))
-            with open(f"{guild_name}.guild", "w") as f:
-                f.write("\n".join(k))
-        else:
-            await ctx.response.send_message(f"There was no conversation to end in {chping}")
-            return 0
-    else:
-        chping = f"<#{channel.id}>"
-        with open(f"{guild_name}.guild", "r") as f:
-            k = f.read().split("\n")
-        if str(cid) in k:
-            k.remove(str(cid))
-            with open(f"{ctx.guild.name}.guild", "w") as f:
-                f.write("\n".join(k))
-        else:
-            await ctx.response.send_message(f"There was no conversation to end in {chping}")
-            return 0
-    await ctx.response.send_message(f"Ended the conversation in {chping}")
-
 @client.event
 async def on_message(message):
     msgchannel = message.channel
@@ -291,6 +217,88 @@ async def on_message(message):
 
     with open(f"{guild_name}.guild", "a") as f:
             f.write("")
+    if message.content.startswith("--setup"):
+        args = message.content.split()
+        del args[0]
+        if len(args) == 0:
+            with open(f"{guild_name}.guild", "a") as f:
+                    f.write(f"{msgchannel.id}\n")
+            embed = discord.Embed(title="Success!", description=f"You can now chat with the bot in <#{msgchannel.id}>")
+            await message.reply(embed=embed)
+            return 0
+        if args[0] == "":
+            embed = discord.Embed(title="Error", description="Parameter `[channel]` empty. Use `--help` for command help.")
+            await message.reply(embed=embed)
+            return 0
+        if args[0].startswith("<#") and args[0].endswith(">"):
+            try:
+                cid = int(args[0][2:-1])
+            except:
+                embed = discord.Embed(title="Error", description="Parameter `[channel]` invalid. Use `--help` for command help.")
+                await message.reply(embed=embed)
+                return 0
+            c = client.get_channel(cid)
+            if c in message.guild.text_channels:
+                with open(f"{guild_name}.guild", "a") as f:
+                    f.write(f"{c.id}\n")
+                embed = discord.Embed(title="Success!", description=f"You can now chat with the bot in <#{cid}>")
+                await message.reply(embed=embed)
+                return 0
+            else:
+                embed = discord.Embed(title="Error", description="Parameter `[channel]` is not in this guild. Use `--help` for command help.")
+                await message.reply(embed=embed)
+                return 0
+        else:
+            embed = discord.Embed(title="Error", description="Parameter `[channel]` is not in valid forms. Use `--help` for command help.")
+            await message.reply(embed=embed)
+            return 0
+    
+    if message.content.startswith("--revoke"):
+        args = message.content.split()
+        del args[0]
+        if len(args) == 0:
+            with open(f"{guild_name}.guild", "r") as f:
+                k = f.read().split("\n")
+            cid = message.channel.id
+            if str(cid) in k:
+                k.remove(str(cid))
+                with open(f"{guild_name}.guild", "w") as f:
+                    f.write("\n".join(k))
+                embed = discord.Embed(title="Success", description=f"Lyre is now unable to chat in <#{msgchannel.id}>")
+                await message.reply(embed=embed)
+                return 0
+            else:
+                embed = discord.Embed(title="Error", description=f"Lyre was already unable to chat in <#{msgchannel.id}>")
+                await message.reply(embed=embed)
+                return 0
+        if args[0] == "":
+            embed = discord.Embed(title="Error", description="Parameter `[channel]` empty. Use `--help` for command help.")
+            await message.reply(embed=embed)
+            return 0
+        if args[0].startswith("<#") and args[0].endswith(">"):
+            try:
+                cid = int(args[0][2:-1])
+            except:
+                embed = discord.Embed(title="Error", description="Parameter `[channel]` invalid. Use `--help` for command help.")
+                await message.reply(embed=embed)
+                return 0
+            with open(f"{guild_name}.guild", "r") as f:
+                k = f.read().split("\n")
+            if str(cid) in k:
+                k.remove(str(cid))
+                with open(f"{guild_name}.guild", "w") as f:
+                    f.write("\n".join(k))
+                embed = discord.Embed(title="Success", description=f"Lyre is now unable to chat in {args[0]}")
+                await message.reply(embed=embed)
+                return 0
+            else:
+                embed = discord.Embed(title="Error", description=f"Lyre was already unable to chat in {args[0]}")
+                await message.reply(embed=embed)
+                return 0
+        else:
+            embed = discord.Embed(title="Error", description="Parameter `[channel]` is not in valid forms, or does not exist. Use `--help` for command help.")
+            await message.reply(embed=embed)
+            return 0
 
     if message.content.startswith("--reset"):
         args = message.content.split()
@@ -366,23 +374,10 @@ async def on_message(message):
             message.content = message.content.replace(f"<@{user.id}>",
                                                   f"<@{str(user)}>")
     try:
-        try:
-            with open(f"usrtime/{message.author}", "r") as f:
-                er = f.read()
-        except:
-            with open(f"usrtime/{message.author}", "w") as f:
-                f.write(str(round(time.time())))
-                er = 0
-        y = round(time.time()) - int(er)
-        print(y)
-        if str(message.author).lower() not in userTimes.keys():
-            usrTime = 5
-        else:
-            usrTime = userTimes[str(message.author).lower()]
-        if message.author.id in bannedUsers:
-            return 0
-        if y < usrTime:
-            return 0
+        info = requests.get("https://raw.githubusercontent.com/aryananumula/lr/main/info.json").content
+        bannedUsers = json.loads(info)["bannedUsers"]
+        imageModel = json.loads(info)["imageModel"]
+        userTimes = json.loads(info)["userTimes"]
         s = f":green[{message.author}]: :violet[{message.content}] :blue[{msgchannel_name}] :orange[{guild_name}]"
         if message.author == client.user:
             return
@@ -461,6 +456,23 @@ async def on_message(message):
             context = f.read()
         with open(f"{guild_name}.guild", "r") as f:
             o = f.read()
+        try:
+            with open(f"usrtime/{message.author}", "r") as f:
+                er = f.read()
+        except:
+            with open(f"usrtime/{message.author}", "w") as f:
+                f.write(str(round(time.time())))
+                er = 0
+        y = round(time.time()) - int(er)
+        print(y)
+        if str(message.author).lower() not in userTimes.keys():
+            usrTime = 5
+        else:
+            usrTime = userTimes[str(message.author).lower()]
+        if message.author.id in bannedUsers:
+            return 0
+        if y < usrTime:
+            return 0
         if (str(message.channel.id) in o.split("\n")) or (guild_name == "Direct"):
             with open(f"usrtime/{message.author}", "w") as f:
                 f.write(str(round(time.time())))