diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 5f6d0afe..996a7cb7 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -21,26 +21,31 @@ jobs:
name: 'run .net tests'
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v1
- with:
- submodules: recursive
- - name: Setup .NET Core
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: 8.0.x
- - name: Run automated tests
- run: dotnet test --configuration Release
+ - uses: actions/checkout@v4
+ with:
+ submodules: recursive
+
+ - name: Setup .NET Core
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: 8.0.x
+
+ - name: Run automated tests
+ run: dotnet test --configuration Release
+
dotnet-format:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
+
+ - name: Setup .NET Core
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: 8.0.x
- name: Add dotnet-format problem matcher
uses: xt0rted/dotnet-format-problem-matcher@v1
- - name: Restore dotnet tools
- uses: xt0rted/dotnet-tool-restore@v1
-
- - name: Run dotnet format
- uses: PluralKit/dotnet-format@fix/net6
+ - name: Run dotnet-format
+ run: dotnet format --no-restore --verify-no-changes
diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..ca9b0551
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,619 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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
diff --git a/Cargo.lock b/Cargo.lock
index 52ab48dc..d52d073b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4448,7 +4448,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "twilight-cache-inmemory"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"bitflags 2.9.0",
"dashmap",
@@ -4460,7 +4460,7 @@ dependencies = [
[[package]]
name = "twilight-gateway"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"bitflags 2.9.0",
"fastrand",
@@ -4480,7 +4480,7 @@ dependencies = [
[[package]]
name = "twilight-gateway-queue"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"tokio",
"tracing",
@@ -4489,7 +4489,7 @@ dependencies = [
[[package]]
name = "twilight-http"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"fastrand",
"http 1.3.1",
@@ -4511,7 +4511,7 @@ dependencies = [
[[package]]
name = "twilight-http-ratelimiting"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"tokio",
"tracing",
@@ -4520,7 +4520,7 @@ dependencies = [
[[package]]
name = "twilight-model"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"bitflags 2.9.0",
"serde",
@@ -4532,7 +4532,7 @@ dependencies = [
[[package]]
name = "twilight-util"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"twilight-model",
]
@@ -4540,7 +4540,7 @@ dependencies = [
[[package]]
name = "twilight-validate"
version = "0.16.0"
-source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-70105ef#941604f888bb8d25239f4f3d4dfb1a9ecdb9851b"
+source = "git+https://github.com/pluralkit/twilight?branch=pluralkit-7f08d95#054a2aa5d29fb46220af1cd5df568b73511cdb26"
dependencies = [
"twilight-model",
]
diff --git a/Cargo.toml b/Cargo.toml
index 23ab960f..270d00a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,11 +25,11 @@ uuid = { version = "1.7.0", features = ["serde"] }
axum = { git = "https://github.com/pluralkit/axum", branch = "v0.8.4-pluralkit" }
-twilight-gateway = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-70105ef" }
-twilight-cache-inmemory = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-70105ef", features = ["permission-calculator"] }
-twilight-util = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-70105ef", features = ["permission-calculator"] }
-twilight-model = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-70105ef" }
-twilight-http = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-70105ef", default-features = false, features = ["rustls-aws_lc_rs", "rustls-native-roots"] }
+twilight-gateway = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-7f08d95" }
+twilight-cache-inmemory = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-7f08d95", features = ["permission-calculator"] }
+twilight-util = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-7f08d95", features = ["permission-calculator"] }
+twilight-model = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-7f08d95" }
+twilight-http = { git = "https://github.com/pluralkit/twilight", branch = "pluralkit-7f08d95", default-features = false, features = ["rustls-aws_lc_rs", "rustls-native-roots"] }
# twilight-gateway = { path = "../twilight/twilight-gateway" }
# twilight-cache-inmemory = { path = "../twilight/twilight-cache-inmemory", features = ["permission-calculator"] }
diff --git a/Myriad/COPYING b/Myriad/COPYING
new file mode 100644
index 00000000..adf0ac6d
--- /dev/null
+++ b/Myriad/COPYING
@@ -0,0 +1,20 @@
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+“Software”), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
diff --git a/Myriad/README.md b/Myriad/README.md
index 9ddc72cf..aa01760c 100644
--- a/Myriad/README.md
+++ b/Myriad/README.md
@@ -2,4 +2,6 @@
'Myriad' is a .NET library used to interact with the Discord API. It's primarily intended for use with PluralKit, but feel free to fork or submodule it!
-You can find a simple example bot using the Myriad library here:
\ No newline at end of file
+You can find a simple example bot using the Myriad library here:
+
+The Myriad library (`/Myriad` directory in this repository) is available under the MIT license. The license text can be found in the /Myriad/COPYING file.
diff --git a/PluralKit.Bot/PluralKit.Bot.csproj b/PluralKit.Bot/PluralKit.Bot.csproj
index 753d1f30..152d736a 100644
--- a/PluralKit.Bot/PluralKit.Bot.csproj
+++ b/PluralKit.Bot/PluralKit.Bot.csproj
@@ -24,6 +24,6 @@
-
+
diff --git a/PluralKit.Bot/Services/HttpListenerService.cs b/PluralKit.Bot/Services/HttpListenerService.cs
index bafeae41..d2bfc4ce 100644
--- a/PluralKit.Bot/Services/HttpListenerService.cs
+++ b/PluralKit.Bot/Services/HttpListenerService.cs
@@ -1,4 +1,3 @@
-using System.Text;
using System.Text.Json;
using Serilog;
@@ -58,7 +57,7 @@ public class HttpListenerService
private async Task RuntimeConfigSet(HttpContextBase ctx)
{
var key = ctx.Request.Url.Parameters["key"];
- var value = ReadStream(ctx.Request.Data, ctx.Request.ContentLength);
+ var value = ctx.Request.DataAsString;
await _runtimeConfig.Set(key, value);
await RuntimeConfigGet(ctx);
}
@@ -77,7 +76,7 @@ public class HttpListenerService
var shardIdString = ctx.Request.Url.Parameters["shard_id"];
if (!int.TryParse(shardIdString, out var shardId)) return;
- var packet = JsonSerializer.Deserialize(ReadStream(ctx.Request.Data, ctx.Request.ContentLength), _jsonSerializerOptions);
+ var packet = JsonSerializer.Deserialize(ctx.Request.DataAsString, _jsonSerializerOptions);
var evt = DeserializeEvent(shardId, packet.EventType!, (JsonElement)packet.Payload!);
if (evt != null)
{
@@ -108,39 +107,4 @@ public class HttpListenerService
return null;
}
}
-
- //temporary re-implementation of the ReadStream function found in WatsonWebserver.Lite, but with handling for closed connections
- //https://github.com/dotnet/WatsonWebserver/issues/171
- private static string ReadStream(Stream input, long contentLength)
- {
- if (input == null) throw new ArgumentNullException(nameof(input));
- if (!input.CanRead) throw new InvalidOperationException("Input stream is not readable");
- if (contentLength < 1) return "";
-
- byte[] buffer = new byte[65536];
- long bytesRemaining = contentLength;
-
- using (MemoryStream ms = new MemoryStream())
- {
- int read;
-
- while (bytesRemaining > 0)
- {
- read = input.Read(buffer, 0, buffer.Length);
- if (read > 0)
- {
- ms.Write(buffer, 0, read);
- bytesRemaining -= read;
- }
- else
- {
- throw new IOException("Connection closed before reading end of stream.");
- }
- }
-
- if (ms.Length < 1) return null;
- var str = Encoding.Default.GetString(ms.ToArray());
- return str;
- }
- }
}
\ No newline at end of file
diff --git a/PluralKit.Bot/packages.lock.json b/PluralKit.Bot/packages.lock.json
index 449923d9..25e461cf 100644
--- a/PluralKit.Bot/packages.lock.json
+++ b/PluralKit.Bot/packages.lock.json
@@ -16,12 +16,12 @@
},
"Watson.Lite": {
"type": "Direct",
- "requested": "[6.3.5, )",
- "resolved": "6.3.5",
- "contentHash": "YF8+se3IVenn8YlyNeb4wSJK6QMnVD0QHIOEiZ22wS4K2wkwoSDzWS+ZAjk1MaPeB+XO5gRoENUN//pOc+wI2g==",
+ "requested": "[6.3.12, )",
+ "resolved": "6.3.12",
+ "contentHash": "L/TfJadyOwK9bhhvOnEKXLeyDaTAn8v6hnYPVPIwQ7JlnUXDbDqsUa3qHFdFIHiuK8vMZOnDL7+k/mY10yxdYw==",
"dependencies": {
- "CavemanTcp": "2.0.5",
- "Watson.Core": "6.3.5"
+ "CavemanTcp": "2.0.9",
+ "Watson.Core": "6.3.12"
}
},
"App.Metrics": {
@@ -119,8 +119,8 @@
},
"CavemanTcp": {
"type": "Transitive",
- "resolved": "2.0.5",
- "contentHash": "90wywmGpjrj26HMAkufYZwuZI8sVYB1mRwEdqugSR3kgDnPX+3l0jO86gwtFKsPvsEpsS4Dn/1EbhguzUxMU8Q=="
+ "resolved": "2.0.9",
+ "contentHash": "KgIwYhPhGkBTm+wwVAmWonkKPw4xYVnutzzlIeqOLcX1fti+8d+MEGTvbern1smf3S/UpjFjihkf6XRziTddzQ=="
},
"Dapper": {
"type": "Transitive",
@@ -746,8 +746,8 @@
},
"Watson.Core": {
"type": "Transitive",
- "resolved": "6.3.5",
- "contentHash": "Y5YxKOCSLe2KDmfwvI/J0qApgmmZR77LwyoufRVfKH7GLdHiE7fY0IfoNxWTG7nNv8knBfgwyOxdehRm+4HaCg==",
+ "resolved": "6.3.12",
+ "contentHash": "lCWv+7rz++z/1ceu+aBdJYw+nO7u/dgXxVYrmdUO/3ylFeEbbPQP19MYjOJbhSQY4+bmQRex79YJ1IneLZhprA==",
"dependencies": {
"IpMatcher": "1.0.5",
"RegexMatcher": "1.0.9",
diff --git a/PluralKit.Core/Dispatch/DispatchService.cs b/PluralKit.Core/Dispatch/DispatchService.cs
index 832e63d3..0622ee64 100644
--- a/PluralKit.Core/Dispatch/DispatchService.cs
+++ b/PluralKit.Core/Dispatch/DispatchService.cs
@@ -97,7 +97,7 @@ public class DispatchService
var repo = _provider.Resolve();
var system = await repo.GetSystem(systemId);
- if (system.WebhookUrl == null)
+ if (system == null || system.WebhookUrl == null)
return;
data.SigningToken = system.WebhookToken;
diff --git a/PluralKit.Core/PluralKit.Core.csproj b/PluralKit.Core/PluralKit.Core.csproj
index a13bcefb..0e87ecd5 100644
--- a/PluralKit.Core/PluralKit.Core.csproj
+++ b/PluralKit.Core/PluralKit.Core.csproj
@@ -60,7 +60,7 @@
-
+
diff --git a/PluralKit.Tests/packages.lock.json b/PluralKit.Tests/packages.lock.json
index ce0dbc15..bffeb33d 100644
--- a/PluralKit.Tests/packages.lock.json
+++ b/PluralKit.Tests/packages.lock.json
@@ -130,8 +130,8 @@
},
"CavemanTcp": {
"type": "Transitive",
- "resolved": "2.0.5",
- "contentHash": "90wywmGpjrj26HMAkufYZwuZI8sVYB1mRwEdqugSR3kgDnPX+3l0jO86gwtFKsPvsEpsS4Dn/1EbhguzUxMU8Q=="
+ "resolved": "2.0.9",
+ "contentHash": "KgIwYhPhGkBTm+wwVAmWonkKPw4xYVnutzzlIeqOLcX1fti+8d+MEGTvbern1smf3S/UpjFjihkf6XRziTddzQ=="
},
"Dapper": {
"type": "Transitive",
@@ -912,8 +912,8 @@
},
"Watson.Core": {
"type": "Transitive",
- "resolved": "6.3.5",
- "contentHash": "Y5YxKOCSLe2KDmfwvI/J0qApgmmZR77LwyoufRVfKH7GLdHiE7fY0IfoNxWTG7nNv8knBfgwyOxdehRm+4HaCg==",
+ "resolved": "6.3.12",
+ "contentHash": "lCWv+7rz++z/1ceu+aBdJYw+nO7u/dgXxVYrmdUO/3ylFeEbbPQP19MYjOJbhSQY4+bmQRex79YJ1IneLZhprA==",
"dependencies": {
"IpMatcher": "1.0.5",
"RegexMatcher": "1.0.9",
@@ -924,11 +924,11 @@
},
"Watson.Lite": {
"type": "Transitive",
- "resolved": "6.3.5",
- "contentHash": "YF8+se3IVenn8YlyNeb4wSJK6QMnVD0QHIOEiZ22wS4K2wkwoSDzWS+ZAjk1MaPeB+XO5gRoENUN//pOc+wI2g==",
+ "resolved": "6.3.12",
+ "contentHash": "L/TfJadyOwK9bhhvOnEKXLeyDaTAn8v6hnYPVPIwQ7JlnUXDbDqsUa3qHFdFIHiuK8vMZOnDL7+k/mY10yxdYw==",
"dependencies": {
- "CavemanTcp": "2.0.5",
- "Watson.Core": "6.3.5"
+ "CavemanTcp": "2.0.9",
+ "Watson.Core": "6.3.12"
}
},
"xunit.abstractions": {
@@ -1001,7 +1001,7 @@
"Myriad": "[1.0.0, )",
"PluralKit.Core": "[1.0.0, )",
"Sentry": "[4.13.0, )",
- "Watson.Lite": "[6.3.5, )"
+ "Watson.Lite": "[6.3.12, )"
}
},
"pluralkit.core": {
diff --git a/PluralKit.sln b/PluralKit.sln
index b1a66c75..26579278 100644
--- a/PluralKit.sln
+++ b/PluralKit.sln
@@ -1,6 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-#
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36408.4 d17.14
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Bot", "PluralKit.Bot\PluralKit.Bot.csproj", "{F2C5562D-FD96-4C11-B54E-93737D127959}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Core", "PluralKit.Core\PluralKit.Core.csproj", "{5DBE037D-179D-4C05-8A28-35E37129C961}"
@@ -11,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Tests", "PluralKi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Myriad", "Myriad\Myriad.csproj", "{ACB9BF37-F29C-4068-A7D1-2EFF2C308C4B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog", "Serilog\src\Serilog\Serilog.csproj", "{4CF74FA7-1417-27D7-76DE-2467733F7E8B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -37,9 +41,12 @@ Global
{ACB9BF37-F29C-4068-A7D1-2EFF2C308C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACB9BF37-F29C-4068-A7D1-2EFF2C308C4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ACB9BF37-F29C-4068-A7D1-2EFF2C308C4B}.Release|Any CPU.Build.0 = Release|Any CPU
- {374A8EB3-655D-4230-982B-459AE3553991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {374A8EB3-655D-4230-982B-459AE3553991}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {374A8EB3-655D-4230-982B-459AE3553991}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {374A8EB3-655D-4230-982B-459AE3553991}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4CF74FA7-1417-27D7-76DE-2467733F7E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4CF74FA7-1417-27D7-76DE-2467733F7E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4CF74FA7-1417-27D7-76DE-2467733F7E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4CF74FA7-1417-27D7-76DE-2467733F7E8B}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
diff --git a/README.md b/README.md
index 26b96c6d..bc560bcd 100644
--- a/README.md
+++ b/README.md
@@ -36,4 +36,6 @@ See [the dev-docs/ directory](./dev-docs/README.md)
See [the docs/ directory](./docs/README.md)
# License
-This project is under the GNU Affero General Public License, Version 3. It is available at the following link: https://www.gnu.org/licenses/agpl-3.0.en.html
+With the exception of the Myriad library, this project is under the GNU Affero General Public License, Version 3. The license text can be found in the COPYING file.
+
+Licensing information for the Myriad library can be found in the library's README.md file.
diff --git a/ci/Dockerfile.rust b/ci/Dockerfile.rust
index e320fb00..063cb6ea 100644
--- a/ci/Dockerfile.rust
+++ b/ci/Dockerfile.rust
@@ -4,7 +4,7 @@ WORKDIR /build
RUN apk add rustup build-base
# todo: arm64 target
-RUN rustup-init --default-host x86_64-unknown-linux-musl --default-toolchain nightly-2024-08-20 --profile default -y
+RUN rustup-init --default-host x86_64-unknown-linux-musl --default-toolchain nightly-2025-08-22 --profile default -y
ENV PATH=/root/.cargo/bin:$PATH
ENV RUSTFLAGS='-C link-arg=-s'
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
index 9413d62c..b19bfe74 100644
--- a/crates/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "api"
version = "0.1.0"
-edition = "2021"
+edition = "2024"
[dependencies]
pluralkit_models = { path = "../models" }
diff --git a/crates/api/src/endpoints/private.rs b/crates/api/src/endpoints/private.rs
index 067fef57..2116e3c5 100644
--- a/crates/api/src/endpoints/private.rs
+++ b/crates/api/src/endpoints/private.rs
@@ -4,9 +4,10 @@ use fred::interfaces::*;
use libpk::state::ShardState;
use pk_macros::api_endpoint;
use serde::Deserialize;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
use std::collections::HashMap;
+#[allow(dead_code)]
#[derive(Deserialize)]
#[serde(rename_all = "PascalCase")]
struct ClusterStats {
diff --git a/crates/api/src/endpoints/system.rs b/crates/api/src/endpoints/system.rs
index 7b919df5..58c9a154 100644
--- a/crates/api/src/endpoints/system.rs
+++ b/crates/api/src/endpoints/system.rs
@@ -1,11 +1,11 @@
-use axum::{extract::State, response::IntoResponse, Extension, Json};
+use axum::{Extension, Json, extract::State, response::IntoResponse};
use pk_macros::api_endpoint;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
use sqlx::Postgres;
use pluralkit_models::{PKSystem, PKSystemConfig, PrivacyLevel};
-use crate::{auth::AuthState, error::fail, ApiContext};
+use crate::{ApiContext, auth::AuthState, error::fail};
#[api_endpoint]
pub async fn get_system_settings(
diff --git a/crates/api/src/main.rs b/crates/api/src/main.rs
index 07e47f89..f22450ce 100644
--- a/crates/api/src/main.rs
+++ b/crates/api/src/main.rs
@@ -1,16 +1,14 @@
-#![feature(let_chains)]
-
use auth::{AuthState, INTERNAL_APPID_HEADER, INTERNAL_SYSTEMID_HEADER};
use axum::{
+ Extension, Router,
body::Body,
extract::{Request as ExtractRequest, State},
http::Uri,
response::{IntoResponse, Response},
routing::{delete, get, patch, post},
- Extension, Router,
};
use hyper_util::{
- client::legacy::{connect::HttpConnector, Client},
+ client::legacy::{Client, connect::HttpConnector},
rt::TokioExecutor,
};
use tracing::info;
diff --git a/crates/api/src/middleware/auth.rs b/crates/api/src/middleware/auth.rs
index 0992757f..1d536e97 100644
--- a/crates/api/src/middleware/auth.rs
+++ b/crates/api/src/middleware/auth.rs
@@ -10,7 +10,7 @@ use subtle::ConstantTimeEq;
use tracing::error;
use crate::auth::AuthState;
-use crate::{util::json_err, ApiContext};
+use crate::{ApiContext, util::json_err};
pub async fn auth(State(ctx): State, mut req: Request, next: Next) -> Response {
let mut authed_system_id: Option = None;
diff --git a/crates/api/src/middleware/logger.rs b/crates/api/src/middleware/logger.rs
index 38e45e2c..512234bb 100644
--- a/crates/api/src/middleware/logger.rs
+++ b/crates/api/src/middleware/logger.rs
@@ -2,7 +2,7 @@ use std::time::Instant;
use axum::{extract::MatchedPath, extract::Request, middleware::Next, response::Response};
use metrics::{counter, histogram};
-use tracing::{info, span, warn, Instrument, Level};
+use tracing::{Instrument, Level, info, span, warn};
use crate::{auth::AuthState, util::header_or_unknown};
diff --git a/crates/api/src/middleware/params.rs b/crates/api/src/middleware/params.rs
index 06a76f64..1b52bfbf 100644
--- a/crates/api/src/middleware/params.rs
+++ b/crates/api/src/middleware/params.rs
@@ -6,11 +6,11 @@ use axum::{
routing::url_params::UrlParams,
};
-use sqlx::{types::Uuid, Postgres};
+use sqlx::{Postgres, types::Uuid};
use tracing::error;
use crate::auth::AuthState;
-use crate::{util::json_err, ApiContext};
+use crate::{ApiContext, util::json_err};
use pluralkit_models::PKSystem;
// move this somewhere else
@@ -31,7 +31,7 @@ pub async fn params(State(ctx): State, mut req: Request, next: Next)
StatusCode::BAD_REQUEST,
r#"{"message":"400: Bad Request","code": 0}"#.to_string(),
)
- .into()
+ .into();
}
};
diff --git a/crates/api/src/util.rs b/crates/api/src/util.rs
index 35a5bf0d..e9723976 100644
--- a/crates/api/src/util.rs
+++ b/crates/api/src/util.rs
@@ -3,7 +3,7 @@ use axum::{
http::{HeaderValue, StatusCode},
response::IntoResponse,
};
-use serde_json::{json, to_string, Value};
+use serde_json::{Value, json, to_string};
use tracing::error;
pub fn header_or_unknown(header: Option<&HeaderValue>) -> &str {
diff --git a/crates/avatars/Cargo.toml b/crates/avatars/Cargo.toml
index 725e5396..ee1aa91e 100644
--- a/crates/avatars/Cargo.toml
+++ b/crates/avatars/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "avatars"
version = "0.1.0"
-edition = "2021"
+edition = "2024"
[[bin]]
name = "avatar_cleanup"
diff --git a/crates/avatars/src/main.rs b/crates/avatars/src/main.rs
index c8399086..df80ac82 100644
--- a/crates/avatars/src/main.rs
+++ b/crates/avatars/src/main.rs
@@ -8,10 +8,10 @@ use anyhow::Context;
use axum::extract::State;
use axum::routing::get;
use axum::{
+ Json, Router,
http::StatusCode,
response::{IntoResponse, Response},
routing::post,
- Json, Router,
};
use libpk::_config::AvatarsConfig;
use libpk::db::repository::avatars as db;
@@ -153,7 +153,7 @@ async fn verify(
)
.await?;
- let encoded = process::process_async(result.data, req.kind).await?;
+ process::process_async(result.data, req.kind).await?;
Ok(())
}
diff --git a/crates/avatars/src/process.rs b/crates/avatars/src/process.rs
index 024f40de..0c9ba8c1 100644
--- a/crates/avatars/src/process.rs
+++ b/crates/avatars/src/process.rs
@@ -4,7 +4,7 @@ use std::io::Cursor;
use std::time::Instant;
use tracing::{debug, error, info, instrument};
-use crate::{hash::Hash, ImageKind, PKAvatarError};
+use crate::{ImageKind, PKAvatarError, hash::Hash};
const MAX_DIMENSION: u32 = 4000;
diff --git a/crates/avatars/src/pull.rs b/crates/avatars/src/pull.rs
index fdf5f073..44c4a952 100644
--- a/crates/avatars/src/pull.rs
+++ b/crates/avatars/src/pull.rs
@@ -62,7 +62,7 @@ pub async fn pull(
let size = match response.content_length() {
None => return Err(PKAvatarError::MissingHeader("Content-Length")),
Some(size) if size > MAX_SIZE => {
- return Err(PKAvatarError::ImageFileSizeTooLarge(size, MAX_SIZE))
+ return Err(PKAvatarError::ImageFileSizeTooLarge(size, MAX_SIZE));
}
Some(size) => size,
};
@@ -162,7 +162,7 @@ pub fn parse_url(url: &str) -> anyhow::Result {
attachment_id: 0,
filename: "".to_string(),
full_url: url.to_string(),
- })
+ });
}
_ => anyhow::bail!("not a discord cdn url"),
}
diff --git a/crates/dispatch/Cargo.toml b/crates/dispatch/Cargo.toml
index c76856d1..f48acf8c 100644
--- a/crates/dispatch/Cargo.toml
+++ b/crates/dispatch/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "dispatch"
version = "0.1.0"
-edition = "2021"
+edition = "2024"
[dependencies]
anyhow = { workspace = true }
diff --git a/crates/dispatch/src/logger.rs b/crates/dispatch/src/logger.rs
index aa65bc67..ec2576b6 100644
--- a/crates/dispatch/src/logger.rs
+++ b/crates/dispatch/src/logger.rs
@@ -1,7 +1,7 @@
use std::time::Instant;
use axum::{extract::MatchedPath, extract::Request, middleware::Next, response::Response};
-use tracing::{info, span, warn, Instrument, Level};
+use tracing::{Instrument, Level, info, span, warn};
// log any requests that take longer than 2 seconds
// todo: change as necessary
diff --git a/crates/dispatch/src/main.rs b/crates/dispatch/src/main.rs
index 6570cf19..3a3403bd 100644
--- a/crates/dispatch/src/main.rs
+++ b/crates/dispatch/src/main.rs
@@ -5,17 +5,16 @@ use hickory_client::{
rr::{DNSClass, Name, RData, RecordType},
udp::UdpClientStream,
};
-use reqwest::{redirect::Policy, StatusCode};
+use reqwest::{StatusCode, redirect::Policy};
use std::{
net::{Ipv4Addr, SocketAddr, SocketAddrV4},
sync::Arc,
time::Duration,
};
use tokio::{net::UdpSocket, sync::RwLock};
-use tracing::{debug, error, info};
-use tracing_subscriber::EnvFilter;
+use tracing::{debug, error};
-use axum::{extract::State, http::Uri, routing::post, Json, Router};
+use axum::{Json, Router, extract::State, http::Uri, routing::post};
mod logger;
@@ -128,7 +127,7 @@ async fn dispatch(
match res {
Ok(res) if res.status() != 200 => {
- return DispatchResponse::InvalidResponseCode(res.status()).to_string()
+ return DispatchResponse::InvalidResponseCode(res.status()).to_string();
}
Err(error) => {
error!(?error, url = req.url.clone(), "failed to fetch");
diff --git a/crates/gateway/Cargo.toml b/crates/gateway/Cargo.toml
index c707b29b..0222ab18 100644
--- a/crates/gateway/Cargo.toml
+++ b/crates/gateway/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "gateway"
version = "0.1.0"
-edition = "2021"
+edition = "2024"
[dependencies]
anyhow = { workspace = true }
diff --git a/crates/gateway/src/api.rs b/crates/gateway/src/api.rs
index f8c3f556..aa2d069e 100644
--- a/crates/gateway/src/api.rs
+++ b/crates/gateway/src/api.rs
@@ -1,18 +1,18 @@
use axum::{
+ Router,
extract::{ConnectInfo, Path, State},
http::StatusCode,
response::{IntoResponse, Response},
routing::{delete, get, post},
- Router,
};
use libpk::runtime_config::RuntimeConfig;
use serde_json::{json, to_string};
use tracing::{error, info};
-use twilight_model::id::{marker::ChannelMarker, Id};
+use twilight_model::id::{Id, marker::ChannelMarker};
use crate::{
discord::{
- cache::{dm_channel, DiscordCache, DM_PERMISSIONS},
+ cache::{DM_PERMISSIONS, DiscordCache, dm_channel},
gateway::cluster_config,
shard_state::ShardStateManager,
},
diff --git a/crates/gateway/src/discord/cache.rs b/crates/gateway/src/discord/cache.rs
index e0a4aacf..cc538d08 100644
--- a/crates/gateway/src/discord/cache.rs
+++ b/crates/gateway/src/discord/cache.rs
@@ -4,18 +4,18 @@ use serde::Serialize;
use std::{collections::HashMap, sync::Arc};
use tokio::sync::RwLock;
use twilight_cache_inmemory::{
+ InMemoryCache, ResourceType,
model::CachedMember,
permission::{MemberRoles, RootError},
traits::CacheableChannel,
- InMemoryCache, ResourceType,
};
use twilight_gateway::Event;
use twilight_model::{
channel::{Channel, ChannelType},
guild::{Guild, Member, Permissions},
id::{
- marker::{ChannelMarker, GuildMarker, MessageMarker, UserMarker},
Id,
+ marker::{ChannelMarker, GuildMarker, MessageMarker, UserMarker},
},
};
use twilight_util::permission_calculator::PermissionCalculator;
diff --git a/crates/gateway/src/discord/gateway.rs b/crates/gateway/src/discord/gateway.rs
index 92acdeaa..215fb4cf 100644
--- a/crates/gateway/src/discord/gateway.rs
+++ b/crates/gateway/src/discord/gateway.rs
@@ -6,17 +6,17 @@ use std::sync::Arc;
use tokio::sync::mpsc::Sender;
use tracing::{error, info, warn};
use twilight_gateway::{
- create_iterator, ConfigBuilder, Event, EventTypeFlags, Message, Shard, ShardId,
+ CloseFrame, ConfigBuilder, Event, EventTypeFlags, Message, Shard, ShardId, create_iterator,
};
use twilight_model::gateway::{
+ Intents,
payload::outgoing::update_presence::UpdatePresencePayload,
presence::{Activity, ActivityType, Status},
- Intents,
};
use crate::{
- discord::identify_queue::{self, RedisQueue},
RUNTIME_CONFIG_KEY_EVENT_TARGET,
+ discord::identify_queue::{self, RedisQueue},
};
use super::cache::DiscordCache;
@@ -116,7 +116,11 @@ pub async fn runner(
let raw_event = match item {
Ok(evt) => match evt {
Message::Close(frame) => {
+ let mut state_event = ShardStateEvent::Closed;
let close_code = if let Some(close) = frame {
+ if close == CloseFrame::RESUME {
+ state_event = ShardStateEvent::Reconnect;
+ }
close.code.to_string()
} else {
"unknown".to_string()
@@ -131,9 +135,7 @@ pub async fn runner(
)
.increment(1);
- if let Err(error) =
- tx_state.try_send((shard.id(), ShardStateEvent::Closed, None, None))
- {
+ if let Err(error) = tx_state.try_send((shard.id(), state_event, None, None)) {
error!("failed to update shard state for socket closure: {error}");
}
@@ -227,7 +229,9 @@ pub async fn runner(
}
if runtime_config.exists(RUNTIME_CONFIG_KEY_EVENT_TARGET).await {
- tx.send((shard.id(), event, raw_event)).await.unwrap();
+ if let Err(error) = tx.try_send((shard.id(), event, raw_event)) {
+ tracing::error!(?error, "error sending shard event");
+ }
}
}
}
diff --git a/crates/gateway/src/discord/shard_state.rs b/crates/gateway/src/discord/shard_state.rs
index c85e02c8..847b14c6 100644
--- a/crates/gateway/src/discord/shard_state.rs
+++ b/crates/gateway/src/discord/shard_state.rs
@@ -86,7 +86,7 @@ impl ShardStateManager {
Ok(())
}
- pub async fn socket_closed(&self, shard_id: u32) -> anyhow::Result<()> {
+ pub async fn socket_closed(&self, shard_id: u32, reconnect: bool) -> anyhow::Result<()> {
gauge!("pluralkit_gateway_shard_up").decrement(1);
let mut info = self
@@ -97,6 +97,9 @@ impl ShardStateManager {
info.shard_id = shard_id as i32;
info.cluster_id = Some(cluster_config().node_id as i32);
info.up = false;
+ if reconnect {
+ info.last_reconnect = chrono::offset::Utc::now().timestamp() as i32
+ }
info.disconnection_count += 1;
self.save_shard(shard_id, info).await?;
diff --git a/crates/gateway/src/event_awaiter.rs b/crates/gateway/src/event_awaiter.rs
index 765ad8e5..97a6955e 100644
--- a/crates/gateway/src/event_awaiter.rs
+++ b/crates/gateway/src/event_awaiter.rs
@@ -3,7 +3,7 @@
// - interaction: (custom_id where not_includes "help-menu")
use std::{
- collections::{hash_map::Entry, HashMap},
+ collections::{HashMap, hash_map::Entry},
net::{IpAddr, SocketAddr},
time::Duration,
};
@@ -15,8 +15,8 @@ use twilight_gateway::Event;
use twilight_model::{
application::interaction::InteractionData,
id::{
- marker::{ChannelMarker, MessageMarker, UserMarker},
Id,
+ marker::{ChannelMarker, MessageMarker, UserMarker},
},
};
@@ -103,7 +103,13 @@ impl EventAwaiter {
}
}
}
- info!("ran event_awaiter cleanup loop, took {}us, {} reactions, {} messages, {} interactions", Instant::now().duration_since(now).as_micros(), counts.0, counts.1, counts.2);
+ info!(
+ "ran event_awaiter cleanup loop, took {}us, {} reactions, {} messages, {} interactions",
+ Instant::now().duration_since(now).as_micros(),
+ counts.0,
+ counts.1,
+ counts.2
+ );
}
}
diff --git a/crates/gateway/src/logger.rs b/crates/gateway/src/logger.rs
index 459aef31..0a081432 100644
--- a/crates/gateway/src/logger.rs
+++ b/crates/gateway/src/logger.rs
@@ -4,7 +4,7 @@ use axum::{
extract::MatchedPath, extract::Request, http::StatusCode, middleware::Next, response::Response,
};
use metrics::{counter, histogram};
-use tracing::{info, span, warn, Instrument, Level};
+use tracing::{Instrument, Level, info, span, warn};
// log any requests that take longer than 2 seconds
// todo: change as necessary
diff --git a/crates/gateway/src/main.rs b/crates/gateway/src/main.rs
index e61c3445..3ac7be21 100644
--- a/crates/gateway/src/main.rs
+++ b/crates/gateway/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(let_chains)]
#![feature(if_let_guard)]
#![feature(duration_constructors)]
@@ -10,7 +9,7 @@ use libpk::{runtime_config::RuntimeConfig, state::ShardStateEvent};
use reqwest::{ClientBuilder, StatusCode};
use std::{sync::Arc, time::Duration, vec::Vec};
use tokio::{
- signal::unix::{signal, SignalKind},
+ signal::unix::{SignalKind, signal},
sync::mpsc::channel,
task::JoinSet,
};
@@ -109,8 +108,16 @@ async fn main() -> anyhow::Result<()> {
};
}
ShardStateEvent::Closed => {
- if let Err(error) = shard_state.socket_closed(shard_id.number()).await {
- error!("failed to update shard state for heartbeat: {error}")
+ if let Err(error) =
+ shard_state.socket_closed(shard_id.number(), false).await
+ {
+ error!("failed to update shard state for closed: {error}")
+ };
+ }
+ ShardStateEvent::Reconnect => {
+ if let Err(error) = shard_state.socket_closed(shard_id.number(), true).await
+ {
+ error!("failed to update shard state for reconnect: {error}")
};
}
ShardStateEvent::Other => {
@@ -121,7 +128,7 @@ async fn main() -> anyhow::Result<()> {
)
.await
{
- error!("failed to update shard state for heartbeat: {error}")
+ error!("failed to update shard state for other evt: {error}")
};
}
}
diff --git a/crates/gdpr_worker/Cargo.toml b/crates/gdpr_worker/Cargo.toml
index a30751f9..b57ccddf 100644
--- a/crates/gdpr_worker/Cargo.toml
+++ b/crates/gdpr_worker/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "gdpr_worker"
version = "0.1.0"
-edition = "2021"
+edition = "2024"
[dependencies]
libpk = { path = "../libpk" }
diff --git a/crates/gdpr_worker/src/main.rs b/crates/gdpr_worker/src/main.rs
index b40557c0..bcedbedd 100644
--- a/crates/gdpr_worker/src/main.rs
+++ b/crates/gdpr_worker/src/main.rs
@@ -1,12 +1,10 @@
-#![feature(let_chains)]
-
use sqlx::prelude::FromRow;
use std::{sync::Arc, time::Duration};
use tracing::{error, info, warn};
use twilight_http::api_error::{ApiError, GeneralApiError};
use twilight_model::id::{
- marker::{ChannelMarker, MessageMarker},
Id,
+ marker::{ChannelMarker, MessageMarker},
};
// create table messages_gdpr_jobs (mid bigint not null references messages(mid) on delete cascade, channel bigint not null);
diff --git a/crates/libpk/Cargo.toml b/crates/libpk/Cargo.toml
index 30d77ae0..1f0c3c42 100644
--- a/crates/libpk/Cargo.toml
+++ b/crates/libpk/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "libpk"
version = "0.1.0"
-edition = "2021"
+edition = "2024"
[dependencies]
anyhow = { workspace = true }
diff --git a/crates/libpk/src/_config.rs b/crates/libpk/src/_config.rs
index 7f992d95..f21d9adf 100644
--- a/crates/libpk/src/_config.rs
+++ b/crates/libpk/src/_config.rs
@@ -3,7 +3,7 @@ use lazy_static::lazy_static;
use serde::Deserialize;
use std::sync::Arc;
-use twilight_model::id::{marker::UserMarker, Id};
+use twilight_model::id::{Id, marker::UserMarker};
#[derive(Clone, Deserialize, Debug)]
pub struct ClusterSettings {
@@ -151,11 +151,11 @@ lazy_static! {
// hacks
if let Ok(var) = std::env::var("NOMAD_ALLOC_INDEX")
&& std::env::var("pluralkit__discord__cluster__total_nodes").is_ok() {
- std::env::set_var("pluralkit__discord__cluster__node_id", var);
+ unsafe { std::env::set_var("pluralkit__discord__cluster__node_id", var); }
}
if let Ok(var) = std::env::var("STATEFULSET_NAME_FOR_INDEX")
&& std::env::var("pluralkit__discord__cluster__total_nodes").is_ok() {
- std::env::set_var("pluralkit__discord__cluster__node_id", var.split("-").last().unwrap());
+ unsafe { std::env::set_var("pluralkit__discord__cluster__node_id", var.split("-").last().unwrap()); }
}
Arc::new(Config::builder()
diff --git a/crates/libpk/src/db/repository/avatars.rs b/crates/libpk/src/db/repository/avatars.rs
index 1ff10cc7..9a667c11 100644
--- a/crates/libpk/src/db/repository/avatars.rs
+++ b/crates/libpk/src/db/repository/avatars.rs
@@ -52,7 +52,7 @@ pub async fn remove_deletion_queue(pool: &PgPool, attachment_id: u64) -> anyhow:
pub async fn pop_queue(
pool: &PgPool,
-) -> anyhow::Result