ynerant
/
tfjm-discord-bot
mirror of https://gitlab.com/ddorn/tfjm-discord-bot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:e0c288289d9308cdf39ce912767675bdffd2946e
Branches Tags
ynerant:master
ynerant:better-tirages
..
compare: ynerant:924abea6c89782fb23430087d6ac273141424f03
Branches Tags
ynerant:master
ynerant:better-tirages

No commits in common. "e0c288289d9308cdf39ce912767675bdffd2946e" and "924abea6c89782fb23430087d6ac273141424f03" have entirely different histories.
e0c288289d ... 924abea6c8

8 changed files with 62 additions and 217 deletions
Show Stats Expand all files Collapse all files

50
src/base_tirage.py
View File

@ -13,22 +13,6 @@ import discord
import yaml
from src.constants import *
from src.utils import pprint_send
def skip_if(check, default=None):
"""Decorator that skips running the function if the check is False, and returns the default."""
def decorator(f):
@wraps(f)
def wrapper(*args, **kwargs):
if check(*args, **kwargs):
return default
return f(*args, **kwargs)
return wrapper
return decorator
class Event(asyncio.Event):
@ -161,16 +145,14 @@ class BaseTirage(yaml.YAMLObject):
return event
event.clear()
async def run(self, rounds=(0, 1)):
async def run(self):
await self.info_start()
for i in rounds:
new_poules = await self.make_poules(i)
self.poules.update(new_poules)
self.poules = await self.make_poules()
for poule in new_poules:
await self.draw_poule(poule)
for poule in self.poules:
await self.draw_poule(poule)
await self.info_finish()
@ -199,20 +181,19 @@ class BaseTirage(yaml.YAMLObject):
return dices
async def make_poules(self, rnd):
"""Put teams in poules for a given round (0 or 1)."""
async def make_poules(self):
poules = {}
await self.start_make_poule(rnd)
for rnd in (0, 1):
await self.start_make_poule(rnd)
dices = await self.get_dices(self.teams)
sorted_teams = sorted(self.teams, key=lambda t: dices[t])
dices = await self.get_dices(self.teams)
sorted_teams = sorted(self.teams, key=lambda t: dices[t])
idx = 0
for i, qte in enumerate(self.format):
letter = chr(ord("A") + i)
poules[Poule(letter, rnd)] = sorted_teams[idx : idx + qte]
idx += qte
idx = 0
for i, qte in enumerate(self.format):
letter = chr(ord("A") + i)
poules[Poule(letter, rnd)] = sorted_teams[idx : idx + qte]
idx += qte
await self.annonce_poules(poules)
return poules
@ -281,8 +262,7 @@ class BaseTirage(yaml.YAMLObject):
i += 1
# The conflicts
order = doubles + order
self.poules[poule] = [t.name for t in order]
self.poules[poule] = order
await self.annonce_poule(poule)

2
src/cogs/dev.py
View File

@ -288,7 +288,7 @@ class DevCog(Cog, name="Dev tools"):
pprint(resp, out)
embed = discord.Embed(title="Result", color=discord.Colour.green())
embed.add_field(name="Query", value=f"```py\n{query}```", inline=False)
embed.add_field(name="Query", value=f"```py\n{full_query}```", inline=False)
value = self.to_field_value(out)
if resp is not None and value:

1
src/cogs/misc.py
View File

@ -34,6 +34,7 @@ from discord.ext.commands import (
from discord.utils import get
from src.constants import *
from src.constants import Emoji
from src.core import CustomBot
from src.errors import TfjmError
from src.utils import has_role, start_time, send_and_bin

15
src/cogs/teams.py
View File

@ -91,7 +91,7 @@ class TeamsCog(Cog, name="Teams"):
@commands.command(name="tourist")
@send_and_bin
async def touriste_cmd(self, ctx: Context, tournoi="Finale"):
async def touriste_cmd(self, ctx: Context, tournoi):
"""
Permet de voir et ecouter dans les salons d'un certain tournoi.
@ -99,13 +99,9 @@ class TeamsCog(Cog, name="Teams"):
`!tourist Bordeaux-Nancy` - Donne les droits de spectateurs pour Bordeaux-Nancy
"""
if ctx.author.top_role not in (
ctx.guild.default_role,
get(ctx.guild.roles, name=Role.TOURIST),
):
if ctx.author.top_role != ctx.guild.default_role:
return f"{ctx.author.mention} tu as déjà un role, devenir spéctateur t'enlèverait des droits."
tournoi = tournoi.title()
if tournoi not in TOURNOIS:
return f"{tournoi} n'est pas un nom de tournoi. Possibilités: {french_join(TOURNOIS)}"
@ -113,16 +109,11 @@ class TeamsCog(Cog, name="Teams"):
tournoi_role = get(guild.roles, name=tournoi)
touriste_role = get(guild.roles, name=Role.TOURIST)
if tournoi == "Finale":
# we don't give the "Finaliste" role to the tourists, it would give them rights.
# to simplify branching we assign twice "Touriste"
touriste_role = touriste_role
await ctx.author.add_roles(
touriste_role, tournoi_role, reason="Demande via le bot."
)
return f"{ctx.author.mention} à été ajouté comme spectateur pour {tournoi}."
return f"{ctx.author.mention} à été ajouté comme spectateur dans à {tournoi}."
@group(name="team", invoke_without_command=True, case_insensitive=True, hidden=True)
async def team(self, ctx):

159
src/cogs/tirages.py
View File

@ -2,7 +2,6 @@
import asyncio
import random
import re
import sys
import traceback
from collections import defaultdict, namedtuple
@ -26,11 +25,8 @@ from src.errors import TfjmError, UnwantedCommand
__all__ = ["TirageCog"]
from src.utils import send_and_bin, french_join, pprint_send, confirm
from src.utils import send_and_bin, french_join
RE_DRAW_START = re.compile(
r"^((?P<fmt>\d(\+\d)*) )?(?P<teams>[A-Z]{3}(\s[A-Z]{3})+)((?P<finale>\s--finale)|(\s--continue[= ](?P<continue>\d+)))$"
)
Record = namedtuple("Record", ["name", "pb", "penalite"])
@ -248,9 +244,7 @@ class DiscordTirage(BaseTirage):
@safe
async def start_select_pb(self, team):
await self.ctx.send(
f"C'est au tour de {team.mention} de choisir un problème (`!rp`)."
)
await self.ctx.send(f"C'est au tour de {team.mention} de choisir un problème.")
@safe
@send_all
@ -261,10 +255,12 @@ class DiscordTirage(BaseTirage):
second = "\n".join(
f"{p}: {french_join(t)}" for p, t in poules.items() if p.rnd == 1
)
if first:
yield (f"Les poules sont donc, pour le premier tour :" f"```{first}```\n")
if second:
yield (f"Pour le second tour les poules sont :" f"```{second}```")
yield (
f"Les poules sont donc, pour le premier tour :"
f"```{first}```\n"
f"Et pour le second tour :"
f"```{second}```"
)
@safe
@send_all
@ -279,8 +275,8 @@ class DiscordTirage(BaseTirage):
if len(teams) == 3:
table = """```
╔═════╦═════════╦═════════╦═════════╗
║ T F ║ Phase 1 ║ Phase 2 ║ Phase 3 ║
║ J M ║ Pb. {0.pb} ║ Pb. {1.pb} ║ Pb. {2.pb} ║
║ ║ Phase 1 ║ Phase 2 ║ Phase 3 ║
║ ║ Pb {0.pb} ║ Pb {1.pb} ║ Pb {2.pb} ║
╠═════╬═════════╬═════════╬═════════╣
║ {0.name} ║ Def ║ Rap ║ Opp ║
╠═════╬═════════╬═════════╬═════════╣
@ -292,7 +288,7 @@ class DiscordTirage(BaseTirage):
table = """```
+-----+---------+---------+---------+---------+
| | Phase 1 | Phase 2 | Phase 3 | Phase 4 |
| | Pb {0.pb} | Pb {1.pb} | Pb {2.pb} | Pb {3.pb} |
| | Pb {0.pb} | Pb {1.pb} | Pb {2.pb} | Pb {3.pb} |
+-----+---------+---------+---------+---------+
| {0.name} | Déf | | Rap | Opp |
+-----+---------+---------+---------+---------+
@ -304,22 +300,22 @@ class DiscordTirage(BaseTirage):
+-----+---------+---------+---------+---------+```"""
elif len(teams) == 5:
table = """```
╔═══╦═══════════════════╦═══════════════════╦═════════╗
║ ║ Phase 1 ║ Phase 2 ║ Phase 3 ║
╠═══╬═════════╦═════════╬═════════╦═════════╬═════════╣
║ ║ Salle 1 ║ Salle 2 ║ Salle 1 ║ Salle 2 ║ Salle 1 ║
║ ║ Pb. {0.pb} ║ Pb. {1.pb} ║ Pb. {2.pb} ║ Pb. {3.pb} ║ Pb. {4.pb} ║
╠═══╬═════════╬═════════╬═════════╬═════════╬═════════╣
║{0.name}║ Def ║ ║ Opp ║ Rap ║ ║
╠═══╬═════════╬═════════╬═════════╬═════════╬═════════╣
║{1.name}║ ║ Def ║ Rap ║ ║ Opp ║
╠═══╬═════════╬═════════╬═════════╬═════════╬═════════╣
║{2.name}║ Opp ║ ║ Def ║ ║ Rap ║
╠═══╬═════════╬═════════╬═════════╬═════════╬═════════╣
║{3.name}║ Rap ║ Opp ║ ║ Def ║ ║
╠═══╬═════════╬═════════╬═════════╬═════════╬═════════╣
║{4.name}║ ║ Rap ║ ║ Opp ║ Def ║
╚═══╩═════════╩═════════╩═════════╩═════════╩═════════╝```"""
╔═════╦═══════════════════╦═══════════════════╦═════════╗
║ ║ Phase 1 ║ Phase 2 ║ Phase 3 ║
╠═════╬═════════╦═════════╬═════════╦═════════╬═════════╣
║ ║ Salle 1 ║ Salle 2 ║ Salle 1 ║ Salle 2 ║ Salle 1 ║
║ ║ Pb {0.pb} ║ Pb {1.pb} ║ Pb {2.pb} ║ Pb {3.pb} ║ Pb {4.pb} ║
╠═════╬═════════╬═════════╬═════════╬═════════╬═════════╣
║ {0.name} ║ Def ║ ║ Opp ║ Rap ║ ║
╠═════╬═════════╬═════════╬═════════╬═════════╬═════════╣
║ {1.name} ║ ║ Def ║ Rap ║ ║ Opp ║
╠═════╬═════════╬═════════╬═════════╬═════════╬═════════╣
║ {2.name} ║ Opp ║ ║ Def ║ ║ Rap ║
╠═════╬═════════╬═════════╬═════════╬═════════╬═════════╣
║ {3.name} ║ Rap ║ Opp ║ ║ Def ║ ║
╠═════╬═════════╬═════════╬═════════╬═════════╬═════════╣
║ {4.name} ║ ║ Rap ║ ║ Opp ║ Def ║
╚═════╩═════════╩═════════╩═════════╩═════════╩═════════╝```"""
else:
table = "WTF il n'y a pas 3,4 ou 5 equipes ici."
@ -536,8 +532,7 @@ class TirageCog(Cog, name="Tirages"):
await ctx.send(f"Le problème tiré est... **{problem}**")
@commands.command(
name="oui",
aliases=["accept", "yes", "o", "oh-yeaaah", "accepte", "ouiiiiiii", "owi"],
name="oui", aliases=["accept", "yes", "o", "oh-yeaaah", "accepte", "ouiiiiiii"],
)
async def accept_cmd(self, ctx):
"""
@ -583,20 +578,17 @@ class TirageCog(Cog, name="Tirages"):
await ctx.invoke(self.bot.get_command("help"), "draw")
@draw_group.command(
name="start", usage="FMT TRI1 TRI2... [--finale] [--continue=ID]",
name="start", usage="équipe1 équipe2 équipe3 (équipe4)",
)
@commands.has_any_role(*Role.ORGAS)
async def start(self, ctx: Context, *args):
async def start(self, ctx: Context, fmt, *teams: discord.Role):
"""
(orga) Commence un tirage avec 3 ou 4 équipes.
Cette commande attend des trigrames d'équipes.
Exemple:
`!draw start 5 AAA BBB CCC DDD EEE` - Tirage à une poule de 5 équipes
`!draw start 3+3 AAA BBB CCC DDD EEE FFF` - Deux poules de 3 équipes
`!draw start 3 AAA BBB CCC --finale` - Tirage seulement du premier tour
`!draw start AAA BBB CCC --continue=7` - Continue un tirage commencé avec `--finale`
`!draw start AAA BBB CCC`
"""
channel: discord.TextChannel = ctx.channel
@ -607,70 +599,22 @@ class TirageCog(Cog, name="Tirages"):
"il est possible d'en commencer un autre sur une autre channel."
)
query = " ".join(args)
match = re.match(RE_DRAW_START, query)
if match is None:
await ctx.send("La commande est mal formée.")
return await ctx.invoke(self.bot.get_command("help"), "draw start")
teams = match["teams"].split()
finale = bool(match["finale"])
continue_id = int(match["continue"]) if match["continue"] else None
if match["fmt"]:
fmt = list(map(int, match["fmt"].split()))
else:
l = len(teams)
if l <= 5:
fmt = [l]
else:
fmt = [3] * (l // 3 - 1) + [3 + l % 3]
yes = await confirm(
ctx,
self.bot,
f"Le format déterminé est {'+'.join(map(str, fmt))}, "
f"cela est-il correct ?",
try:
fmt = list(map(int, fmt.split("+")))
except ValueError:
raise TfjmError(
"Le premier argument doit être le format du tournoi, "
"par exemple `3+3` pour deux poules à trois équipes"
)
if not yes:
raise TfjmError(
"Le tirage est annulé, vous pouvez le recommencer en précisant le format."
)
if not set(fmt).issubset({3, 4, 5}):
raise TfjmError("Seuls les poules à 3, 4 ou 5 équipes sont suportées.")
teams_roles = [get(ctx.guild.roles, name=tri) for tri in teams]
if not all(teams_roles):
raise TfjmError("Toutes les équipes ne sont pas sur le discord.")
# Here all data should be valid
if continue_id is None:
# New tirage
tirage = DiscordTirage(ctx, *teams_roles, fmt=fmt)
if finale:
rounds = (0,)
else:
rounds = 0, 1
else:
try:
tirage = self.get_tirages()[continue_id]
except KeyError:
raise TfjmError(
f"Il n'y pas de tirage {continue_id}. ID possibles {french_join(self.get_tirages())}"
)
self.tirages[channel_id] = DiscordTirage(ctx, *teams, fmt=fmt)
rounds = (1,)
tirage.ctx = ctx
tirage.queue = asyncio.Queue()
for i, t in enumerate(teams_roles):
await tirage.event(Event(t.name, i + 1))
self.tirages[channel_id] = tirage
await self.tirages[channel_id].run(rounds)
await self.tirages[channel_id].run()
if self.tirages[channel_id]:
# Check if aborted in an other way
@ -678,12 +622,10 @@ class TirageCog(Cog, name="Tirages"):
@draw_group.command(name="abort")
@commands.has_any_role(*Role.ORGAS)
async def abort_draw_cmd(self, ctx, force: bool = False):
async def abort_draw_cmd(self, ctx):
"""
(orga) Annule le tirage en cours.
Si oui est passé en paramettre, le tirage sera supprímé en même temps.
Le tirage ne pourra pas être continué. Si besoin,
n'hésitez pas à appeller un @dev : il peut réparer
plus de choses qu'on imagine (mais moins qu'on voudrait).
@ -691,18 +633,9 @@ class TirageCog(Cog, name="Tirages"):
channel_id = ctx.channel.id
if channel_id in self.tirages:
id = self.tirages[channel_id].id
await ctx.send(f"Le tirage {id} est annulé.")
await ctx.send(f"Le tirage {self.tirages[channel_id].id} est annulé.")
self.tirages[channel_id].save()
del self.tirages[channel_id]
if force:
tirages = self.get_tirages()
del tirages[id]
File.TIRAGES.touch()
with open(File.TIRAGES, "w") as f:
yaml.dump(tirages, f)
else:
await ctx.send("Il n'y a pas de tirage en cours.")
@ -806,16 +739,6 @@ class TirageCog(Cog, name="Tirages"):
await ctx.send(str(resp.reason))
await ctx.send(await resp.content.read())
@draw_group.command(name="order")
@commands.has_role(Role.DEV)
async def set_order(self, ctx, *teams: discord.Role):
"""(dev) L'ordre des équipes sera celui du message."""
channel = ctx.channel.id
if channel in self.tirages:
for i, t in enumerate(teams):
await self.tirages[channel].event(Event(t.name, i + 1))
def setup(bot):
bot.add_cog(TirageCog(bot))

1
src/constants.py
View File

@ -88,7 +88,6 @@ class Emoji:
BIN = "🗑️"
DICE = "🎲"
CHECK = "✅"
CROSS = "❌"
PLUS_1 = "👍"
MINUS_1 = "👎"

2
src/tfjm_discord_bot.py
View File

@ -15,7 +15,7 @@ tirages = {}
def start():
bot = CustomBot(("! ", "!"), case_insensitive=True, owner_id=DIEGO)
bot = CustomBot(("! ", "!"), case_insensitive=True)
@bot.event
async def on_ready():

49
src/utils.py
View File

@ -1,15 +1,9 @@
import asyncio
from pprint import pprint
from functools import wraps
from io import StringIO
from typing import Union
import discord
import psutil
from discord.ext.commands import Bot
from src.constants import *
def fg(text, color: int = 0xFFA500):
r = color >> 16
@ -20,10 +14,6 @@ def fg(text, color: int = 0xFFA500):
def french_join(l):
l = list(l)
if not l:
return ""
if len(l) < 2:
return l[0]
start = ", ".join(l[:-1])
return f"{start} et {l[-1]}"
@ -54,45 +44,6 @@ def send_and_bin(f):
return wrapped
async def pprint_send(ctx, *objs, **nobjs):
embed = discord.Embed(title="Debug")
nobjs.update({f"Object {i}": o for i, o in enumerate(objs)})
for name, obj in nobjs.items():
out = StringIO()
pprint(obj, out)
out.seek(0)
value = out.read()
if len(value) > 1000:
value = value[:500] + "\n...\n" + value[-500:]
value = f"```py\n{value}\n```"
embed.add_field(name=name, value=value)
return await ctx.send(embed=embed)
async def confirm(ctx, bot, prompt):
msg: discord.Message = await ctx.send(prompt)
await msg.add_reaction(Emoji.CHECK)
await msg.add_reaction(Emoji.CROSS)
def check(reaction: discord.Reaction, u):
return (
ctx.author == u
and msg.id == reaction.message.id
and str(reaction.emoji) in (Emoji.CHECK, Emoji.CROSS)
)
reaction, u = await bot.wait_for("reaction_add", check=check)
if str(reaction) == Emoji.CHECK:
await msg.clear_reaction(Emoji.CROSS)
return True
else:
await msg.clear_reaction(Emoji.CHECK)
return False
def start_time():
return psutil.Process().create_time()