Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 marc
|
39958ce82f |
@@ -4,6 +4,9 @@
|
||||
Makefile
|
||||
Dockerfile
|
||||
docker-compose.yml
|
||||
README.md
|
||||
Procfile
|
||||
run.sh
|
||||
runtime.txt
|
||||
Pipfile
|
||||
Pipfile.lock
|
||||
|
||||
@@ -1,7 +1 @@
|
||||
liberapay: marcpartensky
|
||||
patreon: marcpartensky
|
||||
github: marcpartensky
|
||||
custom:
|
||||
# - monero:43J2XmRtjDPRLD35UsYGH2AZamFBQz7dt4VdvZXVm3SuadTrvcoXUXBRUNHqukFte23Q5TWXqhbwaLJJgoVQzzbe2AJDANQ
|
||||
- https://paypal.me/marcpartensky
|
||||
- https://buymeacoffee.com/marcpartensky
|
||||
|
||||
@@ -13,7 +13,7 @@ on:
|
||||
- master
|
||||
|
||||
env:
|
||||
IMAGE_NAME: discord-bot
|
||||
IMAGE_NAME: website
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -32,18 +32,12 @@ jobs:
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
- name: Build and push with tag
|
||||
id: tag-build
|
||||
- name: Build and push
|
||||
id: docker_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 }}
|
||||
@@ -67,20 +61,3 @@ jobs:
|
||||
- name: Display Python version
|
||||
run: python -c "import sys; print(sys.version)"
|
||||
|
||||
deploy:
|
||||
name: Deploy
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- build
|
||||
steps:
|
||||
- name: executing remote ssh commands using password
|
||||
uses: appleboy/ssh-action@v1.0.3
|
||||
with:
|
||||
host: ${{ secrets.HOST }}
|
||||
username: ${{ secrets.USERNAME }}
|
||||
key: ${{ secrets.KEY}}
|
||||
port: ${{ secrets.PORT }}
|
||||
script: |
|
||||
cd ~/git/docker/services
|
||||
podman-compose -f discord.yml pull
|
||||
podman-compose -f discord.yml up -d --force-recreate bot
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
name: Docker
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- '*'
|
||||
|
||||
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)"
|
||||
|
||||
@@ -8,6 +8,3 @@ venv/
|
||||
.env
|
||||
.env.dev
|
||||
./config/marc_store.yml
|
||||
.python-version
|
||||
.ash_history
|
||||
.cache
|
||||
|
||||
+20
-10
@@ -1,16 +1,26 @@
|
||||
FROM python:3.13-alpine AS alpine
|
||||
LABEL maintainer="marc.partensky@proton.me"
|
||||
FROM python:3.8.12-slim
|
||||
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-get autoremove -y
|
||||
RUN apt-get install -y ffmpeg git curl
|
||||
COPY requirements.txt ./
|
||||
|
||||
RUN pip install -U pip
|
||||
RUN pip install -r requirements.txt
|
||||
|
||||
WORKDIR /app
|
||||
COPY README.md LICENSE pyproject.toml uv.lock build.sh requirements.txt ./
|
||||
COPY ./discord_bot discord_bot
|
||||
RUN ./build.sh
|
||||
WORKDIR /app/discord_bot
|
||||
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
|
||||
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 ["uv", "run", "--directory", "discord_bot", "python", "."]
|
||||
ENTRYPOINT ["python", "."]
|
||||
|
||||
ENTRYPOINT ["python", "__main__.py"]
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
set dotenv-load := true
|
||||
|
||||
image := "marcpartensky/discord-bot"
|
||||
|
||||
# lance le bot en local
|
||||
run:
|
||||
uv run --directory discord_bot python .
|
||||
|
||||
# installe les deps
|
||||
sync:
|
||||
uv sync
|
||||
|
||||
# build l'image
|
||||
build:
|
||||
podman build -t {{image}}:local .
|
||||
|
||||
# lance l'image
|
||||
docker-run:
|
||||
podman run --rm -it --env-file .env {{image}}:local
|
||||
|
||||
# logs du service
|
||||
logs:
|
||||
journalctl -fu podman-discord-bot
|
||||
|
||||
# relance le service
|
||||
restart:
|
||||
sudo systemctl reset-failed podman-discord-bot
|
||||
sudo systemctl restart podman-discord-bot
|
||||
@@ -1,165 +1,674 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
GNU 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
|
||||
|
||||
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.
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
0. Additional Definitions.
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
"The Library" refers to a covered work governed by this License,
|
||||
other than an Application or a Combined Work as defined below.
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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".
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
1. Exception to Section 3 of the GNU GPL.
|
||||
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.
|
||||
|
||||
You may convey a covered work under sections 3 and 4 of this License
|
||||
without being bound by section 3 of the GNU GPL.
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
2. Conveying Modified Versions.
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
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:
|
||||
0. Definitions.
|
||||
|
||||
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
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
b) under the GNU GPL, with none of the additional permissions of
|
||||
this License applicable to that copy.
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
3. Object Code Incorporating Material from Library Header Files.
|
||||
"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.
|
||||
|
||||
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:
|
||||
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) 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.
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||
document.
|
||||
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.
|
||||
|
||||
4. Combined Works.
|
||||
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.
|
||||
|
||||
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:
|
||||
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.
|
||||
|
||||
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.
|
||||
1. Source Code.
|
||||
|
||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||
document.
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
d) Do one of the following:
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
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.)
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
5. Combined Libraries.
|
||||
2. Basic Permissions.
|
||||
|
||||
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:
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
6. Revised Versions of the GNU Lesser General Public License.
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
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>.
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
run:
|
||||
uv --directory discord_bot run python .
|
||||
start:
|
||||
pipenv run python .
|
||||
update:
|
||||
uv lock
|
||||
uv pip compile requirements.txt \
|
||||
--universal \
|
||||
--output-file requirements.txt
|
||||
pipenv lock --pre --clear
|
||||
pipenv lock -r > requirements.txt
|
||||
dev:
|
||||
docker-compose -f docker-compose.yml up -d --build --force-recreate --remove-orphans dev
|
||||
prod:
|
||||
@@ -16,8 +14,12 @@ push: build
|
||||
deploy: push
|
||||
DOCKER_HOST=ssh://vps docker service update vps_esclave
|
||||
setup:
|
||||
uv pip install
|
||||
uv shell
|
||||
pip install pipenv
|
||||
pipenv shell
|
||||
pipenv install
|
||||
recreate:
|
||||
docker-compose -f docker-compose.yml up --force-recreate dev
|
||||
fixwithbrew:
|
||||
brew 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
|
||||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
[[source]]
|
||||
url = "https://pypi.org/simple"
|
||||
verify_ssl = true
|
||||
name = "pypi"
|
||||
|
||||
[packages]
|
||||
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 = "*"
|
||||
|
||||
[dev-packages]
|
||||
black = "*"
|
||||
pylint = "*"
|
||||
jedi = "*"
|
||||
|
||||
[requires]
|
||||
python_version = "3.8.12"
|
||||
Generated
+1418
File diff suppressed because it is too large
Load Diff
@@ -4,22 +4,22 @@
|
||||
import os
|
||||
import random
|
||||
import itertools
|
||||
import asyncio
|
||||
import warnings
|
||||
from rich import print
|
||||
|
||||
import html
|
||||
import progressbar
|
||||
warnings.filterwarnings("ignore")
|
||||
|
||||
import progressbar
|
||||
import discord
|
||||
from discord.ext import commands, tasks
|
||||
import html
|
||||
|
||||
from dotenv import load_dotenv
|
||||
|
||||
load_dotenv()
|
||||
|
||||
from config.config import prefix, masters, access
|
||||
from config.config import prefix, masters, delete_after_time, status, access
|
||||
from config.credentials import token, client_id
|
||||
|
||||
from discord.ext import commands, tasks
|
||||
|
||||
|
||||
# TODO
|
||||
@@ -39,69 +39,67 @@ from config.credentials import token, client_id
|
||||
# # 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.Bot):
|
||||
|
||||
class Main(commands.Cog):
|
||||
"""Main cog for commands."""
|
||||
|
||||
def __init__(self, *args, client_id, **kwargs):
|
||||
def __init__(self, bot: commands.Bot):
|
||||
"""Create the main cog using the bot as argument."""
|
||||
super().__init__(*args, **kwargs)
|
||||
self.id = client_id
|
||||
self.bot = bot
|
||||
self.invited = "invité"
|
||||
self.good_invited = "bon invité"
|
||||
self.bad_invited = "mauvais invité"
|
||||
self.help_every = 5
|
||||
self._status = itertools.cycle([]) # Will be populated in load_status()
|
||||
|
||||
async def setup_hook(self) -> None:
|
||||
"""Automatically run by discord.py."""
|
||||
print("DEBUG: setup_hook called")
|
||||
await self.load_cogs()
|
||||
print("DEBUG: load_cogs finished")
|
||||
self.load_cogs()
|
||||
self.load_status()
|
||||
print("DEBUG: load_status finished")
|
||||
self.load_icloud()
|
||||
self.api: PycloudService = None
|
||||
|
||||
def load_icloud(self):
|
||||
"""Charge l'api d'icloud."""
|
||||
pass
|
||||
|
||||
def load_status(self):
|
||||
"""Charge les statuts."""
|
||||
self._status = []
|
||||
for command in self.commands:
|
||||
self.status = []
|
||||
for command in self.bot.commands:
|
||||
msg = prefix + command.name + " " + command.short_doc
|
||||
self._status.append(msg)
|
||||
random.shuffle(self._status)
|
||||
self.status.append(msg)
|
||||
random.shuffle(self.status)
|
||||
i = 0
|
||||
while i < len(self._status):
|
||||
while i < len(self.status):
|
||||
msg = prefix + "help Voir les commandes."
|
||||
self._status.insert(i, msg)
|
||||
self.status.insert(i, msg)
|
||||
i += self.help_every
|
||||
self._status = itertools.cycle(self._status)
|
||||
|
||||
async def load_cogs(self):
|
||||
"""Charge tous les cogs."""
|
||||
cogs = os.listdir("./cogs")
|
||||
with progressbar.ProgressBar(max_value=len(cogs)) as bar:
|
||||
for i, filename in enumerate(cogs):
|
||||
bar.update(i)
|
||||
if filename.endswith(".py"):
|
||||
print(filename)
|
||||
self.load_extension(f"cogs.{filename[:-3]}")
|
||||
self.status = itertools.cycle(self.status)
|
||||
|
||||
@commands.command()
|
||||
async def environment(self, ctx: commands.Context):
|
||||
"""Affiche l'environnement dans lequel le bot tourne."""
|
||||
host = os.environ.get("HOST")
|
||||
print(f"environment: {host}")
|
||||
await ctx.send(f"> Environment: **{host}**")
|
||||
|
||||
@commands.command(name="charge-tous")
|
||||
@access.admin
|
||||
async def load_all(self, ctx: commands.Context):
|
||||
"""Charge tous les cogs."""
|
||||
await self.load_cogs()
|
||||
self.load_cogs()
|
||||
await ctx.send("Tous les cogs sont chargés.")
|
||||
|
||||
def load_cogs(self):
|
||||
"""Charge tous les cogs."""
|
||||
cogs = os.listdir("./cogs")
|
||||
with progressbar.ProgressBar(max_value=len(cogs)) as bar:
|
||||
for i, filename in enumerate(cogs):
|
||||
bar.update(i)
|
||||
if filename.endswith(".py"):
|
||||
self.bot.load_extension(f"cogs.{filename[:-3]}")
|
||||
|
||||
@commands.command()
|
||||
async def list_cogs(self, ctx: commands.Context):
|
||||
async def cogs(self, ctx: commands.Context):
|
||||
"""Liste tous les cogs."""
|
||||
cog_list = []
|
||||
for file in os.listdir("./cogs"):
|
||||
@@ -116,40 +114,36 @@ class Main(commands.Bot):
|
||||
@commands.command()
|
||||
async def loaded_cogs(self, ctx: commands.Context):
|
||||
"""Liste tous les cogs."""
|
||||
loaded_cog_list = [f"- {s[5:]}" for s in self.extensions.keys()]
|
||||
if len(loaded_cog_list) == 0:
|
||||
await ctx.send("> Aucun cog chargé")
|
||||
else:
|
||||
list_text = "\n".join(loaded_cog_list)
|
||||
text = "```md\n" + list_text + "\n```"
|
||||
print(text)
|
||||
await ctx.send(text)
|
||||
loaded_cog_list = [f"- {s[5:]}" for s in self.bot.extensions.keys()]
|
||||
list_text = "\n".join(loaded_cog_list)
|
||||
text = "```md\n" + list_text + "\n```"
|
||||
await ctx.send(text)
|
||||
|
||||
@commands.command(name="décharge-tous")
|
||||
@access.admin
|
||||
async def unload_all(self, ctx: commands.Context):
|
||||
"""Décharge tous les cogs."""
|
||||
await self.unload_cogs()
|
||||
self.unload_cogs()
|
||||
await ctx.send("Tous les cogs sont déchargés.")
|
||||
|
||||
async def unload_cogs(self):
|
||||
def unload_cogs(self):
|
||||
"""Décharge tous les cogs."""
|
||||
for filename in os.listdir("./cogs"):
|
||||
if filename.endswith(".py"):
|
||||
await self.unload_extension(f"cogs.{filename[:-3]}")
|
||||
self.bot.unload_extension(f"cogs.{filename[:-3]}")
|
||||
|
||||
@commands.command(name="charge", aliases=["load"])
|
||||
@access.admin
|
||||
async def load(self, ctx, extension):
|
||||
"""Charge les extensions."""
|
||||
await self.load_extension(f"cogs.{extension}")
|
||||
self.bot.load_extension(f"cogs.{extension}")
|
||||
await ctx.send(f"Le cog {extension} a été chargée.")
|
||||
|
||||
@commands.command(name="décharge", aliases=["unload"])
|
||||
@access.admin
|
||||
async def unload(self, ctx, extension):
|
||||
"""Décharge les extensions."""
|
||||
await self.unload_extension(f"cogs.{extension}")
|
||||
self.bot.unload_extension(f"cogs.{extension}")
|
||||
await ctx.send(f"Le cog {extension} a été déchargée.")
|
||||
|
||||
@tasks.loop(seconds=10)
|
||||
@@ -163,34 +157,17 @@ class Main(commands.Bot):
|
||||
- discord.ActivityType.watching,
|
||||
- discord.ActivityType.competing
|
||||
"""
|
||||
try:
|
||||
status_name = next(self._status)
|
||||
await self.change_presence(
|
||||
activity=discord.Activity(
|
||||
type=discord.ActivityType.watching, name=status_name
|
||||
)
|
||||
await self.bot.change_presence(
|
||||
activity=discord.Activity(
|
||||
type=discord.ActivityType.watching, name=next(self.status)
|
||||
)
|
||||
except StopIteration:
|
||||
# Pas de statuts disponibles, on ne fait rien
|
||||
pass
|
||||
)
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_ready(self):
|
||||
"""Déclare être prêt."""
|
||||
self.change_status.start()
|
||||
print(f"{self.user} is connected to Discord!")
|
||||
|
||||
# Démarrer le serveur HTTP API
|
||||
print(f"DEBUG: on_ready - Looking for API cog...")
|
||||
api_cog = self.get_cog("API")
|
||||
print(f"DEBUG: API cog = {api_cog}")
|
||||
if api_cog and hasattr(api_cog, '_start_server'):
|
||||
print(f"DEBUG: Starting HTTP server from on_ready...")
|
||||
if not hasattr(api_cog, '_server_started') or not api_cog._server_started:
|
||||
await api_cog._start_server()
|
||||
api_cog._server_started = True
|
||||
else:
|
||||
print("DEBUG: API cog not found or no _start_server method")
|
||||
print(f"{self.bot.user} is connected to Discord!")
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_member_join(self, member: discord.Member):
|
||||
@@ -226,7 +203,7 @@ class Main(commands.Bot):
|
||||
return False
|
||||
|
||||
try:
|
||||
msg = await self.wait_for(
|
||||
msg = await self.bot.wait_for(
|
||||
"message", check=check, timeout=timeout
|
||||
)
|
||||
await channel.send("T'es un bon toi. T'iras loin!")
|
||||
@@ -254,7 +231,7 @@ class Main(commands.Bot):
|
||||
def check(ctx):
|
||||
return not ctx.author.bot
|
||||
|
||||
msg = await self.wait_for(
|
||||
msg = await self.bot.wait_for(
|
||||
"message", check=check, timeout=timeout
|
||||
)
|
||||
await channel.send(f"On a dit une minute de silence!")
|
||||
@@ -296,22 +273,12 @@ class Main(commands.Bot):
|
||||
# break
|
||||
|
||||
|
||||
async def main():
|
||||
def setup(bot: commands.Bot):
|
||||
"""Setup the bot for the main cog."""
|
||||
os.system("clear")
|
||||
print(f"prefix: {prefix}")
|
||||
|
||||
# warnings.filterwarnings("ignore")
|
||||
intents = discord.Intents.default()
|
||||
intents.message_content = True
|
||||
|
||||
# client = commands.Bot(command_prefix=prefix, case_insensitive=True)
|
||||
bot = Main(intents=intents, command_prefix=prefix, case_insensitive=False, client_id=client_id)
|
||||
|
||||
async with bot:
|
||||
await bot.setup_hook()
|
||||
await bot.start(token)
|
||||
bot.add_cog(Main(bot))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(main())
|
||||
os.system("clear")
|
||||
setup(client)
|
||||
client.run(token)
|
||||
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 116 KiB |
@@ -1,27 +0,0 @@
|
||||
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"])
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
apk update
|
||||
apk add curl
|
||||
|
||||
curl -LsSf https://astral.sh/uv/install.sh | sh &
|
||||
apk add --no-cache --virtual .build build-base libffi-dev &
|
||||
wait
|
||||
export PATH="$PATH:$HOME/.cargo/bin"
|
||||
|
||||
# uv sync -v &
|
||||
# uv pip compile pyproject.toml -o requirements.txt
|
||||
# uv export --format requirements.txt > requirements.txt
|
||||
# sed -i '1,2d' requirements.txt
|
||||
pip install -r requirements.txt &
|
||||
apk add ffmpeg postgresql p7zip &
|
||||
wait
|
||||
# apk del .build &
|
||||
# rm -rf /var/cache/apk/* /tmp/* &
|
||||
# wait
|
||||
+158
@@ -0,0 +1,158 @@
|
||||
#!/usr/bin/env python
|
||||
"""HTTP web service to interact with the bot."""
|
||||
__author__ = "Marc Partensky"
|
||||
|
||||
# from config.config import cluster, access, check
|
||||
# from utils.check import check
|
||||
# from utils import tools
|
||||
|
||||
import os
|
||||
import typing
|
||||
import uuid
|
||||
import traceback
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
|
||||
import server
|
||||
from aiohttp import web
|
||||
|
||||
|
||||
class API(commands.Cog):
|
||||
"""HTTP web service to interact with the bot."""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
self.bot = bot
|
||||
self.server = server.HTTPServer(
|
||||
bot=self.bot,
|
||||
host=os.environ.get("DISCORD_BOT_HOST") or "localhost",
|
||||
port=int(os.environ.get("DISCORD_BOT_PORT") or "8000"),
|
||||
)
|
||||
self.guild_id = int(
|
||||
os.environ.get("DISCORD_BOT_GUILD_ID") or "550332212340326428"
|
||||
)
|
||||
self.bot.loop.create_task(self._start_server())
|
||||
self.contexts: typing.Dict[str, commands.Context] = {}
|
||||
|
||||
async def _start_server(self):
|
||||
"""Task to run the HTTP server."""
|
||||
await self.bot.wait_until_ready()
|
||||
await self.server.start()
|
||||
|
||||
# async def checker(self, a, request):
|
||||
# print(a)
|
||||
# print(request)
|
||||
# # return request.headers.get("authorization") == "password"
|
||||
# return True
|
||||
|
||||
async def fail_handler(self, request):
|
||||
return web.json_response(data={"message": "you are not authorized"}, status=401)
|
||||
|
||||
@server.add_route(path="/send/user", method="POST", cog="API")
|
||||
async def send_user(self, request: web.Request):
|
||||
"""API home path."""
|
||||
body = await request.json()
|
||||
user: discord.User = await self.bot.fetch_user(body["id"])
|
||||
await user.send(body["message"])
|
||||
return web.json_response(
|
||||
data={"text": "Successfully sent message."}, status=200
|
||||
)
|
||||
|
||||
@server.add_route(path="/send/channel", method="POST", cog="API")
|
||||
async def send_channel(self, request: web.Request):
|
||||
"""API home path."""
|
||||
body = await request.json()
|
||||
channel: discord.TextChannel = await self.bot.fetch_channel(body["id"])
|
||||
await channel.send(body["message"])
|
||||
self.bot.commands
|
||||
return web.json_response(
|
||||
data={"text": "Successfully sent message."}, status=200
|
||||
)
|
||||
|
||||
# def build_context(self, channel: discord.TextChannel, args: list) -> commands.Context:
|
||||
# """Build a fake context to run bot commands."""
|
||||
# # state = discord
|
||||
# data = {}
|
||||
# state = discord.message.ConnectionState({}, {}, {}, http, loop)
|
||||
# message = discord.Message(state, channel, data)
|
||||
# view = discord.channel.TextChannel
|
||||
# return commands.Context(message, self.bot, view, args=args))
|
||||
|
||||
@server.add_route(path="/command/channel", method="POST", cog="API")
|
||||
async def command_channel(self, request: web.Request):
|
||||
"""API home path."""
|
||||
body = await request.json()
|
||||
ctx_id = body["ctx"]
|
||||
cmd = body["cmd"]
|
||||
if "args" in body:
|
||||
args = body["args"]
|
||||
else:
|
||||
args = []
|
||||
if "kwargs" in body:
|
||||
kwargs = body["kwargs"]
|
||||
else:
|
||||
kwargs = {}
|
||||
channel: discord.TextChannel = await self.bot.fetch_channel(body["id"])
|
||||
command_list = []
|
||||
for command in self.bot.commands:
|
||||
command_list.append(dict(name=command.name, doc=command.short_doc))
|
||||
print(command.name)
|
||||
if command.name == cmd:
|
||||
# context = self.build_context(channel, args)
|
||||
ctx = self.contexts[ctx_id]
|
||||
try:
|
||||
print(ctx.args)
|
||||
print(ctx.kwargs)
|
||||
ctx.args = args
|
||||
ctx.kwargs = kwargs
|
||||
# command.clean_params
|
||||
# for param in command.params:
|
||||
|
||||
# print(command._parse_arguments(ctx))
|
||||
# await command.prepare(ctx)
|
||||
# await converter._construct_default(ctx)
|
||||
# await command.callback(context, __p1=command.clean_params)
|
||||
# print(command.clean_params)
|
||||
# print(command.params)
|
||||
# print(command.invoke())
|
||||
# ctx.args = args
|
||||
result = await command.invoke(ctx)
|
||||
return web.json_response(data={"text": str(result)}, status=200)
|
||||
except Exception as exception:
|
||||
traceback.print_exc()
|
||||
return web.json_response(
|
||||
data={"error": str(exception), "doc": command.short_doc},
|
||||
status=500,
|
||||
)
|
||||
return web.json_response(
|
||||
data={"error": "No match found.", "commands": command_list}, status=404
|
||||
)
|
||||
|
||||
@server.add_route(path="/debug/bot", method="GET", cog="API")
|
||||
async def debug_bot(self, request: web.Request):
|
||||
"""API home path."""
|
||||
body = await request.json()
|
||||
return web.json_response(data=self.bot, status=200)
|
||||
|
||||
@server.add_route(path="/live", method="GET", cog="API")
|
||||
# @server.check(predicate=checker, fail_handler="fail_handler")
|
||||
async def live(self, request: web.Request):
|
||||
"""API home path."""
|
||||
return web.json_response(text="OK", status=200)
|
||||
|
||||
@commands.command(name="save-context")
|
||||
async def save_context(self, ctx: commands.Context, context_id: str or None):
|
||||
"""Save a context since it is really hard to build one from scratch."""
|
||||
context_id = context_id or str(uuid.uuid1())
|
||||
self.contexts[context_id] = ctx
|
||||
await ctx.send(f"> Saved context as **{context_id}**")
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_message(self, msg: discord.Message):
|
||||
"""Nettoie les messages des salons innapropriés, dès que
|
||||
ceux-ci sont postés."""
|
||||
if msg.author.bot:
|
||||
return
|
||||
|
||||
|
||||
def setup(bot: commands.Bot):
|
||||
bot.add_cog(API(bot))
|
||||
@@ -1,12 +1,14 @@
|
||||
from config.config import access, delete_after_time, link
|
||||
from config.config import access, status, delete_after_time, masters, link
|
||||
from config import emoji
|
||||
|
||||
from utils.date import days, months
|
||||
from utils import tools
|
||||
|
||||
from discord.ext import commands
|
||||
from discord.ext import commands, tasks
|
||||
from translate import Translator
|
||||
from discord import Message, PartialEmoji
|
||||
import requests
|
||||
from discord.utils import get
|
||||
from discord import Message, PartialEmoji, Emoji
|
||||
from bs4 import BeautifulSoup
|
||||
import datetime
|
||||
import discord
|
||||
import random
|
||||
@@ -364,17 +366,6 @@ 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)
|
||||
|
||||
@commands.command(name="channel")
|
||||
async def channel(self, ctx: commands.Context):
|
||||
"""Affiche l'id du channel."""
|
||||
await ctx.send("> "+str(ctx.channel.id))
|
||||
|
||||
def setup(bot):
|
||||
bot.add_cog(Basic(bot))
|
||||
@@ -88,7 +88,7 @@ class BlackJack(commands.Cog):
|
||||
room.embed_message = await ctx.send(embed=embed)
|
||||
else:
|
||||
if room.message:
|
||||
await room.message.edit(content=content)
|
||||
room.message.edit(content=content)
|
||||
else:
|
||||
room.message = await ctx.send(content)
|
||||
|
||||
@@ -103,7 +103,7 @@ class BlackJack(commands.Cog):
|
||||
@commands.Cog.listener()
|
||||
async def on_command_error(self, ctx: commands.Context, error):
|
||||
"""Envoie l'erreur aux utilisateurs."""
|
||||
await self.send(ctx, error)
|
||||
self.send(ctx, error)
|
||||
print("erreur capturée")
|
||||
|
||||
@blackjack.command(name="créer", aliases=["create", "c"])
|
||||
@@ -235,7 +235,7 @@ class BlackJack(commands.Cog):
|
||||
room = self.getRoom(ctx)
|
||||
player = room.find(member)
|
||||
player.drawing = False
|
||||
await self.send(ctx, f"> {member.name} se couche.")
|
||||
self.send(ctx, f"> {member.name} se couche.")
|
||||
|
||||
@blackjack.command(name="retirer", aliases=["draw", "r", "d"])
|
||||
async def draw(self, ctx: commands.Context):
|
||||
@@ -80,39 +80,22 @@ class Commandes(commands.Cog):
|
||||
self.commands[command] = post
|
||||
await ctx.send(f"> La commande **{command}** a été apprise.")
|
||||
|
||||
@command.command(name="cherche", aliases=["search", "find"])
|
||||
async def search(self, ctx: commands.Context, command: str, *args, regex: bool = True, show_cmd: bool = True):
|
||||
@command.command(name="cherche", aliases=["search"])
|
||||
async def search(self, ctx: commands.Context, command: str, *args):
|
||||
"""Cherche une commande."""
|
||||
if regex:
|
||||
cursor = self.commands.find(dict(_id={'$regex': ".*" + command + ".*"}))
|
||||
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)
|
||||
else:
|
||||
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}**")
|
||||
await ctx.send(cmd)
|
||||
|
||||
@command.command(aliases=["info"])
|
||||
async def information(self, ctx: commands.Context, *, command: str):
|
||||
@@ -217,7 +200,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("|")), regex=False, show_cmd=False)
|
||||
await self.search(ctx, *map(lambda r: r.strip(), req.strip().split("|")))
|
||||
|
||||
|
||||
def setup(bot: commands.Bot):
|
||||
@@ -23,8 +23,8 @@ class Docker(commands.Cog):
|
||||
"""Initialize the ialab cog."""
|
||||
super().__init__(**kwargs)
|
||||
self.bot: commands.Bot = bot
|
||||
self.url: str = os.environ.get("DOCKER_API_URL", "")
|
||||
self.color = discord.Color(0x4EB3F2)
|
||||
self.url: str = os.environ["DOCKER_API_URL"]
|
||||
self.color = discord.Colour(0x4EB3F2)
|
||||
self.states = dict(
|
||||
exited=discord.Color.red(),
|
||||
running=discord.Color.green(),
|
||||
@@ -172,6 +172,6 @@ class Mongo2(commands.Cog):
|
||||
return await ctx.send("> Rien n'est sélectionné pour l'instant.")
|
||||
|
||||
|
||||
async def setup(bot):
|
||||
def setup(bot):
|
||||
mongo = Mongo(bot)
|
||||
await bot.add_cog(mongo)
|
||||
bot.add_cog(mongo)
|
||||
@@ -16,15 +16,12 @@ 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: ""
|
||||
|
||||
@@ -370,7 +367,6 @@ 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)
|
||||
@@ -445,61 +441,23 @@ class Music(commands.Cog):
|
||||
return
|
||||
ctx.voice_state.voice = await destination.connect()
|
||||
|
||||
|
||||
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"])
|
||||
@commands.command(name="leave", aliases=["disconnect", "quitte"])
|
||||
async def _leave(self, ctx: commands.Context):
|
||||
"""Nettoie la queue, quitte le salon vocal."""
|
||||
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.")
|
||||
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]
|
||||
|
||||
@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):
|
||||
@@ -510,9 +468,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):
|
||||
@@ -544,7 +502,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("⏭")
|
||||
@@ -557,12 +515,12 @@ 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")
|
||||
@commands.command(name="queue", aliases=["q"])
|
||||
async def _queue(self, ctx: commands.Context, *, page: int = 1):
|
||||
"""Affiche la queue à une page."""
|
||||
voice_state = self.voice_states[ctx.guild.id]
|
||||
@@ -572,7 +530,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
|
||||
@@ -601,7 +559,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("✅")
|
||||
|
||||
@@ -609,7 +567,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("✅")
|
||||
|
||||
@@ -618,7 +576,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("✅")
|
||||
@@ -633,7 +591,6 @@ 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:
|
||||
@@ -642,7 +599,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)
|
||||
)
|
||||
)
|
||||
@@ -661,10 +618,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")
|
||||
|
||||
|
||||
@@ -170,5 +170,5 @@ class Music2(commands.Cog):
|
||||
await ctx.send(result['webpage_url'])
|
||||
print("this ends now")
|
||||
|
||||
async def setup(bot):
|
||||
await bot.add_cog(Music2(bot))
|
||||
def setup(bot):
|
||||
bot.add_cog(Music2(bot))
|
||||
@@ -234,5 +234,5 @@ class Music3:
|
||||
else:
|
||||
skip_count = len(state.skip_votes)
|
||||
await self.bot.say('Now playing {} [skips: {}/3]'.format(state.current, skip_count))
|
||||
async def setup(bot):
|
||||
await bot.add_cog(Music3(bot))
|
||||
def setup(bot):
|
||||
bot.add_cog(Music3(bot))
|
||||
@@ -383,5 +383,5 @@ class Music(commands.Cog):
|
||||
|
||||
|
||||
|
||||
async def setup(bot):
|
||||
await bot.add_cog(Music(bot))
|
||||
def setup(bot):
|
||||
bot.add_cog(Music(bot))
|
||||
@@ -69,7 +69,7 @@ class VoiceChannel(commands.Cog):
|
||||
logging.info(before)
|
||||
channel: discord.VoiceChannel = before.channel
|
||||
members: List[discord.Member] = channel.members
|
||||
# await self.mute_if_single(members)
|
||||
await self.mute_if_single(members)
|
||||
await self.leave_if_alone(members, before.channel)
|
||||
|
||||
async def join(
|
||||
@@ -83,7 +83,7 @@ class VoiceChannel(commands.Cog):
|
||||
logging.info(after)
|
||||
channel: discord.VoiceChannel = after.channel
|
||||
members: List[discord.Member] = channel.members
|
||||
# await self.mute_if_single(members)
|
||||
await self.mute_if_single(members)
|
||||
await self.notify_on_join(member)
|
||||
await self.join_if_single(members)
|
||||
|
||||
@@ -102,7 +102,7 @@ class VoiceChannel(commands.Cog):
|
||||
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.mute_if_single(before_members)
|
||||
await self.join_if_single(after_members)
|
||||
|
||||
async def mute_if_single(self, members: List[discord.Member]):
|
||||
@@ -636,7 +636,7 @@ class Web(commands.Cog):
|
||||
):
|
||||
"""Shorten given url."""
|
||||
shortener_token = os.environ.get("SHORTENER_TOKEN")
|
||||
shortener_url = os.environ["SHORTENER_URL"]
|
||||
shortener_url = os.environ.get("SHORTENER_URL")
|
||||
# headers = {"content-type": "application/json"}
|
||||
data = dict(target=url)
|
||||
if shortener_token:
|
||||
@@ -645,11 +645,9 @@ 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)
|
||||
|
||||
|
||||
@@ -15,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 = os.environ.get("IALAB_URL") or "https://ialab.marcpartensky.com"
|
||||
ialab_bot_url = "https://ialab.marcpartensky.com"
|
||||
|
||||
roles = ["@Maître", "@Admin"]
|
||||
|
||||
@@ -6,6 +6,6 @@ client_id = os.environ["DISCORD_CLIENT_ID"]
|
||||
mongo_username = os.environ["DISCORD_MONGO_USERNAME"]
|
||||
mongo_password = os.environ["DISCORD_MONGO_PASSWORD"]
|
||||
mongo_cluster = os.environ["DISCORD_MONGO_CLUSTER"]
|
||||
wolfram_alpha_id = os.environ.get("WOLFRAM_ALPHA_ID", "")
|
||||
wolfram_alpha_id = os.environ["WOLFRAM_ALPHA_ID"]
|
||||
|
||||
mongo_url = f"mongodb+srv://{mongo_username}:{mongo_password}@{mongo_cluster}"
|
||||
@@ -1,146 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""HTTP web service to interact with the bot."""
|
||||
__author__ = "Marc Partensky"
|
||||
|
||||
import asyncio
|
||||
import functools
|
||||
import os
|
||||
import traceback
|
||||
import typing
|
||||
import uuid
|
||||
|
||||
import discord
|
||||
from aiohttp import web
|
||||
from discord.ext import commands
|
||||
|
||||
|
||||
def json_errors(handler):
|
||||
"""Mappe les exceptions Discord vers des réponses JSON."""
|
||||
@functools.wraps(handler)
|
||||
async def wrapper(self, request: web.Request):
|
||||
try:
|
||||
return await handler(self, request)
|
||||
except KeyError as e:
|
||||
return web.json_response({"error": f"Missing required field: {e}"}, status=400)
|
||||
except discord.NotFound:
|
||||
return web.json_response({"error": "Not found"}, status=404)
|
||||
except discord.Forbidden:
|
||||
return web.json_response({"error": "Forbidden"}, status=403)
|
||||
except Exception as e:
|
||||
traceback.print_exc()
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
return wrapper
|
||||
|
||||
|
||||
class API(commands.Cog):
|
||||
"""HTTP web service to interact with the bot."""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
self.bot = bot
|
||||
self.host = os.environ.get("DISCORD_BOT_HOST", "0.0.0.0")
|
||||
self.port = int(os.environ.get("DISCORD_BOT_PORT", "8050"))
|
||||
self.token = os.environ.get("DISCORD_BOT_API_TOKEN")
|
||||
self.contexts: typing.Dict[str, commands.Context] = {}
|
||||
self.runner: typing.Optional[web.AppRunner] = None
|
||||
self.site: typing.Optional[web.TCPSite] = None
|
||||
self._lock = asyncio.Lock()
|
||||
|
||||
self.app = web.Application(middlewares=[self._auth])
|
||||
self.app.router.add_post("/send/user", self.send_user)
|
||||
self.app.router.add_post("/send/channel", self.send_channel)
|
||||
self.app.router.add_post("/command/channel", self.command_channel)
|
||||
self.app.router.add_get("/debug/bot", self.debug_bot)
|
||||
self.app.router.add_get("/live", self.live)
|
||||
|
||||
@web.middleware
|
||||
async def _auth(self, request: web.Request, handler):
|
||||
if self.token and request.path != "/live":
|
||||
if request.headers.get("Authorization") != f"Bearer {self.token}":
|
||||
return web.json_response({"error": "Unauthorized"}, status=401)
|
||||
return await handler(request)
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_ready(self):
|
||||
"""on_ready peut se redéclencher à chaque reconnexion: idempotent."""
|
||||
async with self._lock:
|
||||
if self.site is not None:
|
||||
return
|
||||
self.runner = web.AppRunner(self.app)
|
||||
await self.runner.setup()
|
||||
self.site = web.TCPSite(self.runner, self.host, self.port)
|
||||
try:
|
||||
await self.site.start()
|
||||
except OSError:
|
||||
self.site = None
|
||||
await self.runner.cleanup()
|
||||
self.runner = None
|
||||
raise
|
||||
print(f"HTTP server listening on {self.host}:{self.port}")
|
||||
|
||||
def cog_unload(self):
|
||||
if self.runner:
|
||||
asyncio.create_task(self.runner.cleanup())
|
||||
|
||||
async def _send(self, request: web.Request, fetch):
|
||||
body = await request.json()
|
||||
target = await fetch(int(body["id"]))
|
||||
await target.send(body["message"])
|
||||
return web.json_response({"text": "Successfully sent message."})
|
||||
|
||||
@json_errors
|
||||
async def send_user(self, request: web.Request):
|
||||
"""Send a DM to a Discord user."""
|
||||
return await self._send(request, self.bot.fetch_user)
|
||||
|
||||
@json_errors
|
||||
async def send_channel(self, request: web.Request):
|
||||
"""Send a message to a Discord channel."""
|
||||
return await self._send(request, self.bot.fetch_channel)
|
||||
|
||||
@json_errors
|
||||
async def command_channel(self, request: web.Request):
|
||||
"""Invoke a bot command on a saved context."""
|
||||
body = await request.json()
|
||||
command = self.bot.get_command(body["cmd"])
|
||||
if command is None:
|
||||
return web.json_response({
|
||||
"error": "No match found.",
|
||||
"commands": [
|
||||
{"name": c.name, "doc": c.short_doc} for c in self.bot.commands
|
||||
],
|
||||
}, status=404)
|
||||
|
||||
ctx = self.contexts.get(body["ctx"])
|
||||
if ctx is None:
|
||||
return web.json_response(
|
||||
{"error": f"Unknown context: {body['ctx']}"}, status=404
|
||||
)
|
||||
|
||||
ctx.args = body.get("args", [])
|
||||
ctx.kwargs = body.get("kwargs", {})
|
||||
result = await command.invoke(ctx)
|
||||
return web.json_response({"text": str(result)})
|
||||
|
||||
async def debug_bot(self, request: web.Request):
|
||||
"""Return bot debug information."""
|
||||
return web.json_response({
|
||||
"id": str(self.bot.user.id) if self.bot.user else None,
|
||||
"name": str(self.bot.user) if self.bot.user else None,
|
||||
"guilds": len(self.bot.guilds),
|
||||
"cogs": list(self.bot.cogs.keys()),
|
||||
})
|
||||
|
||||
async def live(self, request: web.Request):
|
||||
"""Healthcheck."""
|
||||
return web.Response(text="OK")
|
||||
|
||||
@commands.command(name="save-context")
|
||||
async def save_context(self, ctx: commands.Context, context_id: typing.Optional[str] = None):
|
||||
"""Save a context since it is really hard to build one from scratch."""
|
||||
context_id = context_id or str(uuid.uuid1())
|
||||
self.contexts[context_id] = ctx
|
||||
await ctx.send(f"> Saved context as **{context_id}**")
|
||||
|
||||
|
||||
def setup(bot: commands.Bot):
|
||||
bot.add_cog(API(bot))
|
||||
@@ -1,355 +0,0 @@
|
||||
#!/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, tasks
|
||||
|
||||
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
||||
from apscheduler.triggers.cron import CronTrigger
|
||||
|
||||
import discord
|
||||
import os
|
||||
import logging
|
||||
|
||||
import psycopg2, subprocess
|
||||
import aiofiles
|
||||
|
||||
SECONDS = 3600
|
||||
ROLE = "Backup"
|
||||
|
||||
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.backup_filename = os.environ.get("POSTGRES_DUMP_FILENAME") or "backup.sql"
|
||||
self.channel_id = int(os.environ.get("BACKUP_CHANNEL_ID") or 0)
|
||||
self.default_cron_expression = os.environ.get("BACKUP_DEFAULT_CRON_EXPRESSION") or "0 5 * * *"
|
||||
self.default_jobname = os.environ.get("BACKUP_DEFAULT_JOBNAME") or "daily"
|
||||
self.jobs = {}
|
||||
self.tmp_directory = "/tmp"
|
||||
self.color = 0x0064a5
|
||||
|
||||
self.scheduler = AsyncIOScheduler() # Le scheduler APScheduler
|
||||
self.scheduler.start() # Démarrer le scheduler
|
||||
self.setup_default_backup()
|
||||
|
||||
# self.connection: psycopg2.connection
|
||||
# self.cursor: psycopg2.cursor
|
||||
# self.backup_job.start()
|
||||
|
||||
def setup_default_backup(self):
|
||||
"""Ajoute un job par défaut tous les jours à 5h du matin."""
|
||||
job_name = self.default_jobname
|
||||
cron_expression = self.default_cron_expression
|
||||
trigger = CronTrigger.from_crontab(cron_expression)
|
||||
job = self.scheduler.add_job(self._backup_postgres, trigger, name=job_name)
|
||||
self.jobs[job_name] = job
|
||||
logging.info("Job de backup quotidien à 5h du matin ajouté.")
|
||||
|
||||
@property
|
||||
def storage(self):
|
||||
return self.bot.get_cog("Storage")
|
||||
|
||||
# def setup_jobs(self):
|
||||
# """Configurer les jobs récurrents avec APScheduler."""
|
||||
# # Planifier le job quotidien à 5h du matin
|
||||
# self.scheduler.add_job(
|
||||
# self._backup_postgres, # La fonction à exécuter
|
||||
# CronTrigger(hour=5, minute=0), # CronTrigger à 5h00 chaque jour
|
||||
# name="backup", # Nom du job
|
||||
# replace_existing=True # Remplacer si le job existe déjà
|
||||
# )
|
||||
# logging.info("Job de backup quotidien à 5h du matin configuré.")
|
||||
|
||||
|
||||
async def _execute_pg_command(self, command: list, dump_file_path: str, env: dict):
|
||||
"""
|
||||
Execute a PostgreSQL dump command.
|
||||
"""
|
||||
try:
|
||||
_ = subprocess.run(command + ["--file", dump_file_path], env=env, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
except subprocess.CalledProcessError as e:
|
||||
raise RuntimeError(f"Backup failed: {e.stderr.decode()}")
|
||||
|
||||
async def _backup_postgres(self, *db_names: str) -> str:
|
||||
"""
|
||||
Backup specified PostgreSQL databases or all databases if no arguments are provided.
|
||||
Concatenate the backups into a single file if multiple databases are specified.
|
||||
"""
|
||||
if not self.user or not self.password:
|
||||
raise RuntimeError("PostgreSQL credentials are missing")
|
||||
|
||||
env = os.environ.copy()
|
||||
env["PGPASSWORD"] = self.password
|
||||
|
||||
filename = self.backup_filename
|
||||
|
||||
if db_names:
|
||||
# Création d'un fichier de dump unique pour plusieurs bases
|
||||
dump_file_path = f"{self.tmp_directory}/{filename}"
|
||||
|
||||
# Ouvre le fichier pour concaténer les résultats des dumps
|
||||
async with aiofiles.open(dump_file_path, 'w') as dump_file:
|
||||
for db_name in db_names:
|
||||
pg_dump_command = [
|
||||
"pg_dump",
|
||||
"--username", self.user,
|
||||
"--host", self.host,
|
||||
"--port", self.port,
|
||||
"--dbname", f"postgresql://{self.user}@{self.host}:{self.port}/{self.database}"
|
||||
]
|
||||
|
||||
try:
|
||||
# Exécute pg_dump et capture la sortie
|
||||
result = subprocess.run(pg_dump_command, env=env, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
await dump_file.write(result.stdout.decode()) # Ajoute le dump au fichier
|
||||
except subprocess.CalledProcessError as e:
|
||||
raise RuntimeError(f"Backup failed for {db_name}: {e.stderr.decode()}")
|
||||
|
||||
else:
|
||||
# Si aucune base de données spécifiée, on sauvegarde toutes les bases
|
||||
dump_file_path = f"{self.tmp_directory}/{filename}"
|
||||
pg_dumpall_command = [
|
||||
"pg_dumpall",
|
||||
"--username", self.user,
|
||||
"--host", self.host,
|
||||
"--port", self.port
|
||||
]
|
||||
|
||||
try:
|
||||
await self._execute_pg_command(pg_dumpall_command, dump_file_path, env)
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"Backup all databases failed: {str(e)}")
|
||||
|
||||
chunks = await self.storage.send_file_in_chunks(dump_file_path, filename, channel_id=self.channel_id)
|
||||
await self.storage.clean_files(chunks)
|
||||
os.remove(dump_file_path)
|
||||
|
||||
return dump_file_path
|
||||
|
||||
# @tasks.loop(seconds=SECONDS)
|
||||
# async def backup_job(self):
|
||||
# """La tâche qui sera exécutée tous les jours à 5h."""
|
||||
# try:
|
||||
# # Effectuer un backup de toutes les bases
|
||||
# dump_file_paths = await self._backup_postgres()
|
||||
# logging.info(f"Backup quotidien réussi : {dump_file_paths}")
|
||||
# except Exception as e:
|
||||
# logging.error(f"Erreur lors du backup quotidien : {e}")
|
||||
|
||||
def build_embed(self):
|
||||
"""Return the embed that contains all the infos of the backup cog."""
|
||||
embed = discord.Embed(
|
||||
title="PostgreSQL Logins", color=discord.Color(self.color)
|
||||
)
|
||||
embed.add_field(name="user", value=str(self.user))
|
||||
embed.add_field(name="password", value="*"*len(str(self.password)))
|
||||
embed.add_field(name="database", value=str(self.database))
|
||||
embed.add_field(name="host", value=str(self.host))
|
||||
embed.add_field(name="port", value=str(self.port))
|
||||
embed.add_field(name="channel", value=str(self.channel_id))
|
||||
return embed
|
||||
|
||||
|
||||
@commands.group(aliases=["bk"])
|
||||
async def backup(self, ctx: commands.Context):
|
||||
"""Groupe de commandes du cog 'Backup'."""
|
||||
if not ctx.invoked_subcommand:
|
||||
await self.backup_dump(ctx)
|
||||
# await ctx.send("> No command invoked")
|
||||
|
||||
@backup.group(name="role")
|
||||
@commands.is_owner()
|
||||
async def role(self, ctx: commands.Context):
|
||||
"""Groupe de commandes pour controller le role 'Backup'."""
|
||||
if not ctx.invoked_subcommand:
|
||||
await ctx.send("> Aucune sous-commande invoquée.")
|
||||
|
||||
@role.command(name="create")
|
||||
async def create_backup_role(self, ctx: commands.Context):
|
||||
"""Crée un rôle nommé 'Backup' si l'utilisateur est le propriétaire du bot."""
|
||||
guild = ctx.guild # Obtenir le serveur actuel
|
||||
role_name = ROLE
|
||||
|
||||
# Vérifier si le rôle existe déjà
|
||||
existing_role = discord.utils.get(guild.roles, name=role_name)
|
||||
if existing_role:
|
||||
await ctx.send(f"> Le rôle `{role_name}` existe déjà.")
|
||||
return
|
||||
try:
|
||||
# Créer le nouveau rôle
|
||||
existing_role = await guild.create_role(name=role_name, color=self.color)
|
||||
await ctx.author.add_roles(existing_role)
|
||||
await ctx.send(f"> Le rôle `{role_name}` a été créé et ajouté à **{ctx.author}** avec succès.")
|
||||
except discord.Forbidden:
|
||||
await ctx.send("> Je n'ai pas la permission de créer des rôles.")
|
||||
except discord.HTTPException as e:
|
||||
await ctx.send(f"> Une erreur est survenue : {e}")
|
||||
|
||||
@role.command(name="delete")
|
||||
async def delete_backup_role(self, ctx: commands.Context):
|
||||
"""Supprime le rôle nommé 'Backup'."""
|
||||
role_name = ROLE
|
||||
|
||||
# Vérifier si le rôle existe
|
||||
existing_role = discord.utils.get(ctx.guild.roles, name=role_name)
|
||||
if not existing_role:
|
||||
await ctx.send(f"> Le rôle `{role_name}` n'existe pas.")
|
||||
return
|
||||
|
||||
try:
|
||||
# Supprimer le rôle
|
||||
await existing_role.delete()
|
||||
await ctx.send(f"> Le rôle `{role_name}` a été supprimé avec succès.")
|
||||
except discord.Forbidden:
|
||||
await ctx.send("> Je n'ai pas la permission de supprimer des rôles.")
|
||||
except discord.HTTPException as e:
|
||||
await ctx.send(f"> Une erreur est survenue : {e}")
|
||||
|
||||
@backup.group(name="job")
|
||||
@commands.has_role(ROLE)
|
||||
async def job(self, ctx: commands.Context):
|
||||
"""Groupe de commandes pour gérer les jobs de backup."""
|
||||
if not ctx.invoked_subcommand:
|
||||
await ctx.send("> Aucune sous-commande invoquée.")
|
||||
|
||||
@job.command(name="add")
|
||||
async def add_job(self, ctx: commands.Context, job_name: str, cron_expression: str):
|
||||
"""Ajoute un job de backup avec un nom et une expression cron."""
|
||||
try:
|
||||
trigger = CronTrigger.from_crontab(cron_expression)
|
||||
job = self.scheduler.add_job(self._backup_postgres, trigger, name=job_name)
|
||||
self.jobs[job_name] = job
|
||||
await ctx.send(f"> Job `{job_name}` ajouté avec succès.")
|
||||
await ctx.send(embed=await self.build_job_embed())
|
||||
except Exception as e:
|
||||
await ctx.send(f"> Erreur lors de l'ajout du job : {e}")
|
||||
|
||||
@job.command(name="list")
|
||||
async def list_jobs(self, ctx: commands.Context):
|
||||
"""Liste tous les jobs de backup configurés."""
|
||||
if not self.jobs:
|
||||
await ctx.send("> Aucun job de backup configuré.")
|
||||
return
|
||||
|
||||
# await ctx.send(f"> Jobs configurés :\n{job_list}")
|
||||
await ctx.send(embed=await self.build_job_embed())
|
||||
|
||||
@job.command(name="delete")
|
||||
async def delete_job(self, ctx: commands.Context, job_name: str):
|
||||
"""Supprime un job de backup par son nom."""
|
||||
job = self.jobs.pop(job_name, None)
|
||||
if job:
|
||||
job.remove()
|
||||
await ctx.send(f"> Job `{job_name}` supprimé avec succès.")
|
||||
await ctx.send(embed=await self.build_job_embed())
|
||||
else:
|
||||
await ctx.send("> Job non trouvé.")
|
||||
|
||||
def get_cron_expression(self, trigger: CronTrigger) -> str:
|
||||
"""Retourne une représentation de l'expression Cron sous forme de chaîne de caractères."""
|
||||
return str(trigger)
|
||||
|
||||
async def build_job_embed(self) -> discord.Embed:
|
||||
"""Affiche les jobs configurés."""
|
||||
embed = discord.Embed(
|
||||
title="Jobs de Backup Configurés",
|
||||
description="Liste de tous les jobs de sauvegarde actuellement configurés.",
|
||||
color=self.color
|
||||
)
|
||||
for job_name, job in self.jobs.items():
|
||||
embed.add_field(
|
||||
name=job_name,
|
||||
value=self.get_cron_expression(job.trigger),
|
||||
inline=True
|
||||
)
|
||||
return embed
|
||||
|
||||
@backup.command(name="connect")
|
||||
@commands.has_role(ROLE)
|
||||
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")
|
||||
|
||||
@backup.command(name="set")
|
||||
@commands.has_role(ROLE)
|
||||
async def set_backup(
|
||||
self,
|
||||
ctx: commands.Context,
|
||||
*,
|
||||
args: str = ""
|
||||
):
|
||||
"""
|
||||
Change les identifiants postgres avec une chaîne de format key=value.
|
||||
Exemple: ?backup set host=localhost user=postgres
|
||||
"""
|
||||
# Analyse des arguments
|
||||
params = {}
|
||||
for pair in args.split():
|
||||
if '=' in pair:
|
||||
key, value = pair.split('=', 1)
|
||||
params[key.strip()] = value.strip()
|
||||
|
||||
# Mise à jour des attributs
|
||||
if 'user' in params:
|
||||
self.user = params['user']
|
||||
if 'password' in params:
|
||||
self.password = params['password']
|
||||
if 'host' in params:
|
||||
self.host = params['host']
|
||||
if 'port' in params:
|
||||
self.port = params['port']
|
||||
if 'database' in params:
|
||||
self.database = params['database']
|
||||
if 'channel_id' in params:
|
||||
self.channel_id = int(params['channel_id'])
|
||||
|
||||
embed = self.build_embed()
|
||||
await ctx.send(embed=embed)
|
||||
|
||||
@backup.command(name="get")
|
||||
@commands.has_role(ROLE)
|
||||
async def get_postgres_logins(self, ctx: commands.Context):
|
||||
"""Affiche les identifiants postgres uniquement si master"""
|
||||
embed = self.build_embed()
|
||||
await ctx.send(embed=embed)
|
||||
|
||||
@backup.command(name="claim")
|
||||
@commands.has_role(ROLE)
|
||||
async def claim_channel(self, ctx: commands.Context):
|
||||
"""Déclare le salon textuel qui fait office de stockage de backup."""
|
||||
self.channel_id = ctx.channel.id
|
||||
embed = self.build_embed()
|
||||
await ctx.send(embed=embed)
|
||||
|
||||
@backup.command(name="dump")
|
||||
@commands.has_role(ROLE)
|
||||
async def backup_dump(self, ctx: commands.Context, *db_names: str):
|
||||
"""
|
||||
Commande Discord pour créer une sauvegarde (dump) de bases de données PostgreSQL spécifiques
|
||||
ou de toutes les bases de données si aucun nom n'est fourni.
|
||||
"""
|
||||
try:
|
||||
await self._backup_postgres(*db_names)
|
||||
await ctx.send("> Backup done")
|
||||
except Exception as e:
|
||||
await ctx.send(f"Erreur: {str(e)}")
|
||||
|
||||
def setup(bot):
|
||||
bot.add_cog(Backup(bot))
|
||||
@@ -1,114 +0,0 @@
|
||||
#!/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))
|
||||
@@ -1,250 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""Pont vers un gateway Hermes Agent dedie (profil `discord-bridge`).
|
||||
|
||||
Reserve aux membres qui portent le role Discord `hermes` (nom configurable via
|
||||
`HERMES_BRIDGE_ROLE_NAME`) et aux masters du bot. Parle a l'API server
|
||||
OpenAI-compatible d'Hermes (services/hermes cote NixOS, loopback uniquement).
|
||||
|
||||
L'API server est un listener UNIQUE par hote : un profil secondaire n'a pas son
|
||||
propre port, il est servi sur le listener du profil default sous /p/<profil>/...
|
||||
|
||||
Variables d'environnement (injectees par systemd, cf. services/discord-bot) :
|
||||
HERMES_BRIDGE_URL defaut http://127.0.0.1:8642/p/discord-bridge/v1/chat/completions
|
||||
HERMES_BRIDGE_API_KEY bearer token (sops secrets/discord-hermes-bridge.yml)
|
||||
HERMES_BRIDGE_ROLE_NAME nom du role Discord autorise (defaut "hermes")
|
||||
HERMES_BRIDGE_ASK_PORT port loopback de la surface de test (defaut 8052)
|
||||
DISCORD_BOT_API_TOKEN si pose, exige en Bearer (convention de cogs/api.py)
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import os
|
||||
import typing
|
||||
|
||||
import discord
|
||||
import requests
|
||||
from aiohttp import web
|
||||
from discord.ext import commands
|
||||
|
||||
from config.config import prefix, masters
|
||||
from utils.tools import create_role_if_missing
|
||||
|
||||
DEFAULT_BRIDGE_URL = "http://127.0.0.1:8642/p/discord-bridge/v1/chat/completions"
|
||||
|
||||
BRIDGE_URL = os.environ.get("HERMES_BRIDGE_URL", DEFAULT_BRIDGE_URL)
|
||||
BRIDGE_KEY = os.environ.get("HERMES_BRIDGE_API_KEY")
|
||||
ROLE_NAME = os.environ.get("HERMES_BRIDGE_ROLE_NAME", "hermes")
|
||||
MAX_HISTORY = 20 # messages (user + assistant) gardes par utilisateur
|
||||
REQUEST_TIMEOUT = 120
|
||||
|
||||
SYSTEM_PROMPT = (
|
||||
"Tu es Hermes, relaye ici depuis Discord (pont dedie, profil discord-bridge). "
|
||||
"Reponds de facon concise, adaptee au format Discord (2000 caracteres max par "
|
||||
"message), sans mise en forme lourde."
|
||||
)
|
||||
|
||||
|
||||
class Hermes(commands.Cog):
|
||||
"""Bridge to a dedicated Hermes Agent gateway (OpenAI-compatible API)."""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
"""Initialize the cog with the bot."""
|
||||
self.bot = bot
|
||||
self.color: discord.Color = discord.Color.blurple()
|
||||
self.histories: typing.Dict[int, list] = {}
|
||||
|
||||
# Surface de test locale (loopback) : joindre Hermes par HTTP sans client
|
||||
# Discord, et LIRE sa reponse en JSON. Sert au test de bout en bout du
|
||||
# pont depuis le serveur (systemd injecte le port).
|
||||
self.ask_host = os.environ.get("HERMES_BRIDGE_ASK_HOST", "127.0.0.1")
|
||||
self.ask_port = int(os.environ.get("HERMES_BRIDGE_ASK_PORT", "8052"))
|
||||
self.api_token = os.environ.get("DISCORD_BOT_API_TOKEN")
|
||||
self.ask_runner: typing.Optional[web.AppRunner] = None
|
||||
self.ask_site: typing.Optional[web.TCPSite] = None
|
||||
self.ask_lock = asyncio.Lock()
|
||||
|
||||
# --- autorisation ------------------------------------------------------
|
||||
|
||||
@staticmethod
|
||||
def _has_role(user: discord.abc.User) -> bool:
|
||||
"""Vrai si l'utilisateur porte le role Hermes (compare sans la casse).
|
||||
|
||||
En DM, py-cord rend un `Member` (avec ses roles) quand il a le serveur en
|
||||
cache, sinon un simple `User` sans attribut `roles` : d'ou le getattr.
|
||||
"""
|
||||
return any(
|
||||
role.name.lower() == ROLE_NAME.lower()
|
||||
for role in getattr(user, "roles", None) or []
|
||||
)
|
||||
|
||||
def _author_allowed(self, author: discord.abc.User) -> bool:
|
||||
"""Autorise les masters du bot et les porteurs du role, en DM comme en serveur."""
|
||||
if author.id in masters:
|
||||
return True
|
||||
if self._has_role(author):
|
||||
return True
|
||||
for guild in self.bot.guilds:
|
||||
member = guild.get_member(author.id)
|
||||
if member and self._has_role(member):
|
||||
return True
|
||||
return False
|
||||
|
||||
# --- appel Hermes ------------------------------------------------------
|
||||
|
||||
async def _ask(self, user_id: int, message: str) -> str:
|
||||
"""Envoie un message a Hermes et renvoie sa reponse."""
|
||||
if not BRIDGE_KEY:
|
||||
return "> Pont Hermes non configure (HERMES_BRIDGE_API_KEY manquant)."
|
||||
history = self.histories.setdefault(user_id, [])
|
||||
history.append({"role": "user", "content": message})
|
||||
payload = {
|
||||
"model": "discord-bridge",
|
||||
"messages": [{"role": "system", "content": SYSTEM_PROMPT}]
|
||||
+ history[-MAX_HISTORY:],
|
||||
"stream": False,
|
||||
}
|
||||
headers = {
|
||||
"Authorization": f"Bearer {BRIDGE_KEY}",
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
def _do_request():
|
||||
"""Requete bloquante, executee dans un thread pour ne pas figer la boucle."""
|
||||
response = requests.post(
|
||||
BRIDGE_URL, json=payload, headers=headers, timeout=REQUEST_TIMEOUT
|
||||
)
|
||||
response.raise_for_status()
|
||||
return response.json()
|
||||
|
||||
data = await asyncio.to_thread(_do_request)
|
||||
answer = data["choices"][0]["message"]["content"] or "> (reponse vide)"
|
||||
history.append({"role": "assistant", "content": answer})
|
||||
return answer
|
||||
|
||||
# --- ecoute Discord ----------------------------------------------------
|
||||
|
||||
@commands.Cog.listener(name="on_message")
|
||||
async def on_message(self, msg: discord.Message):
|
||||
"""En DM : chaque message est transmis directement a Hermes."""
|
||||
if msg.author == self.bot.user or msg.author.bot:
|
||||
return
|
||||
if not isinstance(msg.channel, discord.DMChannel):
|
||||
return
|
||||
if msg.content.startswith(prefix):
|
||||
return
|
||||
if not self._author_allowed(msg.author):
|
||||
return
|
||||
async with msg.channel.typing():
|
||||
try:
|
||||
answer = await self._ask(msg.author.id, msg.content)
|
||||
except Exception as exc: # noqa: BLE001
|
||||
answer = f"> Erreur pont Hermes : {exc}"
|
||||
await self.send_long(msg.channel, answer)
|
||||
|
||||
# --- commandes ---------------------------------------------------------
|
||||
|
||||
@commands.command(name="hermes")
|
||||
async def hermes(self, ctx: commands.Context, *, message: str):
|
||||
"""Parle a Hermes (masters et porteurs du role hermes)."""
|
||||
if ctx.guild and not self._author_allowed(ctx.author):
|
||||
return await ctx.send(f"> Acces refuse : reserve au role `{ROLE_NAME}`.")
|
||||
async with ctx.typing():
|
||||
try:
|
||||
answer = await self._ask(ctx.author.id, message)
|
||||
except Exception as exc: # noqa: BLE001
|
||||
answer = f"> Erreur pont Hermes : {exc}"
|
||||
await self.send_long(ctx.channel, answer)
|
||||
|
||||
@commands.command(name="hermes-reset")
|
||||
async def hermes_reset(self, ctx: commands.Context):
|
||||
"""Oublie l'historique de conversation courant avec Hermes."""
|
||||
if ctx.guild and not self._author_allowed(ctx.author):
|
||||
return
|
||||
self.histories.pop(ctx.author.id, None)
|
||||
await ctx.send("> Historique Hermes reinitialise.")
|
||||
|
||||
@commands.command(name="hermes-setup")
|
||||
async def hermes_setup(self, ctx: commands.Context):
|
||||
"""Cree le role Discord hermes et l'attribue aux masters du bot."""
|
||||
if ctx.author.id not in masters:
|
||||
return await ctx.send("> Acces refuse : reserve aux masters.")
|
||||
if not ctx.guild:
|
||||
return await ctx.send("> Commande utilisable uniquement en serveur.")
|
||||
await create_role_if_missing(ctx, ROLE_NAME, self.color)
|
||||
await ctx.send(f"> Role `{ROLE_NAME}` pret.")
|
||||
|
||||
# --- surface de test locale (loopback) ---------------------------------
|
||||
|
||||
@web.middleware
|
||||
async def _ask_auth(self, request: web.Request, handler):
|
||||
"""Meme convention que cogs/api.py : Bearer exige seulement si le token est pose."""
|
||||
if self.api_token and request.path != "/live":
|
||||
if request.headers.get("Authorization") != f"Bearer {self.api_token}":
|
||||
return web.json_response({"error": "Unauthorized"}, status=401)
|
||||
return await handler(request)
|
||||
|
||||
@commands.Cog.listener(name="on_ready")
|
||||
async def start_ask_server(self):
|
||||
"""Demarre la surface de test (idempotent : on_ready peut se redeclencher)."""
|
||||
async with self.ask_lock:
|
||||
if self.ask_site is not None:
|
||||
return
|
||||
app = web.Application(middlewares=[self._ask_auth])
|
||||
app.router.add_get("/live", self.ask_live)
|
||||
app.router.add_post("/hermes/ask", self.ask_http)
|
||||
self.ask_runner = web.AppRunner(app)
|
||||
await self.ask_runner.setup()
|
||||
site = web.TCPSite(self.ask_runner, self.ask_host, self.ask_port)
|
||||
try:
|
||||
await site.start()
|
||||
except OSError:
|
||||
await self.ask_runner.cleanup()
|
||||
self.ask_runner = None
|
||||
raise
|
||||
self.ask_site = site
|
||||
print(f"Hermes ask server listening on {self.ask_host}:{self.ask_port}")
|
||||
|
||||
def cog_unload(self):
|
||||
"""Arrete la surface de test."""
|
||||
if self.ask_runner:
|
||||
asyncio.create_task(self.ask_runner.cleanup())
|
||||
|
||||
async def ask_live(self, request: web.Request):
|
||||
"""Healthcheck."""
|
||||
return web.Response(text="OK")
|
||||
|
||||
async def ask_http(self, request: web.Request):
|
||||
"""POST {"message": "..."} -> {"answer": "..."} (historique par user_id)."""
|
||||
try:
|
||||
body = await request.json()
|
||||
except Exception: # noqa: BLE001
|
||||
return web.json_response({"error": "JSON invalide."}, status=400)
|
||||
body = body or {}
|
||||
message = body.get("message")
|
||||
if not message:
|
||||
return web.json_response({"error": "Champ 'message' manquant."}, status=400)
|
||||
try:
|
||||
user_id = int(body.get("user_id") or (masters[0] if masters else 0))
|
||||
except (TypeError, ValueError):
|
||||
return web.json_response({"error": "user_id invalide."}, status=400)
|
||||
try:
|
||||
answer = await self._ask(user_id, message)
|
||||
except Exception as exc: # noqa: BLE001
|
||||
return web.json_response(
|
||||
{"error": f"{type(exc).__name__}: {exc}"}, status=502
|
||||
)
|
||||
return web.json_response({"answer": answer, "user_id": user_id})
|
||||
|
||||
# --- utilitaires -------------------------------------------------------
|
||||
|
||||
@staticmethod
|
||||
async def send_long(channel, text: str):
|
||||
"""Decoupe les reponses de plus de 2000 caracteres (limite Discord)."""
|
||||
if not text:
|
||||
text = "> (reponse vide)"
|
||||
for i in range(0, len(text), 1990):
|
||||
await channel.send(text[i : i + 1990])
|
||||
|
||||
|
||||
def setup(bot: commands.Bot):
|
||||
"""Setup du cog Hermes."""
|
||||
bot.add_cog(Hermes(bot))
|
||||
@@ -1,112 +0,0 @@
|
||||
|
||||
#!/bin/env python
|
||||
|
||||
from config.config import access, cluster
|
||||
from discord.ext import commands, tasks
|
||||
from discord.ext.commands import MessageNotFound
|
||||
import os
|
||||
import discord
|
||||
import yaml
|
||||
|
||||
ROLE = "Library"
|
||||
|
||||
class Library(commands.Cog):
|
||||
"""Store config on discord servers as attachments."""
|
||||
tmp_directory = os.environ.get("TMP_DIRECTORY") or "/tmp"
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
self.bot = bot
|
||||
self.filename = "config.yml"
|
||||
self.filepath = f"/tmp/{self.filename}"
|
||||
self.channel_id = int(os.environ.get("CHANNEL_ID_CONFIG") or 0)
|
||||
|
||||
# @property
|
||||
# def storage(self):
|
||||
# return self.bot.get_cog("Storage")
|
||||
|
||||
@property
|
||||
def channel(self) -> discord.TextChannel:
|
||||
return self.bot.get_channel(self.channel_id)
|
||||
|
||||
async def create_config(self):
|
||||
"""Créer un fichier de config pour la librairie si une existe pas déjà."""
|
||||
config = dict(library=dict(channel_id=self.channel_id))
|
||||
with open(self.filepath, "w") as f:
|
||||
yaml.safe_dump(config, f)
|
||||
|
||||
if not self.channel:
|
||||
raise ValueError("Discord channel not found")
|
||||
|
||||
with open(self.filepath, 'rb') as f:
|
||||
await self.channel.send(file=discord.File(f, filename=self.filename))
|
||||
|
||||
|
||||
@commands.group(aliases=["lib"])
|
||||
async def library(self, ctx: commands.Context):
|
||||
"""Groupe de commandes du cog 'Backup'."""
|
||||
if not ctx.invoked_subcommand:
|
||||
if not self.channel_id:
|
||||
await ctx.send("> Un salon textuel doit être claim pour utiliser la config.")
|
||||
else:
|
||||
await ctx.send("> Aucune sous-commande invokée.")
|
||||
|
||||
@library.command(name="claim")
|
||||
@commands.has_role(ROLE)
|
||||
async def claim_channel(self, ctx: commands.Context):
|
||||
"""Déclare le salon textuel de la library."""
|
||||
self.channel_id = ctx.channel.id
|
||||
await self.create_config()
|
||||
await ctx.send(f"> Salon textuel {ctx.channel.id} sélectionné pour le stockage de la config.")
|
||||
|
||||
@library.command(name="write")
|
||||
@commands.has_role(ROLE)
|
||||
async def write_cmd(self, ctx: commands.Context, key: str, value):
|
||||
"""Écrit une valeur dans la library."""
|
||||
await self.write(key, value)
|
||||
# await ctx.send(f"> Salon textuel {ctx.channel.id} sélectionné pour le stockage de la config.")
|
||||
|
||||
async def read(self, attribute):
|
||||
return (await self.get_library())[attribute]
|
||||
|
||||
async def write(self, attribute, value):
|
||||
library = await self.get_library()
|
||||
print(1, library)
|
||||
library[attribute] = value
|
||||
print(2, library)
|
||||
await self.set_library(library)
|
||||
|
||||
async def search_attachment(self, limit: int):
|
||||
"""Search for the attachment and message."""
|
||||
async for message in self.channel.history(limit=limit, oldest_first=False): # Adjust limit as needed
|
||||
for attachment in message.attachments:
|
||||
print(f"attachement: {attachment.filename}")
|
||||
if attachment.filename == self.filename:
|
||||
return (message, attachment)
|
||||
raise MessageNotFound("No library file found.")
|
||||
|
||||
async def get_library(self, limit=10) -> dict:
|
||||
"""Get the library from discord"""
|
||||
_, attachment = await self.search_attachment(limit)
|
||||
await attachment.save(self.filepath)
|
||||
with open(self.filepath, "r") as f:
|
||||
d = yaml.safe_load(f)
|
||||
return d
|
||||
|
||||
|
||||
async def set_library(self, library, limit=10):
|
||||
"""Set the library to discord"""
|
||||
message, attachment = await self.search_attachment(limit)
|
||||
# await message.remove_attachments(attachment)
|
||||
await message.delete()
|
||||
|
||||
with open(self.filepath, "w") as f:
|
||||
yaml.safe_dump(library, f)
|
||||
|
||||
with open(self.filepath, "rb") as f:
|
||||
# await message.add_files()
|
||||
file = discord.File(fp=f, filename=self.filename)
|
||||
await self.channel.send(file=file)
|
||||
|
||||
|
||||
def setup(bot: commands.Bot):
|
||||
bot.add_cog(Library(bot))
|
||||
@@ -1,66 +0,0 @@
|
||||
"""
|
||||
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))
|
||||
@@ -1,309 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""HTTP web service to interact with the bot."""
|
||||
__author__ = "Marc Partensky"
|
||||
|
||||
# from config.config import cluster, access, check
|
||||
# from utils.check import check
|
||||
# from utils import tools
|
||||
|
||||
import os, time, subprocess
|
||||
import discord
|
||||
import aiofiles
|
||||
# from discord.errors import NotFound
|
||||
from discord.ext.commands import MessageNotFound
|
||||
from discord.ext import commands
|
||||
|
||||
from aiohttp import web
|
||||
|
||||
MAX_CHUNK_SIZE = 8 * 1024 * 1024 # 8 MB
|
||||
|
||||
class Storage(commands.Cog):
|
||||
"""Store files on discord using HTTP web service to interact with the bot."""
|
||||
tmp_directory = os.environ.get("TMP_DIRECTORY") or "/tmp"
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
self.bot = bot
|
||||
self.channel_id = int(os.environ.get("CHANNEL_ID_NOTIF", "0"))
|
||||
self.password = "password"
|
||||
# self.tmp_directory = "/tmp"
|
||||
|
||||
def get_timestamp(self):
|
||||
"""Return a human readable timestamp."""
|
||||
current_time = time.localtime()
|
||||
milliseconds = int((time.time() % 1) * 1000)
|
||||
timestamp = time.strftime(f"%Y-%m-%d_%H-%M-%S_{milliseconds:03d}", current_time)
|
||||
return timestamp
|
||||
|
||||
def sign(self, filepath: str) -> str:
|
||||
"""Sign a file using its file path and return the signed file path."""
|
||||
signed_filepath = f"{filepath}.sig"
|
||||
cmd = f"gpg --output {signed_filepath} --sign {filepath}"
|
||||
subprocess.run(cmd.split(" "))
|
||||
return signed_filepath
|
||||
|
||||
def encrypt_and_compress(self, filepath: str) -> str:
|
||||
"""Encrypt and compress a file using its file path
|
||||
and return the encrypted and compressed file path."""
|
||||
compressed_filepath = f"{filepath}.7z"
|
||||
cmd = f"7z a -p{self.password} {compressed_filepath} {filepath}"
|
||||
subprocess.run(cmd.split(" "))
|
||||
return compressed_filepath
|
||||
|
||||
def compress(self, filepath: str) -> str:
|
||||
"""Compress a file using its file path and return the compressed file path."""
|
||||
compressed_filepath = f"{filepath}.7z"
|
||||
cmd = f"7z -y a {compressed_filepath} {filepath}"
|
||||
subprocess.run(cmd.split(" "))
|
||||
return compressed_filepath
|
||||
|
||||
async def split_file(self, filepath: str, chunk_size: int = MAX_CHUNK_SIZE):
|
||||
"""
|
||||
Split a file into chunks of specified size.
|
||||
"""
|
||||
chunk_paths = []
|
||||
filepath = self.encrypt_and_compress(filepath)
|
||||
# filepath = self.sign(filepath)
|
||||
with open(filepath, 'rb') as file:
|
||||
part_number = 1
|
||||
while True:
|
||||
chunk = file.read(chunk_size)
|
||||
if not chunk:
|
||||
break
|
||||
tmp = self.get_timestamp()
|
||||
chunk_path = f"{Storage.tmp_directory}/{os.path.basename(filepath)}.{tmp}.{part_number}"
|
||||
async with aiofiles.open(chunk_path, 'wb') as chunk_file:
|
||||
await chunk_file.write(chunk)
|
||||
chunk_paths.append(chunk_path)
|
||||
part_number += 1
|
||||
return chunk_paths
|
||||
|
||||
async def send_file_in_chunks(self, filepath: str, file_name: str, channel_id: int = 0, timestamp: str=""):
|
||||
"""
|
||||
Send a file to Discord in chunks using filepath, file_name and optional channel_id.
|
||||
"""
|
||||
channel_id = channel_id or self.channel_id
|
||||
chunk_paths = await self.split_file(filepath)
|
||||
|
||||
channel = self.bot.get_channel(int(channel_id))
|
||||
if not channel:
|
||||
raise ValueError("Discord channel not found")
|
||||
|
||||
if not timestamp:
|
||||
timestamp = self.get_timestamp()
|
||||
|
||||
for i, chunk_path in enumerate(chunk_paths, start=1):
|
||||
chunk_file_name = f"{file_name}.{timestamp}.{i}"
|
||||
with open(chunk_path, 'rb') as f:
|
||||
await channel.send(file=discord.File(f, filename=chunk_file_name))
|
||||
|
||||
return chunk_paths
|
||||
|
||||
async def clean_files(self, filepaths: list):
|
||||
"""Remove the specified files."""
|
||||
for filepath in filepaths:
|
||||
os.remove(filepath)
|
||||
|
||||
def generate_url(self, filename: str, channel_id: int, timestamp: str):
|
||||
"""Generate an url to retrieve a file already sent."""
|
||||
PUBLIC_API_URL = os.environ["PUBLIC_API_URL"]
|
||||
return f"{PUBLIC_API_URL}/retrieve?filename={filename}&channel_id={channel_id}×tamp={timestamp}"
|
||||
|
||||
async def send_file_to_channel(self, request: web.Request):
|
||||
"""Endpoint to send a file to a specific channel by ID."""
|
||||
filename: str
|
||||
channel_id: int
|
||||
|
||||
reader = await request.multipart()
|
||||
field = await reader.next()
|
||||
if field.name == "channel_id":
|
||||
channel_id = await field.text()
|
||||
else:
|
||||
return web.json_response({"error": "Channel ID missing"}, status=400)
|
||||
|
||||
field = await reader.next()
|
||||
if field.name == "file":
|
||||
filename = field.filename
|
||||
filepath = f"{Storage.tmp_directory}/{filename}"
|
||||
|
||||
# Save the file temporarily
|
||||
async with aiofiles.open(filepath, 'wb') as f:
|
||||
while True:
|
||||
chunk = await field.read_chunk() # 8192 bytes by default
|
||||
if not chunk:
|
||||
break
|
||||
await f.write(chunk)
|
||||
else:
|
||||
return web.json_response({"error": "File missing"}, status=400)
|
||||
|
||||
channel: discord.TextChannel = await self.bot.fetch_channel(channel_id)
|
||||
if not channel:
|
||||
return web.json_response({"error": "Channel not found"}, status=404)
|
||||
|
||||
# await channel.send(file=discord.File(filepath))
|
||||
storage = Storage(self.bot)
|
||||
timestamp = storage.get_timestamp()
|
||||
await storage.send_file_in_chunks(filepath, filename, channel_id, timestamp)
|
||||
url = storage.generate_url(filename, channel_id, timestamp)
|
||||
|
||||
# Optionally, delete the temp file after sending it
|
||||
os.remove(filepath)
|
||||
message = f"Uploaded {filename}"
|
||||
print(message)
|
||||
print(url)
|
||||
return web.json_response({"message": message, "url": url}, status=200)
|
||||
|
||||
|
||||
async def retrieve_file_from_channel_request(self, request: web.Request):
|
||||
"""
|
||||
Endpoint to retrieve, reassemble, and download the original file from a channel
|
||||
based on its filename, the timestamp and potentially channel_id.
|
||||
"""
|
||||
# Extract the JSON data from the request
|
||||
body = request.query
|
||||
|
||||
# Extract the required information: channel ID and original filename
|
||||
channel_id = body.get("channel_id") or self.channel_id
|
||||
filename = body.get("filename")
|
||||
timestamp = body.get("timestamp")
|
||||
limit = body.get("limit")
|
||||
print('body:', body)
|
||||
print("channel_id:", channel_id)
|
||||
print("filename:", filename)
|
||||
print("timestamp:", timestamp)
|
||||
print("limit:", limit)
|
||||
|
||||
if not channel_id:
|
||||
return web.json_response({"error": "channel_id missing"}, status=400)
|
||||
if not filename:
|
||||
return web.json_response({"error": "filename missing"}, status=400)
|
||||
if limit:
|
||||
try:
|
||||
limit = int(limit)
|
||||
except:
|
||||
return web.json_response({"error": "limit is not a number"}, status=400)
|
||||
|
||||
channel: discord.TextChannel = await self.bot.fetch_channel(channel_id)
|
||||
if not channel:
|
||||
return web.json_response({"error": "channel not found"}, status=404)
|
||||
print("channel:", channel)
|
||||
|
||||
try:
|
||||
reassembled_filepath = await Storage(self.bot).retrieve_file_from_channel(
|
||||
filename,
|
||||
channel,
|
||||
timestamp,
|
||||
limit
|
||||
)
|
||||
headers = {'Content-Disposition': f'attachment; filename="{filename}"'}
|
||||
return web.FileResponse(reassembled_filepath, headers=headers)
|
||||
except MessageNotFound as e:
|
||||
return web.json_response({"error": str(e)}, status=404)
|
||||
|
||||
|
||||
async def retrieve_file_from_channel(
|
||||
self,
|
||||
filename: str,
|
||||
channel: discord.TextChannel,
|
||||
timestamp: str,
|
||||
limit: int = 1000,
|
||||
):
|
||||
"""Retrieve a file from a channel using:
|
||||
- filename
|
||||
- channel
|
||||
- timestamp
|
||||
- limit [1000] (number of messages checked)
|
||||
"""
|
||||
# Prepare the path to save the reassembled file
|
||||
reassembled_filepath = f"{Storage.tmp_directory}/{filename}"
|
||||
print("reassembled_filepath:", reassembled_filepath)
|
||||
|
||||
# Initialize list to collect all file chunks
|
||||
file_chunks = []
|
||||
|
||||
stop = False
|
||||
found = False
|
||||
|
||||
def is_well_formed(dfilename: str):
|
||||
if not dfilename.startswith(filename):
|
||||
return False
|
||||
dextension = dfilename[len(filename)+1:]
|
||||
if dextension.count(".") != 1:
|
||||
return False
|
||||
dtimestamp, dpart = dextension.split(".")
|
||||
# print(f"dtimestamp: {dtimestamp}, {len(dtimestamp)}")
|
||||
# print(f"dpart: {dpart}")
|
||||
if len(dtimestamp) != 23:
|
||||
return False
|
||||
if not dpart:
|
||||
return False
|
||||
# print("passed:", dfilename)
|
||||
return True
|
||||
|
||||
def deconstruct(dfilepath: str):
|
||||
dfilename = dfilepath.split('/')[-1]
|
||||
dextension = dfilename[len(filename)+1:]
|
||||
dtimestamp, dpart = dextension.split(".")
|
||||
return dextension, dtimestamp, dpart
|
||||
|
||||
|
||||
# Iterate through the channel's message history to find the file chunks
|
||||
i = 0
|
||||
async for message in channel.history(limit=limit, oldest_first=False): # Adjust limit as needed
|
||||
i+=1
|
||||
if i%100==0: print(i, "messages")
|
||||
if stop and found: break
|
||||
for attachment in message.attachments:
|
||||
print(f"attachement found: {attachment.filename}")
|
||||
dfilename = attachment.filename
|
||||
if not is_well_formed(dfilename):
|
||||
# print(f"skip and delete {dfilename} because malformed")
|
||||
await message.delete()
|
||||
continue
|
||||
if dfilename.startswith(filename):
|
||||
dextension = dfilename[len(filename)+1:]
|
||||
# print(filename, dfilename, dextension)
|
||||
if dextension.count(".") != 1:
|
||||
break
|
||||
dtimestamp, dpart = dextension.split(".")
|
||||
# print("dfilename", dfilename)
|
||||
# print("dextension", dextension)
|
||||
# print("dtimestamp", dtimestamp)
|
||||
# print("dpart", dpart)
|
||||
# print("timestamp", timestamp)
|
||||
if not timestamp:
|
||||
timestamp = dtimestamp
|
||||
if timestamp == dtimestamp:
|
||||
# print("found", dtimestamp)
|
||||
found = True
|
||||
elif found:
|
||||
# print("stop", timestamp, "!=", dtimestamp)
|
||||
stop = True
|
||||
break
|
||||
|
||||
chunk_path = f"{Storage.tmp_directory}/{dfilename}"
|
||||
await attachment.save(chunk_path)
|
||||
file_chunks.append(chunk_path)
|
||||
|
||||
if not file_chunks:
|
||||
raise MessageNotFound("No file chunks found in the channel.")
|
||||
|
||||
# Sort the chunks by part number
|
||||
print("sorting chunks", file_chunks)
|
||||
file_chunks.sort(key=lambda filepath: int(deconstruct(filepath)[-1]))
|
||||
|
||||
# Reassemble the file
|
||||
async with aiofiles.open(reassembled_filepath, 'wb') as reassembled_file:
|
||||
for chunk_path in file_chunks:
|
||||
async with aiofiles.open(chunk_path, 'rb') as chunk_file:
|
||||
data = await chunk_file.read()
|
||||
await reassembled_file.write(data)
|
||||
|
||||
# Optionally clean up the chunk files after reassembly
|
||||
for chunk_path in file_chunks:
|
||||
os.remove(chunk_path)
|
||||
|
||||
# Serve the reassembled file as a download response
|
||||
return reassembled_filepath
|
||||
|
||||
def setup(bot: commands.Bot):
|
||||
bot.add_cog(Storage(bot))
|
||||
+5
-6
@@ -1,19 +1,19 @@
|
||||
version: "3.9"
|
||||
services:
|
||||
dev:
|
||||
image: marcpartensky/discord-bot:dev
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./Dockerfile
|
||||
target: alpine
|
||||
ports:
|
||||
- "8000:8000"
|
||||
env_file:
|
||||
- .env
|
||||
volumes:
|
||||
- ./discord_bot/cogs:/app/cogs
|
||||
- ./discord_bot/config:/app/config
|
||||
- ./discord_bot/models:/app/models
|
||||
- ./discord_bot/__main__.py:/app/__main__.py
|
||||
- ./cogs:/app/cogs
|
||||
- ./config:/app/config
|
||||
- ./models:/app/models
|
||||
- ./__main__.py:/app/__main__.py
|
||||
|
||||
prod:
|
||||
image: marcpartensky/discord-bot:latest
|
||||
@@ -21,6 +21,5 @@ services:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./Dockerfile
|
||||
target: alpine
|
||||
env_file:
|
||||
- .env
|
||||
|
||||
Generated
-61
@@ -1,61 +0,0 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1789149629,
|
||||
"narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
@@ -1,146 +0,0 @@
|
||||
{
|
||||
description = "discord-bot";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
flake-utils,
|
||||
...
|
||||
}:
|
||||
flake-utils.lib.eachDefaultSystem (system: let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
python = pkgs.python312;
|
||||
src = ./.;
|
||||
|
||||
libs = with pkgs; [
|
||||
stdenv.cc.cc.lib
|
||||
zlib
|
||||
openssl
|
||||
libffi
|
||||
libopus
|
||||
libxcrypt-legacy
|
||||
postgresql.lib
|
||||
];
|
||||
in {
|
||||
packages.default = pkgs.writeShellApplication {
|
||||
name = "discord-bot";
|
||||
runtimeInputs = [
|
||||
python
|
||||
pkgs.uv
|
||||
pkgs.ffmpeg
|
||||
pkgs.chromedriver
|
||||
pkgs.chromium
|
||||
pkgs.ncurses
|
||||
];
|
||||
text = ''
|
||||
export UV_PYTHON=${python.interpreter}
|
||||
export UV_PYTHON_DOWNLOADS=never
|
||||
export UV_PYTHON_PREFERENCE=only-system
|
||||
export UV_PROJECT_ENVIRONMENT="''${RUNTIME_DIRECTORY:-$PWD}/venv"
|
||||
export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath libs}
|
||||
|
||||
uv sync --frozen --no-dev --project ${src}
|
||||
sync
|
||||
|
||||
VENV="$UV_PROJECT_ENVIRONMENT"
|
||||
BOT_DIR="$("$VENV/bin/python" -c 'import discord_bot, pathlib; print(pathlib.Path(discord_bot.__file__).parent)')"
|
||||
export PYTHONPATH="$BOT_DIR"
|
||||
|
||||
cd "$BOT_DIR"
|
||||
exec "$VENV/bin/python" -m discord_bot
|
||||
'';
|
||||
};
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
packages = [
|
||||
python
|
||||
pkgs.uv
|
||||
pkgs.just
|
||||
pkgs.ffmpeg
|
||||
pkgs.chromedriver
|
||||
pkgs.chromium
|
||||
];
|
||||
env = {
|
||||
UV_PYTHON = python.interpreter;
|
||||
UV_PYTHON_DOWNLOADS = "never";
|
||||
UV_PYTHON_PREFERENCE = "only-system";
|
||||
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
|
||||
};
|
||||
shellHook = ''
|
||||
echo "python $(python --version), uv $(uv --version)"
|
||||
[ -d .venv ] || uv venv
|
||||
source .venv/bin/activate
|
||||
'';
|
||||
};
|
||||
})
|
||||
// {
|
||||
nixosModules.default = {
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.services.discord-bot;
|
||||
in {
|
||||
options.services.discord-bot = {
|
||||
enable = lib.mkEnableOption "discord-bot";
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
};
|
||||
environmentFile = lib.mkOption {type = lib.types.path;};
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
};
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 8050;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
users.users.discord-bot = {
|
||||
isSystemUser = true;
|
||||
group = "discord-bot";
|
||||
};
|
||||
users.groups.discord-bot = {};
|
||||
|
||||
systemd.services.discord-bot = {
|
||||
wantedBy = ["multi-user.target"];
|
||||
wants = ["network-online.target"];
|
||||
after = ["network-online.target"];
|
||||
environment = {
|
||||
DISCORD_BOT_HOST = cfg.host;
|
||||
DISCORD_BOT_PORT = toString cfg.port;
|
||||
UV_CACHE_DIR = "/var/cache/discord-bot/uv";
|
||||
HOME = "/var/lib/discord-bot";
|
||||
TERM = "dumb";
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = lib.getExe cfg.package;
|
||||
EnvironmentFile = cfg.environmentFile;
|
||||
User = "discord-bot";
|
||||
Group = "discord-bot";
|
||||
StateDirectory = "discord-bot";
|
||||
CacheDirectory = "discord-bot";
|
||||
RuntimeDirectory = "discord-bot";
|
||||
RuntimeDirectorySize = "4G";
|
||||
WorkingDirectory = "/var/lib/discord-bot";
|
||||
Restart = "always";
|
||||
RestartSec = 10;
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = true;
|
||||
PrivateTmp = true;
|
||||
NoNewPrivileges = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user