Compare commits
12
Commits
b0a6950005
...
rewrite
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0dc5a3af6 | ||
|
|
29d24e2054 | ||
|
|
ee01d2160d | ||
|
|
16cbda838e | ||
|
|
ce0cef5db7 | ||
|
|
afcfdad13d | ||
|
|
2823868460 | ||
|
|
78fcfe386d | ||
|
|
5fdea76f37 | ||
|
|
6248dc72f0 | ||
|
|
53e066f868 | ||
|
|
c9b81219e5 |
Generated
+1
-1
@@ -2013,7 +2013,7 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "payphone"
|
name = "payphone"
|
||||||
version = "4.4.46"
|
version = "4.4.57"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "payphone"
|
name = "payphone"
|
||||||
version = "4.4.46"
|
version = "4.4.57"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
default-run = "payphone"
|
default-run = "payphone"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,661 @@
|
|||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are 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.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
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 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 work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
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 AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
To read the documentation, run
|
To read the documentation, run
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
$ git clone --branch rewrite https://git.nyeki.dev/payphone/payphone.git
|
$ git clone --branch rewrite https://git.moan.dev/nyeki/payphone.git
|
||||||
$ cd payphone
|
$ cd payphone
|
||||||
$ cargo run -- docs --open
|
$ cargo run -- docs --open
|
||||||
```
|
```
|
||||||
|
|||||||
+23
-23
@@ -1,24 +1,24 @@
|
|||||||
$ANSIBLE_VAULT;1.1;AES256
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
38323862623762363734393366316436666137373937653630656665666232333435326166306633
|
30363364303339383037643864396632306537333737383933363164663838333364323837633838
|
||||||
6438393065663630383537316230336633363932646663300a666666393930376638663537663837
|
3561323032663461663834613634633734636333306638380a396436646332373330393931396530
|
||||||
64366231366561623365363634323466626333626534326631323964613361373339333639623137
|
36353439343736656432333437653764653132393364626136396230623038626330313366386263
|
||||||
3335376535313338390a373262393230353238373332316464653165363762323634646335613564
|
3630663539303665340a623961656435373337363534363863353934326336653361663538616664
|
||||||
31356633643837643437366130623638643133333336343264623536346339313365663533346566
|
36313865646530346633626639393739653131313835383631613833393832396434633038343639
|
||||||
61333564323066386639353032306639656465383263616263386563343539313530396662613831
|
62656236326662343236303133306137653533633064626161636165646164646165653534633036
|
||||||
61393030363264346564626239663531343433616231643732343835333338326538393838396132
|
63623863353438616237323530383033366138656665613331666532316562336232353239323535
|
||||||
36316331666131616264613461323432663430616562303865636461306264336330646263313439
|
33326237653463663862383266373534343434383765303237613436643439313233396338376134
|
||||||
66633261333063313162393765653263356263333934366333363037363765646264386632393733
|
65303161313930383165636133616236386435663232313531633461383938326131353930353761
|
||||||
39663339313939366162656336353563643836376366363032363430306162666331373165643462
|
35303238333863666137313330336366623536613230353639666133333633353566303131393666
|
||||||
32363930373231646135306466613935646636386639643137313830346531393735373938373531
|
32313964636138343632373064366166333134343437613937303538613834623934623161626261
|
||||||
63356665613434353162366638396339396130643066336135616433633830313736343265646165
|
63303832663438356331363534316230613561613961306561376432646132663733303366393961
|
||||||
61373461616363623239616534396431646561333630666230633766363832613365636664633865
|
64373166633938633730643339646433623235306161386338316330336264623031363365376634
|
||||||
32626636393262303235626132666661623134373766663135643131626363383238363836326232
|
38306639356236383464653038663732653465626265663939643234306563346330336139373235
|
||||||
62363962613965356165653134366235376364333965303361643634636231323639373132623336
|
36616662313139356139363532633664333762623235326237636339323039373131666162613930
|
||||||
33383532383237636436303164396531343134633838373936646132353132386465636330363161
|
63336161396635646565393565373736616431643830366163356532383034396636323163623836
|
||||||
65653937313032346138373435656663653639653133373564366137363261326438336436303330
|
37613632343563363032303133333930653431343039633239306561303266393861366134643734
|
||||||
32386434663236643132326536306437653231383366366363666461323931613839383762343361
|
66326534343464363634383461326330346432613266653066643139636232656638346635343130
|
||||||
38343138613466346335396136313334343731313265633365646666366131653837343664663666
|
61383336623763353034316238313536336261616433356461666537633665636430393139663465
|
||||||
62616336386339393465626138613465316334303239643335633239666165373630333135373062
|
61643066356466646264616562343939616336343935663939313537356237303264303761376139
|
||||||
35353530643164643732633732336364326161366666333233313833313939663535653763636237
|
34623231623264633934363537643132643336313633663430643265633564646363623130396437
|
||||||
62633064363561323065653162336134643338623065356536613961303034323235363631343530
|
61383763396633663439626661333630373662616633353232356165663034336131343666643633
|
||||||
663832616435656433306266643463373930
|
373138346631323465303932633962613234
|
||||||
|
|||||||
@@ -49,6 +49,16 @@
|
|||||||
changed_when: false
|
changed_when: false
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
|
||||||
|
- name: Clear Redis Nodes
|
||||||
|
ansible.builtin.shell: >
|
||||||
|
for ip in {{ redis_node_ips.stdout }}; do
|
||||||
|
kubectl exec redis-cluster-0 -n redis -- redis-cli -p 6379 -h $ip flushall;
|
||||||
|
done
|
||||||
|
args:
|
||||||
|
executable: /bin/bash
|
||||||
|
when: "'cluster_state:ok' not in redis_cluster_state.stdout"
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: Activate Redis Cluster
|
- name: Activate Redis Cluster
|
||||||
ansible.builtin.shell: >
|
ansible.builtin.shell: >
|
||||||
kubectl exec redis-cluster-0 -n redis -- redis-cli --cluster create --cluster-replicas 1 {{ redis_node_ips.stdout }} --cluster-yes
|
kubectl exec redis-cluster-0 -n redis -- redis-cli --cluster create --cluster-replicas 1 {{ redis_node_ips.stdout }} --cluster-yes
|
||||||
|
|||||||
@@ -101,7 +101,7 @@
|
|||||||
"--redis-urls",
|
"--redis-urls",
|
||||||
"redis://redis-cluster.redis",
|
"redis://redis-cluster.redis",
|
||||||
"--bot-owner-id",
|
"--bot-owner-id",
|
||||||
"1357199907512914051"
|
"1486270291410817114"
|
||||||
]
|
]
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
|
|||||||
+3
-52
@@ -18,7 +18,7 @@ use twilight_model::channel::{Message as TwilightMessage, Webhook};
|
|||||||
use twilight_model::guild::Guild as TwilightGuild;
|
use twilight_model::guild::Guild as TwilightGuild;
|
||||||
use twilight_model::id::Id;
|
use twilight_model::id::Id;
|
||||||
use twilight_model::user::User as TwilightUser;
|
use twilight_model::user::User as TwilightUser;
|
||||||
use twilight_validate::request::{ValidationError, ValidationErrorType, webhook_username};
|
use twilight_validate::request::{ValidationErrorType, webhook_username};
|
||||||
|
|
||||||
use crate::colors::AvatarColorFetchingRequest;
|
use crate::colors::AvatarColorFetchingRequest;
|
||||||
use crate::constants::DEFAULT_PREFIX;
|
use crate::constants::DEFAULT_PREFIX;
|
||||||
@@ -345,23 +345,6 @@ impl User {
|
|||||||
is_first_incident: incidents.is_empty(),
|
is_first_incident: incidents.is_empty(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn count(session: &Session) -> Result<usize, DatabaseError> {
|
|
||||||
let result = session
|
|
||||||
.query_unpaged(
|
|
||||||
r#"
|
|
||||||
SELECT
|
|
||||||
user_id
|
|
||||||
FROM
|
|
||||||
payphone.users;
|
|
||||||
"#,
|
|
||||||
(),
|
|
||||||
)
|
|
||||||
.await?
|
|
||||||
.into_rows_result()?;
|
|
||||||
|
|
||||||
Ok(result.rows_num())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<TwilightUser> for User {
|
impl From<TwilightUser> for User {
|
||||||
@@ -1098,23 +1081,6 @@ impl Call {
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn count(session: &Session) -> Result<usize, DatabaseError> {
|
|
||||||
let result = session
|
|
||||||
.query_unpaged(
|
|
||||||
r#"
|
|
||||||
SELECT
|
|
||||||
call_id
|
|
||||||
FROM
|
|
||||||
payphone.calls;
|
|
||||||
"#,
|
|
||||||
(),
|
|
||||||
)
|
|
||||||
.await?
|
|
||||||
.into_rows_result()?;
|
|
||||||
|
|
||||||
Ok(result.rows_num())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, SerializeValue, DeserializeValue)]
|
#[derive(Debug, Clone, SerializeValue, DeserializeValue)]
|
||||||
@@ -1403,20 +1369,6 @@ impl Message {
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn count(session: &Session) -> Result<usize, DatabaseError> {
|
|
||||||
let result = session
|
|
||||||
.query_unpaged(
|
|
||||||
r#"
|
|
||||||
SELECT message_id FROM payphone.messages;
|
|
||||||
"#,
|
|
||||||
(),
|
|
||||||
)
|
|
||||||
.await?
|
|
||||||
.into_rows_result()?;
|
|
||||||
|
|
||||||
Ok(result.rows_num())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct MessageByAuthorId {
|
pub struct MessageByAuthorId {
|
||||||
@@ -1840,8 +1792,8 @@ impl<'a> Object<'a> for Participant {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn make_name_valid(mut name: String) -> String {
|
fn make_name_valid(mut name: String) -> String {
|
||||||
if let Err(error) = webhook_username(&name) {
|
if let Err(error) = webhook_username(&name)
|
||||||
if let ValidationErrorType::WebhookUsername { len, .. } = error.kind() {
|
&& let ValidationErrorType::WebhookUsername { len, .. } = error.kind() {
|
||||||
if let Some(len) = len {
|
if let Some(len) = len {
|
||||||
if *len < 2 {
|
if *len < 2 {
|
||||||
name = format!("{name}--");
|
name = format!("{name}--");
|
||||||
@@ -1852,7 +1804,6 @@ fn make_name_valid(mut name: String) -> String {
|
|||||||
name = "Invalid name".into();
|
name = "Invalid name".into();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
name
|
name
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ pub(super) fn get_all_command_help_embed(
|
|||||||
.unwrap())
|
.unwrap())
|
||||||
.color(COLOR_WHITE)
|
.color(COLOR_WHITE)
|
||||||
.field(EmbedFieldBuilder::new("Commands", get_commands_table(rt, extras)).build())
|
.field(EmbedFieldBuilder::new("Commands", get_commands_table(rt, extras)).build())
|
||||||
.footer(EmbedFooterBuilder::new(format!("v{VERSION} - Use {}help <command> to get more information about a specific command.", prefix)))
|
.footer(EmbedFooterBuilder::new(format!("v{VERSION}-{} - Use {}help <command> to get more information about a specific command.", rt.shard_number + 1, prefix)))
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ use async_trait::async_trait;
|
|||||||
use rand::{Rng, SeedableRng};
|
use rand::{Rng, SeedableRng};
|
||||||
use rand_chacha::ChaCha20Rng;
|
use rand_chacha::ChaCha20Rng;
|
||||||
use twilight_model::gateway::payload::outgoing::UpdatePresence;
|
use twilight_model::gateway::payload::outgoing::UpdatePresence;
|
||||||
use twilight_model::gateway::payload::outgoing::update_presence::UpdatePresencePayload;
|
|
||||||
use twilight_model::gateway::presence::{Activity, ActivityType, Status};
|
use twilight_model::gateway::presence::{Activity, ActivityType, Status};
|
||||||
|
|
||||||
use crate::extras::Extras;
|
use crate::extras::Extras;
|
||||||
|
|||||||
@@ -599,27 +599,25 @@ impl Command<State, Extras> for MaskCommand {
|
|||||||
|
|
||||||
if let Some(channel) = channel
|
if let Some(channel) = channel
|
||||||
&& let Some(call_id) = channel.call_id
|
&& let Some(call_id) = channel.call_id
|
||||||
{
|
&& let Some(mut participant) = Participant::get_for_user_and_channel_in_call(
|
||||||
if let Some(mut participant) = Participant::get_for_user_and_channel_in_call(
|
|
||||||
ctx.extras.user.id,
|
ctx.extras.user.id,
|
||||||
ctx.event.channel_id.get(),
|
ctx.event.channel_id.get(),
|
||||||
call_id,
|
call_id,
|
||||||
&ctx.rt.state.db,
|
&ctx.rt.state.db,
|
||||||
)
|
)
|
||||||
.await?
|
.await?
|
||||||
{
|
{
|
||||||
participant.is_masked = ctx.extras.user.is_masked;
|
participant.is_masked = ctx.extras.user.is_masked;
|
||||||
participant.upsert(&ctx.rt.state.db).await?;
|
participant.upsert(&ctx.rt.state.db).await?;
|
||||||
|
|
||||||
if ctx.extras.user.is_masked {
|
if ctx.extras.user.is_masked {
|
||||||
mask_message = format!(
|
mask_message = format!(
|
||||||
"🎭 Your mask {mask_verb} set to `on`. You're currently being displayed as **{} {}**. You can toggle your mask on or off using `{}mask on` and `{}mask off`.",
|
"🎭 Your mask {mask_verb} set to `on`. You're currently being displayed as **{} {}**. You can toggle your mask on or off using `{}mask on` and `{}mask off`.",
|
||||||
get_mask_emoji(&participant.user_mask).expect("User's mask did not exist"),
|
get_mask_emoji(&participant.user_mask).expect("User's mask did not exist"),
|
||||||
get_mask_display_name(&participant.user_mask),
|
get_mask_display_name(&participant.user_mask),
|
||||||
ctx.prefix,
|
ctx.prefix,
|
||||||
ctx.prefix
|
ctx.prefix
|
||||||
);
|
);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -102,6 +102,7 @@ impl OnMessageHandler<State, Extras> for CallMessageHandler {
|
|||||||
|
|
||||||
if UtcDateTime::from_unix_timestamp(event.author.id.timestamp() / 1000).unwrap()
|
if UtcDateTime::from_unix_timestamp(event.author.id.timestamp() / 1000).unwrap()
|
||||||
> UtcDateTime::now() - Duration::days(30)
|
> UtcDateTime::now() - Duration::days(30)
|
||||||
|
&& event.author.id.get() != rt.state.bot_owner_id
|
||||||
{
|
{
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ use async_trait::async_trait;
|
|||||||
use time::{Duration, UtcDateTime};
|
use time::{Duration, UtcDateTime};
|
||||||
use twilight_util::snowflake::Snowflake;
|
use twilight_util::snowflake::Snowflake;
|
||||||
|
|
||||||
use crate::database::models::{Call, Channel, Participant, UserIncident};
|
use crate::database::models::{Channel, Participant, UserIncident};
|
||||||
use crate::extras::Extras;
|
use crate::extras::Extras;
|
||||||
use crate::framework::commands::CommandError;
|
use crate::framework::commands::CommandError;
|
||||||
use crate::framework::commands::context::CommandContext;
|
use crate::framework::commands::context::CommandContext;
|
||||||
@@ -50,10 +50,9 @@ pub struct NonNewAccountPermission;
|
|||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Permission<State, Extras> for NonNewAccountPermission {
|
impl Permission<State, Extras> for NonNewAccountPermission {
|
||||||
async fn check(&self, ctx: &CommandContext<State, Extras>) -> Result<bool, CommandError> {
|
async fn check(&self, ctx: &CommandContext<State, Extras>) -> Result<bool, CommandError> {
|
||||||
Ok(
|
Ok(ctx.event.author.id.get() == ctx.rt.state.bot_owner_id
|
||||||
UtcDateTime::from_unix_timestamp(ctx.event.author.id.timestamp() / 1000).unwrap()
|
|| UtcDateTime::from_unix_timestamp(ctx.event.author.id.timestamp() / 1000).unwrap()
|
||||||
< UtcDateTime::now() - Duration::days(30),
|
< UtcDateTime::now() - Duration::days(30))
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn on_handle_denied(
|
async fn on_handle_denied(
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
[
|
[
|
||||||
"Thank you X and Anonymous Person for your support! We have covered next month's hosting costs."
|
"Hey! I'm Nyeki, Payphone's developer. A month of downtime, but hosting costs didn't stop. We're at $3 and we need to make it to $20 in less than 24 hours, or Payphone will go down again due to hosting renewal. If you can, and want to, help me keep Payphone finally up and stable, consider [making a donation here](<https://ko-fi.com/payphonedev>). Payphone cannot stay up without your help. Thank you so much in advance."
|
||||||
]
|
]
|
||||||
@@ -1,16 +1,5 @@
|
|||||||
[
|
[
|
||||||
"Automod features are still under development! Join the [official Discord server](<https://discord.gg/9daSsrfTmE>) if you detect a bug and we'll help you out.",
|
"Automod features are still under development! Join the [official Discord server](<https://discord.gg/9daSsrfTmE>) if you detect a bug and we'll help you out.",
|
||||||
"Automod features are still under development! Join the [official Discord server](<https://discord.gg/9daSsrfTmE>) if you detect a bug and we'll help you out.",
|
|
||||||
"Automod features are still under development! Join the [official Discord server](<https://discord.gg/9daSsrfTmE>) if you detect a bug and we'll help you out.",
|
|
||||||
"Automod features are still under development! Join the [official Discord server](<https://discord.gg/9daSsrfTmE>) if you detect a bug and we'll help you out.",
|
|
||||||
"Automod features are still under development! Join the [official Discord server](<https://discord.gg/9daSsrfTmE>) if you detect a bug and we'll help you out.",
|
|
||||||
"Automod features are still under development! Join the [official Discord server](<https://discord.gg/9daSsrfTmE>) if you detect a bug and we'll help you out.",
|
|
||||||
"Payphone needs your help! We're running out of money to pay for next month's hosting. If you can and want to help, consider [donating](<https://ko-fi.com/payphonedev>) to help Payphone stay alive. All help is greatly appreciated!",
|
|
||||||
"Payphone needs your help! We're running out of money to pay for next month's hosting. If you can and want to help, consider [donating](<https://ko-fi.com/payphonedev>) to help Payphone stay alive. All help is greatly appreciated!",
|
|
||||||
"Payphone needs your help! We're running out of money to pay for next month's hosting. If you can and want to help, consider [donating](<https://ko-fi.com/payphonedev>) to help Payphone stay alive. All help is greatly appreciated!",
|
|
||||||
"Payphone needs your help! We're running out of money to pay for next month's hosting. If you can and want to help, consider [donating](<https://ko-fi.com/payphonedev>) to help Payphone stay alive. All help is greatly appreciated!",
|
|
||||||
"Payphone needs your help! We're running out of money to pay for next month's hosting. If you can and want to help, consider [donating](<https://ko-fi.com/payphonedev>) to help Payphone stay alive. All help is greatly appreciated!",
|
|
||||||
"Payphone needs your help! We're running out of money to pay for next month's hosting. If you can and want to help, consider [donating](<https://ko-fi.com/payphonedev>) to help Payphone stay alive. All help is greatly appreciated!",
|
|
||||||
"You can report messages using `Message > Apps > Report Message`.",
|
"You can report messages using `Message > Apps > Report Message`.",
|
||||||
"Help us sharing Payphone to make it more active!",
|
"Help us sharing Payphone to make it more active!",
|
||||||
"Emojis will only show if they're from a server Payphone's in.",
|
"Emojis will only show if they're from a server Payphone's in.",
|
||||||
@@ -25,7 +14,7 @@
|
|||||||
"Do you like Payphone? Consider [making a donation](<https://ko-fi.com/payphonedev>) to help us grow Payphone (and keep it running)!",
|
"Do you like Payphone? Consider [making a donation](<https://ko-fi.com/payphonedev>) to help us grow Payphone (and keep it running)!",
|
||||||
"Using `{prefix}friendreq` is the best way to ask the other party to add you.",
|
"Using `{prefix}friendreq` is the best way to ask the other party to add you.",
|
||||||
"There's a secret easter egg command. Try to find it! (Hint: cat)",
|
"There's a secret easter egg command. Try to find it! (Hint: cat)",
|
||||||
"Make sure to read Payphone's [Code of Conduct](<https://payphone.nyeki.dev/code-of-conduct>). Let's keep Payphone safe and fun for everyone!",
|
"Make sure to read Payphone's [Code of Conduct](<https://payphone.lat/code-of-conduct>). Let's keep Payphone safe and fun for everyone!",
|
||||||
"Did you join [Payphone's new official server](<https://discord.gg/9daSsrfTmE>) yet? We have a lot of fun stuff there!",
|
"Did you join [Payphone's new official server](<https://discord.gg/9daSsrfTmE>) yet? We have a lot of fun stuff there!",
|
||||||
"How high are you on the leaderboard? Use `{prefix}leaderboard` to check it out!"
|
"How high are you on the leaderboard? Use `{prefix}leaderboard` to check it out!"
|
||||||
]
|
]
|
||||||
@@ -3,7 +3,7 @@ use std::time::Duration;
|
|||||||
|
|
||||||
use scylla::client::session::Session;
|
use scylla::client::session::Session;
|
||||||
|
|
||||||
use crate::database::models::{Message, User};
|
use crate::database::models::{Channel, Message, User};
|
||||||
use crate::extras::Extras;
|
use crate::extras::Extras;
|
||||||
use crate::framework::commands::arguments::{ArgumentParsingError, FromArguments, NeedyString};
|
use crate::framework::commands::arguments::{ArgumentParsingError, FromArguments, NeedyString};
|
||||||
use crate::framework::commands::context::CommandContext;
|
use crate::framework::commands::context::CommandContext;
|
||||||
@@ -206,3 +206,63 @@ impl DerefMut for DurationArgument {
|
|||||||
&mut self.0
|
&mut self.0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct ChannelArgument(pub Channel);
|
||||||
|
|
||||||
|
impl FromArguments<State, Extras> for ChannelArgument {
|
||||||
|
async fn from_args<'a>(
|
||||||
|
args: &'a str,
|
||||||
|
ctx: &'a CommandContext<'_, State, Extras>,
|
||||||
|
) -> Result<(Self, &'a str), ArgumentParsingError> {
|
||||||
|
let (identifier, args) = NeedyString::from_args(args, ctx).await?;
|
||||||
|
let identifier = identifier.0.trim();
|
||||||
|
|
||||||
|
if identifier == "." || identifier == "this" || identifier == "here" {
|
||||||
|
let channel = Channel::get_by_id(ctx.event.channel_id.get(), &ctx.rt.state.db).await?;
|
||||||
|
|
||||||
|
if let Some(channel) = channel {
|
||||||
|
return Ok((Self(channel), args));
|
||||||
|
}
|
||||||
|
} else if identifier.starts_with("<#") && identifier.ends_with(">") {
|
||||||
|
// The argument is a Discord mention.
|
||||||
|
|
||||||
|
let channel_id: u64 = identifier[2..identifier.len() - 1]
|
||||||
|
.to_string()
|
||||||
|
.parse()
|
||||||
|
.map_err(|_| ArgumentParsingError::InvalidArgument)?;
|
||||||
|
|
||||||
|
let channel = Channel::get_by_id(channel_id, &ctx.rt.state.db).await?;
|
||||||
|
|
||||||
|
if let Some(channel) = channel {
|
||||||
|
return Ok((Self(channel), args));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
let channel_id: u64 = identifier
|
||||||
|
.parse()
|
||||||
|
.map_err(|_| ArgumentParsingError::InvalidArgument)?;
|
||||||
|
|
||||||
|
let channel = Channel::get_by_id(channel_id, &ctx.rt.state.db).await?;
|
||||||
|
|
||||||
|
if let Some(channel) = channel {
|
||||||
|
return Ok((Self(channel), args));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(ArgumentParsingError::MissingArgument)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deref for ChannelArgument {
|
||||||
|
type Target = Channel;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl DerefMut for ChannelArgument {
|
||||||
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||||
|
&mut self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
|
use deadpool_redis::redis::AsyncTypedCommands;
|
||||||
use time::UtcDateTime;
|
use time::UtcDateTime;
|
||||||
|
|
||||||
use crate::database::models::{UserIncident, UserIncidentType};
|
use crate::database::models::{Call, UserIncident, UserIncidentType};
|
||||||
use crate::extras::Extras;
|
use crate::extras::Extras;
|
||||||
use crate::framework::commands::arguments::{
|
use crate::framework::commands::arguments::{
|
||||||
Arg, Argument, ArgumentParsingError, NeedyGreedyString, ParseArguments,
|
Arg, Argument, ArgumentParsingError, NeedyGreedyString, ParseArguments,
|
||||||
@@ -10,11 +11,11 @@ use crate::framework::commands::context::CommandContext;
|
|||||||
use crate::framework::commands::permissions::Permission;
|
use crate::framework::commands::permissions::Permission;
|
||||||
use crate::framework::commands::{Command, CommandError};
|
use crate::framework::commands::{Command, CommandError};
|
||||||
use crate::framework::runtime::Runtime;
|
use crate::framework::runtime::Runtime;
|
||||||
use crate::groups::moderation::arguments::{DurationArgument, UserArgument};
|
use crate::groups::moderation::arguments::{ChannelArgument, DurationArgument, UserArgument};
|
||||||
use crate::groups::moderation::get_incident_page;
|
use crate::groups::moderation::get_incident_page;
|
||||||
use crate::groups::moderation::permissions::{BotModeratorPermission, BotOwnerPermission};
|
use crate::groups::moderation::permissions::{BotModeratorPermission, BotOwnerPermission};
|
||||||
use crate::state::State;
|
use crate::state::State;
|
||||||
use crate::utils::get_random_u64;
|
use crate::utils::{Bye, get_random_u64};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct ModeratorCommand;
|
pub struct ModeratorCommand;
|
||||||
@@ -246,3 +247,116 @@ impl Command<State, Extras> for BanCommand {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct RemoteHangupCommand;
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl Command<State, Extras> for RemoteHangupCommand {
|
||||||
|
fn name(&self) -> &'static str {
|
||||||
|
"remotehangup"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn aliases(&self) -> &'static [&'static str] {
|
||||||
|
&["rh"]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn permissions(&self) -> Vec<Box<dyn Permission<State, Extras> + Send + Sync + 'static>> {
|
||||||
|
vec![Box::new(BotModeratorPermission)]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn show_in_help(&self, _rt: &Runtime<State, Extras>, extras: &Extras) -> bool {
|
||||||
|
extras.user.is_moderator
|
||||||
|
}
|
||||||
|
|
||||||
|
fn arguments(&self) -> &'static [Argument] {
|
||||||
|
&[Argument {
|
||||||
|
name: "channel",
|
||||||
|
is_optional: false,
|
||||||
|
is_greedy: false,
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn execute(
|
||||||
|
&self,
|
||||||
|
ctx: CommandContext<'_, State, Extras>,
|
||||||
|
args: &str,
|
||||||
|
) -> Result<(), CommandError> {
|
||||||
|
let Arg(mut channel) = match Arg::<ChannelArgument>::parse(args, &ctx).await {
|
||||||
|
Ok(arg) => arg,
|
||||||
|
Err(e) => match e {
|
||||||
|
ArgumentParsingError::InvalidArgument => {
|
||||||
|
ctx.send().content("❌ Channel not found in DB.").await?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
ArgumentParsingError::DatabaseFailed(e) => {
|
||||||
|
return Err(CommandError::DatabaseFailed(e));
|
||||||
|
}
|
||||||
|
e => {
|
||||||
|
unreachable!("Unexpected error: {e}");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if channel.is_searching {
|
||||||
|
channel
|
||||||
|
.cancel_search(&ctx.rt.state.db)
|
||||||
|
.await
|
||||||
|
.inspect_err(|e| {
|
||||||
|
log::error!("Failed to cancel search: {e:?}");
|
||||||
|
})?;
|
||||||
|
|
||||||
|
ctx.send()
|
||||||
|
.content("The channel was remotely made to stop searching for a call!")
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(call_id) = channel.call_id {
|
||||||
|
let mut redis = ctx.rt.state.redis.get().await?;
|
||||||
|
|
||||||
|
let Some(call) = Call::get_by_id(call_id, &ctx.rt.state.db)
|
||||||
|
.await
|
||||||
|
.inspect_err(|e| log::error!("Failed to get call: {e:?}"))?
|
||||||
|
else {
|
||||||
|
ctx.send().content("❌ The call could not be found.\n-# This is not supposed to happen. The channel is pointing to an ID in the database that does not exist.").await?;
|
||||||
|
|
||||||
|
channel.call_id = None;
|
||||||
|
channel.upsert(&ctx.rt.state.db).await.bye();
|
||||||
|
|
||||||
|
redis
|
||||||
|
.zrem("active-calls", format!("{}:{}", call_id, channel.id))
|
||||||
|
.await
|
||||||
|
.bye();
|
||||||
|
|
||||||
|
return Err(CommandError::DatabaseInconsistentState);
|
||||||
|
};
|
||||||
|
|
||||||
|
let channel_keys = [
|
||||||
|
format!("{call_id}:{}", call.channel_ids[0]),
|
||||||
|
format!("{call_id}:{}", call.channel_ids[1]),
|
||||||
|
];
|
||||||
|
|
||||||
|
redis
|
||||||
|
.zrem("active-calls", &channel_keys)
|
||||||
|
.await
|
||||||
|
.inspect_err(|e| log::error!("Failed to remove inactive call from redis: {e}"))
|
||||||
|
.ok();
|
||||||
|
|
||||||
|
call.hangup(&ctx.rt.state.db)
|
||||||
|
.await
|
||||||
|
.inspect_err(|e| log::error!("Failed to hang up call: {e:?}"))?;
|
||||||
|
|
||||||
|
ctx.send().content(format!("<#{}> had its call hung up.", channel.id)).await?;
|
||||||
|
} else {
|
||||||
|
ctx.send()
|
||||||
|
.content("❌ This channel is not in a call.")
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+2
-1
@@ -137,7 +137,7 @@ use crate::groups::calls::events::{
|
|||||||
use crate::groups::gateway::events::{ReadyHandler, ReconnectHandler};
|
use crate::groups::gateway::events::{ReadyHandler, ReconnectHandler};
|
||||||
use crate::groups::leveling::commands::LeaderboardCommand;
|
use crate::groups::leveling::commands::LeaderboardCommand;
|
||||||
use crate::groups::leveling::events::MessageLevelingHandler;
|
use crate::groups::leveling::events::MessageLevelingHandler;
|
||||||
use crate::groups::moderation::commands::{BanCommand, IncidentsCommand, ModeratorCommand};
|
use crate::groups::moderation::commands::{BanCommand, IncidentsCommand, ModeratorCommand, RemoteHangupCommand};
|
||||||
use crate::groups::servers::commands::PrefixCommand;
|
use crate::groups::servers::commands::PrefixCommand;
|
||||||
use crate::groups::servers::events::{
|
use crate::groups::servers::events::{
|
||||||
ServerCreateHandler, ServerDeleteHandler, ServerUpdateHandler,
|
ServerCreateHandler, ServerDeleteHandler, ServerUpdateHandler,
|
||||||
@@ -298,6 +298,7 @@ async fn start(
|
|||||||
.command(ModeratorCommand)
|
.command(ModeratorCommand)
|
||||||
.command(IncidentsCommand)
|
.command(IncidentsCommand)
|
||||||
.command(BanCommand)
|
.command(BanCommand)
|
||||||
|
.command(RemoteHangupCommand)
|
||||||
.component(HelpGoBackButton)
|
.component(HelpGoBackButton)
|
||||||
.cache_resource_type(ResourceType::GUILD)
|
.cache_resource_type(ResourceType::GUILD)
|
||||||
.cache_resource_type(ResourceType::CHANNEL)
|
.cache_resource_type(ResourceType::CHANNEL)
|
||||||
|
|||||||
+2
-2
@@ -111,9 +111,9 @@ pub fn u64_to_i64(u: u64) -> i64 {
|
|||||||
/// Returns:
|
/// Returns:
|
||||||
/// [`Option<(&str, &str)>`] - The splitted parts of the string, or [`None`] if no occurrences of
|
/// [`Option<(&str, &str)>`] - The splitted parts of the string, or [`None`] if no occurrences of
|
||||||
/// `pattern` were found in `s`.
|
/// `pattern` were found in `s`.
|
||||||
pub fn split_at_nth_from_end<'a, 'b>(
|
pub fn split_at_nth_from_end<'a>(
|
||||||
s: &'a str,
|
s: &'a str,
|
||||||
pattern: &'b str,
|
pattern: &str,
|
||||||
n: usize,
|
n: usize,
|
||||||
) -> Option<(&'a str, &'a str)> {
|
) -> Option<(&'a str, &'a str)> {
|
||||||
let mut end = s.len();
|
let mut end = s.len();
|
||||||
|
|||||||
Reference in New Issue
Block a user