Merge branch 'feat/revive' of https://github.com/team-nameless/nameless-discord-bot into feat/revive-music

Author: FoxeiZ

nameless/command/crossover.py

@@ -4,11 +4,10 @@
 import discord.ui
 from discord import app_commands
 from discord.ext import commands
-from prisma.models import CrossChatMessage, CrossChatSubscription
+from prisma.models import CrossChatMessage, CrossChatRoom, CrossChatSubscription
 
 from nameless import Nameless
 from nameless.custom.crud import NamelessCRUD
-from nameless.custom.ui import NamelessYesNoPrompt
 
 __all__ = ["CrossOverCommand"]
 
@@ -30,16 +29,19 @@ async def on_message(self, message: discord.Message):
             return
 
         subs = await CrossChatSubscription.prisma().find_many(
-            where={"GuildId": message.guild.id, "ChannelId": message.channel.id}
+            where={"GuildId": message.guild.id, "ChannelId": message.channel.id},
+            include={"Room": True},
         )
 
         for sub in subs:
-            guild = self.bot.get_guild(sub.TargetGuildId)
+            assert sub.Room is not None
+
+            guild = self.bot.get_guild(sub.Room.GuildId)
 
             if guild is None:
                 return
 
-            channel = guild.get_channel(sub.TargetChannelId)
+            channel = guild.get_channel(sub.Room.ChannelId)
 
             if channel is None:
                 return
@@ -94,16 +96,18 @@ async def on_message_edit(self, _: discord.Message, message: discord.Message):
                 "ChannelId": message.channel.id,
                 "Messages": {"some": {"OriginMessageId": message.id}},
             },
-            include={"Messages": True},
+            include={"Messages": True, "Room": True},
         )
 
         for sub in subs:
-            guild = self.bot.get_guild(sub.TargetGuildId)
+            assert sub.Room is not None
+
+            guild = self.bot.get_guild(sub.Room.GuildId)
 
             if guild is None:
                 return
 
-            channel = guild.get_channel(sub.TargetChannelId)
+            channel = guild.get_channel(sub.Room.ChannelId)
 
             if channel is None:
                 return
@@ -143,16 +147,18 @@ async def on_message_delete(self, message: discord.Message):
                 "ChannelId": message.channel.id,
                 "Messages": {"some": {"OriginMessageId": message.id}},
             },
-            include={"Messages": True},
+            include={"Messages": True, "Room": True},
         )
 
         for sub in subs:
-            guild = self.bot.get_guild(sub.TargetGuildId)
+            assert sub.Room is not None
+
+            guild = self.bot.get_guild(sub.Room.GuildId)
 
             if guild is None:
                 return
 
-            channel = guild.get_channel(sub.TargetChannelId)
+            channel = guild.get_channel(sub.Room.ChannelId)
 
             if channel is None:
                 return
@@ -173,86 +179,77 @@ async def on_message_delete(self, message: discord.Message):
 
     @app_commands.command()
     @app_commands.guild_only()
-    @app_commands.describe(
-        target_guild="Target guild ID to establish.",
-        target_channel="Target channel to establish.",
-    )
-    async def create_link(
-        self,
-        interaction: discord.Interaction[Nameless],
-        target_guild: str,
-        target_channel: str,
-    ):
-        """Create link to another guild."""
+    @app_commands.checks.has_permissions(manage_guild=True)
+    async def publish(self, interaction: discord.Interaction[Nameless]):
+        """Establish this channel to the public."""
         await interaction.response.defer()
 
-        guild = self.bot.get_guild(int(target_guild))
-
-        if guild is None:
-            await interaction.followup.send("That guild does not exist.")
-            return
+        assert interaction.guild is not None
+        assert interaction.channel is not None
 
-        channel = guild.get_channel(int(target_channel))
+        room_data: CrossChatRoom | None = await CrossChatRoom.prisma().find_first(
+            where={"ChannelId": interaction.channel.id, "GuildId": interaction.guild.id}
+        )
 
-        if channel is None:
-            await interaction.followup.send("That channel does not exist.")
-            return
+        if room_data is None:
+            room_data = await CrossChatRoom.prisma().create(
+                data={
+                    "GuildId": interaction.guild.id,
+                    "ChannelId": interaction.channel.id,
+                }
+            )
 
-        if isinstance(channel, (discord.ForumChannel, discord.CategoryChannel)):
-            await interaction.followup.send("Invalid channel to link to.")
-            return
+        await interaction.followup.send(
+            f"Your cross-chat room code is: `{room_data.RoomId}`"
+        )
 
-        assert interaction.guild is not None
-        assert interaction.channel is not None
+    @app_commands.command()
+    @app_commands.guild_only()
+    @app_commands.describe(room_code="Room code to subscribe.")
+    @app_commands.checks.has_permissions(manage_guild=True)
+    async def connect(self, interaction: discord.Interaction[Nameless], room_code: str):
+        """Create link to another guild."""
+        await interaction.response.defer()
 
-        temp_data: (
-            CrossChatSubscription | None
-        ) = await CrossChatSubscription.prisma().find_first(
-            where={
-                "ChannelId": interaction.channel.id,
-                "TargetGuildId": guild.id,
-                "TargetChannelId": channel.id,
-            }
+        room_data: CrossChatRoom | None = await CrossChatRoom.prisma().find_first(
+            where={"RoomId": room_code}
         )
 
-        if temp_data is not None:
-            await interaction.followup.send("You had a link with this place before.")
+        if room_data is None:
+            await interaction.followup.send("Room code does not exist!")
             return
 
-        await interaction.followup.send("Sending out request, please wait.")
+        assert interaction.guild is not None
+        assert interaction.channel is not None
 
-        prompt = NamelessYesNoPrompt()
+        this_guild = interaction.guild
+        that_guild = await self.bot.fetch_guild(room_data.GuildId)
 
-        await channel.send("You have an incoming link!", view=prompt)
-        await prompt.wait()
+        assert this_guild is not None
+        assert that_guild is not None
 
-        if not prompt.is_a_yes:
-            await interaction.followup.send("Response declined.")
+        if (
+            room_data.GuildId == this_guild.id
+            and room_data.ChannelId == interaction.channel.id
+        ):
+            await interaction.followup.send("Don't connect to yourself!")
             return
 
-        await NamelessCRUD.get_or_create_guild_entry(interaction.guild)
-        await NamelessCRUD.get_or_create_guild_entry(guild)
+        await NamelessCRUD.get_or_create_guild_entry(this_guild)
+        await NamelessCRUD.get_or_create_guild_entry(that_guild)
 
         await CrossChatSubscription.prisma().create(
             data={
-                "Guild": {"connect": {"Id": interaction.guild.id}},
+                "Guild": {"connect": {"Id": this_guild.id}},
                 "ChannelId": interaction.channel.id,
-                "TargetGuildId": guild.id,
-                "TargetChannelId": channel.id,
+                "Room": {"connect": {"RoomId": room_code}},
             }
         )
 
-        await CrossChatSubscription.prisma().create(
-            data={
-                "Guild": {"connect": {"Id": guild.id}},
-                "ChannelId": channel.id,
-                "TargetGuildId": interaction.guild.id,
-                "TargetChannelId": interaction.channel.id,
-            }
+        await interaction.followup.send(
+            "Linking success! Please note that the other guild need to do the same."
         )
 
-        await interaction.followup.send("Linking success!")
-
 
 async def setup(bot: Nameless):
     await bot.add_cog(CrossOverCommand(bot))

nameless/custom/crud.py

@@ -14,6 +14,10 @@ class NamelessCRUD:
     async def init() -> None:
         await raw_db.connect()
 
+    @staticmethod
+    async def dispose() -> None:
+        await raw_db.disconnect()
+
     @staticmethod
     async def get_or_create_guild_entry(
         guild: discord.Guild, *, include_cross_chat: bool = False

nameless/nameless.py

@@ -41,8 +41,14 @@ async def setup_hook(self):
         await self._register_commands()
 
         logging.info("Syncing commands.")
-        await self.tree.sync()
-        logging.warning("Please wait at least one hour before using global commands.")
+
+        if bool(int(os.getenv("DEBUG", 0))):
+            await self.tree.sync(guild=discord.Object(708668574201544745))
+            await self.tree.sync(guild=discord.Object(507428680813772812))
+            logging.warning("Commands are available in debug mode.")
+        else:
+            await self.tree.sync()
+            logging.warning("Commands should be available in one hour.")
 
     async def on_ready(self):
         logging.info("Setting presence.")
@@ -65,6 +71,7 @@ def start_bot(self, *, is_debug: bool = False) -> None:
     async def close(self) -> None:
         logging.warning("Shutting down...")
         nameless_config["nameless"]["is_shutting_down"] = True
+        await NamelessCRUD.dispose()
         await super().close()
         exit(0)
 

nameless/prisma/schema.prisma

@@ -18,15 +18,22 @@ model Guild {
   PlayerSetting PlayerSettings?
 }
 
-model CrossChatSubscription {
-  SubscriptionId  String  @id @default(cuid())
-  Guild           Guild?  @relation(fields: [GuildId], references: [Id])
-  GuildId         BigInt?
-  ChannelId       BigInt
-  TargetGuildId   BigInt
-  TargetChannelId BigInt
+model CrossChatRoom {
+  RoomId                String                  @id @default(cuid())
+  GuildId               BigInt
+  ChannelId             BigInt
+  IsOpen                Boolean                 @default(true)
+  CrossChatSubscription CrossChatSubscription[]
+}
 
-  Messages CrossChatMessage[]
+model CrossChatSubscription {
+  SubscriptionId String             @id @default(cuid())
+  Guild          Guild?             @relation(fields: [GuildId], references: [Id])
+  GuildId        BigInt?
+  ChannelId      BigInt
+  Room           CrossChatRoom      @relation(fields: [RoomId], references: [RoomId])
+  RoomId         String
+  Messages       CrossChatMessage[]
 }
 
 model CrossChatMessage {