branches ignore

.dockerignore

@@ -6,7 +6,9 @@ Dockerfile
 docker-compose.yml
 README.md
 Procfile
-Pipfile.lock
-# requirements.txt
 run.sh
 runtime.txt
+Pipfile
+Pipfile.lock
+pyproject.toml
+poetry.lock

.github/FUNDING.yml

@@ -1 +1,7 @@
+liberapay: marcpartensky
 patreon: marcpartensky
+github: marcpartensky
+custom:
+  # - monero:43J2XmRtjDPRLD35UsYGH2AZamFBQz7dt4VdvZXVm3SuadTrvcoXUXBRUNHqukFte23Q5TWXqhbwaLJJgoVQzzbe2AJDANQ
+  - https://paypal.me/marcpartensky
+  - https://buymeacoffee.com/marcpartensky

.github/workflows/docker-push.yml

@@ -32,12 +32,18 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Build and push
-      id: docker_build
+    - name: Build and push with tag
+      id: tag-build
       uses: docker/build-push-action@v2
       with:
         push: true
         tags: marcpartensky/discord-bot:v${{ github.run_number }}.${{ steps.tag.outputs.tag }}
+    - name: Build and push latest
+      id: latest-build
+      uses: docker/build-push-action@v2
+      with:
+        push: true
+        tags: marcpartensky/discord-bot:latest
 
   test-python-versions:
     runs-on: ${{ matrix.os }}

.github/workflows/docker-test.yml

@@ -0,0 +1,53 @@
+name: Docker
+
+on:
+  push:
+    branches-ignore:
+      - master
+
+env:
+  IMAGE_NAME: discord-bot
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Build and push latest
+      id: latest-build
+      uses: docker/build-push-action@v2
+      with:
+        push: false
+        tags: marcpartensky/discord-bot:latest
+
+  test-python-versions:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ['3.8', '3.9', '3.10']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }}
+      - name: Install requirements
+        run: pip install -r requirements.txt
+      - name: Display Python version
+        run: python -c "import sys; print(sys.version)"
+

.gitignore

@@ -8,3 +8,4 @@ venv/
 .env
 .env.dev
 ./config/marc_store.yml
+.python-version

Dockerfile

@@ -1,9 +1,8 @@
-FROM python:3.8.12-slim
+FROM python:3.8.13-slim as ubuntu
 LABEL maintainer="marc.partensky@gmail.com"
 LABEL image="https://hub.docker.com/r/marcpartensky/discord-bot"
 LABEL source="https://github.com/marcpartensky/discord-bot"
-RUN apt-get update && apt-get upgrade -y && apt autoremove -y
-# RUN add-apt-repository ppa:mc3man/trusty-media
+RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y
 RUN apt-get install -y ffmpeg git curl
 COPY requirements.txt ./
 
@@ -25,3 +24,32 @@ ENV DISCORD_BOT_PORT 8000
 HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD curl -f http://localhost:8000/live || exit 1
 
 ENTRYPOINT ["python", "__main__.py"]
+
+
+FROM python:3.8.13-alpine as alpine
+LABEL maintainer="marc.partensky@proton.me"
+LABEL image="https://hub.docker.com/r/marcpartensky/discord-bot"
+LABEL source="https://github.com/marcpartensky/discord-bot"
+RUN apk update
+RUN apk add ffmpeg git gcc g++ gfortran musl musl-dev build-base cmake openblas pkgconfig
+# RUN apk add ffmpeg git py3-scikit-learn
+COPY requirements.txt ./
+
+RUN pip install -U pip
+RUN pip install -r requirements.txt
+
+WORKDIR /app
+COPY ./tts tts
+COPY ./libs libs
+COPY ./assets assets
+COPY ./utils utils
+COPY ./config config
+COPY ./models models
+COPY ./cogs cogs
+COPY  __main__.py LICENSE ./
+
+ENV DISCORD_BOT_HOST 0.0.0.0
+ENV DISCORD_BOT_PORT 8000
+HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD curl -f http://localhost:8000/live || exit 1
+
+ENTRYPOINT ["python", "__main__.py"]

LICENSE

@@ -1,674 +1,165 @@
-                    GNU GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <https://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:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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
-<https://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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Makefile

@@ -1,24 +1,21 @@
 start:
-	pipenv run python .
+	poetry run python .
 update:
-	pipenv lock --pre --clear
+	poetry update
+	poetry export --output requirements.txt
 dev:
 	docker-compose -f docker-compose.yml up -d --build --force-recreate --remove-orphans dev
 prod:
 	docker-compose -f docker-compose.yml up -d --build --force-recreate --remove-orphans prod
-build:
+build: update
 	docker-compose -f docker-compose.yml build prod
 push: build
 	docker-compose -f docker-compose.yml push prod
-requirements:
-	pipenv lock -r > requirements.txt
+deploy: push
+	DOCKER_HOST=ssh://vps docker service update vps_esclave
 setup:
-	pip install pipenv
-	pipenv shell
-	pipenv install
+	poetry install
+	poetry shell
 recreate:
 	docker-compose -f docker-compose.yml up --force-recreate dev
-fixwithbrew:
-	brwe install python@3.8
-	sudo ln -sf /home/linuxbrew/.linuxbrew/Cellar/python@3.8/3.8.12_1/bin/python3.8 /usr/bin/python3.8
 

Pipfile

@@ -1,124 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-aenum = "*"
-aiohttp = "*"
-appdirs = "*"
-astroid = "*"
-async-timeout = "*"
-attrs = "*"
-autopep8 = "*"
-beautifulsoup4 = "*"
-black = "*"
-bs4 = "*"
-certifi = "*"
-cffi = "*"
-cfgv = "*"
-chardet = "*"
-click = "==7.1.2"
-colorama = "*"
-commonmark = "*"
-cryptography = "*"
-# "discord.py[voice]" = "*"
-# "discord.py" = {file = "https://github.com/Rapptz/discord.py/archive/async.zip#egg=discord.py[voice]"}
-"discord.py" = {git = "https://github.com/Rapptz/discord.py"}
-distlib = "*"
-dnspython = "*"
-fake-useragent = "*"
-# fbchat = "*"
-fbchat = {git = "git://github.com/carpedm20/fbchat.git"}
-filelock = "*"
-future = "*"
-html2text = "*"
-identify = "*"
-idna = "*"
-inflect = "*"
-isort = "*"
-"jaraco.itertools" = "*"
-jedi = "*"
-jeepney = "*"
-joblib = "*"
-keyring = "*"
-"keyrings.alt" = "*"
-lazy-object-proxy = "*"
-lxml = "*"
-mccabe = "*"
-more-itertools = "*"
-multidict = "*"
-mypy-extensions = "*"
-nightcore = "*"
-nodeenv = "*"
-numpy = "*"
-paho-mqtt = "*"
-parso = "*"
-pathspec = "*"
-pluggy = "*"
-pre-commit = "*"
-profanity-check = "*"
-progressbar2 = "*"
-pycodestyle = "*"
-pycparser = "*"
-pydub = "*"
-# pyicloud = "*"
-pylint = "*"
-pymongo = "*"
-pyparsing = "*"
-python-utils = "*"
-pytz = "*"
-regex = "*"
-requests = "*"
-requests-futures = "*"
-rich = "*"
-scikit-learn = "*"
-scipy = "*"
-selenium = "*"
-six = "*"
-soupsieve = "*"
-stem = "*"
-threadpoolctl = "*"
-toml = "*"
-torrequest = "*"
-tox = "*"
-translate = "*"
-typed-ast = "*"
-typing-extensions = "*"
-tzlocal = "*"
-urllib3 = "*"
-vcrpy = "*"
-virtualenv = "*"
-websockets = "*"
-wikipedia = "*"
-wolframalpha = "*"
-wrapt = "*"
-xmltodict = "*"
-yarl = "*"
-"zope.interface" = "*"
-DateTime = "*"
-Deprecated = "*"
-gTTS = "2.2.1"
-gTTS-token = "*"
-Pillow = "*"
-PyGithub = "*"
-Pygments = "*"
-PyJWT = "*"
-PyMySQL = "*"
-PyNaCl = "*"
-PySocks = "*"
-PyYAML = "*"
-SecretStorage = "*"
-Unidecode = "*"
-youtube_dl = "*"
-python-dotenv = "*"
-dpy-http-server = "*"
-
-[dev-packages]
-black = "*"
-pylint = "*"
-jedi = "*"
-
-[requires]
-# python_version = "3.8.3"
-python_version = "3.8.12"

__main__.py

@@ -17,7 +17,7 @@ from dotenv import load_dotenv
 
 load_dotenv()
 
-from config.config import prefix, masters, delete_after_time, status, access
+from config.config import prefix, masters, access
 from config.credentials import token, client_id
 from discord.ext import commands, tasks
 
@@ -31,6 +31,9 @@ from discord.ext import commands, tasks
 #     # Notice how you can use spaces in prefixes. Try to keep them simple though.
 #     prefixes = ['>?', 'lol ', '!?']
 
+    
+
+
 #     # Check to see if we are outside of a guild. e.g DM's etc.
 #     if not message.guild:
 #         # Only allow ? to be used in DMs
@@ -39,8 +42,6 @@ from discord.ext import commands, tasks
 #     # If we are in a guild, we allow for the user to mention us or use any of the prefixes in our list.
 #     return commands.when_mentioned_or(*prefixes)(bot, message)
 
-client = commands.Bot(command_prefix=prefix, case_insensitive=True)
-client.id = client_id
 
 
 class Main(commands.Cog):
@@ -56,7 +57,7 @@ class Main(commands.Cog):
         self.load_cogs()
         self.load_status()
         self.load_icloud()
-        self.api: PycloudService = None
+        # self.api: PycloudService = None
 
     def load_icloud(self):
         """Charge l'api d'icloud."""
@@ -79,6 +80,7 @@ class Main(commands.Cog):
     @commands.command()
     async def environment(self, ctx: commands.Context):
         """Affiche l'environnement dans lequel le bot tourne."""
+        print("environment")
         host = os.environ.get("HOST")
         await ctx.send(f"> Environment: **{host}**")
 
@@ -96,6 +98,7 @@ class Main(commands.Cog):
             for i, filename in enumerate(cogs):
                 bar.update(i)
                 if filename.endswith(".py"):
+                    print(filename)
                     self.bot.load_extension(f"cogs.{filename[:-3]}")
 
     @commands.command()
@@ -280,5 +283,12 @@ def setup(bot: commands.Bot):
 
 if __name__ == "__main__":
     os.system("clear")
+    print("prefix:", prefix)
+    intents = discord.Intents.default()
+    intents.message_content = True
+
+    # client = commands.Bot(command_prefix=prefix, case_insensitive=True)
+    client = commands.Bot(command_prefix=prefix, intents=intents)
+    client.id = client_id
     setup(client)
     client.run(token)

basic.py

@@ -0,0 +1,27 @@
+import discord
+import os
+import dotenv
+from discord.ext import commands
+
+dotenv.load_dotenv()
+
+intents = discord.Intents.default()
+intents.message_content = True
+bot = commands.Bot(command_prefix=">", intents=intents)
+
+# bot = discord.Bot()
+
+@bot.command()
+async def hello(ctx, name: str = None):
+    name = name or ctx.author.name
+    await ctx.respond(f"Hello {name}!")
+
+@bot.command(name="Say Hello")
+async def hi(ctx, user):
+    await ctx.respond(f"{ctx.author.mention} says hello to {user.name}!")
+
+@bot.command()
+async def ping(ctx):
+    await ctx.send("pong")
+
+bot.run(os.environ["DISCORD_TOKEN"])

cogs/admin.py

@@ -1,12 +1,9 @@
-from config.config import access, status, delete_after_time, masters, cluster
+from config.config import access, cluster
 from config import shops
-from utils import tools
 
-from discord.ext import commands, tasks
+from discord.ext import commands
 from models.terminal import Terminal
 import discord
-import random
-import time
 import os
 import typing
 
@@ -27,6 +24,7 @@ class Muted(commands.Converter):
 
 class Admin(commands.Cog):
     def __init__(self, bot: commands.Bot, **kwargs):
+        """Cog pour administrer un serveur."""
         super().__init__(**kwargs)
         self.bot = bot
         self.kick_reason = "c'est la vie"
@@ -245,11 +243,7 @@ class Admin(commands.Cog):
                     name=self.muted_role_name,
                     reason="Pour muter les gens trop bavards.",
                 )
-                for (
-                    channel
-                ) in (
-                    ctx.guild.channels
-                ):  # removes permission to view and send in the channel
+                for channel in ctx.guild.channels:  # removes permission to view and send in the channel
                     await channel.set_permissions(
                         role,
                         send_messages=False,

cogs/api.py

@@ -7,11 +7,10 @@ __author__ = "Marc Partensky"
 # from utils import tools
 
 import os
-import discord
 import typing
 import uuid
-import discord
 import traceback
+import discord
 from discord.ext import commands
 
 import server

cogs/backup.py

@@ -0,0 +1,79 @@
+#!/bin/env python
+
+# from config.config import masters, access, check
+# from config import shops
+# from utils import tools
+
+from config.config import access, cluster
+from discord.ext import commands
+
+import discord
+import os
+import psycopg2
+
+
+class Backup(commands.Cog):
+    def __init__(self, bot):
+        """Setup postgres logins"""
+        self.bot = bot
+        self.host = os.environ.get("POSTGRES_HOST")
+        self.port = os.environ.get("POSTGRES_PORT")
+        self.database = os.environ.get("POSTGRES_DATABASE")
+        self.user = os.environ.get("POSTGRES_USER")
+        self.password = os.environ.get("POSTGRES_PASSWORD")
+        self.color = 0x0064a5
+        self.connection: psycopg2.connection
+        self.cursor: psycopg2.cursor
+
+
+    @commands.command(name="postgres-connect")
+    @access.admin
+    async def connect_postgres(self, ctx: commands.Context):
+        """Change les identifiants postgres avec un string user,password,database,host,port."""
+        self.connection = psycopg2.connect(
+            user=self.user,
+            password=self.password,
+            host=self.host,
+            port=self.port,
+            database=self.database
+        )
+        self.cursor = self.connection.cursor()
+        await ctx.send("Connected to the database")
+
+    @commands.command(name="postgres-set")
+    @access.admin
+    async def set_postgres_logins(self, ctx: commands.Context, connection: str):
+        """Change les identifiants postgres avec un string user,password,database,host,port."""
+
+        try:
+            self.user, self.password, self.database, self.host, self.port = connection.split(",")
+        except:
+            return await ctx.send("> Le format doit être le suivant: user,password,database,host,port")
+        embed = discord.Embed(
+            title="PostgreSQL logins", color=discord.Color(self.color)
+        )
+        embed.add_field(name="user", value=self.user)
+        embed.add_field(name="password", value=self.password)
+        embed.add_field(name="database", value=self.database)
+        embed.add_field(name="host", value=self.host)
+        embed.add_field(name="port", value=self.port)
+
+        await ctx.send(embed=embed)
+
+    @commands.command(name="postgres")
+    @access.admin
+    async def get_postgres_logins(self, ctx: commands.Context):
+        """Affiche les identifiants postgres uniquement si master"""
+        embed = discord.Embed(
+            title="PostgreSQL Logins", color=discord.Color(self.color)
+        )
+        embed.add_field(name="user", value=self.user)
+        embed.add_field(name="password", value=self.password)
+        embed.add_field(name="database", value=self.database)
+        embed.add_field(name="host", value=self.host)
+        embed.add_field(name="port", value=self.port)
+
+        await ctx.send(embed=embed)
+
+def setup(bot):
+    bot.add_cog(Backup(bot))

cogs/basic.py

@@ -1,14 +1,12 @@
-from config.config import access, status, delete_after_time, masters, link
-from config import emoji
+from config.config import access, delete_after_time, link
 
 from utils.date import days, months
 from utils import tools
 
-from discord.ext import commands, tasks
+from discord.ext import commands
 from translate import Translator
-from discord.utils import get
-from discord import Message, PartialEmoji, Emoji
-from bs4 import BeautifulSoup
+from discord import Message, PartialEmoji
+import requests
 import datetime
 import discord
 import random
@@ -366,6 +364,12 @@ class Basic(commands.Cog):
     #     print(reaction, user)
     #     # await msg.channel.send("je vois")
 
+    @commands.command(name="profile-picture", aliases=["pp"])
+    async def set_profile_picture(self, ctx: commands.Context, url: str):
+        """Choisi l'image de profil du bot."""
+        print(url)
+        file = requests.get(url)
+        await self.bot.user.edit(avatar=file.content)
 
 def setup(bot):
     bot.add_cog(Basic(bot))

cogs/code.py

@@ -142,7 +142,7 @@ class Code(commands.Cog):
             author = msg.author
 
         if ctx.author.id in self.users_list:
-            if msg.content == "?python":
+            if msg.content == self.bot.command_prefix + "python":
                 pass
             else:
                 await self.execute(ctx, cmd=code)
@@ -158,9 +158,6 @@ class Code(commands.Cog):
                     and str(reaction.emoji) in emojis
                 )
 
-            class DestroyReactions(Exception):
-                """Destroy the reactions."""
-
             try:
                 reaction, user = await self.bot.wait_for(
                     "reaction_add", timeout=60.0, check=check

cogs/commandes.py

@@ -80,22 +80,39 @@ class Commandes(commands.Cog):
         self.commands[command] = post
         await ctx.send(f"> La commande **{command}** a été apprise.")
 
-    @command.command(name="cherche", aliases=["search"])
-    async def search(self, ctx: commands.Context, command: str, *args):
+    @command.command(name="cherche", aliases=["search", "find"])
+    async def search(self, ctx: commands.Context, command: str, *args, regex: bool = True, show_cmd: bool = True):
         """Cherche une commande."""
-        if command not in self.commands:
-            return await ctx.send(f"> La commande **{command}** n'existe pas.")
-        post = self.commands[command]
-        post.setdefaults(use=0)
-        post.use += 1
-        post.user = ctx.author.id
-        code = self.bot.get_cog("Code")
-        ctx.authorized = True
-        cmd = tools.parse(post.result, *args)
-        if post.author in masters:
-            await code.code(ctx, cmd=cmd)
+        if regex:
+            cursor = self.commands.find(dict(_id={'$regex': ".*" + command + ".*"}))
         else:
-            await ctx.send(cmd)
+            cursor = self.commands.find(dict(_id=command))
+        n = -1
+        for n, post in enumerate(cursor):
+            post.setdefault("use", 0)
+            post["use"] = post["use"] + 1
+            post["user"] = ctx.author.id
+            code = self.bot.get_cog("Code")
+            if not "result" in post:
+                del post
+                continue
+            ctx.authorized = True
+            cmd = tools.parse(post["result"], *args)
+            if post["author"] in masters:
+                if show_cmd:
+                    await ctx.send(f"> {post['_id']} =>")
+                await code.code(ctx, cmd=cmd)
+                continue
+            if post["result"]:
+                response = post["result"]
+                if show_cmd:
+                    response = f"> {post['_id']}" + " =>\n" + response
+                await ctx.send(response)
+                continue
+            await ctx.send("> Pas de réponse configurée.")
+
+        if n == -1:
+            return await ctx.send(f"> Aucun résultat pour la commande **{command}**")
 
     @command.command(aliases=["info"])
     async def information(self, ctx: commands.Context, *, command: str):
@@ -200,7 +217,7 @@ class Commandes(commands.Cog):
             await self.learn(ctx, req.strip(), resp.strip())
         elif msg.content.startswith(self.search_prefix):
             req = msg.content.replace(self.search_prefix, "", 1)
-            await self.search(ctx, *map(lambda r: r.strip(), req.strip().split("|")))
+            await self.search(ctx, *map(lambda r: r.strip(), req.strip().split("|")), regex=False, show_cmd=False)
 
 
 def setup(bot: commands.Bot):

cogs/docker.py

@@ -219,7 +219,12 @@ class Docker(commands.Cog):
                 continue
             print(content)
             texts = []
-            text = f"{name}\n" + "_" * len(name) + "\n\n   " + "".join([f"{word: <10}" for word in content["Titles"]])
+            text = (
+                f"{name}\n"
+                + "_" * len(name)
+                + "\n\n   "
+                + "".join([f"{word: <10}" for word in content["Titles"]])
+            )
             n = len(text)
             for process in content["Processes"]:
                 line = " \n * " + "".join([f"{word: <10}" for word in process])
@@ -230,7 +235,7 @@ class Docker(commands.Cog):
                     text += line
             texts.append(text)
             for text in texts:
-                text = text.replace('_', '‗')
+                text = text.replace("_", "‗")
                 await ctx.send("```md\n" + text + "\n```")
 
     @commands.has_role(DOCKER_ROLE)

cogs/groq.py

@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+"""Use groq"""
+
+import typing
+import discord
+from discord.ext import commands
+from discord.ext.commands.core import has_role
+
+from utils.tools import create_role_if_missing, Capturing
+
+import sys
+import asyncio, os
+from websockets.sync.client import connect
+
+GROQ_ROLE = "Groq"
+
+
+class Groq(commands.Cog):
+    """Control Groq shells"""
+
+    def __init__(self, bot: commands.Bot):
+        """Initialize the cog with the bot."""
+        self.host = "localhost"
+        self.port = 8765
+        self.bot = bot
+        self.color: discord.Color = discord.Color.darker_grey()
+        self.thumbnail: str = "https://wow.groq.com/wp-content/uploads/2021/04/groq-logo.svg"
+        self.shells: typing.Dict[int, dict] = {}
+    #     self.timeout = 3600
+
+    # @commands.command(name="groq-shells")
+    # async def groq_shells(self, ctx: commands.Context):
+    #     """List opened shells."""
+    #     if len(self.shells) == 0:
+    #         return await ctx.send("> No shell opened.")
+    #     embed = discord.Embed(title="Shells :", color=self.color)
+    #     embed.set_thumbnail(url=self.thumbnail)
+
+    #     shell_users = []
+    #     for shell_user in map(self.bot.fetch_user, self.shells.keys()):
+    #         shell_users.append(f"- {await shell_user}")
+    #     embed.description = "\n".join(shell_users)
+    #     await ctx.send(embed=embed)
+
+    @commands.Cog.listener(name="on_message")
+    async def on_message(self, msg: discord.Message):
+        """Read all messages"""
+        if msg.author == self.bot.user:
+            return
+        if msg.content.startswith(self.bot.command_prefix):
+            return
+        if self.hash(msg) in self.shells:
+            answer = await self.ask(msg, msg.content)
+            await msg.channel.send(answer)
+
+
+    # async def cog_common_error(self, ctx, error):
+    #     """Close all shell sessions."""
+    #     for shell in self.shells.values():
+    #         shell.close()
+
+    @commands.command()
+    async def groq(self, ctx: commands.Context):
+        """Go in groq mode."""
+        key = self.hash(ctx)
+        # Create a role if in guild
+        if ctx.guild:
+            await create_role_if_missing(ctx, GROQ_ROLE, self.color)
+        embed = discord.Embed(color=self.color)
+        embed.set_thumbnail(url=self.thumbnail)
+        embed.set_author(name=ctx.author.name, icon_url=ctx.author.avatar)
+        # embed.description = self.shell_path
+
+        if ctx.author.id in self.shells:
+            shell = self.shells[key]
+            del self.shells[key]
+            embed.title = "Closed shell"
+            await ctx.send(embed=embed)
+        else:
+            embed.title = "Opened shell"
+            await ctx.send(embed=embed)
+            self.shells[key] = dict(messages=[])
+
+    def hash(self, ctx):
+        """Make a unique hash with channel id and author."""
+        print(ctx.author.id, ctx.channel.id)
+        print(self.shells)
+        return hash((ctx.author.id, ctx.channel.id))
+
+    def build_prompt(self, messages: list) -> str:
+        """Build prompt."""
+        prompt = ""
+        for (me, bot) in messages:
+            prompt += f"me: {me}\n"
+            prompt += f"you: {bot}\n"
+        return prompt
+
+    async def ask(self, ctx, message: str) -> str:
+        """Return groq answer"""
+        key = self.hash(ctx)
+        prompt = self.build_prompt(self.shells[key]["messages"])
+        prompt += f"me: {message}\n"
+        prompt += "answer my last message"
+        with connect(f"ws://{self.host}:{self.port}") as websocket:
+            websocket.send(prompt)
+            answer = str(websocket.recv())
+            print(f"{prompt} => {answer}")
+        self.shells[key]["messages"].append((message, answer))
+        return answer
+
+
+def setup(bot):
+    """Setup the Shell cog."""
+    bot.add_cog(Groq(bot))

cogs/music.py

@@ -16,12 +16,15 @@ import functools
 import itertools
 import math
 import random
+# import logging
 
 import discord
 import youtube_dl
 from async_timeout import timeout
 from discord.ext import commands
 
+# logging.basicConfig(level=logging.INFO)
+
 # Silence useless bug reports messages
 youtube_dl.utils.bug_reports_message = lambda: ""
 
@@ -367,6 +370,7 @@ class Music(commands.Cog):
         self.bot = bot
         self.voice_states = {}
         self.color = discord.Color(0xFF66CC)  # pink
+        self.victims_channel_name = "Temporaire"
 
     def get_voice_state(self, ctx: commands.Context):
         state = self.voice_states.get(ctx.guild.id)
@@ -441,23 +445,61 @@ class Music(commands.Cog):
             return
         ctx.voice_state.voice = await destination.connect()
 
-    @commands.command(name="leave", aliases=["disconnect", "quitte"])
+
+    async def _kick_from_voice_channel(
+        self, ctx: commands.Context, member: discord.Member = None
+    ):
+        """Kick un membre du salon vocal."""
+        try:
+            victims_channel = await ctx.guild.create_voice_channel(
+                name=self.victims_channel_name
+            )
+            await member.move_to(victims_channel)
+        except Exception as e:
+            print(e)
+        finally:
+            await victims_channel.delete()
+
+
+    @commands.command(name="leave", aliases=["disconnect", "quit"])
     async def _leave(self, ctx: commands.Context):
         """Nettoie la queue, quitte le salon vocal."""
-        if not ctx.voice_state.voice:
-            return await ctx.send("Pas connecté à un salon vocal.")
-        await ctx.voice_state.stop()
-        del self.voice_states[ctx.guild.id]
+        voice_state : discord.VoiceState = ctx.voice_state
+        if voice_state.voice:
+            await voice_state.stop()
+            del self.voice_states[ctx.guild.id]
+            return
+        print("self.bot.voice_clients:")
+        print(self.bot.voice_clients)
+        for voice_client in self.bot.voice_clients:
+            print(voice_client.__dict__)
+        print("ctx.voice_client:")
+        print(ctx.voice_client)
+        for voice_channel in ctx.guild.voice_channels:
+            member: discord.Member
+            for member in voice_channel.members:
+                print(member.id, self.bot.id)
+                print(member.id == int(self.bot.id))
+                if int(self.bot.id) == member.id:
+                    for voice_client in self.bot.voice_clients:
+                        print("voice_client.channel, voice_channel.id")
+                        print(voice_client.channel.id, voice_channel.id)
+                        print(type(voice_channel.id), type(voice_channel.id))
+                        if voice_client.channel.id == voice_channel.id:
+                            return await voice_client.disconnect()
+                    print("member.voice:")
+                    await self._kick_from_voice_channel(ctx, member)
+        return await ctx.send("> Pas connecté à un salon vocal.")
 
     @commands.command(name="volume")
     async def _volume(self, ctx: commands.Context, *, volume: int):
         """Change le volume de la playliste."""
         if not ctx.voice_state.is_playing:
-            return await ctx.send("Aucune musique n'est jouée pour le moment.")
+            return await ctx.send("> Aucune musique n'est jouée pour le moment.")
         if 0 > volume > 100:
-            return await ctx.send("Le son doit être compris entre 0 et 100.")
+            return await ctx.send("> Le son doit être compris entre 0 et 100.")
         ctx.voice_state.volume = volume / 100
-        await ctx.send("Le volume de la playliste est réglé à {}%".format(volume))
+        await ctx.send("> Le volume de la playliste est réglé à {}%".format(volume))
 
     @commands.command(name="now", aliases=["current", "playing", "maintenant", "mtn"])
     async def _now(self, ctx: commands.Context):
@@ -468,9 +510,9 @@ class Music(commands.Cog):
     async def _left(self, ctx: commands.Context):
         """Affiche le nombre de musiques restantes."""
         try:
-            await ctx.send(f"Il reste {ctx.voice_state.queue.qsize()} musiques.")
+            await ctx.send(f"> Il reste {ctx.voice_state.queue.qsize()} musiques.")
         except AttributeError:
-            await ctx.send(f"La queue est vide.")
+            await ctx.send(f"> La queue est vide.")
 
     @commands.command(name="pause")
     async def _pause(self, ctx: commands.Context):
@@ -502,7 +544,7 @@ class Music(commands.Cog):
         un certain nombre de votes sont nécessaires pour
         passer une musique, sauf pour le demandeur."""
         if not ctx.voice_state.is_playing:
-            return await ctx.send("Je ne joue pas de musique pour le moment")
+            return await ctx.send("> Je ne joue pas de musique pour le moment")
         voter = ctx.message.author
         if voter == ctx.voice_state.current.requester:
             await ctx.message.add_reaction("⏭")
@@ -515,10 +557,10 @@ class Music(commands.Cog):
                 ctx.voice_state.skip()
             else:
                 await ctx.send(
-                    "Le compte de vote est maintenant à **{}/3**".format(total_votes)
+                    "> Le compte de vote est maintenant à **{}/3**".format(total_votes)
                 )
         else:
-            await ctx.send("Vous avez voté pour changer de musique.")
+            await ctx.send("> Vous avez voté pour changer de musique.")
 
     @commands.command(name="queue")
     async def _queue(self, ctx: commands.Context, *, page: int = 1):
@@ -530,7 +572,7 @@ class Music(commands.Cog):
             songs = []
         songs += list(voice_state.songs)
         if len(songs) == 0:
-            return await ctx.send("Queue vide.")
+            return await ctx.send("> Queue vide.")
         items_per_page = 10
         pages = math.ceil(len(songs) / items_per_page)
         start = (page - 1) * items_per_page
@@ -559,7 +601,7 @@ class Music(commands.Cog):
     async def _shuffle(self, ctx: commands.Context):
         """Mélange la queue."""
         if len(ctx.voice_state.songs) == 0:
-            return await ctx.send("Queue vide.")
+            return await ctx.send("> Queue vide.")
         ctx.voice_state.songs.shuffle()
         await ctx.message.add_reaction("✅")
 
@@ -567,7 +609,7 @@ class Music(commands.Cog):
     async def _remove(self, ctx: commands.Context, index: int):
         """Retire une musique avec un numéro."""
         if len(ctx.voice_state.songs) == 0:
-            return await ctx.send("Queue vide.")
+            return await ctx.send("> Queue vide.")
         ctx.voice_state.songs.remove(index - 1)
         await ctx.message.add_reaction("✅")
 
@@ -576,7 +618,7 @@ class Music(commands.Cog):
         """Joue en boucle la musique en cours.
         Pour arrêter la boucle, retapez la commande."""
         if not ctx.voice_state.is_playing:
-            return await ctx.send("Nothing being played at the moment.")
+            return await ctx.send("> Nothing being played at the moment.")
         # Inverse boolean value to loop and unloop.
         ctx.voice_state.loop = not ctx.voice_state.loop
         await ctx.message.add_reaction("✅")
@@ -591,6 +633,7 @@ class Music(commands.Cog):
         https://rg3.github.io/youtube-dl/supportedsites.html
         """
         if not ctx.voice_state.voice:
+            await self._leave(ctx)
             await ctx.invoke(self._join)
         async with ctx.typing():
             try:
@@ -599,7 +642,7 @@ class Music(commands.Cog):
                 )
             except YTDLError as e:
                 await ctx.send(
-                    "Une erreur s'est produite pendant le traitement de: {}".format(
+                    "> Une erreur s'est produite pendant le traitement de: {}".format(
                         str(e)
                     )
                 )
@@ -618,10 +661,10 @@ class Music(commands.Cog):
     @_join.before_invoke
     async def ensure_voice_state(self, ctx: commands.Context):
         if not ctx.author.voice or not ctx.author.voice.channel:
-            raise commands.CommandError("Vous n'êtes pas connecté à un salon vocal.")
+            raise commands.CommandError("> Vous n'êtes pas connecté à un salon vocal.")
         if ctx.voice_client:
             if ctx.voice_client.channel != ctx.author.voice.channel:
-                raise commands.CommandError("Le bot est déjà dans un salon vocal.")
+                raise commands.CommandError("> Le bot est déjà dans un salon vocal.")
         print("voice_state ok")
 
 

cogs/record.py

@@ -0,0 +1,66 @@
+"""
+All sound effects you want in one command.
+"""
+
+import time
+import datetime
+import discord
+
+from utils.date import months, days
+from config.config import cluster, masters
+from discord.ext import commands
+
+
+class Record(commands.Cog):
+    """Record voices."""
+
+    def __init__(self, bot: commands.Bot):
+        """Define the recorder"""
+        # self.sounds = cluster.sound_deck.sounds
+        self.bot = bot
+        self.connections = {}
+
+    # @property
+    # def music(self):
+    #     return self.bot.get_cog("Music")
+
+    # @commands.group(name="son", aliases=["sound", "sn"])
+    # async def sound(self, ctx: commands.Context):
+    #     """Groupe des commandes pour un son."""
+    #     if not ctx.invoked_subcommand:
+    #         return await ctx.send(
+    #             f"> Commande inexistante."
+    #             f"\n> Écrivez `{ctx.bot.command_prefix}help son` pour voir les commandes disponibles."
+    #             ""
+    #         )
+
+    # @sound.command(name="voir", aliases=["v", "show", "see"])
+    # async def show(self, ctx: commands.Context, *, name: str):
+    #     """Affiche un son."""
+    #     embed = self.embed_sound(name)
+    #     await ctx.send(embed=embed)
+
+
+    @commands.command(name="record")
+    async def record(self, ctx):  # If you're using commands.Bot, this will also work.
+        """Enregistre une voix."""
+        voice = ctx.author.voice
+
+        if not voice:
+            await ctx.respond("You aren't in a voice channel!")
+
+        vc = await voice.channel.connect()  # Connect to the voice channel the author is in.
+        self.connections.update({ctx.guild.id: vc})  # Updating the cache with the guild and channel.
+
+        vc.start_recording(
+            discord.sinks.WaveSink(),  # The sink type to use.
+            self.once_done,  # What to do once done.
+            ctx.channel  # The channel to disconnect from.
+        )
+        await ctx.respond("Started recording!")
+
+    def once_done(self, *args):
+        print("its done", args)
+
+def setup(bot):
+    bot.add_cog(Record(bot))

cogs/shell.py

@@ -1,30 +1,104 @@
 #!/usr/bin/env python
 """Control shells."""
 
-from discord.ext import commands
+import os
+import sys
+import typing
 import discord
+from discord.ext import commands
+from discord.ext.commands.core import has_role
 
-from utils import tools
-from config.config import access, masters
-from config import emoji
-from urllib.parse import quote
+from utils.tools import create_role_if_missing, Capturing
 
-import requests
-import asyncio
-import re
+
+import pexpect
+
+SHELL_ROLE = "Shell"
 
 
 class Shell(commands.Cog):
     """Control shells"""
 
     def __init__(self, bot: commands.Bot):
+        """Initialize the cog with the bot."""
         self.bot = bot
+        self.color: discord.Color = discord.Color.darker_grey()
+        # self.thumbnail: str = (
+        #     "https://cdn0.iconfinder.com/data/icons/development-2/24/terminal-512.png"
+        # )
+        self.thumbnail: str = "https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/GNOME_Terminal_icon_2019.svg/1200px-GNOME_Terminal_icon_2019.svg.png"
+        self.shells: typing.Dict[int, pexpect.pty_spawn.spawn] = {}
+        self.timeout = 3600
+        self.shell_path = os.environ.get("SHELL")
 
-    @commands.command()
-    async def shell(self, ctx: commands.Context, *, command: str):
+    @has_role(SHELL_ROLE)
+    @commands.command(aliases=["sh"])
+    async def shell(self, ctx: commands.Context):
         """Run a command in a shell"""
-        await ctx.send(command)
+        await create_role_if_missing(ctx, SHELL_ROLE, self.color)
+        embed = discord.Embed(color=self.color)
+        embed.set_thumbnail(url=self.thumbnail)
+        embed.set_author(name=ctx.author.name, icon_url=ctx.author.avatar)
+        embed.description = self.shell_path
+
+        if ctx.author.id in self.shells:
+            shell = self.shells[ctx.author.id]
+            shell.close()
+            del self.shells[ctx.author.id]
+            embed.title = "Closed shell"
+            await ctx.send(embed=embed)
+        else:
+            embed.title = "Opened shell"
+            await ctx.send(embed=embed)
+            shell = pexpect.spawn(command=self.shell_path, encoding="utf-8")
+            # shell = pexpect.spawn(
+            #     command=self.shell_path, timeout=self.timeout, encoding="utf-8"
+            # )
+            # shell.logfile = open(f"/tmp/discord_shell_{ctx.author.id}", "w")
+            # shell.logfile = sys.stdout
+            self.shells[ctx.author.id] = shell
+
+    @commands.command(name="shells")
+    async def list_shells(self, ctx: commands.Context):
+        """List opened shells."""
+        if len(self.shells) == 0:
+            return await ctx.send("> No shell opened.")
+        embed = discord.Embed(title="Shells :", color=self.color)
+        embed.set_thumbnail(url=self.thumbnail)
+
+        shell_users = []
+        for shell_user in map(self.bot.fetch_user, self.shells.keys()):
+            shell_users.append(f"- {await shell_user}")
+        embed.description = "\n".join(shell_users)
+        await ctx.send(embed=embed)
+
+    @commands.Cog.listener(name="on_message")
+    async def on_message(self, msg: discord.Message):
+        """Read all messages"""
+        if msg.author == self.bot.user:
+            return
+        if msg.content.startswith(self.bot.command_prefix):
+            return
+        if msg.author.id in self.shells:
+            shell = self.shells[msg.author.id]
+            print(shell.sendline(msg.content))
+            # output = shell.read()
+            # output = shell.before
+            # print(output)
+            shell.expect(pexpect.EOF)
+            # shell.expect(".*\$ ")
+            output = shell.before
+            # output = "\n".join(output_list)
+            print(output)
+            # await msg.channel.send(output)
+            await msg.channel.send("test")
+
+    # async def cog_common_error(self, ctx, error):
+    #     """Close all shell sessions."""
+    #     for shell in self.shells.values():
+    #         shell.close()
 
 
 def setup(bot):
+    """Setup the Shell cog."""
     bot.add_cog(Shell(bot))

cogs/texttospeech.py

@@ -4,6 +4,7 @@ import nightcore as nc
 
 import discord
 import os
+import logging
 
 
 class TextToSpeech(commands.Cog):
@@ -15,7 +16,10 @@ class TextToSpeech(commands.Cog):
         """Assure que l'opus est chargé."""
         music = self.bot.get_cog("Music")
         await music.cog_before_invoke(ctx)
-        await music._join(ctx)
+        try:
+            await music._join(ctx)
+        except discord.errors.ClientException:
+            logging.debug("attempted to connect to voice channel but already connected")
         # if os.environ.get('DEVELOPMENT'):
         #     if not discord.opus.is_loaded():
         #         discord.opus.load_opus('libopus.so')

cogs/voicechannel.py

@@ -0,0 +1,168 @@
+"""Monitor voice channels."""
+
+import os
+import logging
+from typing import List
+
+import discord
+from discord.ext import commands
+
+from config.config import masters
+
+# logging.basicConfig(level=logging.INFO)
+
+
+class VoiceChannel(commands.Cog):
+    """Monitor voice channels."""
+
+    def __init__(self, bot: commands.Bot, **kwargs):
+        """Initialize the cog."""
+        super().__init__(**kwargs)
+        self.bot = bot
+        self.role = "Voix"
+        self.color = discord.Color.teal()
+        self.notify_channel_id: int = os.environ.get("CHNOTIF")
+        self.tmp_channel_name = "Temporaire"
+
+    async def get_bot_member(self, guild: discord.Guild):
+        """Return the member object of the bot."""
+        return guild.fetch_member(self.bot.user.id)
+
+    async def create_role_if_missing(self, guild: discord.Guild):
+        """Create the voice role if it doesn't already exist."""
+        if self.role in [role.name for role in guild.roles]:
+            return
+        # Create the role
+        role = await guild.create_role(name=self.role, colour=self.color)
+        # Add the role to all the masters
+        for master in masters:
+            if member := await guild.fetch_member(master):
+                if self.role in [role.name for role in member.roles]:
+                    await member.add_roles(role)
+
+    @commands.Cog.listener()
+    async def on_voice_state_update(
+        self,
+        member: discord.Member,
+        before: discord.VoiceState,
+        after: discord.VoiceState,
+    ):
+        """Detect any changes on voice channels"""
+        await self.create_role_if_missing(member.guild)
+        if member.bot:
+            return
+        if not after.channel:
+            await self.leave(member, before)
+        elif not before.channel:
+            await self.join(member, after)
+        else:
+            await self.move(member, before, after)
+
+    async def leave(
+        self,
+        member: discord.Member,
+        before: discord.VoiceState,
+    ):
+        """Detect when a user leaves."""
+        logging.info("leave")
+        logging.info(member)
+        logging.info(before)
+        channel: discord.VoiceChannel = before.channel
+        members: List[discord.Member] = channel.members
+        # await self.mute_if_single(members)
+        await self.leave_if_alone(members, before.channel)
+
+    async def join(
+        self,
+        member: discord.Member,
+        after: discord.VoiceState,
+    ):
+        """Detect when a user leaves."""
+        logging.info("join")
+        logging.info(member)
+        logging.info(after)
+        channel: discord.VoiceChannel = after.channel
+        members: List[discord.Member] = channel.members
+        # await self.mute_if_single(members)
+        await self.notify_on_join(member)
+        await self.join_if_single(members)
+
+    async def move(
+        self,
+        member: discord.Member,
+        before: discord.VoiceState,
+        after: discord.VoiceState,
+    ):
+        """Detect when a user leaves."""
+        logging.info("move")
+        logging.info(member)
+        logging.info(before)
+        logging.info(after)
+        before_channel: discord.VoiceChannel = before.channel
+        before_members: List[discord.Member] = before_channel.members
+        after_channel: discord.VoiceChannel = after.channel
+        after_members: List[discord.Member] = after_channel.members
+        # await self.mute_if_single(before_members)
+        await self.join_if_single(after_members)
+
+    async def mute_if_single(self, members: List[discord.Member]):
+        """Mute a member if single."""
+        logging.info("mute if single")
+        logging.info(members)
+        members = list(filter(lambda m: not m.bot, members))
+        if len(members) != 1:
+            return
+        member = members[0]
+        if member.voice:
+            if self.role in map(lambda r: r.name, member.roles):
+                await member.edit(mute=True)
+
+    async def join_if_single(self, members: List[discord.Member]):
+        """Mute a member if single."""
+        logging.info("join if single")
+        logging.info(members)
+        members = list(filter(lambda m: not m.bot, members))
+        if len(members) != 1:
+            return
+        member = members[0]
+        destination = member.voice.channel
+        for voice_client in self.bot.voice_clients:
+            if voice_client.channel.id == member.voice.channel.id:
+                return
+            elif voice_client.channel in member.guild.voice_channels:
+                await voice_client.move_to(destination)
+                return
+        if self.bot.user.id not in [m.id for m in destination.members]:
+            await destination.connect()
+
+    async def notify_on_join(self, member: discord.Member):
+        """Notify me if a member joins."""
+        logging.info("notify on join")
+        logging.info(member)
+        if member.id in masters:
+            return
+        if member.bot:
+            return
+        chan_id = self.notify_channel_id
+        channel: discord.TextChannel = await self.bot.fetch_channel(chan_id)
+        await channel.send(f"> **{member}** a rejoint **{channel}**.", delete_after=60)
+
+    async def leave_if_alone(
+        self, members: List[discord.Member], channel: discord.VoiceChannel
+    ):
+        """Mute a member if single."""
+        logging.info("leave if alone")
+        true_members = list(filter(lambda m: not m.bot, members))
+        if len(true_members) > 0:
+            return
+        bot_search_results = list(filter(lambda m: m.id == self.bot.user.id, members))
+        if len(bot_search_results) == 0:
+            return
+        for voice_client in self.bot.voice_clients:
+            if voice_client.channel.id == channel.id:
+                await voice_client.disconnect()
+                break
+
+
+def setup(bot):
+    bot.add_cog(VoiceChannel(bot))

cogs/web.py

@@ -636,7 +636,7 @@ class Web(commands.Cog):
     ):
         """Shorten given url."""
         shortener_token = os.environ.get("SHORTENER_TOKEN")
-        shortener_url = os.environ.get("SHORTENER_URL")
+        shortener_url = os.environ["SHORTENER_URL"]
         # headers = {"content-type": "application/json"}
         data = dict(target=url)
         if shortener_token:
@@ -645,9 +645,11 @@ class Web(commands.Cog):
             data["description"] = description
         post_url = shortener_url + "//" + name # <- 2 slash are required
         session = requests.Session()
+        print(post_url, data)
         response = session.post(post_url, data, allow_redirects=True)
         # print(post_url, data, response.request.headers, response.request.body, response.headers, response.reason)
         shortened_url = response.text
+        print(shortened_url)
         return await ctx.send(shortened_url)
 
 

config/config.py

@@ -1,14 +1,11 @@
-from .credentials import mongo_url, wolfram_alpha_id
-from utils import access, check
-
-import itertools
-
-from pymongo import MongoClient
-import pymongo
 import os
+import itertools
 import wolframalpha
 
+from utils.access import Access
+from utils.check import Check
 from models.mongo import MongoCluster
+from .credentials import mongo_url, wolfram_alpha_id
 
 
 cluster = MongoCluster(mongo_url)
@@ -18,7 +15,7 @@ link = "https://discordapp.com/oauth2/authorize?&client_id=703347349623144549&sc
 prefix = os.environ.get("DISCORD_PREFIX") or "."
 masters = [478552571510915072]  # , 219949869220102147]
 wolfram = wolframalpha.Client(wolfram_alpha_id)
-ialab_bot_url = "https://ialab.marcpartensky.com"
+ialab_bot_url = os.environ.get("IALAB_URL") or "https://ialab.marcpartensky.com"
 
 roles = ["@Maître", "@Admin"]
 
@@ -32,5 +29,5 @@ status = itertools.cycle(
         "finaliser la théorie quantique",
     ]
 )
-access = access.Access(masters)  # Create access for commands
-check = check.Check()
+access = Access(masters)  # Create access for commands
+check = Check()

docker-compose.yml

@@ -5,6 +5,7 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+      target: ubuntu
     ports:
       - "8000:8000"
     env_file:
@@ -21,5 +22,6 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+      target: alpine
     env_file:
       - .env

models/mongo.py

@@ -1,5 +1,4 @@
 # from mongocollection import MongoCollection
-import discord
 from pymongo import MongoClient
 from pymongo.database import Database
 from pymongo.collection import Collection, ObjectId
@@ -102,7 +101,7 @@ class MongoCluster(MongoClient):
     def __getitem__(self, item):
         """Return a mongo database given its key."""
         item = super().__getitem__(item)
-        if isinstance(item, pymongo.database.Database):
+        if isinstance(item, Database):
             return MongoDatabase.from_database(item)
         else:
             return item
@@ -120,7 +119,7 @@ class MongoDatabase(Database):
     def __getitem__(self, item):
         """Return a mongo collection given a key."""
         item = super().__getitem__(item)
-        if isinstance(item, pymongo.collection.Collection):
+        if isinstance(item, Collection):
             return MongoCollection.from_collection(item)
         else:
             return item
@@ -201,10 +200,10 @@ class MongoCollection(Collection):
         else:
             self.insert_one(arg, **kwargs)
 
-    def insert_many(self, posts, **kwargs):
+    def insert_many(self, posts):
         """Insert many posts."""
         posts = [self.treat(post) for post in posts]
-        super().insert_many(post)
+        super().insert_many(posts)
 
     def __contains__(self, id):
         return self.seek_one(_id=id) != None
@@ -241,10 +240,9 @@ class MongoCollection(Collection):
 
     def __delitem__(self, id):
         """Delete a post."""
-        print(id)
-        print(self.find_one(dict(_id=id)))
+        # print(self.find_one(dict(_id=id)))
         self.delete_one(dict(_id=id))
-        print(self.find_one(dict(_id=id)))
+        # print(self.find_one(dict(_id=id)))
 
     def post(self, post):
         """Replace or insert a post."""
@@ -264,12 +262,14 @@ class MongoCollection(Collection):
         """Set a default post."""
         if id in self:
             post.update(self[id]._dict)
-        print(1, post)
+        # print(1, post)
         self[id] = post
-        print(2, self[id])
+        # print(2, self[id])
 
     def __setattr__(self, att, value):
-        if att in type(self).keys or att in dir(self):
+        """Set attribute to a collection."""
+        # print(att, value)
+        if att in type(self).keys or att in dir(self) or att.startswith("_"):
             super().__setattr__(att, value)
         else:
             self.__setitem__(att, value)
@@ -497,7 +497,14 @@ class User(DictObject):
 # command = db.commands.find(machin=34, bidule=324)
 
 if __name__ == "__main__":
-    mongo_url = "mongodb+srv://esclave:esclave@discord-cluster-5ckni.mongodb.net/test"
+    import os
+    from dotenv import load_dotenv
+    load_dotenv()
+
+    cluster = os.environ["DISCORD_MONGO_CLUSTER"]
+    username = os.environ["DISCORD_MONGO_USERNAME"]
+    password = os.environ["DISCORD_MONGO_PASSWORD"]
+    mongo_url = f"mongodb+srv://{username}:{password}@{cluster}"
     cl = MongoCluster(mongo_url)
     # print('cluster over')
     esclave = cl.esclave

pyproject.toml

@@ -0,0 +1,55 @@
+[tool.poetry]
+name = "discord-bot"
+version = "0.1.0"
+description = "A discord bot multi purpose."
+authors = ["Marc Partensky <marc.partensky@gmail.com>"]
+license = "GPL2"
+readme = "README.md"
+packages = [{include = "discord_bot"}]
+
+[tool.poetry.dependencies]
+python = "3.8.13"
+# python = "3.8-dev"
+beautifulsoup4 = "*"
+# "discord.py[voice]" = "*"
+fbchat = "*"
+# fbchat = {git = "git://github.com/carpedm20/fbchat.git"}
+nightcore = "*"
+profanity-check = "*"
+progressbar2 = "*"
+# pyicloud = "*"
+pymongo = "*"
+requests = "*"
+rich = "*"
+translate = "*"
+wikipedia = "*"
+wolframalpha = "*"
+html2text = "*"
+gTTS = "2.2.1"
+Pillow = "*"
+PyGithub = "*"
+PyYAML = "*"
+youtube_dl = "*"
+python-dotenv = "*"
+dpy-http-server = "*"
+pexpect = "*"
+# libs/sherlock
+dnspython = "*"
+requests-futures = "*"
+torrequest = "*"
+# libs/google
+unidecode = '*'
+future = '*'
+selenium = "*"
+fake-useragent = "*"
+colorama = "*"
+# py-cord = "^2.4.1"
+psycopg2 = "*"
+py-cord = {extras = ["voice"], version = "^2.5.0"}
+groq = "^0.9.0"
+websockets = "^12.0"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

tests/audio_recording.py

@@ -0,0 +1,81 @@
+from enum import Enum
+
+import discord
+import os
+import dotenv
+from discord import Forbidden
+
+dotenv.load_dotenv()
+
+bot = discord.Bot(debug_guilds=["Beta"])
+connections = {}
+
+
+class Sinks(Enum):
+    mp3 = discord.sinks.MP3Sink()
+    wav = discord.sinks.WaveSink()
+    pcm = discord.sinks.PCMSink()
+    ogg = discord.sinks.OGGSink()
+    mka = discord.sinks.MKASink()
+    mkv = discord.sinks.MKVSink()
+    mp4 = discord.sinks.MP4Sink()
+    m4a = discord.sinks.M4ASink()
+
+
+async def finished_callback(sink, channel: discord.TextChannel, *args):
+    recorded_users = [f"<@{user_id}>" for user_id, audio in sink.audio_data.items()]
+    await sink.vc.disconnect()
+    files = [
+        discord.File(audio.file, f"{user_id}.{sink.encoding}")
+        for user_id, audio in sink.audio_data.items()
+    ]
+    await channel.send(
+        f"Finished! Recorded audio for {', '.join(recorded_users)}.", files=files
+    )
+
+
+
+@bot.command()
+async def get_channels(ctx, id):
+    try:
+        guild = await bot.get_guild(id)
+    except Forbidden:
+        await ctx.send("I do not have access to that guild or it doesn't exist.")
+    else:
+        for channel in guild.channels:
+            print(channel.id)
+
+
+@bot.command()
+async def start(ctx: discord.ApplicationContext, sink: Sinks):
+    """Record your voice!"""
+    voice = ctx.author.voice
+
+    if not voice:
+        return await ctx.respond("You're not in a vc right now")
+
+    vc = await voice.channel.connect()
+    connections.update({ctx.guild.id: vc})
+
+    vc.start_recording(
+        sink.value,
+        finished_callback,
+        ctx.channel,
+    )
+
+    await ctx.respond("The recording has started!")
+
+
+@bot.command()
+async def stop(ctx: discord.ApplicationContext):
+    """Stop recording."""
+    if ctx.guild.id in connections:
+        vc = connections[ctx.guild.id]
+        vc.stop_recording()
+        del connections[ctx.guild.id]
+        await ctx.delete()
+    else:
+        await ctx.respond("Not recording in this guild.")
+
+
+bot.run(os.environ["DISCORD_TOKEN"])

tests/audio_recording_merged.py

@@ -0,0 +1,141 @@
+import io
+
+import pydub  # pip install pydub==0.25.1
+
+import discord
+from discord.ext import commands
+from discord.sinks import MP3Sink
+import os
+import dotenv
+dotenv.load_dotenv()
+
+PREFIX = "."
+
+intents = discord.Intents.default()
+intents.members = True
+intents.message_content = True
+
+# bot = commands.Bot(
+#     command_prefix=PREFIX,
+#     intents=intents,
+# )
+
+intents = discord.Intents.default()
+intents.message_content = True
+
+# client = commands.Bot(command_prefix=prefix, case_insensitive=True)
+bot = commands.Bot(command_prefix=PREFIX, intents=intents)
+# setup(client)
+
+# bot = discord.Bot(command_prefix=PREFIX)
+
+
+
+@bot.event
+async def on_ready():
+    print(f"Logged in as {bot.user}")
+
+@bot.command()
+async def answer(ctx: discord.ApplicationContext):
+    """answer"""
+    await ctx.respond("answer!")
+
+
+async def finished_callback(sink: MP3Sink, channel: discord.TextChannel):
+    mention_strs = []
+    audio_segs: list[pydub.AudioSegment] = []
+    files: list[discord.File] = []
+
+    longest = pydub.AudioSegment.empty()
+
+    for user_id, audio in sink.audio_data.items():
+        mention_strs.append(f"<@{user_id}>")
+
+        seg = pydub.AudioSegment.from_file(audio.file, format="mp3")
+
+        # Determine the longest audio segment
+        if len(seg) > len(longest):
+            audio_segs.append(longest)
+            longest = seg
+        else:
+            audio_segs.append(seg)
+
+        audio.file.seek(0)
+        files.append(discord.File(audio.file, filename=f"{user_id}.mp3"))
+
+    for seg in audio_segs:
+        longest = longest.overlay(seg)
+
+    with io.BytesIO() as f:
+        longest.export(f, format="mp3")
+        await channel.send(
+            f"Finished! Recorded audio for {', '.join(mention_strs)}.",
+            files=files + [discord.File(f, filename="recording.mp3")],
+        )
+
+
+@bot.command()
+async def join(ctx: discord.ApplicationContext):
+    """Join the voice channel!"""
+    voice = ctx.author.voice
+
+    if not voice:
+        return await ctx.respond("You're not in a vc right now")
+
+    await voice.channel.connect()
+
+    await ctx.respond("Joined!")
+
+
+@bot.command()
+async def start(ctx: discord.ApplicationContext):
+    """Record the voice channel!"""
+    voice = ctx.author.voice
+
+    if not voice:
+        return await ctx.respond("You're not in a vc right now")
+
+    vc: discord.VoiceClient = ctx.voice_client
+
+    if not vc:
+        return await ctx.respond(
+            "I'm not in a vc right now. Use `/join` to make me join!"
+        )
+
+    vc.start_recording(
+        MP3Sink(),
+        finished_callback,
+        ctx.channel,
+        sync_start=True,  # WARNING: This feature is very unstable and may break at any time.
+    )
+
+    await ctx.respond("The recording has started!")
+
+
+@bot.command()
+async def stop(ctx: discord.ApplicationContext):
+    """Stop the recording"""
+    vc: discord.VoiceClient = ctx.voice_client
+
+    if not vc:
+        return await ctx.respond("There's no recording going on right now")
+
+    vc.stop_recording()
+
+    await ctx.respond("The recording has stopped!")
+
+
+@bot.command()
+async def leave(ctx: discord.ApplicationContext):
+    """Leave the voice channel!"""
+    vc: discord.VoiceClient = ctx.voice_client
+
+    if not vc:
+        return await ctx.respond("I'm not in a vc right now")
+
+    await vc.disconnect()
+
+    await ctx.respond("Left!")
+
+
+bot.run(os.environ["DISCORD_TOKEN"])

utils/check.py

@@ -1,9 +1,21 @@
 import inspect
 from discord.ext import commands
-from utils import tools
 from config import emoji
 
 
+def post_passer(func, *passed_args, **passed_kwargs):
+    """Decorator that passes additionnal arguments (after its own) to a function."""
+
+    def decorated(*args, **kwargs):
+        args = list(args)
+        args.extend(passed_args)
+        args = tuple(args)
+        kwargs.update(passed_kwargs)
+        return func(*args, **kwargs)
+
+    return decorated
+
+
 class Check:
     @staticmethod
     def same_author(msg, ctx):
@@ -27,7 +39,7 @@ class Check:
         try:
             msg = await ctx.bot.wait_for(
                 "message",
-                check=tools.post_passer(Check.same_author, ctx),
+                check=post_passer(Check.same_author, ctx),
                 timeout=self.timeout,
             )
             if msg.content.lower() in self.yes:
@@ -42,13 +54,13 @@ class Check:
 
     def consent(self, message):
         message = self.consent_message + " " + message
-        return tools.post_passer(self.validation, message=message)
+        return post_passer(self.validation, message=message)
 
     def validate(self, message):
-        return tools.post_passer(self.validation, message=message)
+        return post_passer(self.validation, message=message)
 
     def warn(self, message):
-        return tools.post_passer(self.validation, message=message, warning=True)
+        return post_passer(self.validation, message=message, warning=True)
 
     def validation(self, func, message=None, warning=False):
         async def decorated(command, ctx: commands.Context, *args):

utils/tools.py

@@ -1,8 +1,9 @@
+import sys
 import signal
 from contextlib import contextmanager
 from io import StringIO
-import sys
 from discord.ext import commands
+from config.config import masters
 import discord
 
 
@@ -59,19 +60,6 @@ class DictObject(dict):
         self.__dict__ = self
 
 
-def post_passer(func, *passed_args, **passed_kwargs):
-    """Decorator that passes additionnal arguments (after its own) to a function."""
-
-    def decorated(*args, **kwargs):
-        args = list(args)
-        args.extend(passed_args)
-        args = tuple(args)
-        kwargs.update(passed_kwargs)
-        return func(*args, **kwargs)
-
-    return decorated
-
-
 def for_all_cog_methods(decorator_method):
     def decorate(cls):
         def decorator__new__(new):
@@ -133,7 +121,7 @@ def lazy_embed(
     fields: dict,
     title: str = None,
     description: str = None,
-    color: bytes = None,
+    color: discord.Colour = None,
     footer: str = None,
     url: str = None,
     thumbnail: str = None,
@@ -145,8 +133,37 @@ def lazy_embed(
         embed.set_thumbnail(url=thumbnail)
     if image:
         embed.set_image(url=image)
-    for k, v in fields.items():
-        embed.add_field(name=k, value=v)
+    for name, value in fields.items():
+        embed.add_field(name=name, value=value)
     if footer:
         embed.set_footer(text=footer)
     return embed
+
+
+async def create_role_if_missing(
+    ctx: commands.Context, role_name: str, role_color: discord.Color
+):
+    """Create a role if it does not already exist."""
+    if not role_name in [role.name for role in ctx.guild.roles]:
+        # Create the role
+        role = await ctx.guild.create_role(name=role_name, colour=role_color)
+        await ctx.send(f"> Created `{role}` role.")
+        # Define a list of role members
+        role_members = []
+        # Add the role to all the masters
+        for master in masters:
+            if member := await ctx.guild.fetch_member(master):
+                if role_name in [role.name for role in member.roles]:
+                    print(member, member.id, master)
+                    await member.add_roles(role)
+                    role_members.append(member)
+        # Send a message to show the new role members
+        if role_members:
+            role_members_text = "\n".join(f"+ {member}" for member in role_members)
+            await ctx.send(
+                '```diff\nAdded "'
+                + role_name
+                + '" role to:\n'
+                + role_members_text
+                + "```"
+            )