diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0ad25db --- /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/backend/composer.json b/backend/composer.json index 624e8ab..3a2492a 100644 --- a/backend/composer.json +++ b/backend/composer.json @@ -15,6 +15,8 @@ "doctrine/orm": "^3.5.0", "nesbot/carbon": "^3.10.1", "hyvor/internal": "^3.1.4", + "phpdocumentor/reflection-docblock": "^5.6", + "phpstan/phpdoc-parser": "^2.3", "runtime/frankenphp-symfony": "^0.2.0", "symfony/console": "7.3.*", "symfony/doctrine-messenger": "7.3.*", @@ -24,8 +26,11 @@ "symfony/http-client": "7.3.*", "symfony/lock": "7.3.*", "symfony/messenger": "7.3.*", + "symfony/property-access": "7.3.*", + "symfony/property-info": "7.3.*", "symfony/runtime": "7.3.*", "symfony/scheduler": "7.3.*", + "symfony/serializer": "7.3.*", "symfony/uid": "7.3.*", "symfony/yaml": "7.3.*" }, diff --git a/backend/composer.lock b/backend/composer.lock index 083ef98..9011479 100644 --- a/backend/composer.lock +++ b/backend/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a79ccdc6b2c8d501d4c45f0709d3b33f", + "content-hash": "53ad0a3374364a5038765a93c18672f1", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -325,16 +325,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "2.16.0", + "version": "2.16.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "cb2ad28708f870ff9534e82798c557bdc79809ba" + "reference": "1c10de0fe995f01eca6b073d1c2549ef0b603a7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/cb2ad28708f870ff9534e82798c557bdc79809ba", - "reference": "cb2ad28708f870ff9534e82798c557bdc79809ba", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1c10de0fe995f01eca6b073d1c2549ef0b603a7f", + "reference": "1c10de0fe995f01eca6b073d1c2549ef0b603a7f", "shasum": "" }, "require": { @@ -368,11 +368,11 @@ "phpstan/phpstan": "2.1.1", "phpstan/phpstan-phpunit": "2.0.3", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "^9.6.22", + "phpunit/phpunit": "^10.5.53", "psr/log": "^1.1.4 || ^2.0 || ^3.0", "symfony/doctrine-messenger": "^6.4 || ^7.0", + "symfony/expression-language": "^6.4 || ^7.0", "symfony/messenger": "^6.4 || ^7.0", - "symfony/phpunit-bridge": "^7.2", "symfony/property-info": "^6.4 || ^7.0", "symfony/security-bundle": "^6.4 || ^7.0", "symfony/stopwatch": "^6.4 || ^7.0", @@ -427,7 +427,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/2.16.0" + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.16.2" }, "funding": [ { @@ -443,7 +443,7 @@ "type": "tidelift" } ], - "time": "2025-09-02T17:41:12+00:00" + "time": "2025-09-10T19:14:48+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", @@ -1589,16 +1589,16 @@ }, { "name": "hyvor/internal", - "version": "3.1.4", + "version": "3.1.5", "source": { "type": "git", "url": "https://github.com/hyvor/internal.git", - "reference": "c79d05b7073b2f0542c62df6a99fe62e576f7288" + "reference": "f45f734609727e47d3366c0a946482bef8b2e1d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hyvor/internal/zipball/c79d05b7073b2f0542c62df6a99fe62e576f7288", - "reference": "c79d05b7073b2f0542c62df6a99fe62e576f7288", + "url": "https://api.github.com/repos/hyvor/internal/zipball/f45f734609727e47d3366c0a946482bef8b2e1d0", + "reference": "f45f734609727e47d3366c0a946482bef8b2e1d0", "shasum": "" }, "require": { @@ -1657,22 +1657,22 @@ "description": "Internal Package for HYVOR Applications", "support": { "issues": "https://github.com/hyvor/internal/issues", - "source": "https://github.com/hyvor/internal/tree/3.1.4" + "source": "https://github.com/hyvor/internal/tree/3.1.5" }, - "time": "2025-08-13T22:04:57+00:00" + "time": "2025-09-17T19:10:08+00:00" }, { "name": "illuminate/collections", - "version": "v12.28.1", + "version": "v12.31.1", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "2737a0477a3f4855a71bf8f3d0b8d32596ded628" + "reference": "0683d7b5210b18a2e00bc2dbc5f856a611e1f152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/2737a0477a3f4855a71bf8f3d0b8d32596ded628", - "reference": "2737a0477a3f4855a71bf8f3d0b8d32596ded628", + "url": "https://api.github.com/repos/illuminate/collections/zipball/0683d7b5210b18a2e00bc2dbc5f856a611e1f152", + "reference": "0683d7b5210b18a2e00bc2dbc5f856a611e1f152", "shasum": "" }, "require": { @@ -1718,11 +1718,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-09-02T15:31:06+00:00" + "time": "2025-09-23T13:51:52+00:00" }, { "name": "illuminate/conditionable", - "version": "v12.28.1", + "version": "v12.31.1", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -1768,16 +1768,16 @@ }, { "name": "illuminate/contracts", - "version": "v12.28.1", + "version": "v12.31.1", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "f1c4cf02c9ab81a9ce47940cf261fa2386ed6c5d" + "reference": "0bdbf0cdb5dd5739b2c8e6caf881a4114399ab15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/f1c4cf02c9ab81a9ce47940cf261fa2386ed6c5d", - "reference": "f1c4cf02c9ab81a9ce47940cf261fa2386ed6c5d", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/0bdbf0cdb5dd5739b2c8e6caf881a4114399ab15", + "reference": "0bdbf0cdb5dd5739b2c8e6caf881a4114399ab15", "shasum": "" }, "require": { @@ -1812,11 +1812,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-08-27T18:34:41+00:00" + "time": "2025-09-12T14:35:11+00:00" }, { "name": "illuminate/encryption", - "version": "v12.28.1", + "version": "v12.31.1", "source": { "type": "git", "url": "https://github.com/illuminate/encryption.git", @@ -1867,16 +1867,16 @@ }, { "name": "illuminate/log", - "version": "v12.28.1", + "version": "v12.31.1", "source": { "type": "git", "url": "https://github.com/illuminate/log.git", - "reference": "bcd4c0ac05b47c45f0693a83704b46399fec6414" + "reference": "535f80fd257318656d1d29c4e8f679d0f4b195b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/log/zipball/bcd4c0ac05b47c45f0693a83704b46399fec6414", - "reference": "bcd4c0ac05b47c45f0693a83704b46399fec6414", + "url": "https://api.github.com/repos/illuminate/log/zipball/535f80fd257318656d1d29c4e8f679d0f4b195b2", + "reference": "535f80fd257318656d1d29c4e8f679d0f4b195b2", "shasum": "" }, "require": { @@ -1916,11 +1916,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-08-22T14:22:42+00:00" + "time": "2025-09-21T15:11:44+00:00" }, { "name": "illuminate/macroable", - "version": "v12.28.1", + "version": "v12.31.1", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -1966,16 +1966,16 @@ }, { "name": "illuminate/support", - "version": "v12.28.1", + "version": "v12.31.1", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "487bbe527806615b818e87c364d93ba91f27db9b" + "reference": "3abe3b6866701c3c8d2b8724d51a435c5236c106" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/487bbe527806615b818e87c364d93ba91f27db9b", - "reference": "487bbe527806615b818e87c364d93ba91f27db9b", + "url": "https://api.github.com/repos/illuminate/support/zipball/3abe3b6866701c3c8d2b8724d51a435c5236c106", + "reference": "3abe3b6866701c3c8d2b8724d51a435c5236c106", "shasum": "" }, "require": { @@ -2041,7 +2041,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-09-03T16:23:04+00:00" + "time": "2025-09-23T13:51:52+00:00" }, { "name": "monolog/monolog", @@ -2208,16 +2208,16 @@ }, { "name": "nesbot/carbon", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24" + "reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24", - "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f", + "reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f", "shasum": "" }, "require": { @@ -2235,13 +2235,13 @@ "require-dev": { "doctrine/dbal": "^3.6.3 || ^4.0", "doctrine/orm": "^2.15.2 || ^3.0", - "friendsofphp/php-cs-fixer": "^3.75.0", + "friendsofphp/php-cs-fixer": "^v3.87.1", "kylekatarnls/multi-tester": "^2.5.3", "phpmd/phpmd": "^2.15.0", "phpstan/extension-installer": "^1.4.3", - "phpstan/phpstan": "^2.1.17", - "phpunit/phpunit": "^10.5.46", - "squizlabs/php_codesniffer": "^3.13.0" + "phpstan/phpstan": "^2.1.22", + "phpunit/phpunit": "^10.5.53", + "squizlabs/php_codesniffer": "^3.13.4" }, "bin": [ "bin/carbon" @@ -2309,7 +2309,7 @@ "type": "tidelift" } ], - "time": "2025-08-02T09:36:06+00:00" + "time": "2025-09-06T13:39:36+00:00" }, { "name": "nikic/php-parser", @@ -3032,16 +3032,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.53", + "version": "10.5.57", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "32768472ebfb6969e6c7399f1c7b09009723f653" + "reference": "8e7598bbb17bb5cd80728f4831d3f83223d3a6b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/32768472ebfb6969e6c7399f1c7b09009723f653", - "reference": "32768472ebfb6969e6c7399f1c7b09009723f653", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e7598bbb17bb5cd80728f4831d3f83223d3a6b3", + "reference": "8e7598bbb17bb5cd80728f4831d3f83223d3a6b3", "shasum": "" }, "require": { @@ -3062,10 +3062,10 @@ "phpunit/php-timer": "^6.0.0", "sebastian/cli-parser": "^2.0.1", "sebastian/code-unit": "^2.0.0", - "sebastian/comparator": "^5.0.3", + "sebastian/comparator": "^5.0.4", "sebastian/diff": "^5.1.1", "sebastian/environment": "^6.1.0", - "sebastian/exporter": "^5.1.2", + "sebastian/exporter": "^5.1.4", "sebastian/global-state": "^6.0.2", "sebastian/object-enumerator": "^5.0.0", "sebastian/recursion-context": "^5.0.1", @@ -3113,7 +3113,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.53" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.57" }, "funding": [ { @@ -3137,7 +3137,7 @@ "type": "tidelift" } ], - "time": "2025-08-20T14:40:06+00:00" + "time": "2025-09-24T06:30:38+00:00" }, { "name": "promphp/prometheus_client_php", @@ -3934,16 +3934,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.3", + "version": "5.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" + "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", - "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e8e53097718d2b53cfb2aa859b06a41abf58c62e", + "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e", "shasum": "" }, "require": { @@ -3999,15 +3999,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.4" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2024-10-18T14:56:07+00:00" + "time": "2025-09-07T05:25:07+00:00" }, { "name": "sebastian/complexity", @@ -4200,16 +4212,16 @@ }, { "name": "sebastian/exporter", - "version": "5.1.2", + "version": "5.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf" + "reference": "0735b90f4da94969541dac1da743446e276defa6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0735b90f4da94969541dac1da743446e276defa6", + "reference": "0735b90f4da94969541dac1da743446e276defa6", "shasum": "" }, "require": { @@ -4218,7 +4230,7 @@ "sebastian/recursion-context": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -4266,15 +4278,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.4" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2024-03-02T07:17:12+00:00" + "time": "2025-09-24T06:09:11+00:00" }, { "name": "sebastian/global-state", @@ -9695,16 +9719,16 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.22", + "version": "2.1.28", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4" + "reference": "578fa296a166605d97b94091f724f1257185d278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/41600c8379eb5aee63e9413fe9e97273e25d57e4", - "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/578fa296a166605d97b94091f724f1257185d278", + "reference": "578fa296a166605d97b94091f724f1257185d278", "shasum": "" }, "require": { @@ -9749,7 +9773,7 @@ "type": "github" } ], - "time": "2025-08-04T19:17:37+00:00" + "time": "2025-09-19T08:58:49+00:00" }, { "name": "symfony/browser-kit", @@ -10267,16 +10291,16 @@ }, { "name": "zenstruck/foundry", - "version": "v2.6.3", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/zenstruck/foundry.git", - "reference": "7c951226c9cb09c8d57818c0f1ec84d6d484ed57" + "reference": "854b581e1f43b6a4b0420c5ab249015f8b583a1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zenstruck/foundry/zipball/7c951226c9cb09c8d57818c0f1ec84d6d484ed57", - "reference": "7c951226c9cb09c8d57818c0f1ec84d6d484ed57", + "url": "https://api.github.com/repos/zenstruck/foundry/zipball/854b581e1f43b6a4b0420c5ab249015f8b583a1c", + "reference": "854b581e1f43b6a4b0420c5ab249015f8b583a1c", "shasum": "" }, "require": { @@ -10306,16 +10330,19 @@ "doctrine/orm": "^2.16|^3.0", "doctrine/persistence": "^2.0|^3.0|^4.0", "phpunit/phpunit": "^9.5.0 || ^10.0 || ^11.0 || ^12.0", + "symfony/browser-kit": "^6.4|^7.0|^8.0", "symfony/console": "^6.4|^7.0|^8.0", "symfony/dotenv": "^6.4|^7.0|^8.0", "symfony/framework-bundle": "^6.4|^7.0|^8.0", "symfony/maker-bundle": "^1.55", "symfony/phpunit-bridge": "^6.4|^7.0|^8.0", + "symfony/routing": "^6.4|^7.0|^8.0", "symfony/runtime": "^6.4|^7.0|^8.0", "symfony/translation-contracts": "^3.4", "symfony/uid": "^6.4|^7.0|^8.0", "symfony/var-dumper": "^6.4|^7.0|^8.0", - "symfony/yaml": "^6.4|^7.0|^8.0" + "symfony/yaml": "^6.4|^7.0|^8.0", + "webmozart/assert": "^1.11" }, "type": "library", "extra": { @@ -10336,7 +10363,8 @@ ], "psr-4": { "Zenstruck\\Foundry\\": "src/", - "Zenstruck\\Foundry\\Psalm\\": "utils/psalm" + "Zenstruck\\Foundry\\Psalm\\": "utils/psalm", + "Zenstruck\\Foundry\\Utils\\Rector\\": "utils/rector/src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -10366,7 +10394,7 @@ ], "support": { "issues": "https://github.com/zenstruck/foundry/issues", - "source": "https://github.com/zenstruck/foundry/tree/v2.6.3" + "source": "https://github.com/zenstruck/foundry/tree/v2.7.1" }, "funding": [ { @@ -10378,7 +10406,7 @@ "type": "github" } ], - "time": "2025-08-28T05:57:45+00:00" + "time": "2025-09-24T15:50:00+00:00" }, { "name": "zenstruck/messenger-test", diff --git a/backend/src/Api/App/Controller/CollectionController.php b/backend/src/Api/App/Controller/CollectionController.php index ed7e1c3..a043705 100644 --- a/backend/src/Api/App/Controller/CollectionController.php +++ b/backend/src/Api/App/Controller/CollectionController.php @@ -5,7 +5,6 @@ use App\Api\App\Object\CollectionObject; use App\Api\App\Object\PublicationObject; use App\Service\Collection\CollectionService; - use Symfony\Component\HttpFoundation\Request; use App\Api\App\Authorization\AuthorizationListener; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -13,7 +12,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; - +use Symfony\Component\HttpKernel\Attribute\MapRequestPayload; +use App\Api\App\Input\AddCollectionInput; class CollectionController extends AbstractController { @@ -55,5 +55,18 @@ public function getCollection(string $slug, Request $request): JsonResponse ]); } + #[Route('/collections', methods: ['POST'])] + public function createCollection(Request $request, #[MapRequestPayload] AddCollectionInput $payload): JsonResponse + { + $user = AuthorizationListener::getUser($request); + + $name = trim($payload->name); + $isPublic = $payload->is_public; + + $collection = $this->collectionService->createCollection($user->id, $name, $isPublic); -} + return $this->json([ + 'collection' => new CollectionObject($collection, $user->id), + ]); + } +} diff --git a/backend/src/Api/App/Controller/PublicationController.php b/backend/src/Api/App/Controller/PublicationController.php index 05c60ac..d9a9631 100644 --- a/backend/src/Api/App/Controller/PublicationController.php +++ b/backend/src/Api/App/Controller/PublicationController.php @@ -2,6 +2,7 @@ namespace App\Api\App\Controller; +use App\Api\App\Object\PublicationObject; use App\Api\App\Authorization\AuthorizationListener; use App\Service\Publication\PublicationService; use App\Service\Collection\CollectionService; @@ -65,6 +66,7 @@ public function addPublication( $user = AuthorizationListener::getUser($request); $collectionSlug = trim($payload->collection_slug); $url = trim($payload->url); + $title = trim($payload->title); $collection = $this->collectionService->findBySlug($collectionSlug); if (!$collection) { @@ -88,28 +90,25 @@ public function addPublication( $normalizedUrl = $inspection['final_url']; $publication = $this->publicationService->findByUrl($normalizedUrl); $created = false; - $attached = false; if (!$publication) { $publication = $this->publicationService->createPublication($collection, $inspection); $created = true; $attached = true; - $status = Response::HTTP_CREATED; } else { $attached = $this->publicationService->attachToCollectionIfMissing($publication, $collection); - - if ($attached) { - $publication->setIsFetching(true); - $this->em->flush(); - $this->messageBus->dispatch(new ProcessFeedMessage($publication->getId())); - } - $status = Response::HTTP_OK; } + + if ($created || $attached) { + $publication->setIsFetching(true); + $this->em->flush(); + $this->messageBus->dispatch(new ProcessFeedMessage($publication->getId())); + } return $this->json([ - 'publication' => new \App\Api\App\Object\PublicationObject($publication), + 'publication' => new PublicationObject($publication), 'created' => $created, 'attached' => $attached, ], $status); diff --git a/backend/src/Api/App/Input/AddCollectionInput.php b/backend/src/Api/App/Input/AddCollectionInput.php new file mode 100644 index 0000000..1b76efe --- /dev/null +++ b/backend/src/Api/App/Input/AddCollectionInput.php @@ -0,0 +1,14 @@ +name = $collection->getName(); $this->slug = $collection->getSlug(); $this->is_public = $collection->isPublic(); - $this->is_owner = $currentUserId ? $collection->getHyvorUserId() === $currentUserId : false; + $this->is_owner = $currentUserId && $collection->getHyvorUserId() === $currentUserId; } } \ No newline at end of file diff --git a/backend/src/Repository/CollectionUserRepository.php b/backend/src/Repository/CollectionUserRepository.php index 612773f..30fc29d 100644 --- a/backend/src/Repository/CollectionUserRepository.php +++ b/backend/src/Repository/CollectionUserRepository.php @@ -16,21 +16,12 @@ public function __construct(ManagerRegistry $registry) parent::__construct($registry, CollectionUser::class); } - /** - * @return CollectionUser|null - */ - public function findUserCollectionAccess(int $hyvorUserId, int $collectionId): ?CollectionUser + public function getCollectionUserWithAccess(int $hyvorUserId, int $collectionId): ?CollectionUser { - $result = $this->createQueryBuilder('cu') - ->andWhere('cu.hyvorUserId = :hyvorUserId') - ->andWhere('cu.collection = :collectionId') - ->setParameter('hyvorUserId', $hyvorUserId) - ->setParameter('collectionId', $collectionId) - ->getQuery() - ->getOneOrNullResult(); - - assert($result instanceof CollectionUser || $result === null); - return $result; + return $this->findOneBy([ + 'hyvorUserId' => $hyvorUserId, + 'collection' => $collectionId, + ]); } } diff --git a/backend/src/Service/Collection/CollectionService.php b/backend/src/Service/Collection/CollectionService.php index 6b5fd2c..50faa79 100644 --- a/backend/src/Service/Collection/CollectionService.php +++ b/backend/src/Service/Collection/CollectionService.php @@ -151,7 +151,7 @@ public function hasUserReadAccess(int $hyvorUserId, Collection $collection): boo return true; } - $collectionUser = $this->getCollectionUserRepository()->findUserCollectionAccess( + $collectionUser = $this->getCollectionUserRepository()->getCollectionUserWithAccess( $hyvorUserId, $collection->getId() ); @@ -165,7 +165,7 @@ public function hasUserWriteAccess(int $hyvorUserId, Collection $collection): bo return true; } - $collectionUser = $this->getCollectionUserRepository()->findUserCollectionAccess( + $collectionUser = $this->getCollectionUserRepository()->getCollectionUserWithAccess( $hyvorUserId, $collection->getId() ); diff --git a/backend/src/Service/Opml/OpmlService.php b/backend/src/Service/Opml/OpmlService.php index 180b4f2..6bc85a0 100644 --- a/backend/src/Service/Opml/OpmlService.php +++ b/backend/src/Service/Opml/OpmlService.php @@ -27,7 +27,7 @@ public function import(string $content, int $hyvorUserId): void if ($child->nodeType === XML_ELEMENT_NODE && $child->tagName === 'outline') { $publicationUrl = $child->getAttribute('xmlUrl'); $inspection = $this->fetchService->inspectFeed($publicationUrl); - $this->publicationService->createPublication($collection, $inspection); + $this->publicationService->addPublication($collection, $inspection); } } } diff --git a/backend/src/Service/Publication/PublicationService.php b/backend/src/Service/Publication/PublicationService.php index f87f27a..048321e 100644 --- a/backend/src/Service/Publication/PublicationService.php +++ b/backend/src/Service/Publication/PublicationService.php @@ -41,7 +41,7 @@ public function getPublicationsFromCollection(Collection $collection): array return $publications; } - public function createPublication(Collection $collection, array $inspection): Publication + public function addPublication(Collection $collection, array $inspection): Publication { $url = $inspection['final_url']; $feed = $inspection['feed']; diff --git a/frontend/src/routes/app/(reader)/+layout.svelte b/frontend/src/routes/app/(reader)/+layout.svelte index 3f397bf..b7a7b3e 100644 --- a/frontend/src/routes/app/(reader)/+layout.svelte +++ b/frontend/src/routes/app/(reader)/+layout.svelte @@ -2,7 +2,7 @@ import IconChevronDown from '@hyvor/icons/IconChevronDown'; import IconBoxArrowUpRight from '@hyvor/icons/IconBoxArrowUpRight'; import IconPlus from '@hyvor/icons/IconPlus'; - import { Button, Dropdown, ActionList, ActionListItem, Loader, Modal, TextInput } from '@hyvor/design/components'; + import { Button, Dropdown, ActionList, ActionListItem, Loader, Modal, TextInput, Switch } from '@hyvor/design/components'; import { collections, publications, @@ -26,6 +26,10 @@ let showCollections = $state(false); let showAddPublicationModal = $state(false); let rssUrl = $state(''); + let publicationTitle = $state(''); + let showCreateCollectionModal = $state(false); + let collectionName = $state(''); + let collectionIsPublic = $state(false); let selectedItem: Item | null = $state(null); let currentItemIndex = $derived( selectedItem ? $items.findIndex(item => item.id === selectedItem!.id) : -1 @@ -38,6 +42,22 @@ goto(`/app/${collection.slug}`); } + async function handleCreateCollection() { + const trimmed = collectionName.trim(); + if (!trimmed) return; + try { + const res = await api.post('/collections', { name: trimmed, is_public: collectionIsPublic }); + const created: Collection = res.collection; + $collections = [...$collections, created]; + showCreateCollectionModal = false; + collectionName = ''; + collectionIsPublic = false; + goto(`/app/${created.slug}`); + } catch (e) { + console.error('Failed to create collection', e); + } + } + function selectPublication(publication?: Publication) { if (publication) { goto(`/app/${$page.params.collection_slug}/${publication.slug}`); @@ -127,7 +147,8 @@ } const res = await api.post('/publications', { collection_slug: collectionSlug, - url: value + url: value, + title: publicationTitle.trim(), }); const exists = $publications.find(p => p.slug === res.publication.slug); if (!exists) { @@ -135,6 +156,7 @@ } showAddPublicationModal = false; rssUrl = ''; + publicationTitle = ''; } catch (e) { console.error('Failed to add publication', e); addPublicationError = e instanceof Error ? e.message : 'Failed to add publication'; @@ -184,6 +206,9 @@ {collection.name} {/each} + { showCreateCollectionModal = true; showCollections = false; }}> + + Create collection + {/snippet} @@ -238,7 +263,7 @@ {/if} + { showCreateCollectionModal = false; }} + on:confirm={handleCreateCollection} +> + + {addPublicationError} {/if} + + + { + if (e.key === 'Enter' && publicationTitle.trim()) { + handleAdd(); + } + }} + /> + {#snippet footer()} + + {/snippet}