From 7fe334c0f881b27db617aedaf233f6ae58d72278 Mon Sep 17 00:00:00 2001 From: sefidel Date: Tue, 20 Feb 2024 05:48:01 +0900 Subject: project: Initial commit --- LICENSE | 661 +++++++ README.md | 4 + default.nix | 10 + flake.lock | 80 + flake.nix | 39 + hydra/default.nix | 1 + hydra/jobsets.nix | 34 + hydra/spec.json | 24 + pkgs/akkoma/0001-Migrate-to-phoenix-1.7.patch | 2390 ++++++++++++++++++++++++ pkgs/akkoma/0002-Bump-lockfile.patch | 203 ++ pkgs/akkoma/0003-Fix-OAuth-consumer-mode.patch | 248 +++ pkgs/akkoma/default.nix | 197 ++ pkgs/akkoma/mix.nix | 1611 ++++++++++++++++ pkgs/default.nix | 5 + 14 files changed, 5507 insertions(+) create mode 100644 LICENSE create mode 100644 README.md create mode 100644 default.nix create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 hydra/default.nix create mode 100644 hydra/jobsets.nix create mode 100644 hydra/spec.json create mode 100644 pkgs/akkoma/0001-Migrate-to-phoenix-1.7.patch create mode 100644 pkgs/akkoma/0002-Bump-lockfile.patch create mode 100644 pkgs/akkoma/0003-Fix-OAuth-consumer-mode.patch create mode 100644 pkgs/akkoma/default.nix create mode 100644 pkgs/akkoma/mix.nix create mode 100644 pkgs/default.nix diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + 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 + + 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. + + + Copyright (C) + + 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 . + +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 +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..30a5670 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +nixpkgs-exotic +-------------- + +Custom shared packages that doesn't fit in the upstream nixpkgs diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..f620865 --- /dev/null +++ b/default.nix @@ -0,0 +1,10 @@ +(import + ( + let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in + fetchTarball { + url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { src = ./.; } +).defaultNix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..4d1115d --- /dev/null +++ b/flake.lock @@ -0,0 +1,80 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1708373374, + "narHash": "sha256-yEyDvDj/YQc4GOZa/cXx6YUzexD8uv1rUvD6SJVr6UI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "93e1c2d08467d1117ebac45689469613a9fe8453", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..f025190 --- /dev/null +++ b/flake.nix @@ -0,0 +1,39 @@ +{ + description = "Custom shared packages that doesn't fit in the upstream nixpkgs"; + + inputs.nixpkgs.url = "github:NixOS/nixpkgs"; + inputs.flake-parts.url = "github:hercules-ci/flake-parts"; + inputs.flake-compat.url = "github:edolstra/flake-compat"; + inputs.flake-compat.flake = false; + + outputs = { self, flake-parts, ... } @ inputs: + flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + + perSystem = { lib, system, ... }: + let + pkgs = import inputs.nixpkgs { inherit system; }; + + pkgsFor = pkgs: overlays: + import pkgs { + inherit system overlays; + }; + exoticPkgs = (pkgsFor inputs.nixpkgs [ self.overlays.default ]).exoticPackages; + in + { + _module.args.pkgs = pkgs; + + packages = exoticPkgs; + }; + + flake = { + overlays.default = final: prev: { + exoticPackages = import ./pkgs { pkgs = prev; }; + }; + + hydraJobs = { + inherit (self) packages; + }; + }; + }; +} diff --git a/hydra/default.nix b/hydra/default.nix new file mode 100644 index 0000000..827748a --- /dev/null +++ b/hydra/default.nix @@ -0,0 +1 @@ +{ nixpkgs-exotic }: (import nixpkgs-exotic).hydraJobs diff --git a/hydra/jobsets.nix b/hydra/jobsets.nix new file mode 100644 index 0000000..f426873 --- /dev/null +++ b/hydra/jobsets.nix @@ -0,0 +1,34 @@ +{ nixpkgs, ... }: + +let + pkgs = import nixpkgs {}; + + jobsets = { + main = { + enabled = 1; + hidden = false; + description = "main branch"; + nixexprinput = "nixpkgs-exotic"; + nixexprpath = "hydra/default.nix"; + checkinterval = 300; + schedulingshares = 100; + enableemail = false; + emailoverride = ""; + keepnr = 1; + inputs = { + nixpkgs-exotic = { + type = "git"; + value = "https://git.exotic.sh/nixpkgs-exotic main"; + emailresponsible = false; + }; + nixpkgs = { + type = "git"; + value = "https://github.com/NixOS/nixpkgs.git"; + emailresponsible = false; + }; + }; + }; + }; +in { + jobsets = pkgs.writeText "jobsets.json" (builtins.toJSON jobsets); +} diff --git a/hydra/spec.json b/hydra/spec.json new file mode 100644 index 0000000..cf17ff4 --- /dev/null +++ b/hydra/spec.json @@ -0,0 +1,24 @@ +{ + "enabled": 1, + "hidden": false, + "description": "Jobsets", + "nixexprinput": "nixpkgs-exotic", + "nixexprpath": "hydra/jobsets.nix", + "checkinterval": 300, + "schedulingshares": 100, + "enableemail": false, + "emailoverride": "", + "keepnr": 1, + "inputs": { + "nixpkgs-exotic": { + "type": "git", + "value": "https://git.exotic.sh/nixpkgs-exotic main", + "emailresponsible": false + }, + "nixpkgs": { + "type": "git", + "value": "https://github.com/NixOS/nixpkgs.git", + "emailresponsible": false + } + } +} diff --git a/pkgs/akkoma/0001-Migrate-to-phoenix-1.7.patch b/pkgs/akkoma/0001-Migrate-to-phoenix-1.7.patch new file mode 100644 index 0000000..d4cc790 --- /dev/null +++ b/pkgs/akkoma/0001-Migrate-to-phoenix-1.7.patch @@ -0,0 +1,2390 @@ +From ed0cdb8b2be55b9f33f93b3ef2c7e2fa46ba4eb3 Mon Sep 17 00:00:00 2001 +From: sefidel +Date: Mon, 19 Feb 2024 21:06:43 +0900 +Subject: [PATCH 1/3] Migrate to phoenix 1.7 + +Original commit: https://akkoma.dev/AkkomaGang/akkoma/commit/6cb40bee26 +Backported to v3.10.4 + +Signed-off-by: sefidel +--- + .formatter.exs | 13 ++++- + .woodpecker/lint.yml | 55 ++++++++++++++++++ + .woodpecker/test.yml | 40 ++++--------- + CHANGELOG.md | 10 +++- + config/config.exs | 16 +---- + lib/mix/tasks/pleroma/emoji.ex | 2 + + lib/mix/tasks/pleroma/user.ex | 15 +---- + lib/phoenix/transports/web_socket/raw.ex | 1 - + lib/pleroma/emails/admin_email.ex | 9 ++- + lib/pleroma/emails/user_email.ex | 22 ++----- + lib/pleroma/user.ex | 9 +-- + lib/pleroma/web.ex | 29 ++++++++-- + lib/pleroma/web/activity_pub/activity_pub.ex | 5 ++ + lib/pleroma/web/activity_pub/builder.ex | 4 +- + lib/pleroma/web/activity_pub/utils.ex | 15 ++--- + .../web/activity_pub/views/user_view.ex | 14 ++--- + .../controllers/admin_api_controller.ex | 4 +- + lib/pleroma/web/endpoint.ex | 2 +- + lib/pleroma/web/feed/user_controller.ex | 2 +- + lib/pleroma/web/masto_fe_controller.ex | 4 +- + .../controllers/auth_controller.ex | 9 +-- + .../web/mastodon_api/views/status_view.ex | 2 +- + .../web/mastodon_api/views/tag_view.ex | 3 +- + lib/pleroma/web/metadata/providers/feed.ex | 6 +- + .../web/metadata/providers/twitter_card.ex | 4 +- + lib/pleroma/web/o_auth/o_auth_controller.ex | 4 +- + .../web/o_status/o_status_controller.ex | 3 +- + lib/pleroma/web/plugs/http_signature_plug.ex | 7 ++- + .../web/static_fe/static_fe_controller.ex | 11 ++-- + lib/pleroma/web/static_fe/static_fe_view.ex | 1 - + .../frontend_switcher/switch.html.eex | 2 +- + .../web/templates/feed/feed/tag.atom.eex | 4 +- + .../web/templates/feed/feed/tag.rss.eex | 2 +- + .../web/templates/feed/feed/user.atom.eex | 6 +- + .../web/templates/feed/feed/user.rss.eex | 6 +- + .../web/templates/masto_fe/fedibird.html.heex | 58 +++++++++++++++++++ + .../masto_fe/fedibird.index.html.eex | 35 ----------- + .../templates/masto_fe/glitchsoc.html.heex | 57 ++++++++++++++++++ + .../masto_fe/glitchsoc.index.html.eex | 35 ----------- + .../templates/o_auth/mfa/recovery.html.eex | 12 ++-- + .../web/templates/o_auth/mfa/totp.html.eex | 12 ++-- + .../templates/o_auth/o_auth/consumer.html.eex | 2 +- + .../templates/o_auth/o_auth/register.html.eex | 10 ++-- + .../web/templates/o_auth/o_auth/show.html.eex | 10 ++-- + .../static_fe/static_fe/profile.html.eex | 2 +- + .../twitter_api/password/reset.html.eex | 2 +- + .../twitter_api/remote_follow/follow.html.eex | 2 +- + .../remote_follow/follow_login.html.eex | 2 +- + .../remote_follow/follow_mfa.html.eex | 2 +- + .../twitter_api/util/status_interact.html.eex | 2 +- + .../twitter_api/util/subscribe.html.eex | 2 +- + .../controllers/remote_follow_controller.ex | 2 +- + lib/pleroma/web/views/embed_view.ex | 3 +- + lib/pleroma/web/views/masto_fe_view.ex | 2 +- + mix.exs | 7 ++- + mix.lock | 12 ++-- + test/pleroma/emails/admin_email_test.exs | 3 +- + test/pleroma/emails/user_email_test.exs | 10 +--- + test/pleroma/integration/federation_test.exs | 5 +- + test/pleroma/user_test.exs | 14 +---- + .../activity_pub_controller_test.exs | 10 ++-- + .../web/activity_pub/activity_pub_test.exs | 8 +++ + .../controllers/admin_api_controller_test.exs | 3 +- + .../controllers/report_controller_test.exs | 10 ++-- + .../controllers/user_controller_test.exs | 6 +- + test/pleroma/web/feed/tag_controller_test.exs | 8 +-- + .../pleroma/web/feed/user_controller_test.exs | 12 ++-- + .../mastodon_api/update_credentials_test.exs | 2 +- + .../mastodon_api/views/status_view_test.exs | 2 +- + .../metadata/providers/twitter_card_test.exs | 3 +- + .../web/mongoose_im_controller_test.exs | 16 ++--- + .../web/o_auth/o_auth_controller_test.exs | 12 ++-- + .../remote_follow_controller_test.exs | 42 ++++++-------- + test/pleroma/web/uploader_controller_test.exs | 4 +- + test/support/conn_case.ex | 2 +- + test/support/data_case.ex | 2 + + 76 files changed, 431 insertions(+), 355 deletions(-) + create mode 100644 .woodpecker/lint.yml + create mode 100644 lib/pleroma/web/templates/masto_fe/fedibird.html.heex + delete mode 100644 lib/pleroma/web/templates/masto_fe/fedibird.index.html.eex + create mode 100644 lib/pleroma/web/templates/masto_fe/glitchsoc.html.heex + delete mode 100644 lib/pleroma/web/templates/masto_fe/glitchsoc.index.html.eex + +diff --git a/.formatter.exs b/.formatter.exs +index abd91dbbe..a96afe758 100644 +--- a/.formatter.exs ++++ b/.formatter.exs +@@ -1,3 +1,14 @@ + [ +- inputs: ["mix.exs", "{config,lib,test}/**/*.{ex,exs}", "priv/repo/migrations/*.exs", "priv/repo/optional_migrations/**/*.exs", "priv/scrubbers/*.ex"] ++ import_deps: [:ecto, :ecto_sql, :phoenix], ++ subdirectories: ["priv/*/migrations"], ++ plugins: [Phoenix.LiveView.HTMLFormatter], ++ inputs: [ ++ "mix.exs", ++ "*.{heex,ex,exs}", ++ "{config,lib,test}/**/*.{heex,ex,exs}", ++ "priv/*/seeds.exs", ++ "priv/repo/migrations/*.exs", ++ "priv/repo/optional_migrations/**/*.exs", ++ "priv/scrubbers/*.ex" ++ ] + ] +diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml +new file mode 100644 +index 000000000..8308e57d7 +--- /dev/null ++++ b/.woodpecker/lint.yml +@@ -0,0 +1,55 @@ ++platform: linux/amd64 ++ ++variables: ++ - &scw-secrets ++ - SCW_ACCESS_KEY ++ - SCW_SECRET_KEY ++ - SCW_DEFAULT_ORGANIZATION_ID ++ - &setup-hex "mix local.hex --force && mix local.rebar --force" ++ - &on-release ++ when: ++ event: ++ - push ++ - tag ++ branch: ++ - develop ++ - stable ++ - refs/tags/v* ++ - refs/tags/stable-* ++ - &on-stable ++ when: ++ event: ++ - push ++ - tag ++ branch: ++ - stable ++ - refs/tags/stable-* ++ - &on-point-release ++ when: ++ event: ++ - push ++ branch: ++ - develop ++ - stable ++ - &on-pr-open ++ when: ++ event: ++ - pull_request ++ ++ - &tag-build "export BUILD_TAG=$${CI_COMMIT_TAG:-\"$CI_COMMIT_BRANCH\"} && export PLEROMA_BUILD_BRANCH=$BUILD_TAG" ++ ++ - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)" ++ - &mix-clean "mix deps.clean --all && mix clean" ++ ++pipeline: ++ lint: ++ image: akkoma/ci-base:1.15-otp26 ++ <<: *on-pr-open ++ environment: ++ MIX_ENV: test ++ commands: ++ - mix local.hex --force ++ - mix local.rebar --force ++ - mix deps.get ++ - mix compile ++ - mix format --check-formatted +diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml +index be8ea0dfa..3a8a1652e 100644 +--- a/.woodpecker/test.yml ++++ b/.woodpecker/test.yml +@@ -1,5 +1,8 @@ + platform: linux/amd64 + ++depends_on: ++ - lint ++ + matrix: + ELIXIR_VERSION: + - 1.14 +@@ -69,15 +72,7 @@ services: + POSTGRES_PASSWORD: postgres + + pipeline: +- lint: +- <<: *on-pr-open +- image: akkoma/ci-base:1.15 +- commands: +- - mix local.hex --force +- - mix local.rebar --force +- - mix format --check-formatted +- +- build: ++ test: + image: akkoma/ci-base:${ELIXIR_VERSION}-otp${OTP_VERSION} + <<: *on-pr-open + environment: +@@ -91,24 +86,9 @@ pipeline: + - mix local.rebar --force + - mix deps.get + - mix compile +- +- test: +- image: akkoma/ci-base:${ELIXIR_VERSION}-otp${OTP_VERSION} +- <<: *on-pr-open +- environment: +- MIX_ENV: test +- POSTGRES_DB: pleroma_test_${ELIXIR_VERSION}_${OTP_VERSION} +- POSTGRES_USER: postgres +- POSTGRES_PASSWORD: postgres +- DB_HOST: postgres +- commands: +- - mix local.hex --force +- - mix local.rebar --force +- - mix deps.get +- - mix compile +- - mix ecto.drop -f -q +- - mix ecto.create +- - mix ecto.migrate +- - mkdir -p test/tmp +- - mix test --preload-modules --exclude erratic --exclude federated --exclude mocked +- - mix test --preload-modules --only mocked ++ - mix ecto.drop -f -q ++ - mix ecto.create ++ - mix ecto.migrate ++ - mkdir -p test/tmp ++ - mix test --preload-modules --exclude erratic --exclude federated --exclude mocked ++ - mix test --preload-modules --only mocked +diff --git a/CHANGELOG.md b/CHANGELOG.md +index 92b3d1a71..a6c356bab 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -6,8 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). + + ## Unreleased + ++## Added ++- Full compatibility with Erlang OTP26 ++- handling of GET /api/v1/preferences ++ ++## Changed ++- OTP builds are now built on erlang OTP26 ++- The base Phoenix framework is now updated to 1.7 ++ + ## Fixed +-- Issue where a bad inbox URL could break federation ++- Documentation issue in which a non-existing nginx file was referenced + + ## 2023.08 + +diff --git a/config/config.exs b/config/config.exs +index 3430ee4d7..0a3cbde3f 100644 +--- a/config/config.exs ++++ b/config/config.exs +@@ -110,17 +110,6 @@ + "xmpp" + ] + +-websocket_config = [ +- path: "/websocket", +- serializer: [ +- {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"}, +- {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"} +- ], +- timeout: 60_000, +- transport_log: false, +- compress: false +-] +- + # Configures the endpoint + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "localhost"], +@@ -130,10 +119,7 @@ + {:_, + [ + {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []}, +- {"/websocket", Phoenix.Endpoint.CowboyWebSocket, +- {Phoenix.Transports.WebSocket, +- {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}}, +- {:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}} ++ {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}} + ]} + ] + ], +diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex +index 5dedf276a..89df511a7 100644 +--- a/lib/mix/tasks/pleroma/emoji.ex ++++ b/lib/mix/tasks/pleroma/emoji.ex +@@ -235,6 +235,8 @@ def run(["gen-pack" | args]) do + + IO.puts("#{pack_file} has been created with the #{name} pack") + end ++ ++ Pleroma.Emoji.reload() + end + + def run(["reload"]) do +diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex +index 4ca1c28eb..1a8e866ef 100644 +--- a/lib/mix/tasks/pleroma/user.ex ++++ b/lib/mix/tasks/pleroma/user.ex +@@ -11,6 +11,7 @@ defmodule Mix.Tasks.Pleroma.User do + alias Pleroma.UserInviteToken + alias Pleroma.Web.ActivityPub.Builder + alias Pleroma.Web.ActivityPub.Pipeline ++ use Pleroma.Web, :verified_routes + + @shortdoc "Manages Pleroma users" + @moduledoc File.read!("docs/docs/administration/CLI_tasks/user.md") +@@ -113,11 +114,7 @@ def run(["reset_password", nickname]) do + {:ok, token} <- Pleroma.PasswordResetToken.create_token(user) do + shell_info("Generated password reset token for #{user.nickname}") + +- IO.puts( +- "URL: #{Pleroma.Web.Router.Helpers.reset_password_url(Pleroma.Web.Endpoint, +- :reset, +- token.token)}" +- ) ++ IO.puts("URL: #{~p[/api/v1/pleroma/password_reset/#{token.token}]}") + else + _ -> + shell_error("No local user #{nickname}") +@@ -303,13 +300,7 @@ def run(["invite" | rest]) do + {:ok, invite} <- UserInviteToken.create_invite(options) do + shell_info("Generated user invite token " <> String.replace(invite.invite_type, "_", " ")) + +- url = +- Pleroma.Web.Router.Helpers.redirect_url( +- Pleroma.Web.Endpoint, +- :registration_page, +- invite.token +- ) +- ++ url = url(~p[/registration/#{invite.token}]) + IO.puts(url) + else + error -> +diff --git a/lib/phoenix/transports/web_socket/raw.ex b/lib/phoenix/transports/web_socket/raw.ex +index 8ed64eb16..72def9dff 100644 +--- a/lib/phoenix/transports/web_socket/raw.ex ++++ b/lib/phoenix/transports/web_socket/raw.ex +@@ -26,7 +26,6 @@ def init(%Plug.Conn{method: "GET"} = conn, {endpoint, handler, transport}) do + conn + |> fetch_query_params + |> Transport.transport_log(opts[:transport_log]) +- |> Transport.force_ssl(handler, endpoint, opts) + |> Transport.check_origin(handler, endpoint, opts) + + case conn do +diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex +index 88bc78aec..683de8e3b 100644 +--- a/lib/pleroma/emails/admin_email.ex ++++ b/lib/pleroma/emails/admin_email.ex +@@ -6,10 +6,13 @@ defmodule Pleroma.Emails.AdminEmail do + @moduledoc "Admin emails" + + import Swoosh.Email +- ++ use Pleroma.Web, :mailer + alias Pleroma.Config + alias Pleroma.HTML +- alias Pleroma.Web.Router.Helpers ++ ++ use Phoenix.VerifiedRoutes, ++ endpoint: Pleroma.Web.Endpoint, ++ router: Pleroma.Web.Router + + defp instance_config, do: Config.get(:instance) + defp instance_name, do: instance_config()[:name] +@@ -45,7 +48,7 @@ def report(to, reporter, account, statuses, comment) do + statuses + |> Enum.map(fn + %{id: id} -> +- status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, id) ++ status_url = url(~p[/notice/#{id}]) + "
  • #{status_url}
    • " + + %{"id" => id} when is_binary(id) -> +diff --git a/lib/pleroma/emails/user_email.ex b/lib/pleroma/emails/user_email.ex +index 1588c099c..fe319c775 100644 +--- a/lib/pleroma/emails/user_email.ex ++++ b/lib/pleroma/emails/user_email.ex +@@ -6,12 +6,11 @@ defmodule Pleroma.Emails.UserEmail do + @moduledoc "User emails" + + require Pleroma.Web.Gettext ++ use Pleroma.Web, :mailer + + alias Pleroma.Config + alias Pleroma.User +- alias Pleroma.Web.Endpoint + alias Pleroma.Web.Gettext +- alias Pleroma.Web.Router + + import Swoosh.Email + import Phoenix.Swoosh, except: [render_body: 3] +@@ -75,7 +74,7 @@ def welcome(user, opts \\ %{}) do + + def password_reset_email(user, token) when is_binary(token) do + Gettext.with_locale_or_default user.language do +- password_reset_url = Router.Helpers.reset_password_url(Endpoint, :reset, token) ++ password_reset_url = ~p[/api/v1/pleroma/password_reset/#{token}] + + html_body = + Gettext.dpgettext( +@@ -108,12 +107,7 @@ def user_invitation_email( + to_name \\ nil + ) do + Gettext.with_locale_or_default user.language do +- registration_url = +- Router.Helpers.redirect_url( +- Endpoint, +- :registration_page, +- user_invite_token.token +- ) ++ registration_url = ~p[/registration/#{user_invite_token.token}] + + html_body = + Gettext.dpgettext( +@@ -146,13 +140,7 @@ def user_invitation_email( + + def account_confirmation_email(user) do + Gettext.with_locale_or_default user.language do +- confirmation_url = +- Router.Helpers.confirm_email_url( +- Endpoint, +- :confirm_email, +- user.id, +- to_string(user.confirmation_token) +- ) ++ confirmation_url = ~p[/api/account/confirm_email/#{user.id}/#{user.confirmation_token}] + + html_body = + Gettext.dpgettext( +@@ -342,7 +330,7 @@ def unsubscribe_url(user, notifications_type) do + |> Pleroma.JWT.generate_and_sign!() + |> Base.encode64() + +- Router.Helpers.subscription_url(Endpoint, :unsubscribe, token) ++ ~p[/mailer/unsubscribe/#{token}] + end + + def backup_is_ready_email(backup, admin_user_id \\ nil) do +diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex +index 83b45e3b4..ad87837fa 100644 +--- a/lib/pleroma/user.ex ++++ b/lib/pleroma/user.ex +@@ -44,6 +44,8 @@ defmodule Pleroma.User do + alias Pleroma.Web.RelMe + alias Pleroma.Workers.BackgroundWorker + ++ use Pleroma.Web, :verified_routes ++ + require Logger + + @type t :: %__MODULE__{} +@@ -2447,12 +2449,7 @@ defp validate_rel_me_field(changeset, fields, raw_fields, %User{ + end + + if is_url(raw_value) do +- frontend_url = +- Pleroma.Web.Router.Helpers.redirect_url( +- Pleroma.Web.Endpoint, +- :redirector_with_meta, +- nickname +- ) ++ frontend_url = url(~p[/#{nickname}]) + + possible_urls = [ap_id, frontend_url] + +diff --git a/lib/pleroma/web.ex b/lib/pleroma/web.ex +index ecd98b6ca..5422e7896 100644 +--- a/lib/pleroma/web.ex ++++ b/lib/pleroma/web.ex +@@ -27,6 +27,7 @@ defmodule Pleroma.Web do + alias Pleroma.Web.Plugs.ExpectPublicOrAuthenticatedCheckPlug + alias Pleroma.Web.Plugs.OAuthScopesPlug + alias Pleroma.Web.Plugs.PlugHelper ++ require Pleroma.Constants + + def controller do + quote do +@@ -37,7 +38,7 @@ def controller do + import Pleroma.Web.Gettext + import Pleroma.Web.TranslationHelpers + +- alias Pleroma.Web.Router.Helpers, as: Routes ++ unquote(verified_routes()) + + plug(:set_put_layout) + +@@ -184,7 +185,10 @@ def view do + + # Import convenience functions from controllers + import Phoenix.Controller, +- only: [get_flash: 1, get_flash: 2, view_module: 1, view_template: 1] ++ only: [view_module: 1, view_template: 1] ++ ++ import Phoenix.Flash ++ alias Phoenix.Flash + + # Include shared imports and aliases for views + unquote(view_helpers()) +@@ -218,7 +222,7 @@ def component do + + def router do + quote do +- use Phoenix.Router ++ use Phoenix.Router, helpers: false + + import Plug.Conn + import Phoenix.Controller +@@ -246,7 +250,24 @@ defp view_helpers do + + import Pleroma.Web.ErrorHelpers + import Pleroma.Web.Gettext +- alias Pleroma.Web.Router.Helpers, as: Routes ++ unquote(verified_routes()) ++ end ++ end ++ ++ def static_paths, do: Pleroma.Constants.static_only_files() ++ ++ def verified_routes do ++ quote do ++ use Phoenix.VerifiedRoutes, ++ endpoint: Pleroma.Web.Endpoint, ++ router: Pleroma.Web.Router, ++ statics: Pleroma.Web.static_paths() ++ end ++ end ++ ++ def mailer do ++ quote do ++ unquote(verified_routes()) + end + end + +diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex +index 649bf9095..e4c626d36 100644 +--- a/lib/pleroma/web/activity_pub/activity_pub.ex ++++ b/lib/pleroma/web/activity_pub/activity_pub.ex +@@ -1792,6 +1792,11 @@ def pin_data_from_featured_collection( + end) + end + ++ def pin_data_from_featured_collection(obj) do ++ Logger.error("Could not parse featured collection #{inspect(obj)}") ++ %{} ++ end ++ + def fetch_and_prepare_featured_from_ap_id(nil) do + {:ok, %{}} + end +diff --git a/lib/pleroma/web/activity_pub/builder.ex b/lib/pleroma/web/activity_pub/builder.ex +index 6d39ad3a8..e67a14b58 100644 +--- a/lib/pleroma/web/activity_pub/builder.ex ++++ b/lib/pleroma/web/activity_pub/builder.ex +@@ -18,6 +18,8 @@ defmodule Pleroma.Web.ActivityPub.Builder do + alias Pleroma.Web.CommonAPI.ActivityDraft + alias Pleroma.Web.Endpoint + ++ use Pleroma.Web, :verified_routes ++ + require Pleroma.Constants + + def accept_or_reject(actor, activity, type) do +@@ -402,6 +404,6 @@ def unpin(%User{} = user, object) do + end + + defp pinned_url(nickname) when is_binary(nickname) do +- Pleroma.Web.Router.Helpers.activity_pub_url(Pleroma.Web.Endpoint, :pinned, nickname) ++ url(~p[/users/#{nickname}/collections/featured]) + end + end +diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex +index 008aec475..f731b5286 100644 +--- a/lib/pleroma/web/activity_pub/utils.ex ++++ b/lib/pleroma/web/activity_pub/utils.ex +@@ -16,10 +16,11 @@ defmodule Pleroma.Web.ActivityPub.Utils do + alias Pleroma.Web.ActivityPub.Visibility + alias Pleroma.Web.AdminAPI.AccountView + alias Pleroma.Web.Endpoint +- alias Pleroma.Web.Router.Helpers + + import Ecto.Query + ++ use Pleroma.Web, :verified_routes ++ + require Logger + require Pleroma.Constants + +@@ -124,19 +125,15 @@ def make_date do + end + + def generate_activity_id do +- generate_id("activities") ++ url(~p[/activities/#{UUID.generate()}]) + end + + def generate_context_id do +- generate_id("contexts") ++ url(~p[/contexts/#{UUID.generate()}]) + end + + def generate_object_id do +- Helpers.o_status_url(Endpoint, :object, UUID.generate()) +- end +- +- def generate_id(type) do +- "#{Endpoint.url()}/#{type}/#{UUID.generate()}" ++ url(~p[/objects/#{UUID.generate()}]) + end + + def get_notified_from_object(%{"type" => type} = object) when type in @supported_object_types do +@@ -154,7 +151,7 @@ def get_notified_from_object(object) do + Notification.get_notified_from_activity(%Activity{data: object}, false) + end + +- def maybe_create_context(context), do: context || generate_id("contexts") ++ def maybe_create_context(context),