✨ <3 alias for hug

+ 120s timeout for fracals
+ relative path for memes

.envrc

@@ -1 +0,0 @@
-use_nix

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    tfjm-discord-bot
-    Copyright (C) 2020  Diego Dorn
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    tfjm-discord-bot  Copyright (C) 2020  Diego Dorn
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

poetry.lock

@@ -30,7 +30,7 @@ description = "A small Python module for determining appropriate platform-specif
 name = "appdirs"
 optional = false
 python-versions = "*"
-version = "1.4.4"
+version = "1.4.3"
 
 [[package]]
 category = "main"
@@ -46,13 +46,13 @@ description = "Classes Without Boilerplate"
 name = "attrs"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "20.2.0"
+version = "19.3.0"
 
 [package.extras]
-dev = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "sphinx-rtd-theme", "pre-commit"]
-docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"]
-tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
-tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
+azure-pipelines = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "pytest-azurepipelines"]
+dev = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "pre-commit"]
+docs = ["sphinx", "zope.interface"]
+tests = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
 
 [[package]]
 category = "main"
@@ -79,10 +79,11 @@ description = "A Python wrapper for the Discord API"
 name = "discord.py"
 optional = false
 python-versions = ">=3.5.3"
-version = "1.4.1"
+version = "1.3.3"
 
 [package.dependencies]
 aiohttp = ">=3.6.0,<3.7.0"
+websockets = ">=6.0,<7.0 || >7.0,<8.0 || >8.0,<8.0.1 || >8.0.1,<9.0"
 
 [package.extras]
 docs = ["sphinx (1.8.5)", "sphinxcontrib-trio (1.1.1)", "sphinxcontrib-websupport"]
@@ -94,7 +95,7 @@ description = "Internationalized Domain Names in Applications (IDNA)"
 name = "idna"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.10"
+version = "2.9"
 
 [[package]]
 category = "main"
@@ -108,36 +109,20 @@ version = "1.1.0"
 [package.dependencies]
 idna = ">=2.0"
 
-[[package]]
-category = "main"
-description = "Read metadata from Python packages"
-marker = "python_version < \"3.8\""
-name = "importlib-metadata"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
-version = "1.7.0"
-
-[package.dependencies]
-zipp = ">=0.5"
-
-[package.extras]
-docs = ["sphinx", "rst.linker"]
-testing = ["packaging", "pep517", "importlib-resources (>=1.3)"]
-
 [[package]]
 category = "main"
 description = "An autocompletion tool for Python that can be used for text editors."
 name = "jedi"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "0.17.2"
+version = "0.17.0"
 
 [package.dependencies]
-parso = ">=0.7.0,<0.8.0"
+parso = ">=0.7.0"
 
 [package.extras]
 qa = ["flake8 (3.7.9)"]
-testing = ["Django (<3.1)", "colorama", "docopt", "pytest (>=3.9.0,<5.0.0)"]
+testing = ["colorama", "docopt", "pytest (>=3.9.0,<5.0.0)"]
 
 [[package]]
 category = "main"
@@ -145,7 +130,7 @@ description = "multidict implementation"
 name = "multidict"
 optional = false
 python-versions = ">=3.5"
-version = "4.7.6"
+version = "4.7.5"
 
 [[package]]
 category = "main"
@@ -153,7 +138,7 @@ description = "A Python Parser"
 name = "parso"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.7.1"
+version = "0.7.0"
 
 [package.extras]
 testing = ["docopt", "pytest (>=3.0.7)"]
@@ -175,10 +160,10 @@ description = "Cross-platform lib for process and system monitoring in Python."
 name = "psutil"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "5.7.2"
+version = "5.7.0"
 
 [package.extras]
-test = ["ipaddress", "mock", "unittest2", "enum34", "pywin32", "wmi"]
+enum = ["enum34"]
 
 [[package]]
 category = "main"
@@ -186,7 +171,7 @@ description = "Python REPL build on top of prompt_toolkit"
 name = "ptpython"
 optional = false
 python-versions = ">=3.6"
-version = "3.0.5"
+version = "3.0.2"
 
 [package.dependencies]
 appdirs = "*"
@@ -194,10 +179,6 @@ jedi = ">=0.9.0"
 prompt-toolkit = ">=3.0.0,<3.1.0"
 pygments = "*"
 
-[package.dependencies.importlib-metadata]
-python = "<3.8"
-version = "*"
-
 [package.extras]
 ptipython = ["ipython"]
 
@@ -220,19 +201,27 @@ version = "5.3.1"
 [[package]]
 category = "main"
 description = "Backported and Experimental Type Hints for Python 3.5+"
-marker = "python_version < \"3.8\""
+marker = "python_version < \"3.7\""
 name = "typing-extensions"
 optional = false
 python-versions = "*"
-version = "3.7.4.3"
+version = "3.7.4.2"
 
 [[package]]
 category = "main"
-description = "Measures the displayed width of unicode strings in a terminal"
+description = "Measures number of Terminal column cells of wide-character codes"
 name = "wcwidth"
 optional = false
 python-versions = "*"
-version = "0.2.5"
+version = "0.1.9"
+
+[[package]]
+category = "main"
+description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
+name = "websockets"
+optional = false
+python-versions = ">=3.6"
+version = "8.0.2"
 
 [[package]]
 category = "main"
@@ -240,29 +229,12 @@ description = "Yet another URL library"
 name = "yarl"
 optional = false
 python-versions = ">=3.5"
-version = "1.5.1"
+version = "1.4.2"
 
 [package.dependencies]
 idna = ">=2.0"
 multidict = ">=4.0"
 
-[package.dependencies.typing-extensions]
-python = "<3.8"
-version = ">=3.7.4"
-
-[[package]]
-category = "main"
-description = "Backport of pathlib-compatible object wrapper for zip files"
-marker = "python_version < \"3.8\""
-name = "zipp"
-optional = false
-python-versions = ">=3.6"
-version = "3.1.0"
-
-[package.extras]
-docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["jaraco.itertools", "func-timeout"]
-
 [metadata]
 content-hash = "9c9fe13eda9abe2a52c99a38f8bd1183b208d8f8ac72f478061376066c4a105e"
 python-versions = "^3.6"
@@ -283,16 +255,16 @@ aiohttp = [
     {file = "aiohttp-3.6.2.tar.gz", hash = "sha256:259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326"},
 ]
 appdirs = [
-    {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
-    {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
+    {file = "appdirs-1.4.3-py2.py3-none-any.whl", hash = "sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e"},
+    {file = "appdirs-1.4.3.tar.gz", hash = "sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92"},
 ]
 async-timeout = [
     {file = "async-timeout-3.0.1.tar.gz", hash = "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"},
     {file = "async_timeout-3.0.1-py3-none-any.whl", hash = "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"},
 ]
 attrs = [
-    {file = "attrs-20.2.0-py2.py3-none-any.whl", hash = "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"},
-    {file = "attrs-20.2.0.tar.gz", hash = "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594"},
+    {file = "attrs-19.3.0-py2.py3-none-any.whl", hash = "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c"},
+    {file = "attrs-19.3.0.tar.gz", hash = "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"},
 ]
 chardet = [
     {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"},
@@ -303,67 +275,63 @@ discord = [
     {file = "discord-1.0.1.tar.gz", hash = "sha256:ff6653655e342e7721dfb3f10421345fd852c2a33f2cca912b1c39b3778a9429"},
 ]
 "discord.py" = [
-    {file = "discord.py-1.4.1-py3-none-any.whl", hash = "sha256:98ea3096a3585c9c379209926f530808f5fcf4930928d8cfb579d2562d119570"},
-    {file = "discord.py-1.4.1.tar.gz", hash = "sha256:f9decb3bfa94613d922376288617e6a6f969260923643e2897f4540c34793442"},
+    {file = "discord.py-1.3.3-py3-none-any.whl", hash = "sha256:406871b06d86c3dc49fba63238519f28628dac946fef8a0e22988ff58ec05580"},
+    {file = "discord.py-1.3.3.tar.gz", hash = "sha256:ad00e34c72d2faa8db2157b651d05f3c415d7d05078e7e41dc9e8dc240051beb"},
 ]
 idna = [
-    {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
-    {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},
+    {file = "idna-2.9-py2.py3-none-any.whl", hash = "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"},
+    {file = "idna-2.9.tar.gz", hash = "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"},
 ]
 idna-ssl = [
     {file = "idna-ssl-1.1.0.tar.gz", hash = "sha256:a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c"},
 ]
-importlib-metadata = [
-    {file = "importlib_metadata-1.7.0-py2.py3-none-any.whl", hash = "sha256:dc15b2969b4ce36305c51eebe62d418ac7791e9a157911d58bfb1f9ccd8e2070"},
-    {file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"},
-]
 jedi = [
-    {file = "jedi-0.17.2-py2.py3-none-any.whl", hash = "sha256:98cc583fa0f2f8304968199b01b6b4b94f469a1f4a74c1560506ca2a211378b5"},
-    {file = "jedi-0.17.2.tar.gz", hash = "sha256:86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"},
+    {file = "jedi-0.17.0-py2.py3-none-any.whl", hash = "sha256:cd60c93b71944d628ccac47df9a60fec53150de53d42dc10a7fc4b5ba6aae798"},
+    {file = "jedi-0.17.0.tar.gz", hash = "sha256:df40c97641cb943661d2db4c33c2e1ff75d491189423249e989bcea4464f3030"},
 ]
 multidict = [
-    {file = "multidict-4.7.6-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:275ca32383bc5d1894b6975bb4ca6a7ff16ab76fa622967625baeebcf8079000"},
-    {file = "multidict-4.7.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:1ece5a3369835c20ed57adadc663400b5525904e53bae59ec854a5d36b39b21a"},
-    {file = "multidict-4.7.6-cp35-cp35m-win32.whl", hash = "sha256:5141c13374e6b25fe6bf092052ab55c0c03d21bd66c94a0e3ae371d3e4d865a5"},
-    {file = "multidict-4.7.6-cp35-cp35m-win_amd64.whl", hash = "sha256:9456e90649005ad40558f4cf51dbb842e32807df75146c6d940b6f5abb4a78f3"},
-    {file = "multidict-4.7.6-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:e0d072ae0f2a179c375f67e3da300b47e1a83293c554450b29c900e50afaae87"},
-    {file = "multidict-4.7.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3750f2205b800aac4bb03b5ae48025a64e474d2c6cc79547988ba1d4122a09e2"},
-    {file = "multidict-4.7.6-cp36-cp36m-win32.whl", hash = "sha256:f07acae137b71af3bb548bd8da720956a3bc9f9a0b87733e0899226a2317aeb7"},
-    {file = "multidict-4.7.6-cp36-cp36m-win_amd64.whl", hash = "sha256:6513728873f4326999429a8b00fc7ceddb2509b01d5fd3f3be7881a257b8d463"},
-    {file = "multidict-4.7.6-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:feed85993dbdb1dbc29102f50bca65bdc68f2c0c8d352468c25b54874f23c39d"},
-    {file = "multidict-4.7.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fcfbb44c59af3f8ea984de67ec7c306f618a3ec771c2843804069917a8f2e255"},
-    {file = "multidict-4.7.6-cp37-cp37m-win32.whl", hash = "sha256:4538273208e7294b2659b1602490f4ed3ab1c8cf9dbdd817e0e9db8e64be2507"},
-    {file = "multidict-4.7.6-cp37-cp37m-win_amd64.whl", hash = "sha256:d14842362ed4cf63751648e7672f7174c9818459d169231d03c56e84daf90b7c"},
-    {file = "multidict-4.7.6-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:c026fe9a05130e44157b98fea3ab12969e5b60691a276150db9eda71710cd10b"},
-    {file = "multidict-4.7.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:51a4d210404ac61d32dada00a50ea7ba412e6ea945bbe992e4d7a595276d2ec7"},
-    {file = "multidict-4.7.6-cp38-cp38-win32.whl", hash = "sha256:5cf311a0f5ef80fe73e4f4c0f0998ec08f954a6ec72b746f3c179e37de1d210d"},
-    {file = "multidict-4.7.6-cp38-cp38-win_amd64.whl", hash = "sha256:7388d2ef3c55a8ba80da62ecfafa06a1c097c18032a501ffd4cabbc52d7f2b19"},
-    {file = "multidict-4.7.6.tar.gz", hash = "sha256:fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430"},
+    {file = "multidict-4.7.5-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:fc3b4adc2ee8474cb3cd2a155305d5f8eda0a9c91320f83e55748e1fcb68f8e3"},
+    {file = "multidict-4.7.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:42f56542166040b4474c0c608ed051732033cd821126493cf25b6c276df7dd35"},
+    {file = "multidict-4.7.5-cp35-cp35m-win32.whl", hash = "sha256:7774e9f6c9af3f12f296131453f7b81dabb7ebdb948483362f5afcaac8a826f1"},
+    {file = "multidict-4.7.5-cp35-cp35m-win_amd64.whl", hash = "sha256:c2c37185fb0af79d5c117b8d2764f4321eeb12ba8c141a95d0aa8c2c1d0a11dd"},
+    {file = "multidict-4.7.5-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:e439c9a10a95cb32abd708bb8be83b2134fa93790a4fb0535ca36db3dda94d20"},
+    {file = "multidict-4.7.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:85cb26c38c96f76b7ff38b86c9d560dea10cf3459bb5f4caf72fc1bb932c7136"},
+    {file = "multidict-4.7.5-cp36-cp36m-win32.whl", hash = "sha256:620b37c3fea181dab09267cd5a84b0f23fa043beb8bc50d8474dd9694de1fa6e"},
+    {file = "multidict-4.7.5-cp36-cp36m-win_amd64.whl", hash = "sha256:6e6fef114741c4d7ca46da8449038ec8b1e880bbe68674c01ceeb1ac8a648e78"},
+    {file = "multidict-4.7.5-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:a326f4240123a2ac66bb163eeba99578e9d63a8654a59f4688a79198f9aa10f8"},
+    {file = "multidict-4.7.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:dc561313279f9d05a3d0ffa89cd15ae477528ea37aa9795c4654588a3287a9ab"},
+    {file = "multidict-4.7.5-cp37-cp37m-win32.whl", hash = "sha256:4b7df040fb5fe826d689204f9b544af469593fb3ff3a069a6ad3409f742f5928"},
+    {file = "multidict-4.7.5-cp37-cp37m-win_amd64.whl", hash = "sha256:317f96bc0950d249e96d8d29ab556d01dd38888fbe68324f46fd834b430169f1"},
+    {file = "multidict-4.7.5-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:b51249fdd2923739cd3efc95a3d6c363b67bbf779208e9f37fd5e68540d1a4d4"},
+    {file = "multidict-4.7.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:ae402f43604e3b2bc41e8ea8b8526c7fa7139ed76b0d64fc48e28125925275b2"},
+    {file = "multidict-4.7.5-cp38-cp38-win32.whl", hash = "sha256:bb519becc46275c594410c6c28a8a0adc66fe24fef154a9addea54c1adb006f5"},
+    {file = "multidict-4.7.5-cp38-cp38-win_amd64.whl", hash = "sha256:544fae9261232a97102e27a926019100a9db75bec7b37feedd74b3aa82f29969"},
+    {file = "multidict-4.7.5.tar.gz", hash = "sha256:aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e"},
 ]
 parso = [
-    {file = "parso-0.7.1-py2.py3-none-any.whl", hash = "sha256:97218d9159b2520ff45eb78028ba8b50d2bc61dcc062a9682666f2dc4bd331ea"},
-    {file = "parso-0.7.1.tar.gz", hash = "sha256:caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9"},
+    {file = "parso-0.7.0-py2.py3-none-any.whl", hash = "sha256:158c140fc04112dc45bca311633ae5033c2c2a7b732fa33d0955bad8152a8dd0"},
+    {file = "parso-0.7.0.tar.gz", hash = "sha256:908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c"},
 ]
 prompt-toolkit = [
     {file = "prompt_toolkit-3.0.3-py3-none-any.whl", hash = "sha256:c93e53af97f630f12f5f62a3274e79527936ed466f038953dfa379d4941f651a"},
     {file = "prompt_toolkit-3.0.3.tar.gz", hash = "sha256:a402e9bf468b63314e37460b68ba68243d55b2f8c4d0192f85a019af3945050e"},
 ]
 psutil = [
-    {file = "psutil-5.7.2-cp27-none-win32.whl", hash = "sha256:f2018461733b23f308c298653c8903d32aaad7873d25e1d228765e91ae42c3f2"},
-    {file = "psutil-5.7.2-cp27-none-win_amd64.whl", hash = "sha256:66c18ca7680a31bf16ee22b1d21b6397869dda8059dbdb57d9f27efa6615f195"},
-    {file = "psutil-5.7.2-cp35-cp35m-win32.whl", hash = "sha256:5e9d0f26d4194479a13d5f4b3798260c20cecf9ac9a461e718eb59ea520a360c"},
-    {file = "psutil-5.7.2-cp35-cp35m-win_amd64.whl", hash = "sha256:4080869ed93cce662905b029a1770fe89c98787e543fa7347f075ade761b19d6"},
-    {file = "psutil-5.7.2-cp36-cp36m-win32.whl", hash = "sha256:d8a82162f23c53b8525cf5f14a355f5d1eea86fa8edde27287dd3a98399e4fdf"},
-    {file = "psutil-5.7.2-cp36-cp36m-win_amd64.whl", hash = "sha256:0ee3c36428f160d2d8fce3c583a0353e848abb7de9732c50cf3356dd49ad63f8"},
-    {file = "psutil-5.7.2-cp37-cp37m-win32.whl", hash = "sha256:ff1977ba1a5f71f89166d5145c3da1cea89a0fdb044075a12c720ee9123ec818"},
-    {file = "psutil-5.7.2-cp37-cp37m-win_amd64.whl", hash = "sha256:a5b120bb3c0c71dfe27551f9da2f3209a8257a178ed6c628a819037a8df487f1"},
-    {file = "psutil-5.7.2-cp38-cp38-win32.whl", hash = "sha256:10512b46c95b02842c225f58fa00385c08fa00c68bac7da2d9a58ebe2c517498"},
-    {file = "psutil-5.7.2-cp38-cp38-win_amd64.whl", hash = "sha256:68d36986ded5dac7c2dcd42f2682af1db80d4bce3faa126a6145c1637e1b559f"},
-    {file = "psutil-5.7.2.tar.gz", hash = "sha256:90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb"},
+    {file = "psutil-5.7.0-cp27-none-win32.whl", hash = "sha256:298af2f14b635c3c7118fd9183843f4e73e681bb6f01e12284d4d70d48a60953"},
+    {file = "psutil-5.7.0-cp27-none-win_amd64.whl", hash = "sha256:75e22717d4dbc7ca529ec5063000b2b294fc9a367f9c9ede1f65846c7955fd38"},
+    {file = "psutil-5.7.0-cp35-cp35m-win32.whl", hash = "sha256:f344ca230dd8e8d5eee16827596f1c22ec0876127c28e800d7ae20ed44c4b310"},
+    {file = "psutil-5.7.0-cp35-cp35m-win_amd64.whl", hash = "sha256:e2d0c5b07c6fe5a87fa27b7855017edb0d52ee73b71e6ee368fae268605cc3f5"},
+    {file = "psutil-5.7.0-cp36-cp36m-win32.whl", hash = "sha256:a02f4ac50d4a23253b68233b07e7cdb567bd025b982d5cf0ee78296990c22d9e"},
+    {file = "psutil-5.7.0-cp36-cp36m-win_amd64.whl", hash = "sha256:1413f4158eb50e110777c4f15d7c759521703bd6beb58926f1d562da40180058"},
+    {file = "psutil-5.7.0-cp37-cp37m-win32.whl", hash = "sha256:d008ddc00c6906ec80040d26dc2d3e3962109e40ad07fd8a12d0284ce5e0e4f8"},
+    {file = "psutil-5.7.0-cp37-cp37m-win_amd64.whl", hash = "sha256:73f35ab66c6c7a9ce82ba44b1e9b1050be2a80cd4dcc3352cc108656b115c74f"},
+    {file = "psutil-5.7.0-cp38-cp38-win32.whl", hash = "sha256:60b86f327c198561f101a92be1995f9ae0399736b6eced8f24af41ec64fb88d4"},
+    {file = "psutil-5.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:d84029b190c8a66a946e28b4d3934d2ca1528ec94764b180f7d6ea57b0e75e26"},
+    {file = "psutil-5.7.0.tar.gz", hash = "sha256:685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e"},
 ]
 ptpython = [
-    {file = "ptpython-3.0.5-py2.py3-none-any.whl", hash = "sha256:382d080e4130b9be254776787206380359be4f73c25e6b4e8cc371905c4fa587"},
-    {file = "ptpython-3.0.5.tar.gz", hash = "sha256:5094e7e4daa77453d3c33eb7b7ebbf1060be4446521865a94e698bc85ff15930"},
+    {file = "ptpython-3.0.2-py2.py3-none-any.whl", hash = "sha256:126a9e2126816066e6ad57661a15715649a5a4d4b3ca9387d7825dc7d9040c38"},
+    {file = "ptpython-3.0.2.tar.gz", hash = "sha256:556e5367d4d58231b575dc619493dc0d8ef4c2d15ee85c727a88beb60fa5c52b"},
 ]
 pygments = [
     {file = "Pygments-2.6.1-py3-none-any.whl", hash = "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324"},
@@ -383,34 +351,43 @@ pyyaml = [
     {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"},
 ]
 typing-extensions = [
-    {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"},
-    {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"},
-    {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"},
+    {file = "typing_extensions-3.7.4.2-py2-none-any.whl", hash = "sha256:f8d2bd89d25bc39dabe7d23df520442fa1d8969b82544370e03d88b5a591c392"},
+    {file = "typing_extensions-3.7.4.2-py3-none-any.whl", hash = "sha256:6e95524d8a547a91e08f404ae485bbb71962de46967e1b71a0cb89af24e761c5"},
+    {file = "typing_extensions-3.7.4.2.tar.gz", hash = "sha256:79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae"},
 ]
 wcwidth = [
-    {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
-    {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
+    {file = "wcwidth-0.1.9-py2.py3-none-any.whl", hash = "sha256:cafe2186b3c009a04067022ce1dcd79cb38d8d65ee4f4791b8888d6599d1bbe1"},
+    {file = "wcwidth-0.1.9.tar.gz", hash = "sha256:ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1"},
+]
+websockets = [
+    {file = "websockets-8.0.2-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:e906128532a14b9d264a43eb48f9b3080d53a9bda819ab45bf56b8039dc606ac"},
+    {file = "websockets-8.0.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:83e63aa73331b9ca21af61df8f115fb5fbcba3f281bee650a4ad16a40cd1ef15"},
+    {file = "websockets-8.0.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:e9102043a81cdc8b7c8032ff4bce39f6229e4ac39cb2010946c912eeb84e2cb6"},
+    {file = "websockets-8.0.2-cp36-cp36m-win32.whl", hash = "sha256:8d7a20a2f97f1e98c765651d9fb9437201a9ccc2c70e94b0270f1c5ef29667a3"},
+    {file = "websockets-8.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:c82e286555f839846ef4f0fdd6910769a577952e1e26aa8ee7a6f45f040e3c2b"},
+    {file = "websockets-8.0.2-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:73ce69217e4655783ec72ce11c151053fcbd5b837cc39de7999e19605182e28a"},
+    {file = "websockets-8.0.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:8c77f7d182a6ea2a9d09c2612059f3ad859a90243e899617137ee3f6b7f2b584"},
+    {file = "websockets-8.0.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:a7affaeffbc5d55681934c16bb6b8fc82bb75b175e7fd4dcca798c938bde8dda"},
+    {file = "websockets-8.0.2-cp37-cp37m-win32.whl", hash = "sha256:f5cb2683367e32da6a256b60929a3af9c29c212b5091cf5bace9358d03011bf5"},
+    {file = "websockets-8.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:049e694abe33f8a1d99969fee7bfc0ae6761f7fd5f297c58ea933b27dd6805f2"},
+    {file = "websockets-8.0.2.tar.gz", hash = "sha256:882a7266fa867a2ebb2c0baaa0f9159cabf131cf18c1b4270d79ad42f9208dc5"},
 ]
 yarl = [
-    {file = "yarl-1.5.1-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:db6db0f45d2c63ddb1a9d18d1b9b22f308e52c83638c26b422d520a815c4b3fb"},
-    {file = "yarl-1.5.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:17668ec6722b1b7a3a05cc0167659f6c95b436d25a36c2d52db0eca7d3f72593"},
-    {file = "yarl-1.5.1-cp35-cp35m-win32.whl", hash = "sha256:040b237f58ff7d800e6e0fd89c8439b841f777dd99b4a9cca04d6935564b9409"},
-    {file = "yarl-1.5.1-cp35-cp35m-win_amd64.whl", hash = "sha256:f18d68f2be6bf0e89f1521af2b1bb46e66ab0018faafa81d70f358153170a317"},
-    {file = "yarl-1.5.1-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:c52ce2883dc193824989a9b97a76ca86ecd1fa7955b14f87bf367a61b6232511"},
-    {file = "yarl-1.5.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:ce584af5de8830d8701b8979b18fcf450cef9a382b1a3c8ef189bedc408faf1e"},
-    {file = "yarl-1.5.1-cp36-cp36m-win32.whl", hash = "sha256:df89642981b94e7db5596818499c4b2219028f2a528c9c37cc1de45bf2fd3a3f"},
-    {file = "yarl-1.5.1-cp36-cp36m-win_amd64.whl", hash = "sha256:3a584b28086bc93c888a6c2aa5c92ed1ae20932f078c46509a66dce9ea5533f2"},
-    {file = "yarl-1.5.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:da456eeec17fa8aa4594d9a9f27c0b1060b6a75f2419fe0c00609587b2695f4a"},
-    {file = "yarl-1.5.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bc2f976c0e918659f723401c4f834deb8a8e7798a71be4382e024bcc3f7e23a8"},
-    {file = "yarl-1.5.1-cp37-cp37m-win32.whl", hash = "sha256:4439be27e4eee76c7632c2427ca5e73703151b22cae23e64adb243a9c2f565d8"},
-    {file = "yarl-1.5.1-cp37-cp37m-win_amd64.whl", hash = "sha256:48e918b05850fffb070a496d2b5f97fc31d15d94ca33d3d08a4f86e26d4e7c5d"},
-    {file = "yarl-1.5.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:9b930776c0ae0c691776f4d2891ebc5362af86f152dd0da463a6614074cb1b02"},
-    {file = "yarl-1.5.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b3b9ad80f8b68519cc3372a6ca85ae02cc5a8807723ac366b53c0f089db19e4a"},
-    {file = "yarl-1.5.1-cp38-cp38-win32.whl", hash = "sha256:f379b7f83f23fe12823085cd6b906edc49df969eb99757f58ff382349a3303c6"},
-    {file = "yarl-1.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:9102b59e8337f9874638fcfc9ac3734a0cfadb100e47d55c20d0dc6087fb4692"},
-    {file = "yarl-1.5.1.tar.gz", hash = "sha256:c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6"},
-]
-zipp = [
-    {file = "zipp-3.1.0-py3-none-any.whl", hash = "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b"},
-    {file = "zipp-3.1.0.tar.gz", hash = "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"},
+    {file = "yarl-1.4.2-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:3ce3d4f7c6b69c4e4f0704b32eca8123b9c58ae91af740481aa57d7857b5e41b"},
+    {file = "yarl-1.4.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:a4844ebb2be14768f7994f2017f70aca39d658a96c786211be5ddbe1c68794c1"},
+    {file = "yarl-1.4.2-cp35-cp35m-win32.whl", hash = "sha256:d8cdee92bc930d8b09d8bd2043cedd544d9c8bd7436a77678dd602467a993080"},
+    {file = "yarl-1.4.2-cp35-cp35m-win_amd64.whl", hash = "sha256:c2b509ac3d4b988ae8769901c66345425e361d518aecbe4acbfc2567e416626a"},
+    {file = "yarl-1.4.2-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:308b98b0c8cd1dfef1a0311dc5e38ae8f9b58349226aa0533f15a16717ad702f"},
+    {file = "yarl-1.4.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:944494be42fa630134bf907714d40207e646fd5a94423c90d5b514f7b0713fea"},
+    {file = "yarl-1.4.2-cp36-cp36m-win32.whl", hash = "sha256:5b10eb0e7f044cf0b035112446b26a3a2946bca9d7d7edb5e54a2ad2f6652abb"},
+    {file = "yarl-1.4.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a161de7e50224e8e3de6e184707476b5a989037dcb24292b391a3d66ff158e70"},
+    {file = "yarl-1.4.2-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:26d7c90cb04dee1665282a5d1a998defc1a9e012fdca0f33396f81508f49696d"},
+    {file = "yarl-1.4.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:0c2ab325d33f1b824734b3ef51d4d54a54e0e7a23d13b86974507602334c2cce"},
+    {file = "yarl-1.4.2-cp37-cp37m-win32.whl", hash = "sha256:e15199cdb423316e15f108f51249e44eb156ae5dba232cb73be555324a1d49c2"},
+    {file = "yarl-1.4.2-cp37-cp37m-win_amd64.whl", hash = "sha256:2098a4b4b9d75ee352807a95cdf5f10180db903bc5b7270715c6bbe2551f64ce"},
+    {file = "yarl-1.4.2-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c9959d49a77b0e07559e579f38b2f3711c2b8716b8410b320bf9713013215a1b"},
+    {file = "yarl-1.4.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:25e66e5e2007c7a39541ca13b559cd8ebc2ad8fe00ea94a2aad28a9b1e44e5ae"},
+    {file = "yarl-1.4.2-cp38-cp38-win32.whl", hash = "sha256:6faa19d3824c21bcbfdfce5171e193c8b4ddafdf0ac3f129ccf0cdfcb083e462"},
+    {file = "yarl-1.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:0ca2f395591bbd85ddd50a82eb1fde9c1066fafe888c5c7cc1d810cf03fd3cc6"},
+    {file = "yarl-1.4.2.tar.gz", hash = "sha256:58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b"},
 ]

shell.nix

@@ -1,10 +0,0 @@
-{ pkgs? import <nixpkgs> {}, ... }:
-let 
-  pythonEnv = pkgs.poetry2nix.mkPoetryEnv {
-    projectDir = ./.;
-  };
-in pkgs.mkShell {
-  buildInputs = [ pythonEnv ];
-
-  PYTHONPATH = ".";
-}

src/base_tirage.py

@@ -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)
 

src/cogs/dev.py

@@ -1,11 +1,5 @@
 import asyncio
-import re
-import traceback
-from contextlib import redirect_stdout
-from io import StringIO
 from pprint import pprint
-from textwrap import indent
-from typing import Union
 
 import discord
 from discord import TextChannel, PermissionOverwrite, Message, ChannelType
@@ -16,15 +10,13 @@ from discord.ext.commands import (
     Cog,
     ExtensionNotLoaded,
     Context,
-    is_owner,
 )
 from discord.utils import get
 from ptpython.repl import embed
 
 from src.constants import *
 from src.core import CustomBot
-from src.errors import TfjmError
-from src.utils import fg, french_join
+from src.utils import fg
 
 COGS_SHORTCUTS = {
     "bt": "src.base_tirage",
@@ -37,15 +29,10 @@ COGS_SHORTCUTS = {
     "v": "dev",
 }
 
-RE_QUERY = re.compile(
-    r"^! ?e(val)?[ \n]+(`{1,3}(py(thon)?\n)?)?(?P<query>.*?)\n?(`{1,3})?\n?$", re.DOTALL
-)
-
 
 class DevCog(Cog, name="Dev tools"):
     def __init__(self, bot: CustomBot):
         self.bot = bot
-        self.eval_locals = {}
 
     @command(name="interrupt")
     @has_role(Role.DEV)
@@ -138,24 +125,12 @@ class DevCog(Cog, name="Dev tools"):
             await ctx.send(f":tada: L'extension **{name}** a bien été ajoutée !")
 
     # noinspection PyUnreachableCode
-    @command(name="setup")
+    @command(name="setup", hidden=True)
     @has_role(Role.DEV)
-    async def setup_roles(self, ctx: Context, *teams: discord.Role):
+    async def setup_roles(self, ctx):
         """
         (dev) Commande temporaire pour setup le serveur.
         """
-        return
-        finalist = get(ctx.guild.roles, name=Role.FINALISTE)
-        assert finalist
-
-        for t in teams:
-            m: discord.Member
-            for m in t.members:
-                await m.add_roles(finalist)
-
-        await ctx.send(
-            f"{french_join(t.mention for t in teams)} ont été ajouté en finale !"
-        )
 
         return
         guild: discord.Guild = ctx.guild
@@ -212,7 +187,7 @@ class DevCog(Cog, name="Dev tools"):
     @command(name="send")
     @has_role(Role.DEV)
     async def send_cmd(self, ctx, *msg):
-        """(dev) Envoie un message."""
+        """Envoie un message."""
         await ctx.message.delete()
         await ctx.send(" ".join(msg))
 
@@ -229,122 +204,6 @@ class DevCog(Cog, name="Dev tools"):
         await channel.delete_messages(to_delete)
         await ctx.message.delete()
 
-    async def eval(self, msg: Message) -> discord.Embed:
-        guild: discord.Guild = msg.guild
-        roles = guild.roles
-        members = guild.members
-        hugs_cog = self.bot.get_cog("Divers")
-        hugs = hugs_cog.hugs
-        channel: TextChannel = msg.channel
-        send = lambda text: asyncio.create_task(channel.send(text))
-
-        query = re.match(RE_QUERY, msg.content).group("query")
-
-        if not query:
-            raise TfjmError("No query found.")
-
-        if any(word in query for word in ("=", "return", "await", ":", "\n")):
-            lines = query.splitlines()
-            if (
-                "return" not in lines[-1]
-                and "=" not in lines[-1]
-                and not lines[-1].startswith(" ")
-            ):
-                lines[-1] = f"return {lines[-1]}"
-                query = "\n".join(lines)
-            full_query = f"""async def query():
-    try:
-{indent(query, " " * 8)}
-    finally:
-        self.eval_locals.update(locals())
-"""
-        else:
-            full_query = query
-
-        globs = {**globals(), **locals(), **self.eval_locals}
-        stdout = StringIO()
-
-        try:
-            with redirect_stdout(stdout):
-                if "\n" in full_query:
-                    locs = {}
-                    exec(full_query, globs, locs)
-                    resp = await locs["query"]()
-                else:
-                    resp = eval(query, globs)
-        except Exception as e:
-            tb = StringIO()
-            traceback.print_tb(e.__traceback__, file=tb)
-
-            embed = discord.Embed(title=str(e), color=discord.Colour.red())
-            embed.add_field(
-                name="Query", value=f"```py\n{full_query}\n```", inline=False
-            )
-            embed.add_field(
-                name="Traceback", value=self.to_field_value(tb), inline=False
-            )
-        else:
-            out = StringIO()
-            pprint(resp, out)
-
-            embed = discord.Embed(title="Result", color=discord.Colour.green())
-            embed.add_field(name="Query", value=f"```py\n{query}```", inline=False)
-
-            value = self.to_field_value(out)
-            if resp is not None and value:
-                embed.add_field(name="Value", value=value, inline=False)
-
-        stdout = self.to_field_value(stdout)
-        if stdout:
-            embed.add_field(name="Standard output", value=stdout, inline=False)
-
-        embed.set_footer(text="You may edit your message.")
-        return embed
-
-    def to_field_value(self, string: Union[str, StringIO]):
-        if isinstance(string, StringIO):
-            string.seek(0)
-            string = string.read()
-
-        if not string:
-            return
-
-        if len(string) > 1000:
-            string = string[:500] + "\n...\n" + string[-500:]
-
-        return f"```py\n{string}```"
-
-    @command(name="eval", aliases=["e"])
-    @is_owner()
-    async def eval_cmd(self, ctx: Context):
-        """(dev) Evalue l'entrée."""
-
-        self.eval_locals["ctx"] = ctx
-
-        embed = await self.eval(ctx.message)
-        resp = await ctx.send(embed=embed)
-
-        def check(before, after):
-            return after.id == ctx.message.id
-
-        while True:
-            try:
-                before, after = await self.bot.wait_for(
-                    "message_edit", check=check, timeout=600
-                )
-            except asyncio.TimeoutError:
-                break
-
-            embed = await self.eval(after)
-            await resp.edit(embed=embed)
-
-        # Remove the "You may edit your message"
-        embed.set_footer()
-        try:
-            await resp.edit(embed=embed)
-        except discord.NotFound:
-            pass
-
     @Cog.listener()
     async def on_message(self, msg: Message):
         ch: TextChannel = msg.channel

src/cogs/misc.py

@@ -1,18 +1,11 @@
-import ast
 import asyncio
 import datetime
 import io
 import itertools
-import operator as op
 import random
-import re
-import traceback
 import urllib
-from collections import Counter, defaultdict
 from dataclasses import dataclass, field
-from functools import partial
-import math
-from operator import attrgetter, itemgetter
+from operator import attrgetter
 from time import time
 from typing import List, Set, Union
 
@@ -21,27 +14,26 @@ import discord
 import yaml
 from discord import Guild, Member
 from discord.ext import commands
-from discord.ext.commands import (BadArgument, Cog, command, Command, CommandError, Context, Group, group, is_owner,
-                                  MemberConverter, RoleConverter)
+from discord.ext.commands import (
+    Cog,
+    command,
+    Context,
+    Command,
+    CommandError,
+    Group,
+    group,
+    MemberConverter,
+    BadArgument,
+    RoleConverter,
+)
 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, send_and_bin, start_time
+from src.utils import has_role, start_time, send_and_bin
 
-# supported operators
-OPS = {
-    ast.Add: op.add, ast.Sub: op.sub, ast.Mult: op.mul,
-    ast.FloorDiv: op.floordiv, ast.Mod: op.mod,
-    ast.Div: op.truediv, ast.Pow: op.pow, ast.BitXor: op.xor,
-    ast.USub: op.neg, "abs": abs, "π": math.pi, "τ": math.tau,
-    "i": 1j,
-}
-
-for name in dir(math):
-    if not name.startswith("_"):
-        OPS[name] = getattr(math, name)
 
 @dataclass
 class Joke(yaml.YAMLObject):
@@ -55,37 +47,12 @@ class Joke(yaml.YAMLObject):
     file: str = None
 
 
-HUG_RE = re.compile(r"^(?P<hugger>\d+) -> (?P<hugged>\d+) \| (?P<text>.*)$")
-
-
-class Hug:
-    def __init__(self, hugger, hugged, text):
-        self.hugger = hugger
-        self.hugged = hugged
-        self.text = text
-
-    @classmethod
-    def from_str(cls, line: str):
-        match = HUG_RE.match(line)
-        if not match:
-            raise ValueError(f"'{line}' is not a valid hug format.")
-        hugger = int(match.group("hugger"))
-        hugged = int(match.group("hugged"))
-        text = match.group("text")
-
-        return cls(hugger, hugged, text)
-
-    def __repr__(self):
-        return f"{self.hugger} -> {self.hugged} | {self.text}"
-
-
 class MiscCog(Cog, name="Divers"):
     def __init__(self, bot: CustomBot):
         self.bot = bot
         self.show_hidden = False
         self.verify_checks = True
         self.computing = False
-        self.hugs = self.get_hugs()
 
     @command(
         name="choose",
@@ -166,148 +133,21 @@ class MiscCog(Cog, name="Divers"):
     async def pew(self, ctx):
         await ctx.send("Tu t'es raté ! Kwaaack :duck:")
 
-    @command(aliases=["pong"])
-    async def ping(self, ctx):
-        """Affiche la latence avec le bot."""
-        msg: discord.Message = ctx.message
-        ping = msg.created_at.timestamp()
-        msg: discord.Message = await ctx.send("Pong !")
-        pong = time()
+    @command(aliases=["<3"])
+    async def hug(self, ctx, who="everyone"):
+        """Fait un câlin à quelqu'un."""
 
-        # 7200 is because we are UTC+2
-        delta = pong - ping - 7200
-
-        await msg.edit(content=f"Pong ! Ça a pris {int(1000 * (delta))}ms")
-
-    @command(name="fan", aliases=["join", "adhere"], hidden=True)
-    async def fan_club_cmd(self, ctx: Context, who: Member):
-        """Permet de rejoindre un fan club existant."""
-        role_id = FAN_CLUBS.get(who.id, None)
-        role = get(ctx.guild.roles, id=role_id)
-
-        if role is not None:
-            await ctx.author.add_roles(role)
-            await ctx.send(f"Bienvenue au {role.mention} !! :tada:")
-        else:
-            await ctx.send(
-                f"{who.mention} n'a pas encore de fan club. Peut-être qu'un jour "
-                f"iel sera un membre influent du CNO ?"
-            )
-
-    @command(name="calc", aliases=["="])
-    async def calc_cmd(self, ctx, *args):
-        """Effectue un calcul simple"""
-        with_tb = has_role(ctx.author, Role.DEV)
-        embed = self._calc(ctx.message.content, with_tb)
-        resp = await ctx.send(embed=embed)
-
-        def check(before, after):
-            return after.id == ctx.message.id
-
-        while True:
-            try:
-                before, after = await self.bot.wait_for(
-                    "message_edit", check=check, timeout=600
-                )
-            except asyncio.TimeoutError:
-                break
-
-            embed = self._calc(after.content, with_tb)
-            await resp.edit(embed=embed)
-
-        # Remove the "You may edit your message"
-        embed.set_footer()
-        try:
-            await resp.edit(embed=embed)
-        except discord.NotFound:
-            pass
-
-    def _calc(self, query: str, with_tb=False):
-
-        for prefix in ("! ", "!", "calc", "="):
-            if query.startswith(prefix):
-                query = query[len(prefix):]
-        query = re.sub(r"\b((\d)+(\.\d+)?)(?P<name>[a-zA-Z]+)\b", r"\1*\4", query)
-
-        query = query.strip().strip("`")
-
-        ex = None
-        result = 42
-        try:
-            result = self._eval(ast.parse(query, mode='eval').body)
-        except Exception as e:
-            ex = e
-
-        if isinstance(result, complex):
-            if abs(result.imag) < 1e-12:
-                result = result.real
-            else:
-                r, i = result.real, result.imag
-                r = r if abs(int(r) - r) > 1e-12 else int(r)
-                i = i if abs(int(i) - i) > 1e-12 else int(i)
-                if not r:
-                    result = f"{i if i != 1 else ''}i"
-                else:
-                    result = f"{r}{i if i != 1 else '':+}i"
-        if isinstance(result, float):
-            result = round(result, 12)
-
-        embed = discord.Embed(title=discord.utils.escape_markdown(query), color=EMBED_COLOR)
-        # embed.add_field(name="Entrée", value=f"`{query}`", inline=False)
-        embed.add_field(name="Valeur", value=f"`{result}`", inline=False)
-        if ex and with_tb:
-            embed.add_field(name="Erreur", value=f"{ex.__class__.__name__}: {ex}", inline=False)
-            trace = io.StringIO()
-            traceback.print_exception(type(ex), ex, ex.__traceback__, file=trace)
-            trace.seek(0)
-            embed.add_field(name="Traceback", value=f"```\n{trace.read()}```")
-        embed.set_footer(text="You may edit your message")
-
-        return embed
-
-    def _eval(self, node):
-        if isinstance(node, ast.Num):  # <number>
-            return node.n
-        elif isinstance(node, ast.BinOp):  # <left> <operator> <right>
-            return OPS[type(node.op)](self._eval(node.left), self._eval(node.right))
-        elif isinstance(node, ast.UnaryOp):  # <operator> <operand> e.g., -1
-            return OPS[type(node.op)](self._eval(node.operand))
-        elif isinstance(node, ast.Call):
-            if isinstance(node.func, ast.Name):
-                return OPS[node.func.id](*(self._eval(n) for n in node.args), **{k.arg: self._eval(k.value) for k in node.keywords})
-        elif isinstance(node, ast.Name):
-            return OPS[node.id]
-
-        fields = ", ".join(
-            f"{k}={getattr(node, k).__class__.__name__}" for k in node._fields
-        )
-        raise TypeError(f"Type de noeud non supporté: {node.__class__.__name__}({fields})")
-
-
-    # ----------------- Hugs ---------------- #
-
-    @command(aliases=["<3", "❤️", ":heart:", Emoji.RAINBOW_HEART])
-    async def hug(self, ctx: Context, who="everyone"):
-        """Fait un câlin à quelqu'un. :heart:"""
-
-        if who == "everyone":
-            who = ctx.guild.default_role
-        elif who == "back":
-            return await self.hug_back(ctx)
-        else:
+        if who != "everyone":
             try:
                 who = await RoleConverter().convert(ctx, who)
             except BadArgument:
                 try:
                     who = await MemberConverter().convert(ctx, who)
                 except BadArgument:
-                    return await ctx.send(
-                        discord.utils.escape_mentions(
-                            f'Il n\'y a pas de "{who}". :man_shrugging:'
-                        )
-                    )
+                    return await ctx.send(f'Il n\'y a pas de "{who}". :man_shrugging:')
+        else:
+            who = ctx.guild.default_role
         who: Union[discord.Role, Member]
-        bot_hug = who == self.bot.user
 
         bonuses = [
             "C'est trop meuuuugnon !",
@@ -315,13 +155,9 @@ class MiscCog(Cog, name="Divers"):
             ":hugging:",
             ":smiling_face_with_3_hearts:",
             "Oh wiiii",
-            # f"{'Je me sens' if bot_hug else 'Iel se sent'} désormais prêt à travailler à fond sur les solutions de AQT",
-            f"{who.mention} en redemande un !"
-            if not bot_hug
-            else "J'en veux un autre ! :heart_eyes:",
-            "Le·a pauvre, iel est tout·e rouge !"
-            if not bot_hug
-            else "Un robot ne peut pas rougir, mais je crois que... :blush:",
+            "Iel se sent désormais prêt à travailler à fond sur les solutions de AQT",
+            f"{who.mention} en redemande un !",
+            "Le·a pauvre, iel est tout·e rouge !",
             "Hihi, il gratte ton pull en laine ! :sheep:",
         ]
 
@@ -332,21 +168,6 @@ class MiscCog(Cog, name="Divers"):
         ):
             bonuses += ["Il s'agit surement là d'une tentative de corruption !"]
 
-        if has_role(ctx.author, Role.PRETRESSE_CALINS):
-            bonuses += [
-                "C'est le plus beau calin du monde :smiling_face_with_3_hearts: :smiling_face_with_3_hearts:",
-                f"{who.mention} est subjugué·e ! :smiling_face_with_3_hearts:",
-            ]
-
-        if who.id == DIEGO:
-            bonuses += [
-                "Tiens... Ça sent le mojito... :lemon:",
-                ":green_heart: :lemon: :green_heart:",
-            ]
-
-        if who.id in FAN_CLUBS and not get(ctx.author.roles, id=FAN_CLUBS[who.id]):
-            bonuses += ["Tu devrais rejoindre son fan club :wink:"]
-
         if who == ctx.author:
             msg = f"{who.mention} se fait un auto-calin !"
             bonuses += [
@@ -362,8 +183,7 @@ class MiscCog(Cog, name="Divers"):
                 "C'est pas très COVID-19 tout ça !",
                 "Tout le monde est heureux maintenant !",
             ]
-        elif bot_hug:
-            msg = f"{ctx.author.mention} me fait un gros câliiiiin !"
+        elif who == self.bot.user:
             bonuses += ["Je trouve ça très bienveillant <3"]
         else:
             msg = f"{ctx.author.mention} fait un gros câlin à {who.mention} !"
@@ -371,7 +191,6 @@ class MiscCog(Cog, name="Divers"):
                 f"Mais {who.mention} n'apprécie pas...",
                 "Et ils s'en vont chasser des canards ensemble :wink:",
                 "Oh ! Iel sent bon...",
-                "Et moi quand est ce que j'ai le droit à un calin ?",
                 f"{who.mention} a serré tellment fort qu'iel vous a coupé en deux :scream:",
                 f"{who.mention} propose à {ctx.author.mention} de se revoir autour d'une :pizza: !",
                 "Les drones du commissaire Winston passent par là et vous ordonnent d'arrêter.",
@@ -381,227 +200,32 @@ class MiscCog(Cog, name="Divers"):
 
         bonus = random.choice(bonuses)
 
-        text = f"{msg} {bonus}"
-        self.add_hug(ctx.author.id, who.id, text)
+        await ctx.send(f"{msg} {bonus}")
 
-        await ctx.send(text)
+    @command(aliases=["pong"])
+    async def ping(self, ctx):
+        """Affiche la latence avec le bot."""
+        ping = time()
+        msg: discord.Message = await ctx.send("Pong !")
+        pong = time()
 
-        if bot_hug and random.random() > 0.9:
-            await asyncio.sleep(3.14159265358979323)
-            ctx.author = get(ctx.guild.members, id=self.bot.user.id)
-            await ctx.invoke(self.hug, "back")
+        await msg.edit(content=f"Pong ! Ça a pris {int(1000 * (pong - ping))}ms")
 
-    async def hug_back(self, ctx: Context):
-        hugger = ctx.author.id
+    @command(name="fan", aliases=["join", "adhere"], hidden=True)
+    async def fan_club_cmd(self, ctx: Context, who: Member):
+        """Permet de rejoindre le fan-club d'Ananas ou Citron Vert."""
+        role_id = FAN_CLUBS.get(who.id, None)
+        role = get(ctx.guild.roles, id=role_id)
 
-        last_hug: Hug = get(reversed(self.hugs), hugged=hugger)
-        if not last_hug:
-            return await ctx.send(
-                f"Personne n'a jamais fait de calin à {ctx.author.mention}, il faut y remédier !"
+        if role is not None:
+            await ctx.author.add_roles(role)
+            await ctx.send(f"Bienvenue au {role.mention} !! :tada:")
+        else:
+            await ctx.send(
+                f"{who.mention} n'a pas encore de fan club. Peut-être qu'un jour "
+                f"iel sera un membre influent du CNO ?"
             )
 
-        if "coupé en deux" in last_hug.text:
-            return await ctx.send(
-                "Tu ne vas quand même pas faire un câlin à quelqu'un "
-                "que tu viens de couper en deux !"
-            )
-
-        await ctx.invoke(self.hug, str(last_hug.hugger))
-
-    @command(name="hug-stats", aliases=["hs"])
-    @commands.has_role(Role.PRETRESSE_CALINS)
-    async def hugs_stats_cmd(self, ctx: Context, who: Member = None):
-        """(prêtresse des calins) Affiche qui est le plus câliné """
-
-        if who is None:
-            await self.send_all_hug_stats(ctx)
-        else:
-            await self.send_hugs_stats_for(ctx, who)
-
-    async def send_all_hug_stats(self, ctx):
-        medals = [
-            ":first_place:",
-            ":second_place:",
-            ":third_place:",
-            ":medal:",
-            ":military_medal:",
-        ]
-        ranks = ["Gros Nounours", "Petit Panda", "Ours en peluche"]
-
-        embed = discord.Embed(
-            title="Prix du plus câliné",
-            color=discord.Colour.magenta(),
-            description=f"Nombre de total de câlins : {len(self.hugs)} {Emoji.HEART}",
-        )
-
-        everyone = ctx.guild.default_role.id
-        everyone_hugs = 0
-        everyone_diff = set()
-        stats = Counter()
-        diffs = defaultdict(set)
-        for h in self.hugs:
-            if h.hugged == everyone:
-                everyone_hugs += 1
-                everyone_diff.add(h.hugger)
-            else:
-                if h.hugged != h.hugger:
-                    stats[h.hugged] += 1
-                    diffs[h.hugged].add(h.hugger)
-
-                role: discord.Role = get(ctx.guild.roles, id=h.hugged)
-                if role is not None:
-                    for m in role.members:
-                        if m.id != h.hugger:
-                            stats[m.id] += 1
-                            diffs[m.id].add(h.hugger)
-
-        for m, d in diffs.items():
-            stats[m] += len(everyone_diff.union(d)) * 42 + everyone_hugs
-
-        top = sorted(list(stats.items()), key=itemgetter(1), reverse=True)
-
-        for i in range(3):
-            m = medals[i]
-            r = ranks[i]
-            id, qte = top[i]
-            who = self.name_for(ctx, id)
-
-            embed.add_field(name=f"{m} - {r}", value=f"{who} : {qte}  :heart:")
-
-        top4to7 = "\n ".join(
-            f"{medals[3]} {self.name_for(ctx, id)} : {qte}  :orange_heart:"
-            for id, qte in top[3:8]
-        )
-        embed.add_field(name="Apprenti peluche", value=top4to7)
-
-        top8to13 = "\n".join(
-            f"{medals[4]} {self.name_for(ctx, id)} : {qte}  :yellow_heart:"
-            for id, qte in top[8:13]
-        )
-        embed.add_field(name="Pelote de laine de canard", value=top8to13)
-
-        await ctx.send(embed=embed)
-
-    async def send_hugs_stats_for(self, ctx: Context, who: discord.Member):
-
-        given = self.hugs_given(ctx, who.id)
-        received = self.hugs_received(ctx, who.id)
-        auto = self.auto_hugs(ctx, who.id)
-        cut = [h for h in given if "coupé en deux" in h.text]
-        infos = {
-            "Câlins donnés": (len(given), 1),
-            "Câlins reçus": (len(received), 1),
-            "Personnes câlinées": (len(set(h.hugged for h in given)), 20),
-            "Câliné par": (len(set(h.hugger for h in received)), 30),
-            "Auto-câlins": ((len(auto)), 3),
-            "Morceaux": (len(cut), 30),
-        }
-
-        most_given = Counter(h.hugged for h in given).most_common(1)
-        most_received = Counter(h.hugger for h in received).most_common(1)
-        most_given = most_given[0] if most_given else (0, 0)
-        most_received = most_received[0] if most_received else (0, 0)
-
-        embed = discord.Embed(
-            title=f"Câlins de {who.display_name}",
-            color=discord.Colour.magenta(),
-            description=(
-                f"On peut dire que {who.mention} est très câlin·e, avec un score de "
-                f"{self.score_for(ctx, who.id)}. Iel a beaucoup câliné "
-                f"{self.name_for(ctx, most_given[0])} "
-                f"*({most_given[1]} :heart:)* et "
-                f"s'est beaucoup fait câliner par {self.name_for(ctx, most_received[0])} "
-                f"*({most_received[1]} :heart:)* !"
-            ),
-        )
-        user: discord.User = self.bot.get_user(who.id)
-        embed.set_thumbnail(url=user.avatar_url)
-
-        for f, (v, h_factor) in infos.items():
-            heart = self.heart_for_stat(v * h_factor)
-            if f == "Morceaux":
-                v = 2 ** v
-            embed.add_field(name=f, value=f"{v} {heart}")
-
-        await ctx.send(embed=embed)
-
-    def ris(self, ctx: Context, id, role_or_member_id):
-        """Whether the id is the same member or a member that has the given role."""
-        if id == role_or_member_id:
-            return True
-
-        member: Member = get(ctx.guild.members, id=id)
-
-        if member is None:
-            return False
-
-        role = get(member.roles, id=role_or_member_id)
-
-        return role is not None
-
-    def heart_for_stat(self, v):
-        hearts = [
-            ":broken_heart:",
-            ":green_heart:",
-            ":yellow_heart:",
-            ":orange_heart:",
-            ":heart:",
-            ":sparkling_heart:",
-            Emoji.RAINBOW_HEART,
-        ]
-
-        if v <= 0:
-            return hearts[0]
-        elif v >= 5000:
-            return hearts[-1]
-        elif v >= 2000:
-            return hearts[-2]
-        else:
-            return hearts[len(str(v))]
-
-    def name_for(self, ctx, member_or_role_id):
-        memb = ctx.guild.get_member(member_or_role_id)
-        if memb is not None:
-            name = memb.mention
-        else:
-            role = ctx.guild.get_role(member_or_role_id)
-            if role is None:
-                name = getattr(
-                    self.bot.get_user(member_or_role_id), "mention", "Personne"
-                )
-            else:
-                name = role.name
-
-        return name
-
-    def score_for(self, ctx, member_id):
-        received = self.hugs_received(ctx, member_id)
-        diffs = set(h.hugger for h in received)
-        return 42 * len(diffs) + len(received)
-
-    def hugs_given(self, ctx, who_id):
-        eq = partial(self.ris, ctx, who_id)
-        return [h for h in self.hugs if eq(h.hugger) and not eq(h.hugged)]
-
-    def hugs_received(self, ctx, who_id):
-        eq = partial(self.ris, ctx, who_id)
-        return [h for h in self.hugs if eq(h.hugged) and not eq(h.hugger)]
-
-    def auto_hugs(self, ctx, who_id):
-        eq = partial(self.ris, ctx, who_id)
-        return [h for h in self.hugs if eq(h.hugged) and eq(h.hugger)]
-
-    def get_hugs(self):
-        File.HUGS.touch()
-        lines = File.HUGS.read_text().strip().splitlines()
-        return [Hug.from_str(l) for l in lines]
-
-    def add_hug(self, hugger: int, hugged: int, text):
-        File.HUGS.touch()
-        with open(File.HUGS, "a") as f:
-            f.write(f"{hugger} -> {hugged} | {text}\n")
-        self.hugs.append(Hug(hugger, hugged, text))
-
     # ---------------- Jokes ---------------- #
 
     def load_jokes(self) -> List[Joke]:
@@ -617,16 +241,14 @@ class MiscCog(Cog, name="Divers"):
         with open(File.JOKES_V2, "w") as f:
             yaml.safe_dump_all(jokes, f)
 
-    @group(name="joke", invoke_without_command=True, case_insensitive=True)
-    async def joke(self, ctx: Context, id=None):
-        """Fait discretement une blague aléatoire."""
+    @group(name="joke", invoke_without_command=True)
+    async def joke(self, ctx: Context, id: int = None):
 
         m: discord.Message = ctx.message
         await m.delete()
 
         jokes = self.load_jokes()
         if id is not None:
-            id = int(id)
             joke_id = id
             jokes = sorted(
                 jokes, key=lambda j: len(j.likes) - len(j.dislikes), reverse=True
@@ -668,8 +290,6 @@ class MiscCog(Cog, name="Divers"):
             file: discord.Attachment = message.attachments[0]
             joke.file = str(f"{joke_id}-{file.filename}")
             await file.save(File.MEMES / joke.file)
-        elif not msg.strip():
-            return "Tu ne peux pas ajouter une blague vide..."
 
         jokes.append(joke)
         self.save_jokes(jokes)
@@ -686,7 +306,7 @@ class MiscCog(Cog, name="Divers"):
             )
 
         start = time()
-        end = start + 24 * 60 * 60 * 5  # 5 days
+        end = start + 24 * 60 * 60
         while time() < end:
 
             try:
@@ -708,7 +328,6 @@ class MiscCog(Cog, name="Divers"):
             self.save_jokes(jokes)
 
     @joke.command(name="top", hidden=True)
-    @commands.has_any_role(*Role.ORGAS)
     async def best_jokes(self, ctx: Context):
         """Affiche le palmares des blagues."""
 
@@ -724,9 +343,8 @@ class MiscCog(Cog, name="Divers"):
             if joke.file:
                 text += " - image non inclue - "
 
-            name = who.display_name if who else "Inconnu"
             embed.add_field(
-                name=f"{i} - {name} - {len(joke.likes)} :heart: {len(joke.dislikes)} :broken_heart:", value=text, inline=False
+                name=f"{i} - {who.display_name} - {len(joke.likes)}", value=text
             )
 
         await ctx.send(embed=embed)
@@ -754,11 +372,10 @@ class MiscCog(Cog, name="Divers"):
             color=0xFFA500,
         )
 
-        cog_getter = attrgetter("cog_name")
-        commands = itertools.groupby(sorted(self.bot.walk_commands(), key=cog_getter), cog_getter)
+        commands = itertools.groupby(self.bot.walk_commands(), attrgetter("cog_name"))
 
         for cat_name, cat in commands:
-            cat = {c.qualified_name: c for c in cat}
+            cat = {c.qualified_name: c for c in cat if not isinstance(c, Group)}
             cat = await self.filter_commands(
                 ctx, list(cat.values()), sort=True, key=attrgetter("qualified_name")
             )

src/cogs/teams.py

@@ -89,9 +89,9 @@ class TeamsCog(Cog, name="Teams"):
         # return str(channel.changed_roles)
         return "C'est fait !"
 
-    @commands.command(name="tourist", aliases=["touriste"])
+    @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,17 +109,13 @@ 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.1
-            roles = (touriste_role,)
-        else:
-            roles = touriste_role, tournoi_role
+        await ctx.author.add_roles(
+            touriste_role, tournoi_role, reason="Demande via le bot."
+        )
 
-        await ctx.author.add_roles(*roles, reason="Demande via le bot.")
+        return f"{ctx.author.mention} à été ajouté comme spectateur dans à {tournoi}."
 
-        return f"{ctx.author.mention} à été ajouté comme spectateur pour {tournoi}."
-
-    @group(name="team", invoke_without_command=True, case_insensitive=True, hidden=True)
+    @group(name="team", invoke_without_command=True)
     async def team(self, ctx):
         """Groupe de commandes pour la gestion des équipes."""
 
@@ -334,7 +326,7 @@ class TeamsCog(Cog, name="Teams"):
     @team.command(name="list")
     @commands.has_role(Role.CNO)
     async def list_cmd(self, ctx):
-        """(cno) Affiche les équipes présentes sur le discord."""
+        """(cno) Affiche les équipes de chaque tournoi présentes sur le discord."""
 
         embed = discord.Embed(title="Liste des équipes", color=EMBED_COLOR)
 

src/cogs/tirages.py

@@ -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."
 
@@ -514,7 +510,7 @@ class TirageCog(Cog, name="Tirages"):
     @commands.command(name="dice-all", aliases=["da"])
     @commands.has_role(Role.DEV)
     async def dice_all_cmd(self, ctx, *teams):
-        """(dev) Lance un dé pour chaque equipe en entrée."""
+        """Lance un dé pour chaque equipe afin de tester les tirages."""
         channel = ctx.channel.id
         if channel in self.tirages:
             for t in teams:
@@ -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):
         """
@@ -570,33 +565,24 @@ class TirageCog(Cog, name="Tirages"):
 
     # ---------- Commandes du groupe draw ----------- #
 
-    @group(
-        name="draw",
-        aliases=["d", "tirage"],
-        invoke_without_command=True,
-        case_insensitive=True,
-        hidden=True,
-    )
+    @group(name="draw", aliases=["d", "tirage"], invoke_without_command=True)
     async def draw_group(self, ctx: Context) -> None:
         """Groupe de commandes pour les 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 +593,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 +616,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,21 +627,32 @@ 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.")
 
+    #
+    # @draw_group.command(name="skip", aliases=["s"])
+    # @commands.has_role(Role.DEV)
+    # async def draw_skip(self, ctx, *teams: discord.Role):
+    #     """(dev) Passe certaines phases du tirage."""
+    #     channel = ctx.channel.id
+    #     self.tirages[channel] = tirage = Tirage(ctx, channel, teams)
+    #
+    #     tirage.phase = TiragePhase(tirage, round=1)
+    #     for i, team in enumerate(tirage.teams):
+    #         team.tirage_order = [i + 1, i + 1]
+    #         team.passage_order = [i + 1, i + 1]
+    #         team.accepted_problems = [PROBLEMS[i], PROBLEMS[-i - 1]]
+    #     tirage.teams[0].rejected = [{PROBLEMS[3]}, set(PROBLEMS[4:8])]
+    #     tirage.teams[1].rejected = [{PROBLEMS[7]}, set()]
+    #
+    #     await ctx.send(f"Skipping to {tirage.phase.__class__.__name__}.")
+    #     await tirage.phase.start(ctx)
+    #     await tirage.update_phase(ctx)
+
     def get_tirages(self) -> Dict[int, BaseTirage]:
         return DiscordTirage.load_all()
 
@@ -759,7 +706,7 @@ class TirageCog(Cog, name="Tirages"):
     @commands.has_role(Role.DEV)
     async def send_cmd(self, ctx, tirage_id: int, poule="A", round: int = 1):
         """
-        (dev) Envoie les poules sur tfjm.org
+        Envoie les poules sur tfjm.org
 
         Exemple:
             `!draw send 42 B 1` - Envoie la poule B1 du tirage n°42.
@@ -806,16 +753,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))

src/constants.py

@@ -12,7 +12,6 @@ __all__ = [
     "TEAMS_CHANNEL_CATEGORY",
     "DIEGO",
     "ANANAS",
-    "YOHANN",
     "FAN_CLUBS",
     "BOT",
     "TOURNOIS",
@@ -40,14 +39,10 @@ if DISCORD_TOKEN is None:
 GUILD = "690934836696973404"
 DIEGO = 430566197868625920  # Mon id
 ANANAS = 619132180408303616
-YOHANN = 157252601119899648
-
 FAN_CLUBS = {
     DIEGO: 706586020841259078,
     ANANAS: 706586027535368223,
-    YOHANN: 711707591847444610,
 }
-
 BOT = 703305132300959754
 TEAMS_CHANNEL_CATEGORY = "Channels d'équipes 2"
 EMBED_COLOR = 0xFFA500
@@ -63,7 +58,6 @@ TOURNOIS = [
     "Tours",
     "Bordeaux-Nancy",
     "Rennes",
-    "Finale",
 ]
 
 
@@ -75,23 +69,18 @@ class Role:
     JURY = tuple(f"Jury {t}" for t in TOURNOIS)
     BENEVOLE = "Bénévole"
     CAPTAIN = "Capitaine"
-    FINALISTE = "Finaliste"
     PARTICIPANT = "Participant"
     TOURIST = "Touriste"
-    PRETRESSE_CALINS = "Grande prêtresse des câlins"
 
 
 class Emoji:
-    HEART = "❤️"
     JOY = "😂"
     SOB = "😭"
     BIN = "🗑️"
     DICE = "🎲"
     CHECK = "✅"
-    CROSS = "❌"
     PLUS_1 = "👍"
     MINUS_1 = "👎"
-    RAINBOW_HEART = "<:rainbow_heart:714172834632564818>"
 
 
 class File:
@@ -101,7 +90,6 @@ class File:
     JOKES = TOP_LEVEL / "data" / "jokes"
     JOKES_V2 = TOP_LEVEL / "data" / "jokesv2"
     MEMES = TOP_LEVEL / "data" / "memes"
-    HUGS = TOP_LEVEL / "data" / "hugs"
 
 
 with open(File.TOP_LEVEL / "data" / "problems") as f:

src/tfjm_discord_bot.py

@@ -1,7 +1,5 @@
 #!/bin/python
 
-from discord import Intents
-
 from src.constants import *
 from src.core import CustomBot
 
@@ -9,6 +7,7 @@ from src.core import CustomBot
 # It must be in first otherwise "!" always match first and the space is not recognised
 from src.utils import fg
 
+
 # Global variable to hold the tirages.
 # We *want* it to be global so we can reload the tirages cog without
 # removing all the running tirages
@@ -16,7 +15,7 @@ tirages = {}
 
 
 def start():
-    bot = CustomBot(("! ", "!"), case_insensitive=True, owner_id=DIEGO, intents=Intents.all())
+    bot = CustomBot(("! ", "!"))
 
     @bot.event
     async def on_ready():

src/utils.py

@@ -1,15 +1,8 @@
-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,21 +13,14 @@ 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]}"
 
 
-def has_role(member, role: Union[str, tuple]):
+def has_role(member, role: str):
     """Return whether the member has a role with this name."""
 
-    if isinstance(role, str):
-        return any(r.name == role for r in member.roles)
-    else:
-        return any(r.name == rol for r in member.roles for rol in role)
+    return any(r.name == role for r in member.roles)
 
 
 def send_and_bin(f):
@@ -54,45 +40,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()