From 78b457821a7a329cd016255181357c03c8f014fe Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:00:56 -0500 Subject: [PATCH 01/15] Update --- wordpress.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.py b/wordpress.py index 2b0880f..de58e3d 100644 --- a/wordpress.py +++ b/wordpress.py @@ -100,7 +100,7 @@ class wordpress(commands.Cog): description="create a blog post", ) async def blog(self, interaction: nextcord.Interaction): - await interaction.response.send_modal(BlogModal("https://pastablog.insertapp.net/wp-json/wp/v2/posts",self.bot.blogcredentials)) + await interaction.response.send_modal(BlogModal("https://blog.pastaland.org/wp-json/wp/v2/posts",self.bot.blogcredentials)) def setup(bot: commands.Bot): bot.add_cog(wordpress(bot)) \ No newline at end of file From 5a4095d4ceac4e3f733933ae66aa41e2053929c6 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:13:02 -0500 Subject: [PATCH 02/15] Update --- starboard.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 starboard.py diff --git a/starboard.py b/starboard.py new file mode 100644 index 0000000..17e4740 --- /dev/null +++ b/starboard.py @@ -0,0 +1,28 @@ +import nextcord +from nextcord.ext import commands +from nextcord import TextInputStyle +from dotenv import load_dotenv +from random import randint +import aiosqlite as sqlite3 +import requests +import json +import traceback +import sys +from datetime import datetime +import base64 +from urllib.parse import urlparse +import os + +class starboard(commands.Cog): + def __init__(self, bot: commands.Bot): + self.bot = bot + + @commands.Cog.listener('on_raw_reaction_add') + async def on_raw_reaction_add(self,payload): + if payload.emoji == "⭐": + chann = self.bot.get_channel(payload.channel_id) + message = chann.fetch_message(payload.message_id) + await message.forward(chann) + +def setup(bot: commands.Bot): + bot.add_cog(starboard(bot)) \ No newline at end of file From fdcec189f1491d7cbd6414988a4da499a841ecda Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:20:25 -0500 Subject: [PATCH 03/15] Update --- starboard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/starboard.py b/starboard.py index 17e4740..cbe13af 100644 --- a/starboard.py +++ b/starboard.py @@ -4,7 +4,6 @@ from nextcord import TextInputStyle from dotenv import load_dotenv from random import randint import aiosqlite as sqlite3 -import requests import json import traceback import sys @@ -19,7 +18,9 @@ class starboard(commands.Cog): @commands.Cog.listener('on_raw_reaction_add') async def on_raw_reaction_add(self,payload): + print("recieved emoji payload", file=sys.stderr) if payload.emoji == "⭐": + print("Recieved star payload", file=sys.stderr) chann = self.bot.get_channel(payload.channel_id) message = chann.fetch_message(payload.message_id) await message.forward(chann) From d1e5230d94139cf0499765d9e3a5bed6b0753409 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:21:15 -0500 Subject: [PATCH 04/15] Update --- starboard.py | 1 + 1 file changed, 1 insertion(+) diff --git a/starboard.py b/starboard.py index cbe13af..dab4256 100644 --- a/starboard.py +++ b/starboard.py @@ -19,6 +19,7 @@ class starboard(commands.Cog): @commands.Cog.listener('on_raw_reaction_add') async def on_raw_reaction_add(self,payload): print("recieved emoji payload", file=sys.stderr) + print(payload.emoji, file=sys.stderr) if payload.emoji == "⭐": print("Recieved star payload", file=sys.stderr) chann = self.bot.get_channel(payload.channel_id) From 9fdc1ccbdba11fc8638508c0d95f3c79453f9e02 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:23:41 -0500 Subject: [PATCH 05/15] Update --- starboard.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/starboard.py b/starboard.py index dab4256..db16e20 100644 --- a/starboard.py +++ b/starboard.py @@ -19,12 +19,13 @@ class starboard(commands.Cog): @commands.Cog.listener('on_raw_reaction_add') async def on_raw_reaction_add(self,payload): print("recieved emoji payload", file=sys.stderr) - print(payload.emoji, file=sys.stderr) - if payload.emoji == "⭐": + print(payload.emoji.name, file=sys.stderr) + if payload.emoji.name == "⭐": print("Recieved star payload", file=sys.stderr) chann = self.bot.get_channel(payload.channel_id) message = chann.fetch_message(payload.message_id) await message.forward(chann) + await chann.send("forwarded message") def setup(bot: commands.Bot): bot.add_cog(starboard(bot)) \ No newline at end of file From 055d2a6c8f7453f24ecc06210828c14700b555ca Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:26:49 -0500 Subject: [PATCH 06/15] Update --- starboard.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/starboard.py b/starboard.py index db16e20..a85fee3 100644 --- a/starboard.py +++ b/starboard.py @@ -24,8 +24,7 @@ class starboard(commands.Cog): print("Recieved star payload", file=sys.stderr) chann = self.bot.get_channel(payload.channel_id) message = chann.fetch_message(payload.message_id) - await message.forward(chann) - await chann.send("forwarded message") + await chann.send(message.content) def setup(bot: commands.Bot): bot.add_cog(starboard(bot)) \ No newline at end of file From 50d3ea738313c9d7b458384de37dec3be797e032 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:27:55 -0500 Subject: [PATCH 07/15] Update --- starboard.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/starboard.py b/starboard.py index a85fee3..7dc8341 100644 --- a/starboard.py +++ b/starboard.py @@ -23,8 +23,9 @@ class starboard(commands.Cog): if payload.emoji.name == "⭐": print("Recieved star payload", file=sys.stderr) chann = self.bot.get_channel(payload.channel_id) - message = chann.fetch_message(payload.message_id) - await chann.send(message.content) + message = await chann.fetch_message(payload.message_id) + await message.forward(chann) + await chann.send("forwarded message") def setup(bot: commands.Bot): bot.add_cog(starboard(bot)) \ No newline at end of file From c4b4c9cb611a1b87968a11a6a5e014cc89646032 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:33:23 -0500 Subject: [PATCH 08/15] Update --- starboard.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/starboard.py b/starboard.py index 7dc8341..71c1de9 100644 --- a/starboard.py +++ b/starboard.py @@ -24,8 +24,11 @@ class starboard(commands.Cog): print("Recieved star payload", file=sys.stderr) chann = self.bot.get_channel(payload.channel_id) message = await chann.fetch_message(payload.message_id) - await message.forward(chann) - await chann.send("forwarded message") - + for r in message.reactions: + if r.emoji == "⭐": + await chann.send(f"{r.count}{payload.emoji.name}") + await message.forward(chann) + return + def setup(bot: commands.Bot): bot.add_cog(starboard(bot)) \ No newline at end of file From 5fe69d4473e07ee6fd47d1a79ed034322f5ac44e Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 12:43:40 -0500 Subject: [PATCH 09/15] Update --- starboard.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/starboard.py b/starboard.py index 71c1de9..7cc7f19 100644 --- a/starboard.py +++ b/starboard.py @@ -20,15 +20,21 @@ class starboard(commands.Cog): async def on_raw_reaction_add(self,payload): print("recieved emoji payload", file=sys.stderr) print(payload.emoji.name, file=sys.stderr) - if payload.emoji.name == "⭐": + chann = self.bot.get_channel(payload.channel_id) + message = await chann.fetch_message(payload.message_id) + res = await.cur.execute(f"SELECT emoji, starchannel, minimumneeded, selfstar FROM starsettings WHERE serverid = {message.guild.id}") + try: + emoji, starchannel, minimumneeded, selfstar = await res.fetchone() + except TypeError: + return + if payload.emoji.name == emoji: print("Recieved star payload", file=sys.stderr) - chann = self.bot.get_channel(payload.channel_id) - message = await chann.fetch_message(payload.message_id) for r in message.reactions: - if r.emoji == "⭐": - await chann.send(f"{r.count}{payload.emoji.name}") - await message.forward(chann) - return + if r.emoji == emoji: + if r.count == minimumneeded: + await chann.send(f"{r.count} {payload.emoji.name}") + await message.forward(self.bot.get_channel(starchannel)) + return def setup(bot: commands.Bot): bot.add_cog(starboard(bot)) \ No newline at end of file From 4e6c824e60483a8ca9108d088d86e04a9809c25f Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 14:31:39 -0500 Subject: [PATCH 10/15] Update --- starboard.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/starboard.py b/starboard.py index 7cc7f19..f341e5f 100644 --- a/starboard.py +++ b/starboard.py @@ -22,7 +22,7 @@ class starboard(commands.Cog): print(payload.emoji.name, file=sys.stderr) chann = self.bot.get_channel(payload.channel_id) message = await chann.fetch_message(payload.message_id) - res = await.cur.execute(f"SELECT emoji, starchannel, minimumneeded, selfstar FROM starsettings WHERE serverid = {message.guild.id}") + res = await self.bot.cur.execute(f"SELECT emoji, starchannel, minimumneeded, selfstar FROM starsettings WHERE serverid = {message.guild.id}") try: emoji, starchannel, minimumneeded, selfstar = await res.fetchone() except TypeError: @@ -36,5 +36,27 @@ class starboard(commands.Cog): await message.forward(self.bot.get_channel(starchannel)) return + @nextcord.slash_command( + name="starboard", + description="For all your starring needs", + default_member_permissions=nextcord.Permissions(manage_messages=True), + ) + async def starboard(self, interaction: nextcord.Interaction): + return + + @starboard.subcommand( + name="create", + description="Create a starboard, escape the emoji", + force_global=True, + ) + async def createstarboard(self, interaction: nextcord.Interaction, reaction: str, channel: nextcord.channel, minimumneeded: int, selfstar: str = nextcord.SlashOption(choices=["Yes", "No"])): + selfstar = False + if selfstar == "Yes": + selfstar = True + await self.bot.cur.execute(f""" + INSERT INTO userinfo VALUES + ({reaction}, {channel.id}, '{minimumneeded}', '{selfstar}', {interaction.guild_id}) + """) + def setup(bot: commands.Bot): bot.add_cog(starboard(bot)) \ No newline at end of file From daeee12efeb02c4f44b84a94c031751a56e5dcaf Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 14:32:55 -0500 Subject: [PATCH 11/15] Update --- starboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starboard.py b/starboard.py index f341e5f..839a414 100644 --- a/starboard.py +++ b/starboard.py @@ -40,6 +40,7 @@ class starboard(commands.Cog): name="starboard", description="For all your starring needs", default_member_permissions=nextcord.Permissions(manage_messages=True), + force_global=True, ) async def starboard(self, interaction: nextcord.Interaction): return @@ -47,7 +48,6 @@ class starboard(commands.Cog): @starboard.subcommand( name="create", description="Create a starboard, escape the emoji", - force_global=True, ) async def createstarboard(self, interaction: nextcord.Interaction, reaction: str, channel: nextcord.channel, minimumneeded: int, selfstar: str = nextcord.SlashOption(choices=["Yes", "No"])): selfstar = False From eae185a05a059ecaa93df7d6908532d6f94fa808 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 14:35:32 -0500 Subject: [PATCH 12/15] Update --- starboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starboard.py b/starboard.py index 839a414..b60e7c1 100644 --- a/starboard.py +++ b/starboard.py @@ -49,7 +49,7 @@ class starboard(commands.Cog): name="create", description="Create a starboard, escape the emoji", ) - async def createstarboard(self, interaction: nextcord.Interaction, reaction: str, channel: nextcord.channel, minimumneeded: int, selfstar: str = nextcord.SlashOption(choices=["Yes", "No"])): + async def createstarboard(self, interaction: nextcord.Interaction, reaction: str, channel: nextcord.abc.GuildChannel, minimumneeded: int, selfstar: str = nextcord.SlashOption(choices=["Yes", "No"])): selfstar = False if selfstar == "Yes": selfstar = True From 2f97f433e4f4e66c043404313cf34d1c2903cf47 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 14:44:53 -0500 Subject: [PATCH 13/15] Update --- starboard.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/starboard.py b/starboard.py index b60e7c1..7fd43a0 100644 --- a/starboard.py +++ b/starboard.py @@ -54,9 +54,18 @@ class starboard(commands.Cog): if selfstar == "Yes": selfstar = True await self.bot.cur.execute(f""" - INSERT INTO userinfo VALUES - ({reaction}, {channel.id}, '{minimumneeded}', '{selfstar}', {interaction.guild_id}) + INSERT INTO starsettings VALUES + ('{reaction}', {channel.id}, '{minimumneeded}', {selfstar}, {interaction.guild_id}) """) + await interaction.response.send_message("Done!", ephemeral=True) + + @starboard.subcommand( + name="Delete", + description="Delete a starboard", + ) + async def createstarboard(self, interaction: nextcord.Interaction, channel: nextcord.abc.GuildChannel): + await self.bot.cur.execute(f"DELETE FROM starsettings WHERE starchannel = {channel.id}") + await interaction.response.send_message("Done!", ephemeral=True) def setup(bot: commands.Bot): bot.add_cog(starboard(bot)) \ No newline at end of file From bb893c07d51eef16ce41dd511b6e6ed93729ac5a Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 14:45:45 -0500 Subject: [PATCH 14/15] Update --- starboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starboard.py b/starboard.py index 7fd43a0..8d4aaaa 100644 --- a/starboard.py +++ b/starboard.py @@ -60,7 +60,7 @@ class starboard(commands.Cog): await interaction.response.send_message("Done!", ephemeral=True) @starboard.subcommand( - name="Delete", + name="delete", description="Delete a starboard", ) async def createstarboard(self, interaction: nextcord.Interaction, channel: nextcord.abc.GuildChannel): From dd9f098e4e7e663337622e92d17ed5b71cc49fc3 Mon Sep 17 00:00:00 2001 From: insert Date: Thu, 26 Dec 2024 14:58:30 -0500 Subject: [PATCH 15/15] Update --- starboard.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/starboard.py b/starboard.py index 8d4aaaa..eecf72b 100644 --- a/starboard.py +++ b/starboard.py @@ -37,15 +37,15 @@ class starboard(commands.Cog): return @nextcord.slash_command( - name="starboard", + name="starboardr", description="For all your starring needs", default_member_permissions=nextcord.Permissions(manage_messages=True), force_global=True, ) - async def starboard(self, interaction: nextcord.Interaction): + async def starboardr(self, interaction: nextcord.Interaction): return - @starboard.subcommand( + @starboardr.subcommand( name="create", description="Create a starboard, escape the emoji", ) @@ -59,7 +59,7 @@ class starboard(commands.Cog): """) await interaction.response.send_message("Done!", ephemeral=True) - @starboard.subcommand( + @starboardr.subcommand( name="delete", description="Delete a starboard", )