From c565e41a4b5f8ca03a3ea795b02c160bbe4f5132 Mon Sep 17 00:00:00 2001 From: Peter van Arkel Date: Tue, 16 Jul 2024 16:49:32 +0200 Subject: [PATCH] Prepare jeeves repository for refactor. Removed obsolete commands. --- LICENSE.md | 4 +-- cogs/games.py | 11 +----- cogs/misc.py | 10 +----- help/info.md | 3 -- scripts/emojivvdd.py | 85 -------------------------------------------- 5 files changed, 4 insertions(+), 109 deletions(-) delete mode 100644 scripts/emojivvdd.py diff --git a/LICENSE.md b/LICENSE.md index 6d6fe21..24e2877 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 - Peter van Arkel +Copyright (c) 2024444 - Peter van Arkel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/cogs/games.py b/cogs/games.py index ed1580a..b4b4644 100644 --- a/cogs/games.py +++ b/cogs/games.py @@ -17,15 +17,6 @@ class Games(commands.Cog): self.bot = bot - @commands.command() - @commands.guild_only() - async def bingo(self, ctx): - """ Maak een babbelbingo kaart (staat niet altijd aan) """ - name = ctx.message.author.name - bingocard = babbelbingo.bingo(name) - await ctx.author.send(file=discord.File(bingocard)) - - @commands.command() async def roll(self, ctx): """ Roll the dice! @@ -68,4 +59,4 @@ class Games(commands.Cog): async def setup(bot): - await bot.add_cog(Games(bot)) \ No newline at end of file + await bot.add_cog(Games(bot)) diff --git a/cogs/misc.py b/cogs/misc.py index 500a1d2..a63bd18 100644 --- a/cogs/misc.py +++ b/cogs/misc.py @@ -2,11 +2,9 @@ import discord from discord.ext import commands from logging import getLogger - # setup logging log = getLogger(__name__) - e = discord.Embed() @@ -17,12 +15,6 @@ class Misc(commands.Cog): self.bot = bot - @commands.command() - async def hug(self, ctx): - msg = f'Jeeves geeft {ctx.message.author.mention} een grote knuffel' - await ctx.send(msg) - - @commands.command() async def eirik(self, ctx): await ctx.send('Deze vraag heeft Eirik Fatland al beantwoord in 1997.') @@ -34,4 +26,4 @@ class Misc(commands.Cog): async def setup(bot): - await bot.add_cog(Misc(bot)) \ No newline at end of file + await bot.add_cog(Misc(bot)) diff --git a/help/info.md b/help/info.md index 5d81b31..b79a2e7 100644 --- a/help/info.md +++ b/help/info.md @@ -3,9 +3,6 @@ Om te voorkomen dat mensen een linkje posten die direct een confronterende preview kan geven, staan embeds uit in sommige kanalen waar daar meer kans op is. Dit zorgt er helaas wel voor dat GIFjes in die kanalen niet werken. Door Jeeves is het toch mogelijk om het GIFje te laten zien, zonder dat confronterende previews van links er ook zijn. -** Flair ** -In het #rollen kanaal staat een bericht met daar onder emoji. Als je een voornaamwoord of andere flair rol in je account wil hebben, kun je op de emoji klikken en dan krijg je de rol automatisch. - ** Extra informatie voor het !roll commando ** - Simpele rolls diff --git a/scripts/emojivvdd.py b/scripts/emojivvdd.py deleted file mode 100644 index fcbc5dc..0000000 --- a/scripts/emojivvdd.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env python3 - -import time -import discord -from discord.ext import commands -import sys -import ast -from ..jeevesbot import env - -## Standalone script for emoji-vvdd - -# setup discord.py bot -intents = discord.Intents().all() -client = commands.Bot(command_prefix='!', intents=intents) - -if len(sys.argv) >= 2: - params = sys.argv[1:] -else: - print("Missing parameter input.") - -async def score(question, score): - e = discord.Embed(title='Emoji-VVDD', color=discord.Color.green()) - e.set_author(name='Jeeves', icon_url='https://cdn.hippogrief.nl/jeevesbot/jeeves.jpg') - e.add_field(name=question, value='\u200b', inline=False) - e.add_field(name='Hoogste score:', value=score, inline=False) - e.set_thumbnail(url='https://cdn.hippogrief.nl/jeevesbot/logo.jpg') - return score - -async def run_script(params): - params = params - channel = client.get_channel(729667183126511617) # vvdd 729667183126511617 # tech 790908319005933598 # test 749399756752814105 - emoji_numbers = ['1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣', '6️⃣', '7️⃣', '8️⃣', '9️⃣'] - question = params[0] # string - answers = ast.literal_eval(params[1]) # list - number_of_responses = len(answers) # int - e = discord.Embed(title='Emoji-VVDD', description='Klik de emoji beneden dit bericht om te stemmen op het antwoord wat bij de emoji hoort.', color=discord.Color.blue()) - e.set_author(name='Jeeves', icon_url='https://cdn.hippogrief.nl/jeevesbot/jeeves.jpg') - e.add_field(name=question, value='\u200b', inline=False) - for emoji, answer in zip(emoji_numbers, answers): - e.add_field(name=emoji, value=answer, inline=False) - e.set_thumbnail(url='https://cdn.hippogrief.nl/jeevesbot/logo.jpg') - message = await channel.send(embed=e) - for i in range(number_of_responses): - await message.add_reaction(emoji_numbers[i]) - for i in range(24, -1, -1): - time.sleep(60) - message = await channel.fetch_message(message.id) - - values = {} - for i in message.reactions: - itervalues = {str(i): int(i.count)} - values.update(itervalues) - max_key = max(values, key=values.get) - all_values = values.values() - max_value = max(all_values) - highest_keys = [key for key in values if values[key] == max_value] - - if len(highest_keys) == 1: - max_key = highest_keys[0] - hoogste_score = 'Hoogste score:' - elif len(highest_keys) != 1: - max_key = highest_keys - print(max_key) - hoogste_score = 'Gelijkspel tussen:' - - score = (str(max_key) + ' met ' + str(max_value) + ' stemmen.') - f = discord.Embed(title='Emoji-VVDD', color=discord.Color.green()) - f.set_author(name='Jeeves', icon_url='https://cdn.hippogrief.nl/jeevesbot/jeeves.jpg') - f.add_field(name=question, value='\u200b', inline=False) - f.add_field(name=hoogste_score, value=score, inline=False) - f.set_footer(text="Je mag blijven doorstemmen, deze tussenstand zal niet worden bijgewerkt meer verder.") - f.set_thumbnail(url='https://cdn.hippogrief.nl/jeevesbot/logo.jpg') - message = await channel.send(embed=f) - - await client.close() - -@client.event -async def on_ready(): - print('### Active with id %s as %s ###' % (client.user.id,client.user.name) ) - activity = discord.Activity(name='!help', type=discord.ActivityType.listening) - await client.change_presence(activity=activity) - await run_script(params) - -if __name__ == '__main__': - client.run(env.TOKEN)