diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..0bf239554 --- /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. + + Pleroma + Copyright (C) 2017 Roger Braun + + 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/TODO.txt b/TODO.txt index 42501a637..dd85c5239 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1 +1,5 @@ - Add cache for user fetching / representing. (mostly in TwitterAPI.activity_to_status) + +Unliking: + +- Add a proper undo activity, find out how to ignore those in twitter api. diff --git a/lib/mix/tasks/register_user.ex b/lib/mix/tasks/register_user.ex index e2f36c34c..48236439b 100644 --- a/lib/mix/tasks/register_user.ex +++ b/lib/mix/tasks/register_user.ex @@ -6,15 +6,17 @@ defmodule Mix.Tasks.RegisterUser do @shortdoc "Register user" def run([name, nickname, email, bio, password]) do ensure_started(Repo, []) - user = %User{ + + params = %{ name: name, nickname: nickname, email: email, - password_hash: Comeonin.Pbkdf2.hashpwsalt(password), + password: password, + password_confirmation: password, bio: bio } - user = %{ user | ap_id: User.ap_id(user) } + user = User.register_changeset(%User{}, params) Repo.insert!(user) end diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index c4efc6283..46568bb13 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -1,9 +1,21 @@ defmodule Pleroma.Activity do use Ecto.Schema + alias Pleroma.{Repo, Activity} + import Ecto.Query schema "activities" do field :data, :map timestamps() end + + def get_by_ap_id(ap_id) do + Repo.one(from activity in Activity, + where: fragment("? @> ?", activity.data, ^%{id: ap_id})) + end + + def all_by_object_ap_id(ap_id) do + Repo.all(from activity in Activity, + where: fragment("? @> ?", activity.data, ^%{object: %{id: ap_id}})) + end end diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index e88a85196..e5bd17ced 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -14,6 +14,10 @@ def start(_type, _args) do supervisor(Pleroma.Web.Endpoint, []), # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3) # worker(Pleroma.Worker, [arg1, arg2, arg3]), + supervisor(ConCache, [[ + ttl_check: :timer.seconds(1), + ttl: :timer.seconds(5) + ], [name: :users]]) ] # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index c77704db0..ed85447fe 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -9,6 +9,8 @@ defmodule Pleroma.User do field :name, :string field :nickname, :string field :password_hash, :string + field :password, :string, virtual: true + field :password_confirmation, :string, virtual: true field :following, { :array, :string }, default: [] field :ap_id, :string @@ -29,6 +31,27 @@ def follow_changeset(struct, params \\ %{}) do |> validate_required([:following]) end + def register_changeset(struct, params \\ %{}) do + changeset = struct + |> cast(params, [:bio, :email, :name, :nickname, :password, :password_confirmation]) + |> validate_required([:bio, :email, :name, :nickname, :password, :password_confirmation]) + |> validate_confirmation(:password) + |> unique_constraint(:email) + |> unique_constraint(:nickname) + + if changeset.valid? do + hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password]) + ap_id = User.ap_id(%User{nickname: changeset.changes[:nickname]}) + followers = User.ap_followers(%User{nickname: changeset.changes[:nickname]}) + changeset + |> put_change(:password_hash, hashed) + |> put_change(:ap_id, ap_id) + |> put_change(:following, [followers]) + else + changeset + end + end + def follow(%User{} = follower, %User{} = followed) do ap_followers = User.ap_followers(followed) following = [ap_followers | follower.following] @@ -52,4 +75,17 @@ def unfollow(%User{} = follower, %User{} = followed) do def following?(%User{} = follower, %User{} = followed) do Enum.member?(follower.following, User.ap_followers(followed)) end + + def get_cached_by_ap_id(ap_id) do + ConCache.get_or_store(:users, "ap_id:#{ap_id}", fn() -> + # Return false so the cache will store it. + Repo.get_by(User, ap_id: ap_id) || false + end) + end + + def get_cached_by_nickname(nickname) do + ConCache.get_or_store(:users, "nickname:#{nickname}", fn() -> + Repo.get_by(User, nickname: nickname) || false + end) + end end diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 75e4101f2..0d3360ee1 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -1,10 +1,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do alias Pleroma.Repo - alias Pleroma.{Activity, Object, Upload} + alias Pleroma.{Activity, Object, Upload, User} import Ecto.Query def insert(map) when is_map(map) do - map = Map.put_new_lazy(map, "id", &generate_activity_id/0) + map = map + |> Map.put_new_lazy("id", &generate_activity_id/0) + |> Map.put_new_lazy("published", &make_date/0) map = if is_map(map["object"]) do object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0) @@ -17,6 +19,77 @@ def insert(map) when is_map(map) do Repo.insert(%Activity{data: map}) end + def like(%User{ap_id: ap_id} = user, %Object{data: %{ "id" => id}} = object) do + cond do + # There's already a like here, so return the original activity. + ap_id in (object.data["likes"] || []) -> + query = from activity in Activity, + where: fragment("? @> ?", activity.data, ^%{actor: ap_id, object: id, type: "Like"}) + + activity = Repo.one(query) + {:ok, activity, object} + true -> + data = %{ + "type" => "Like", + "actor" => ap_id, + "object" => id, + "to" => [User.ap_followers(user), object.data["actor"]] + } + + {:ok, activity} = insert(data) + + likes = [ap_id | (object.data["likes"] || [])] |> Enum.uniq + + new_data = object.data + |> Map.put("like_count", length(likes)) + |> Map.put("likes", likes) + + changeset = Ecto.Changeset.change(object, data: new_data) + {:ok, object} = Repo.update(changeset) + + update_object_in_activities(object) + + {:ok, activity, object} + end + end + + defp update_object_in_activities(%{data: %{"id" => id}} = object) do + # Update activities that already had this. Could be done in a seperate process. + relevant_activities = Activity.all_by_object_ap_id(id) + Enum.map(relevant_activities, fn (activity) -> + new_activity_data = activity.data |> Map.put("object", object.data) + changeset = Ecto.Changeset.change(activity, data: new_activity_data) + Repo.update(changeset) + end) + end + + def unlike(%User{ap_id: ap_id}, %Object{data: %{ "id" => id}} = object) do + query = from activity in Activity, + where: fragment("? @> ?", activity.data, ^%{actor: ap_id, object: id, type: "Like"}) + + activity = Repo.one(query) + + if activity do + # just delete for now... + {:ok, _activity} = Repo.delete(activity) + + likes = (object.data["likes"] || []) |> List.delete(ap_id) + + new_data = object.data + |> Map.put("like_count", length(likes)) + |> Map.put("likes", likes) + + changeset = Ecto.Changeset.change(object, data: new_data) + {:ok, object} = Repo.update(changeset) + + update_object_in_activities(object) + + {:ok, object} + else + {:ok, object} + end + end + def generate_activity_id do generate_id("activities") end @@ -64,6 +137,30 @@ def fetch_activities(recipients, opts \\ %{}) do |> Enum.reverse end + def announce(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object) do + data = %{ + "type" => "Announce", + "actor" => ap_id, + "object" => id, + "to" => [User.ap_followers(user), object.data["actor"]] + } + + {:ok, activity} = insert(data) + + announcements = [ap_id | (object.data["announcements"] || [])] |> Enum.uniq + + new_data = object.data + |> Map.put("announcement_count", length(announcements)) + |> Map.put("announcements", announcements) + + changeset = Ecto.Changeset.change(object, data: new_data) + {:ok, object} = Repo.update(changeset) + + update_object_in_activities(object) + + {:ok, activity, object} + end + def fetch_activities_for_context(context) do query = from activity in Activity, where: fragment("? @> ?", activity.data, ^%{ context: context }) @@ -74,4 +171,8 @@ def upload(%Plug.Upload{} = file) do data = Upload.store(file) Repo.insert(%Object{data: data}) end + + defp make_date do + DateTime.utc_now() |> DateTime.to_iso8601 + end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 38052ba02..30e8e12cb 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -28,6 +28,7 @@ def user_fetcher(username) do get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation get "/statusnet/config", TwitterAPI.Controller, :config + post "/account/register", TwitterAPI.Controller, :register end scope "/api", Pleroma.Web do @@ -41,5 +42,10 @@ def user_fetcher(username) do post "/friendships/create", TwitterAPI.Controller, :follow post "/friendships/destroy", TwitterAPI.Controller, :unfollow post "/statusnet/media/upload", TwitterAPI.Controller, :upload + post "/media/upload", TwitterAPI.Controller, :upload_json + post "/favorites/create/:id", TwitterAPI.Controller, :favorite + post "/favorites/create", TwitterAPI.Controller, :favorite + post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite + post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet end end diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index 9e4ffaefe..f2bf93abb 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -4,6 +4,51 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do alias Pleroma.Activity + defp user_by_ap_id(user_list, ap_id) do + Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end) + end + + def to_map(%Activity{data: %{"type" => "Announce", "actor" => actor}} = activity, %{users: users, announced_activity: announced_activity} = opts) do + user = user_by_ap_id(users, actor) + created_at = get_in(activity.data, ["published"]) + |> date_to_asctime + + text = "#{user.nickname} retweeted a status." + + announced_user = user_by_ap_id(users, announced_activity.data["actor"]) + retweeted_status = to_map(announced_activity, Map.merge(%{user: announced_user}, opts)) + %{ + "id" => activity.id, + "user" => UserRepresenter.to_map(user, opts), + "statusnet_html" => text, + "text" => text, + "is_local" => true, + "is_post_verb" => false, + "uri" => "tag:#{activity.data["id"]}:objectType=note", + "created_at" => created_at, + "retweeted_status" => retweeted_status + } + end + + def to_map(%Activity{data: %{"type" => "Like"}} = activity, %{user: user, liked_activity: liked_activity} = opts) do + created_at = get_in(activity.data, ["published"]) + |> date_to_asctime + + text = "#{user.nickname} favorited a status." + + %{ + "id" => activity.id, + "user" => UserRepresenter.to_map(user, opts), + "statusnet_html" => text, # TODO: add summary + "text" => text, + "is_local" => true, + "is_post_verb" => false, + "uri" => "tag:#{activity.data["id"]}:objectType=Favourite", + "created_at" => created_at, + "in_reply_to_status_id" => liked_activity.id, + } + end + def to_map(%Activity{data: %{"type" => "Follow"}} = activity, %{user: user} = opts) do created_at = get_in(activity.data, ["published"]) |> date_to_asctime @@ -25,6 +70,10 @@ def to_map(%Activity{} = activity, %{user: user} = opts) do content = get_in(activity.data, ["object", "content"]) created_at = get_in(activity.data, ["object", "published"]) |> date_to_asctime + like_count = get_in(activity.data, ["object", "like_count"]) || 0 + announcement_count = get_in(activity.data, ["object", "announcement_count"]) || 0 + favorited = opts[:for] && opts[:for].ap_id in (activity.data["object"]["likes"] || []) + repeated = opts[:for] && opts[:for].ap_id in (activity.data["object"]["announcements"] || []) mentions = opts[:mentioned] || [] @@ -45,14 +94,18 @@ def to_map(%Activity{} = activity, %{user: user} = opts) do "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"], "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"], "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts), - "attentions" => attentions + "attentions" => attentions, + "fave_num" => like_count, + "repeat_num" => announcement_count, + "favorited" => !!favorited, + "repeated" => !!repeated, } end defp date_to_asctime(date) do with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do Calendar.Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y") - else e -> + else _e -> "" end end diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 0217b28d6..735d88832 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -1,7 +1,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do alias Pleroma.{User, Activity, Repo, Object} alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter + alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter} import Ecto.Query @@ -13,6 +13,7 @@ def create_status(user = %User{}, data = %{}) do context = ActivityPub.generate_context_id content = HtmlSanitizeEx.strip_tags(data["status"]) + |> String.replace("\n", "
") mentions = parse_mentions(content) @@ -37,7 +38,8 @@ def create_status(user = %User{}, data = %{}) do "content" => content_html, "published" => date, "context" => context, - "attachment" => attachments + "attachment" => attachments, + "actor" => user.ap_id }, "published" => date, "context" => context @@ -123,25 +125,74 @@ def unfollow(%User{} = follower, followed_id) do end end - def upload(%Plug.Upload{} = file) do + def favorite(%User{} = user, %Activity{data: %{"object" => object}} = activity) do + object = Object.get_by_ap_id(object["id"]) + + {:ok, _like_activity, object} = ActivityPub.like(user, object) + new_data = activity.data + |> Map.put("object", object.data) + + status = %{activity | data: new_data} + |> activity_to_status(%{for: user}) + + {:ok, status} + end + + def unfavorite(%User{} = user, %Activity{data: %{"object" => object}} = activity) do + object = Object.get_by_ap_id(object["id"]) + + {:ok, object} = ActivityPub.unlike(user, object) + new_data = activity.data + |> Map.put("object", object.data) + + status = %{activity | data: new_data} + |> activity_to_status(%{for: user}) + + {:ok, status} + end + + def retweet(%User{} = user, %Activity{data: %{"object" => object}} = activity) do + object = Object.get_by_ap_id(object["id"]) + + {:ok, _announce_activity, object} = ActivityPub.announce(user, object) + new_data = activity.data + |> Map.put("object", object.data) + + status = %{activity | data: new_data} + |> activity_to_status(%{for: user}) + + {:ok, status} + end + + def upload(%Plug.Upload{} = file, format \\ "xml") do {:ok, object} = ActivityPub.upload(file) url = List.first(object.data["url"]) href = url["href"] type = url["mediaType"] - # Fake this as good as possible... - """ - - - #{object.id} - #{object.id} - #{object.id} - #{href} - #{href} - - - """ + case format do + "xml" -> + # Fake this as good as possible... + """ + + + #{object.id} + #{object.id} + #{object.id} + #{href} + #{href} + + + """ + "json" -> + %{ + media_id: object.id, + media_id_string: "#{object.id}}", + media_url: href, + size: 0 + } |> Poison.encode! + end end def parse_mentions(text) do @@ -151,7 +202,7 @@ def parse_mentions(text) do Regex.scan(regex, text) |> List.flatten |> Enum.uniq - |> Enum.map(fn ("@" <> match = full_match) -> {full_match, Repo.get_by(User, nickname: match)} end) + |> Enum.map(fn ("@" <> match = full_match) -> {full_match, User.get_cached_by_nickname(match)} end) |> Enum.filter(fn ({_match, user}) -> user end) end @@ -167,21 +218,72 @@ defp add_conversation_id(activity) do |> put_in(["object", "statusnetConversationId"], activity.id) |> put_in(["statusnetConversationId"], activity.id) + object = Object.get_by_ap_id(activity.data["object"]["id"]) + + changeset = Ecto.Changeset.change(object, data: data["object"]) + Repo.update(changeset) + changeset = Ecto.Changeset.change(activity, data: data) Repo.update(changeset) end end + def register_user(params) do + params = %{ + nickname: params["nickname"], + name: params["fullname"], + bio: params["bio"], + email: params["email"], + password: params["password"], + password_confirmation: params["confirm"] + } + + changeset = User.register_changeset(%User{}, params) + + with {:ok, user} <- Repo.insert(changeset) do + {:ok, UserRepresenter.to_map(user)} + else + {:error, changeset} -> + errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, opts} -> msg end) + |> Poison.encode! + {:error, %{error: errors}} + end + end + defp activities_to_statuses(activities, opts) do Enum.map(activities, fn(activity) -> activity_to_status(activity, opts) end) end + # For likes, fetch the liked activity, too. + defp activity_to_status(%Activity{data: %{"type" => "Like"}} = activity, opts) do + actor = get_in(activity.data, ["actor"]) + user = User.get_cached_by_ap_id(actor) + [liked_activity] = Activity.all_by_object_ap_id(activity.data["object"]) + + ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, liked_activity: liked_activity})) + end + + # For announces, fetch the announced activity and the user. + defp activity_to_status(%Activity{data: %{"type" => "Announce"}} = activity, opts) do + actor = get_in(activity.data, ["actor"]) + user = User.get_cached_by_ap_id(actor) + [announced_activity] = Activity.all_by_object_ap_id(activity.data["object"]) + announced_actor = User.get_cached_by_ap_id(announced_activity.data["actor"]) + + ActivityRepresenter.to_map(activity, Map.merge(opts, %{users: [user, announced_actor], announced_activity: announced_activity})) + end + defp activity_to_status(activity, opts) do actor = get_in(activity.data, ["actor"]) - user = Repo.get_by!(User, ap_id: actor) - mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"]) + user = User.get_cached_by_ap_id(actor) + # mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"]) + mentioned_users = Enum.map(activity.data["to"], fn (ap_id) -> + User.get_cached_by_ap_id(ap_id) + end) + |> Enum.filter(&(&1)) + ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, mentioned: mentioned_users})) end diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 766da6c93..f2ca83915 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -2,6 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do use Pleroma.Web, :controller alias Pleroma.Web.TwitterAPI.TwitterAPI alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter} + alias Pleroma.{Repo, Activity} def verify_credentials(%{assigns: %{user: user}} = conn, _params) do response = user |> UserRepresenter.to_json(%{for: user}) @@ -87,6 +88,12 @@ def help_test(conn, _params) do conn |> json_reply(200, Poison.encode!("ok")) end + def upload_json(conn, %{"media" => media}) do + response = TwitterAPI.upload(media, "json") + conn + |> json_reply(200, response) + end + def config(conn, _params) do response = %{ site: %{ @@ -101,6 +108,44 @@ def config(conn, _params) do |> json_reply(200, response) end + def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do + activity = Repo.get(Activity, id) + {:ok, status} = TwitterAPI.favorite(user, activity) + response = Poison.encode!(status) + + conn + |> json_reply(200, response) + end + + def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do + activity = Repo.get(Activity, id) + {:ok, status} = TwitterAPI.unfavorite(user, activity) + response = Poison.encode!(status) + + conn + |> json_reply(200, response) + end + + def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do + activity = Repo.get(Activity, id) + {:ok, status} = TwitterAPI.retweet(user, activity) + response = Poison.encode!(status) + + conn + |> json_reply(200, response) + end + + def register(conn, params) do + with {:ok, user} <- TwitterAPI.register_user(params) do + conn + |> json_reply(200, Poison.encode!(user)) + else + {:error, errors} -> + conn + |> json_reply(400, Poison.encode!(errors)) + end + end + defp json_reply(conn, status, json) do conn |> put_resp_content_type("application/json") diff --git a/mix.exs b/mix.exs index 43a93cc2c..09bc34f1a 100644 --- a/mix.exs +++ b/mix.exs @@ -38,6 +38,8 @@ defp deps do {:trailing_format_plug, "~> 0.0.5" }, {:html_sanitize_ex, "~> 1.0.0"}, {:calendar, "~> 0.16.1"}, + {:con_cache, "~> 0.12.0"}, + {:ex_machina, "~> 2.0", only: :test}, {:mix_test_watch, "~> 0.2", only: :dev}] end diff --git a/mix.lock b/mix.lock index 780a63221..6fb72ac8a 100644 --- a/mix.lock +++ b/mix.lock @@ -1,6 +1,7 @@ %{"calendar": {:hex, :calendar, "0.16.1", "782327ad8bae7c797b887840dc4ddb933f05ce6e333e5b04964d7a5d5f79bde3", [:mix], [{:tzdata, "~> 0.5.8 or ~> 0.1.201603", [hex: :tzdata, optional: false]}]}, "certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], []}, "comeonin": {:hex, :comeonin, "3.0.2", "8b213268a6634bd2e31a8035a963e974681d13ccc1f73f2ae664b6ac4e993c96", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, optional: false]}]}, + "con_cache": {:hex, :con_cache, "0.12.0", "2d961aec219aa5a914473873f348f5a6088292dc69d5192a9d25f8a1e13e9905", [:mix], [{:exactor, "~> 2.2.0", [hex: :exactor, optional: false]}]}, "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []}, "cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, optional: false]}]}, "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []}, @@ -8,6 +9,8 @@ "decimal": {:hex, :decimal, "1.3.1", "157b3cedb2bfcb5359372a7766dd7a41091ad34578296e951f58a946fcab49c6", [:mix], []}, "ecto": {:hex, :ecto, "2.1.4", "d1ba932813ec0e0d9db481ef2c17777f1cefb11fc90fa7c142ff354972dfba7e", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, optional: true]}]}, "elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], []}, + "ex_machina": {:hex, :ex_machina, "2.0.0", "ec284c6f57233729cea9319e083f66e613e82549f78eccdb2059aeba5d0df9f3", [:mix], [{:ecto, "~> 2.1", [hex: :ecto, optional: true]}]}, + "exactor": {:hex, :exactor, "2.2.3", "a6972f43bb6160afeb73e1d8ab45ba604cd0ac8b5244c557093f6e92ce582786", [:mix], []}, "fs": {:hex, :fs, "2.12.0", "ad631efacc9a5683c8eaa1b274e24fa64a1b8eb30747e9595b93bec7e492e25e", [:rebar3], []}, "gettext": {:hex, :gettext, "0.13.1", "5e0daf4e7636d771c4c71ad5f3f53ba09a9ae5c250e1ab9c42ba9edccc476263", [:mix], []}, "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, optional: false]}, {:idna, "4.0.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]}, diff --git a/priv/repo/migrations/20170415141210_add_unique_index_to_email_and_nickname.exs b/priv/repo/migrations/20170415141210_add_unique_index_to_email_and_nickname.exs new file mode 100644 index 000000000..361ca04da --- /dev/null +++ b/priv/repo/migrations/20170415141210_add_unique_index_to_email_and_nickname.exs @@ -0,0 +1,8 @@ +defmodule Pleroma.Repo.Migrations.AddUniqueIndexToEmailAndNickname do + use Ecto.Migration + + def change do + create unique_index(:users, [:email]) + create unique_index(:users, [:nickname]) + end +end diff --git a/priv/static/index.html b/priv/static/index.html old mode 100644 new mode 100755 index 09e66cd6b..c7ba82231 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -Pleroma
\ No newline at end of file +Pleroma
\ No newline at end of file diff --git a/priv/static/static/config.json b/priv/static/static/config.json index fb8d40158..3b6d56c44 100644 --- a/priv/static/static/config.json +++ b/priv/static/static/config.json @@ -1,6 +1,6 @@ { "name": "Pleroma FE", - "theme": "base16-ashes.css", + "theme": "base16-pleroma-dark.css", "background": "/static/bg.jpg", "logo": "/static/logo.png" } diff --git a/priv/static/static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css b/priv/static/static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css new file mode 100644 index 000000000..74e3ab783 Binary files /dev/null and b/priv/static/static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css differ diff --git a/priv/static/static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css.map b/priv/static/static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css.map new file mode 100644 index 000000000..a3219d583 --- /dev/null +++ b/priv/static/static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack:///webpack:///src/App.scss","webpack:///webpack:///src/components/login_form/login_form.vue","webpack:///webpack:///src/components/post_status_form/post_status_form.vue","webpack:///webpack:///src/components/media_upload/media_upload.vue","webpack:///webpack:///~/tributejs/scss/~/tributejs/scss/tribute.scss","webpack:///webpack:///src/components/user_card_content/user_card_content.vue","webpack:///webpack:///src/components/nav_panel/nav_panel.vue","webpack:///webpack:///src/components/notifications/notifications.scss","webpack:///webpack:///src/components/timeline/timeline.vue","webpack:///webpack:///src/components/status/status.vue","webpack:///webpack:///src/components/attachment/attachment.vue","webpack:///webpack:///src/components/favorite_button/favorite_button.vue","webpack:///webpack:///src/components/retweet_button/retweet_button.vue","webpack:///webpack:///src/components/delete_button/delete_button.vue","webpack:///webpack:///src/components/status_or_conversation/status_or_conversation.vue","webpack:///webpack:///src/components/conversation/conversation.vue","webpack:///webpack:///src/components/user_profile/user_profile.vue","webpack:///webpack:///src/components/settings/settings.vue","webpack:///webpack:///src/components/style_switcher/style_switcher.vue","webpack:///webpack:///src/components/registration/registration.vue"],"names":[],"mappings":"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","file":"static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css","sourcesContent":["\n#app{background-size:cover;background-attachment:fixed;background-repeat:no-repeat;background-position:0 50px;min-height:100vh\n}\nh4{margin:0\n}\n#content{padding-top:60px\n}\n.text-center{text-align:center\n}\nbody{font-family:sans-serif;font-size:14px;margin:0\n}\na{text-decoration:none\n}\nbutton{border:none;border-radius:5px;cursor:pointer\n}\nbutton:hover{opacity:0.8\n}\n.container{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin:0;padding:0 10px 0 10px\n}\n.gaps{margin:-1em 0 0 -1em\n}\n.item{-ms-flex:1;flex:1\n}\n.gaps>.item{padding:1em 0 0 1em\n}\n.auto-size{-ms-flex:1;flex:1\n}\nnav{width:100%;-ms-flex-align:center;align-items:center;position:fixed;height:50px\n}\nnav .inner-nav{padding-left:20px;padding-right:20px;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-preferred-size:970px;flex-basis:970px;margin:auto;height:50px;background-repeat:no-repeat;background-position:center;background-size:contain\n}\nmain-router{-ms-flex:1;flex:1\n}\n.status.compact{color:rgba(0,0,0,0.42);font-weight:300\n}\n.status.compact p{margin:0;font-size:0.8em\n}\n.panel{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;margin:0.5em;border-radius:10px\n}\n.panel-heading{border-radius:10px 10px 0 0;background-size:cover;padding:0.6em 1.0em;text-align:left;font-size:1.3em;line-height:24px\n}\n.panel-footer{border-radius:0 0 10px 10px\n}\n.panel-body>p{line-height:18px;padding:1em;margin:0\n}\n#content{margin:auto;max-width:980px;border-radius:10px;padding-bottom:1em;background-color:rgba(0,0,0,0.1)\n}\n.media-body{-ms-flex:1;flex:1;padding-left:0.5em\n}\n.container>*{min-width:0px\n}\n.fa{color:grey\n}\n.status-actions{width:50%;display:-ms-flexbox;display:flex\n}\n.status-actions div,.status-actions favorite-button{-ms-flex:1;flex:1\n}\nstatus-text-container{display:block\n}\n.status-el{line-height:18px\n}\n.status-el .notify .avatar{border-width:3px;border-style:solid\n}\n.status-el .media-left img{margin-top:0.2em;float:right;margin-right:0.3em;border-radius:5px\n}\n.status-el .retweet-info{padding:0.7em 0 0 0.6em\n}\n.status-el .retweet-info .media-left{display:-ms-flexbox;display:flex\n}\n.status-el .retweet-info .media-left i{-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center;text-align:right;-ms-flex:1;flex:1;padding-right:0.3em\n}\n.status-el .media-heading{margin-bottom:0.3em\n}\n.status-el .media-heading small{font-weight:lighter\n}\nnav{z-index:1000\n}\n.fade-enter-active,.fade-leave-active{transition:opacity .2s\n}\n.fade-enter,.fade-leave-active{opacity:0\n}\n.main{-ms-flex-preferred-size:60%;flex-basis:60%;-ms-flex-positive:1;flex-grow:1;-ms-flex-negative:1;flex-shrink:1\n}\n.sidebar{-ms-flex:0;flex:0;-ms-flex-preferred-size:35%;flex-basis:35%\n}\n.sidebar-flexer{-ms-flex:1;flex:1;-ms-flex-preferred-size:345px;flex-basis:345px;width:365px\n}\n.mobile-shown{display:none\n}\n.panel-switcher{display:none;width:100%\n}\n.panel-switcher button{display:block;-ms-flex:1;flex:1;margin:0.5em;padding:0.5em\n}\n@media all and (min-width: 960px){\n.sidebar{overflow:hidden;max-height:100vh;width:350px;position:fixed;margin-top:-10px\n}\n.sidebar .sidebar-container{height:96vh;width:362px;padding-top:10px;padding-right:20px;overflow-x:hidden;overflow-y:scroll\n}\n.sidebar-flexer{max-height:96vh;-ms-flex-negative:0;flex-shrink:0;-ms-flex-positive:0;flex-grow:0\n}\n}\n@media all and (max-width: 959px){\n.mobile-hidden{display:none\n}\n.panel-switcher{display:-ms-flexbox;display:flex\n}\n.container{padding:0 0 0 0\n}\n.panel{margin:0.5em 0 0.5em 0\n}\n}\n.item.right{text-align:right;padding-right:20px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/App.scss","\n.login-form input{border-width:1px;border-style:solid;border-color:silver;border-radius:5px;padding:0.1em 0.2em 0.2em 0.2em\n}\n.login-form .btn{margin-top:1.0em;min-height:28px\n}\n.login-form .error{border-radius:5px;text-align:center;background-color:rgba(255,48,16,0.65);min-height:28px;line-height:28px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/login_form/login_form.vue","\n.tribute-container ul{padding:0px\n}\n.tribute-container ul li{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center\n}\n.tribute-container img{padding:3px;width:16px;height:16px;border-radius:50%\n}\n.post-status-form .form-bottom,.login .form-bottom{display:-ms-flexbox;display:flex;padding:0.5em\n}\n.post-status-form .form-bottom button,.login .form-bottom button{-ms-flex:2;flex:2\n}\n.post-status-form .attachments,.login .attachments{padding:0.5em\n}\n.post-status-form .attachments i,.login .attachments i{position:absolute;margin:10px;padding:5px;background:rgba(230,230,230,0.6);border-radius:5px;font-weight:bold\n}\n.post-status-form .btn,.login .btn{cursor:pointer\n}\n.post-status-form .btn[disabled],.login .btn[disabled]{cursor:not-allowed\n}\n.post-status-form .icon-cancel,.login .icon-cancel{cursor:pointer\n}\n.post-status-form form,.login form{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:0.6em\n}\n.post-status-form .form-group,.login .form-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:0.3em 0.5em 0.6em;line-height:24px\n}\n.post-status-form form textarea,.login form textarea{border:solid;border-width:1px;border-color:silver;border-radius:5px;line-height:16px;padding:5px;resize:vertical\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/post_status_form/post_status_form.vue","\n.media-upload {\n font-size: 26px;\n -ms-flex: 1;\n flex: 1;\n}\n.icon-upload {\n cursor: pointer;\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/media_upload/media_upload.vue",".tribute-container {\n position: absolute;\n top: 0;\n left: 0;\n height: auto;\n max-height: 300px;\n max-width: 500px;\n overflow: auto;\n display: block;\n z-index: 999999;\n\n ul {\n margin: 0;\n margin-top: 2px;\n list-style: none;\n background: #efefef;\n }\n\n li {\n padding: 5px 5px;\n cursor: pointer;\n\n &.highlight, &:hover {\n background: #ddd;\n }\n\n span {\n font-weight: bold;\n }\n }\n\n .menu-highlighted {\n font-weight: bold;\n }\n\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///~/tributejs/scss/~/tributejs/scss/tribute.scss","\n.profile-panel-background{background-size:cover;border-radius:10px\n}\n.profile-panel-background .panel-heading{padding:0.6em 0em;text-align:center\n}\n.profile-panel-body{top:-0em;padding-top:4em\n}\n.user-info{color:white;padding:16px 16px 16px 16px;margin-bottom:-4em;text-shadow:0px 1px 1.5px #000\n}\n.user-info .container{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:start;align-content:flex-start;-ms-flex-pack:center;justify-content:center;max-height:60px\n}\n.user-info img{border:2px solid;border-radius:5px;-ms-flex:1 0 100%;flex:1 0 100%;max-width:48px;max-height:48px\n}\n.user-info .user-name{margin-top:0.0em;margin-left:0.6em;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-item-align:start;align-self:flex-start\n}\n.user-info .user-screen-name{margin-top:0.0em;margin-left:0.6em;font-weight:lighter;font-size:15px;padding-right:0.1em;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-item-align:start;align-self:flex-start\n}\n.user-info .user-interactions{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-pack:justify;justify-content:space-between;margin-top:0.7em;margin-bottom:-1.0em\n}\n.user-info .user-interactions div{-ms-flex:1;flex:1\n}\n.user-info .user-interactions .following{color:white;font-size:14px;-ms-flex:0 0 100%;flex:0 0 100%;margin:-0.7em 0.0em 0.3em 0.0em;padding-left:16px;text-align:left\n}\n.user-info .user-interactions .mute{max-width:220px;min-height:28px\n}\n.user-info .user-interactions .follow{max-width:220px;min-height:28px\n}\n.user-info .user-interactions button{border:solid;border-width:1px;width:92%;height:100%\n}\n.user-info .user-interactions .pressed{border:solid;border-width:1px\n}\n.user-counts{display:-ms-flexbox;display:flex;line-height:16px;padding:1em 1.5em 0em 1em;text-align:center\n}\n.user-count{-ms-flex:1;flex:1\n}\n.user-count h5{font-size:1em;font-weight:bolder;margin:0 0 0.25em\n}\n.dailyAvg{font-size:0.8em;opacity:0.5\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/user_card_content/user_card_content.vue","\n.nav-panel ul{list-style:none;margin:0;padding:0\n}\n.nav-panel li{border-bottom:1px solid;border-color:inherit;padding:0\n}\n.nav-panel li:first-child a{border-top-right-radius:10px;border-top-left-radius:10px\n}\n.nav-panel li:last-child a{border-bottom-right-radius:10px;border-bottom-left-radius:10px\n}\n.nav-panel li:last-child{border:none\n}\n.nav-panel a{display:block;padding:0.8em 0.85em\n}\n.nav-panel a:hover{background-color:transparent\n}\n.nav-panel a.router-link-active{font-weight:bolder;background-color:transparent\n}\n.nav-panel a.router-link-active:hover{text-decoration:underline\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/nav_panel/nav_panel.vue","\n.notifications{padding-bottom:15em\n}\n.notifications .panel-heading{position:relative\n}\n.notifications .panel-heading .read-button{position:absolute;right:0.7em;height:1.8em;line-height:100%\n}\n.notifications .unseen-count{display:inline-block;background-color:rgba(255,16,8,0.8);text-shadow:0px 0px 3px rgba(0,0,0,0.5);min-width:1.3em;border-radius:1.3em;margin:0 0.2em 0 -0.4em;color:white;font-size:0.9em;text-align:center;line-height:1.3em\n}\n.notifications .notification{padding:0.4em 0 0 10px;display:-ms-flexbox;display:flex;border-bottom:1px solid;border-bottom-color:inherit\n}\n.notifications .notification .text{min-width:0px;word-wrap:break-word;line-height:18px;padding:0.3em 0.8em 0.5em\n}\n.notifications .notification .text .icon-retweet{color:#0fa00f\n}\n.notifications .notification .text .icon-reply{color:#0095ff\n}\n.notifications .notification .text h1{margin:0 0 0.3em;padding:0;font-size:1em;line-height:20px\n}\n.notifications .notification .text p{margin:0;margin-top:0;margin-bottom:0.3em\n}\n.notifications .notification .avatar{padding-top:0.3em;width:32px;height:32px;border-radius:50%\n}\n.notifications .notification:last-child{border-bottom:none;border-radius:0 0 10px 10px\n}\n.notifications .unseen{border-left:4px solid rgba(255,16,8,0.75);padding-left:6px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/notifications/notifications.scss","\n.timeline .timeline-heading{position:relative;display:-ms-flexbox;display:flex\n}\n.timeline .title{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:70%\n}\n.timeline .loadmore-button{position:absolute;right:0.6em;min-width:6em;height:1.8em;line-height:100%\n}\n.timeline .error{background-color:rgba(255,48,16,0.65)\n}\n.timeline .no-press{opacity:0.8;cursor:default\n}\n.new-status-notification{position:relative;margin-top:-1px;font-size:1.1em;border-width:1px 0 0 0;border-style:solid;border-radius:0 0 10px 10px;padding:10px;z-index:1\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/timeline/timeline.vue","\n.status-el{-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto;overflow-wrap:break-word;word-wrap:break-word;word-break:break-word;border-left-width:0px\n}\n.status-el .user-content{min-height:52px;padding-top:1px\n}\n.status-el .source_url{float:right\n}\n.status-el .greentext{color:green\n}\n.status-el a{display:inline-block;word-break:break-all\n}\n.status-el .status-content{margin:3px 15px 4px 0\n}\n.status-el p{margin:0;margin-top:0.2em;margin-bottom:0.5em\n}\n.status-conversation{border-left-style:solid\n}\n.status-actions{padding-top:5px\n}\n.icon-reply:hover{color:#0095ff\n}\n.icon-reply-active{color:#0095ff\n}\n.status .avatar{width:48px\n}\n.status.compact .avatar{width:32px\n}\n.status{padding:0.65em 0.7em 0.8em 0.8em;border-bottom:1px solid;border-bottom-color:inherit;border-left:4px rgba(255,48,16,0.65);border-left-style:inherit\n}\n.muted{padding:0.1em 0.7em 0.1em 0.8em\n}\n.muted button{margin-left:auto\n}\n.muted .muteWords{margin-left:10px\n}\na.unmute{display:block;margin-left:auto\n}\n.usercard{border-style:solid;border-width:1px;border-radius:10px;margin-bottom:1em;margin-top:0.2em\n}\n.reply-left{-ms-flex:0;flex:0;min-width:48px\n}\n.reply-body{-ms-flex:1;flex:1\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/status/status.vue","\n.attachments{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-0.7em\n}\n.attachments .attachment{-ms-flex:1 0 30%;flex:1 0 30%;margin:0.5em 0.7em 0.6em 0.0em;-ms-flex-item-align:start;align-self:flex-start\n}\n.attachments .attachment.html{-ms-flex-preferred-size:100%;flex-basis:100%;display:-ms-flexbox;display:flex\n}\n.attachments .attachment.loading{cursor:progress\n}\n.attachments .attachment .hider{position:absolute;margin:10px;padding:5px;background:rgba(230,230,230,0.6);border-radius:5px;font-weight:bold\n}\n.attachments .attachment video{height:100%;border:1px solid;border-radius:5px;width:100%\n}\n.attachments .attachment audio{width:100%\n}\n.attachments .attachment img.media-upload{width:100%;height:100%;-ms-flex:1;flex:1;border:1px solid;border-radius:5px\n}\n.attachments .attachment .oembed{border:1px solid;border-radius:5px;border-color:inherit;width:100%;margin-right:15px;display:-ms-flexbox;display:flex\n}\n.attachments .attachment .oembed img{width:100%\n}\n.attachments .attachment .oembed .image{-ms-flex:1;flex:1\n}\n.attachments .attachment .oembed .image img{border:0px;border-radius:5px;height:100%;object-fit:cover\n}\n.attachments .attachment .oembed .text{-ms-flex:2;flex:2;margin:8px\n}\n.attachments .attachment .oembed .text h1{font-size:14px;margin:0px\n}\n.attachments .attachment a.image-attachment{display:-ms-flexbox;display:flex;-ms-flex:1;flex:1\n}\n.attachments .attachment a.image-attachment img{border-style:solid;border-width:1px;border-radius:5px;object-fit:contain;width:100%;height:100%;max-height:500px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/attachment/attachment.vue","\n.favorite-button{cursor:pointer;animation-duration:0.6s\n}\n.favorite-button:hover{color:orange\n}\n.icon-star{color:orange\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/favorite_button/favorite_button.vue","\n.icon-retweet{cursor:pointer;animation-duration:0.6s\n}\n.icon-retweet:hover{color:#0fa00f\n}\n.retweeted{color:#0fa00f\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/retweet_button/retweet_button.vue","\n.icon-cancel,.delete-status{cursor:pointer\n}\n.icon-cancel:hover,.delete-status:hover{color:red\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/delete_button/delete_button.vue","\n.spacer{height:1em\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/status_or_conversation/status_or_conversation.vue","\n.conversation-heading{border-bottom-style:solid;border-bottom-width:1px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/conversation/conversation.vue","\n.user-profile{-ms-flex:2;flex:2;-ms-flex-preferred-size:500px;flex-basis:500px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/user_profile/user_profile.vue","\n.setting-item{margin:1em 1em 1.4em\n}\n.setting-item textarea{width:100%;height:100px\n}\n.setting-list{list-style-type:none\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/settings/settings.vue","\n.style-switcher{margin-right:1em\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/style_switcher/style_switcher.vue","\n.registration-form form{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:0.6em\n}\n.registration-form .form-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:0.3em 0.5em 0.6em;line-height:24px\n}\n.registration-form form textarea{border:solid;border-width:1px;border-color:silver;border-radius:5px;line-height:16px;padding:5px;resize:vertical\n}\n.registration-form input{border-width:1px;border-style:solid;border-color:silver;border-radius:5px;padding:0.1em 0.2em 0.2em 0.2em\n}\n.registration-form .btn{margin-top:1.0em;min-height:28px\n}\n.registration-form .error{border-radius:5px;text-align:center;background-color:rgba(255,48,16,0.65);min-height:28px;line-height:28px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/registration/registration.vue"],"sourceRoot":""} \ No newline at end of file diff --git a/priv/static/static/css/app.c9152df945545cbfad798e27da935399.css b/priv/static/static/css/app.c9152df945545cbfad798e27da935399.css deleted file mode 100644 index 28d742473..000000000 Binary files a/priv/static/static/css/app.c9152df945545cbfad798e27da935399.css and /dev/null differ diff --git a/priv/static/static/css/app.c9152df945545cbfad798e27da935399.css.map b/priv/static/static/css/app.c9152df945545cbfad798e27da935399.css.map deleted file mode 100644 index 7fdfadaa6..000000000 --- a/priv/static/static/css/app.c9152df945545cbfad798e27da935399.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["webpack:///webpack:///src/App.scss","webpack:///webpack:///src/components/login_form/login_form.vue","webpack:///webpack:///src/components/post_status_form/post_status_form.vue","webpack:///webpack:///src/components/media_upload/media_upload.vue","webpack:///webpack:///~/tributejs/scss/~/tributejs/scss/tribute.scss","webpack:///webpack:///src/components/user_card_content/user_card_content.vue","webpack:///webpack:///src/components/nav_panel/nav_panel.vue","webpack:///webpack:///src/components/notifications/notifications.scss","webpack:///webpack:///src/components/timeline/timeline.vue","webpack:///webpack:///src/components/status/status.vue","webpack:///webpack:///src/components/attachment/attachment.vue","webpack:///webpack:///src/components/favorite_button/favorite_button.vue","webpack:///webpack:///src/components/retweet_button/retweet_button.vue","webpack:///webpack:///src/components/delete_button/delete_button.vue","webpack:///webpack:///src/components/status_or_conversation/status_or_conversation.vue","webpack:///webpack:///src/components/conversation/conversation.vue","webpack:///webpack:///src/components/user_profile/user_profile.vue","webpack:///webpack:///src/components/settings/settings.vue","webpack:///webpack:///src/components/style_switcher/style_switcher.vue"],"names":[],"mappings":"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","file":"static/css/app.c9152df945545cbfad798e27da935399.css","sourcesContent":["\n#app{background-size:cover;background-attachment:fixed;background-repeat:no-repeat;background-position:0 50px;min-height:100vh\n}\nh4{margin:0\n}\n#content{padding-top:60px\n}\n.text-center{text-align:center\n}\nbody{font-family:sans-serif;font-size:14px;margin:0\n}\na{text-decoration:none\n}\nbutton{border:none;border-radius:5px;cursor:pointer\n}\nbutton:hover{opacity:0.8\n}\n.container{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin:0;padding:0 10px 0 10px\n}\n.gaps{margin:-1em 0 0 -1em\n}\n.item{-ms-flex:1;flex:1\n}\n.gaps>.item{padding:1em 0 0 1em\n}\n.auto-size{-ms-flex:1;flex:1\n}\nnav{width:100%;-ms-flex-align:center;align-items:center;position:fixed;height:50px\n}\nnav .inner-nav{padding-left:20px;padding-right:20px;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-preferred-size:970px;flex-basis:970px;margin:auto;height:50px;background-repeat:no-repeat;background-position:center;background-size:contain\n}\nmain-router{-ms-flex:1;flex:1\n}\n.status.compact{color:rgba(0,0,0,0.42);font-weight:300\n}\n.status.compact p{margin:0;font-size:0.8em\n}\n.panel{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;margin:0.5em;border-radius:10px\n}\n.panel-heading{border-radius:10px 10px 0 0;background-size:cover;padding:0.6em 1.0em;text-align:left;font-size:1.3em;line-height:24px\n}\n.panel-footer{border-radius:0 0 10px 10px\n}\n.panel-body>p{line-height:18px;padding:1em;margin:0\n}\n#content{margin:auto;max-width:980px;border-radius:10px;padding-bottom:1em;background-color:rgba(0,0,0,0.1)\n}\n.media-body{-ms-flex:1;flex:1;padding-left:0.5em\n}\n.container>*{min-width:0px\n}\n.fa{color:grey\n}\n.status-actions{width:50%;display:-ms-flexbox;display:flex\n}\n.status-actions div,.status-actions favorite-button{-ms-flex:1;flex:1\n}\nstatus-text-container{display:block\n}\n.status-el{line-height:18px\n}\n.status-el .notify .avatar{border-width:3px;border-style:solid\n}\n.status-el .media-left img{margin-top:0.2em;float:right;margin-right:0.3em;border-radius:5px\n}\n.status-el .retweet-info{padding:0.7em 0 0 0.6em\n}\n.status-el .retweet-info .media-left{display:-ms-flexbox;display:flex\n}\n.status-el .retweet-info .media-left i{-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center;text-align:right;-ms-flex:1;flex:1;padding-right:0.3em\n}\n.status-el .media-heading{margin-bottom:0.3em\n}\n.status-el .media-heading small{font-weight:lighter\n}\nnav{z-index:1000\n}\n.fade-enter-active,.fade-leave-active{transition:opacity .2s\n}\n.fade-enter,.fade-leave-active{opacity:0\n}\n.main{-ms-flex:1;flex:1;-ms-flex-preferred-size:65%;flex-basis:65%\n}\n.sidebar{-ms-flex:1;flex:1;-ms-flex-preferred-size:35%;flex-basis:35%\n}\n.mobile-shown{display:none\n}\n.panel-switcher{display:none;width:100%\n}\n.panel-switcher button{display:block;-ms-flex:1;flex:1;margin:0.5em;padding:0.5em\n}\n@media all and (max-width: 959px){\n.mobile-hidden{display:none\n}\n.panel-switcher{display:-ms-flexbox;display:flex\n}\n.container{padding:0 0 0 0\n}\n.panel{margin:0.5em 0 0.5em 0\n}\n}\n.item.right{text-align:right;padding-right:20px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/App.scss","\n.login-form input{border-width:1px;border-style:solid;border-color:silver;border-radius:5px;padding:0.1em 0.2em 0.2em 0.2em\n}\n.login-form .btn{margin-top:1.0em;min-height:28px\n}\n.login-form .error{border-radius:5px;text-align:center;background-color:rgba(255,48,16,0.65);min-height:28px;line-height:28px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/login_form/login_form.vue","\n.tribute-container ul{padding:0px\n}\n.tribute-container ul li{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center\n}\n.tribute-container img{padding:3px;width:16px;height:16px;border-radius:50%\n}\n.post-status-form .form-bottom,.login .form-bottom{display:-ms-flexbox;display:flex;padding:0.5em\n}\n.post-status-form .form-bottom button,.login .form-bottom button{-ms-flex:2;flex:2\n}\n.post-status-form .attachments,.login .attachments{padding:0.5em\n}\n.post-status-form .attachments i,.login .attachments i{position:absolute;margin:10px;padding:5px;background:rgba(230,230,230,0.6);border-radius:5px;font-weight:bold\n}\n.post-status-form form,.login form{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:0.6em\n}\n.post-status-form .form-group,.login .form-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:0.3em 0.5em 0.6em;line-height:24px\n}\n.post-status-form form textarea,.login form textarea{border:solid;border-width:1px;border-color:silver;border-radius:5px;line-height:16px;padding:5px;resize:vertical\n}\n.post-status-form .btn,.login .btn{cursor:pointer\n}\n.post-status-form .btn[disabled],.login .btn[disabled]{cursor:not-allowed\n}\n.post-status-form .icon-cancel,.login .icon-cancel{cursor:pointer\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/post_status_form/post_status_form.vue","\n.media-upload {\n font-size: 26px;\n -ms-flex: 1;\n flex: 1;\n}\n.icon-upload {\n cursor: pointer;\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/media_upload/media_upload.vue",".tribute-container {\n position: absolute;\n top: 0;\n left: 0;\n height: auto;\n max-height: 300px;\n max-width: 500px;\n overflow: auto;\n display: block;\n z-index: 999999;\n\n ul {\n margin: 0;\n margin-top: 2px;\n list-style: none;\n background: #efefef;\n }\n\n li {\n padding: 5px 5px;\n cursor: pointer;\n\n &.highlight, &:hover {\n background: #ddd;\n }\n\n span {\n font-weight: bold;\n }\n }\n\n .menu-highlighted {\n font-weight: bold;\n }\n\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///~/tributejs/scss/~/tributejs/scss/tribute.scss","\n.profile-panel-background{background-size:cover;border-radius:10px\n}\n.profile-panel-background .panel-heading{padding:0.6em 0em;text-align:center\n}\n.profile-panel-body{padding-top:0em;top:-0em;padding-top:4em\n}\n.user-info{color:white;padding:16px 16px 16px 16px;margin-bottom:-4em;text-shadow:0px 1px 1.5px #000\n}\n.user-info .container{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:start;align-content:flex-start;-ms-flex-pack:center;justify-content:center;max-height:60px\n}\n.user-info img{border:2px solid;border-radius:5px;-ms-flex:1 0 100%;flex:1 0 100%;max-width:48px;max-height:48px\n}\n.user-info .user-name{margin-top:0.0em;margin-left:0.6em;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-item-align:start;align-self:flex-start\n}\n.user-info .user-screen-name{margin-top:0.0em;margin-left:0.6em;font-weight:lighter;font-size:15px;padding-right:0.1em;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-item-align:start;align-self:flex-start\n}\n.user-info .user-interactions{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-pack:justify;justify-content:space-between;margin-top:0.7em;margin-bottom:-1.0em\n}\n.user-info .user-interactions div{-ms-flex:1;flex:1\n}\n.user-info .user-interactions .following{color:white;font-size:14px;-ms-flex:0 0 100%;flex:0 0 100%;margin:-0.7em 0.0em 0.3em 0.0em;padding-left:16px;text-align:left\n}\n.user-info .user-interactions .mute{max-width:220px;min-height:28px\n}\n.user-info .user-interactions .follow{max-width:220px;min-height:28px\n}\n.user-info .user-interactions button{border:solid;border-width:1px;width:92%;height:100%\n}\n.user-info .user-interactions .pressed{border:solid;border-width:1px\n}\n.user-counts{display:-ms-flexbox;display:flex;line-height:16px;padding:1em 1.5em 0em 1em;text-align:center\n}\n.user-count{-ms-flex:1;flex:1\n}\n.user-count h5{font-size:1em;font-weight:bolder;margin:0 0 0.25em\n}\n.dailyAvg{font-size:0.8em;opacity:0.5\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/user_card_content/user_card_content.vue","\n.nav-panel ul{list-style:none;margin:0;padding:0\n}\n.nav-panel li{border-bottom:1px solid;border-color:inherit;padding:0\n}\n.nav-panel li:first-child a{border-top-right-radius:10px;border-top-left-radius:10px\n}\n.nav-panel li:last-child a{border-bottom-right-radius:10px;border-bottom-left-radius:10px\n}\n.nav-panel li:last-child{border:none\n}\n.nav-panel a{display:block;padding:0.8em 0.85em\n}\n.nav-panel a:hover{background-color:transparent\n}\n.nav-panel a.router-link-active{font-weight:bolder;background-color:transparent\n}\n.nav-panel a.router-link-active:hover{text-decoration:underline\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/nav_panel/nav_panel.vue","\n.notifications .panel-heading{position:relative\n}\n.notifications .panel-heading .read-button{position:absolute;right:0.7em;height:1.8em;line-height:100%\n}\n.notifications .unseen-count{display:inline-block;background-color:rgba(255,16,8,0.8);text-shadow:0px 0px 3px rgba(0,0,0,0.5);min-width:1.3em;border-radius:1.3em;margin:0 0.2em 0 -0.4em;color:white;font-size:0.9em;text-align:center;line-height:1.3em\n}\n.notifications .notification{padding:0.4em 0 0 10px;display:-ms-flexbox;display:flex;border-bottom:1px solid;border-bottom-color:inherit\n}\n.notifications .notification .text{min-width:0px;word-wrap:break-word;line-height:18px;padding:0.3em 0.8em 0.5em\n}\n.notifications .notification .text .icon-retweet{color:#0fa00f\n}\n.notifications .notification .text .icon-reply{color:#0095ff\n}\n.notifications .notification .text h1{margin:0 0 0.3em;padding:0;font-size:1em;line-height:20px\n}\n.notifications .notification .text p{margin:0;margin-top:0;margin-bottom:0.3em\n}\n.notifications .notification .avatar{padding-top:0.3em;width:32px;height:32px;border-radius:50%\n}\n.notifications .notification:last-child{border-bottom:none;border-radius:0 0 10px 10px\n}\n.notifications .unseen{border-left:4px solid rgba(255,16,8,0.75);padding-left:6px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/notifications/notifications.scss","\n.timeline .timeline-heading{position:relative;display:-ms-flexbox;display:flex\n}\n.timeline .title{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:70%\n}\n.timeline .loadmore-button{position:absolute;right:0.6em;min-width:6em;height:1.8em;line-height:100%\n}\n.timeline .error{background-color:rgba(255,48,16,0.65)\n}\n.timeline .no-press{opacity:0.8;cursor:default\n}\n.new-status-notification{position:relative;margin-top:-1px;font-size:1.1em;border-width:1px 0 0 0;border-style:solid;border-radius:0 0 10px 10px;padding:10px;z-index:1\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/timeline/timeline.vue","\n.status-el{-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto;overflow-wrap:break-word;word-wrap:break-word;word-break:break-word;border-left-width:0px\n}\n.status-el .user-content{min-height:52px;padding-top:1px\n}\n.status-el .source_url{float:right\n}\n.status-el .greentext{color:green\n}\n.status-el a{display:inline-block;word-break:break-all\n}\n.status-el .status-content{margin:3px 15px 4px 0\n}\n.status-el p{margin:0;margin-top:0.2em;margin-bottom:0.5em\n}\n.status-conversation{border-left-style:solid\n}\n.status-actions{padding-top:5px\n}\n.icon-reply:hover{color:#0095ff\n}\n.icon-reply-active{color:#0095ff\n}\n.status .avatar{width:48px\n}\n.status.compact .avatar{width:32px\n}\n.status{padding:0.65em 0.7em 0.8em 0.8em;border-bottom:1px solid;border-bottom-color:inherit;border-left:4px rgba(255,48,16,0.65);border-left-style:inherit\n}\n.muted button{margin-left:auto\n}\na.unmute{display:block;margin-left:auto\n}\n.usercard{border-style:solid;border-width:1px;border-radius:10px;margin-bottom:1em;margin-top:0.2em\n}\n.reply-left{-ms-flex:0;flex:0;min-width:48px\n}\n.reply-body{-ms-flex:1;flex:1\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/status/status.vue","\n.attachments{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-0.8em\n}\n.attachments .attachment{-ms-flex:1 0 30%;flex:1 0 30%;margin:0.5em 0.8em 0.6em 0.0em;-ms-flex-item-align:start;align-self:flex-start\n}\n.attachments .attachment.html{-ms-flex-preferred-size:100%;flex-basis:100%;display:-ms-flexbox;display:flex\n}\n.attachments .attachment.loading{cursor:progress\n}\n.attachments .attachment .hider{position:absolute;margin:10px;padding:5px;background:rgba(230,230,230,0.6);border-radius:5px;font-weight:bold\n}\n.attachments .attachment video{height:100%;border:1px solid;border-radius:5px;width:100%\n}\n.attachments .attachment audio{width:100%\n}\n.attachments .attachment img.media-upload{width:100%;height:100%;-ms-flex:1;flex:1;border:1px solid;border-radius:5px\n}\n.attachments .attachment .oembed{border:1px solid;border-radius:5px;border-color:inherit;width:100%;margin-right:15px;display:-ms-flexbox;display:flex\n}\n.attachments .attachment .oembed img{width:100%\n}\n.attachments .attachment .oembed .image{-ms-flex:1;flex:1\n}\n.attachments .attachment .oembed .image img{border:0px;border-radius:5px;height:100%;object-fit:cover\n}\n.attachments .attachment .oembed .text{-ms-flex:2;flex:2;margin:8px\n}\n.attachments .attachment .oembed .text h1{font-size:14px;margin:0px\n}\n.attachments .attachment a.image-attachment{display:-ms-flexbox;display:flex;-ms-flex:1;flex:1\n}\n.attachments .attachment a.image-attachment img{border-style:solid;border-width:1px;border-radius:5px;width:100%;height:100%\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/attachment/attachment.vue","\n.favorite-button{cursor:pointer;animation-duration:0.6s\n}\n.favorite-button:hover{color:orange\n}\n.icon-star{color:orange\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/favorite_button/favorite_button.vue","\n.icon-retweet{cursor:pointer;animation-duration:0.6s\n}\n.icon-retweet:hover{color:#0fa00f\n}\n.retweeted{color:#0fa00f\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/retweet_button/retweet_button.vue","\n.icon-cancel,.delete-status{cursor:pointer\n}\n.icon-cancel:hover,.delete-status:hover{color:red\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/delete_button/delete_button.vue","\n.spacer{height:1em\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/status_or_conversation/status_or_conversation.vue","\n.conversation-heading{border-bottom-style:solid;border-bottom-width:1px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/conversation/conversation.vue","\n.user-profile{-ms-flex:2;flex:2;-ms-flex-preferred-size:500px;flex-basis:500px\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/user_profile/user_profile.vue","\n.setting-item {\n margin: 1em 1em 1.4em;\n}\n.setting-list {\n list-style-type: none;\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/settings/settings.vue","\n.style-switcher{margin-right:1em\n}\n\n\n\n// WEBPACK FOOTER //\n// webpack:///src/components/style_switcher/style_switcher.vue"],"sourceRoot":""} \ No newline at end of file diff --git a/priv/static/static/css/base16-pleroma-dark.css b/priv/static/static/css/base16-pleroma-dark.css new file mode 100644 index 000000000..8190d2a78 Binary files /dev/null and b/priv/static/static/css/base16-pleroma-dark.css differ diff --git a/priv/static/static/css/base16-pleroma-light.css b/priv/static/static/css/base16-pleroma-light.css new file mode 100644 index 000000000..1a85689aa Binary files /dev/null and b/priv/static/static/css/base16-pleroma-light.css differ diff --git a/priv/static/static/css/themes.json b/priv/static/static/css/themes.json index e3c35d6dd..ea8e5a0c4 100644 --- a/priv/static/static/css/themes.json +++ b/priv/static/static/css/themes.json @@ -1,4 +1,6 @@ [ +"base16-pleroma-dark.css", +"base16-pleroma-light.css", "base16-3024.css", "base16-apathy.css", "base16-ashes.css", diff --git a/priv/static/static/js/app.8e94b6d65028f6ffaeee.js b/priv/static/static/js/app.8e94b6d65028f6ffaeee.js deleted file mode 100644 index 830f12f67..000000000 Binary files a/priv/static/static/js/app.8e94b6d65028f6ffaeee.js and /dev/null differ diff --git a/priv/static/static/js/app.8e94b6d65028f6ffaeee.js.map b/priv/static/static/js/app.8e94b6d65028f6ffaeee.js.map deleted file mode 100644 index cb331a231..000000000 Binary files a/priv/static/static/js/app.8e94b6d65028f6ffaeee.js.map and /dev/null differ diff --git a/priv/static/static/js/app.dcc60205ebdef9eb3d87.js b/priv/static/static/js/app.dcc60205ebdef9eb3d87.js new file mode 100644 index 000000000..b6b494b97 Binary files /dev/null and b/priv/static/static/js/app.dcc60205ebdef9eb3d87.js differ diff --git a/priv/static/static/js/app.dcc60205ebdef9eb3d87.js.map b/priv/static/static/js/app.dcc60205ebdef9eb3d87.js.map new file mode 100644 index 000000000..0864a16b7 Binary files /dev/null and b/priv/static/static/js/app.dcc60205ebdef9eb3d87.js.map differ diff --git a/priv/static/static/js/manifest.53ddf71d231dbc5f82dc.js b/priv/static/static/js/manifest.53ddf71d231dbc5f82dc.js deleted file mode 100644 index b45353133..000000000 Binary files a/priv/static/static/js/manifest.53ddf71d231dbc5f82dc.js and /dev/null differ diff --git a/priv/static/static/js/manifest.da7ea91e505330123f38.js b/priv/static/static/js/manifest.da7ea91e505330123f38.js new file mode 100644 index 000000000..a2cdde811 Binary files /dev/null and b/priv/static/static/js/manifest.da7ea91e505330123f38.js differ diff --git a/priv/static/static/js/manifest.53ddf71d231dbc5f82dc.js.map b/priv/static/static/js/manifest.da7ea91e505330123f38.js.map similarity index 92% rename from priv/static/static/js/manifest.53ddf71d231dbc5f82dc.js.map rename to priv/static/static/js/manifest.da7ea91e505330123f38.js.map index 2a6fb30f9..389487dfe 100644 Binary files a/priv/static/static/js/manifest.53ddf71d231dbc5f82dc.js.map and b/priv/static/static/js/manifest.da7ea91e505330123f38.js.map differ diff --git a/priv/static/static/js/vendor.a3ec6a31a96c8e7709d8.js.map b/priv/static/static/js/vendor.a3ec6a31a96c8e7709d8.js.map deleted file mode 100644 index 7ed1de8fa..000000000 Binary files a/priv/static/static/js/vendor.a3ec6a31a96c8e7709d8.js.map and /dev/null differ diff --git a/priv/static/static/js/vendor.a3ec6a31a96c8e7709d8.js b/priv/static/static/js/vendor.d7d8813599feb765b152.js similarity index 60% rename from priv/static/static/js/vendor.a3ec6a31a96c8e7709d8.js rename to priv/static/static/js/vendor.d7d8813599feb765b152.js index e5f6a4f33..49750a570 100644 Binary files a/priv/static/static/js/vendor.a3ec6a31a96c8e7709d8.js and b/priv/static/static/js/vendor.d7d8813599feb765b152.js differ diff --git a/priv/static/static/js/vendor.d7d8813599feb765b152.js.map b/priv/static/static/js/vendor.d7d8813599feb765b152.js.map new file mode 100644 index 000000000..1c717d0c5 Binary files /dev/null and b/priv/static/static/js/vendor.d7d8813599feb765b152.js.map differ diff --git a/test/activity_test.exs b/test/activity_test.exs new file mode 100644 index 000000000..ce6eb1545 --- /dev/null +++ b/test/activity_test.exs @@ -0,0 +1,18 @@ +defmodule Pleroma.ActivityTest do + use Pleroma.DataCase + import Pleroma.Factory + + test "returns an activity by it's AP id" do + activity = insert(:note_activity) + found_activity = Pleroma.Activity.get_by_ap_id(activity.data["id"]) + + assert activity == found_activity + end + + test "returns activities by it's objects AP ids" do + activity = insert(:note_activity) + [found_activity] = Pleroma.Activity.all_by_object_ap_id(activity.data["object"]["id"]) + + assert activity == found_activity + end +end diff --git a/test/object_test.exs b/test/object_test.exs new file mode 100644 index 000000000..3ffddbbc5 --- /dev/null +++ b/test/object_test.exs @@ -0,0 +1,11 @@ +defmodule Pleroma.ObjectTest do + use Pleroma.DataCase + import Pleroma.Factory + + test "returns an object by it's AP id" do + object = insert(:note) + found_object = Pleroma.Object.get_by_ap_id(object.data["id"]) + + assert object == found_object + end +end diff --git a/test/support/factory.ex b/test/support/factory.ex new file mode 100644 index 000000000..3fc9cf710 --- /dev/null +++ b/test/support/factory.ex @@ -0,0 +1,67 @@ +defmodule Pleroma.Factory do + use ExMachina.Ecto, repo: Pleroma.Repo + + def user_factory do + user = %Pleroma.User{ + name: sequence(:name, &"Test User #{&1}"), + email: sequence(:email, &"user#{&1}@example.com"), + nickname: sequence(:nickname, &"nick#{&1}"), + password_hash: Comeonin.Pbkdf2.hashpwsalt("test"), + bio: sequence(:bio, &"Tester Number #{&1}"), + } + %{ user | ap_id: Pleroma.User.ap_id(user) } + end + + def note_factory do + text = sequence(:text, &"This is note #{&1}") + + user = insert(:user) + data = %{ + "type" => "Note", + "content" => text, + "id" => Pleroma.Web.ActivityPub.ActivityPub.generate_object_id, + "actor" => user.ap_id, + "to" => ["https://www.w3.org/ns/activitystreams#Public"], + "published_at" => DateTime.utc_now() |> DateTime.to_iso8601, + "likes" => [], + "like_count" => 0 + } + + %Pleroma.Object{ + data: data + } + end + + def note_activity_factory do + note = insert(:note) + data = %{ + "id" => Pleroma.Web.ActivityPub.ActivityPub.generate_activity_id, + "type" => "Create", + "actor" => note.data["actor"], + "to" => note.data["to"], + "object" => note.data, + "published_at" => DateTime.utc_now() |> DateTime.to_iso8601 + } + + %Pleroma.Activity{ + data: data + } + end + + def like_activity_factory do + note_activity = insert(:note_activity) + user = insert(:user) + + data = %{ + "id" => Pleroma.Web.ActivityPub.ActivityPub.generate_activity_id, + "actor" => user.ap_id, + "type" => "Like", + "object" => note_activity.data["object"]["id"], + "published_at" => DateTime.utc_now() |> DateTime.to_iso8601 + } + + %Pleroma.Activity{ + data: data + } + end +end diff --git a/test/test_helper.exs b/test/test_helper.exs index 602c5fca4..a2a9c7fd9 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -1,4 +1,5 @@ ExUnit.start() Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual) +{:ok, _} = Application.ensure_all_started(:ex_machina) diff --git a/test/user_test.exs b/test/user_test.exs index f41063e9c..e7843e1a8 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -53,4 +53,35 @@ test "test if a user is following another user" do assert User.following?(user, followed) refute User.following?(followed, user) end + + describe "user registration" do + @full_user_data %{ + bio: "A guy", + name: "my name", + nickname: "nick", + password: "test", + password_confirmation: "test", + email: "email@example.com" + } + + test "it requires a bio, email, name, nickname and password" do + @full_user_data + |> Map.keys + |> Enum.each(fn (key) -> + params = Map.delete(@full_user_data, key) + changeset = User.register_changeset(%User{}, params) + assert changeset.valid? == false + end) + end + + test "it sets the password_hash, ap_id and following fields" do + changeset = User.register_changeset(%User{}, @full_user_data) + + assert changeset.valid? + + assert is_binary(changeset.changes[:password_hash]) + assert changeset.changes[:ap_id] == User.ap_id(%User{nickname: @full_user_data.nickname}) + assert changeset.changes[:following] == [User.ap_followers(%User{nickname: @full_user_data.nickname})] + end + end end diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index 5cfd46238..b0c2a3544 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -1,9 +1,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do use Pleroma.DataCase alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.{Activity, Object} + alias Pleroma.{Activity, Object, User} alias Pleroma.Builders.ActivityBuilder + import Pleroma.Factory + describe "insertion" do test "inserts a given map into the activity database, giving it an id if it has none." do data = %{ @@ -110,6 +112,71 @@ test "retrieves ids up to max_id" do end end + describe "like an object" do + test "adds a like activity to the db" do + note_activity = insert(:note_activity) + object = Object.get_by_ap_id(note_activity.data["object"]["id"]) + user = insert(:user) + user_two = insert(:user) + + {:ok, like_activity, object} = ActivityPub.like(user, object) + + assert like_activity.data["actor"] == user.ap_id + assert like_activity.data["type"] == "Like" + assert like_activity.data["object"] == object.data["id"] + assert like_activity.data["to"] == [User.ap_followers(user), note_activity.data["actor"]] + assert object.data["like_count"] == 1 + assert object.data["likes"] == [user.ap_id] + + # Just return the original activity if the user already liked it. + {:ok, same_like_activity, object} = ActivityPub.like(user, object) + + assert like_activity == same_like_activity + assert object.data["likes"] == [user.ap_id] + + [note_activity] = Activity.all_by_object_ap_id(object.data["id"]) + assert note_activity.data["object"]["like_count"] == 1 + + {:ok, _like_activity, object} = ActivityPub.like(user_two, object) + assert object.data["like_count"] == 2 + end + end + + describe "unliking" do + test "unliking a previously liked object" do + note_activity = insert(:note_activity) + object = Object.get_by_ap_id(note_activity.data["object"]["id"]) + user = insert(:user) + + # Unliking something that hasn't been liked does nothing + {:ok, object} = ActivityPub.unlike(user, object) + assert object.data["like_count"] == 0 + + {:ok, like_activity, object} = ActivityPub.like(user, object) + assert object.data["like_count"] == 1 + + {:ok, object} = ActivityPub.unlike(user, object) + assert object.data["like_count"] == 0 + + assert Repo.get(Activity, like_activity.id) == nil + end + end + + describe "announcing an object" do + test "adds an announce activity to the db" do + note_activity = insert(:note_activity) + object = Object.get_by_ap_id(note_activity.data["object"]["id"]) + user = insert(:user) + + {:ok, announce_activity, object} = ActivityPub.announce(user, object) + assert object.data["announcement_count"] == 1 + assert object.data["announcements"] == [user.ap_id] + assert announce_activity.data["to"] == [User.ap_followers(user), note_activity.data["actor"]] + assert announce_activity.data["object"] == object.data["id"] + assert announce_activity.data["actor"] == user.ap_id + end + end + describe "uploading files" do test "copies the file to the configured folder" do file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"} diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index f1f2b4c9c..a9129bccc 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -2,7 +2,46 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do use Pleroma.DataCase alias Pleroma.{User, Activity, Object} alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter, ObjectRepresenter} + alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Builders.UserBuilder + import Pleroma.Factory + + test "an announce activity" do + user = insert(:user) + note_activity = insert(:note_activity) + activity_actor = Repo.get_by(User, ap_id: note_activity.data["actor"]) + object = Object.get_by_ap_id(note_activity.data["object"]["id"]) + + {:ok, announce_activity, _object} = ActivityPub.announce(user, object) + note_activity = Activity.get_by_ap_id(note_activity.data["id"]) + + status = ActivityRepresenter.to_map(announce_activity, %{users: [user, activity_actor], announced_activity: note_activity, for: user}) + + assert status["id"] == announce_activity.id + assert status["user"] == UserRepresenter.to_map(user, %{for: user}) + + retweeted_status = ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user}) + assert retweeted_status["repeated"] == true + + assert status["retweeted_status"] == retweeted_status + end + + test "a like activity" do + user = insert(:user) + note_activity = insert(:note_activity) + object = Object.get_by_ap_id(note_activity.data["object"]["id"]) + + {:ok, like_activity, _object} = ActivityPub.like(user, object) + status = ActivityRepresenter.to_map(like_activity, %{user: user, liked_activity: note_activity}) + + assert status["id"] == like_activity.id + assert status["in_reply_to_status_id"] == note_activity.id + + note_activity = Activity.get_by_ap_id(note_activity.data["id"]) + activity_actor = Repo.get_by(User, ap_id: note_activity.data["actor"]) + liked_status = ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user}) + assert liked_status["favorited"] == true + end test "an activity" do {:ok, user} = UserBuilder.insert @@ -45,7 +84,9 @@ test "an activity" do "statusnetConversationId" => 4711, "attachment" => [ object - ] + ], + "like_count" => 5, + "announcement_count" => 3 }, "published" => date } @@ -68,7 +109,11 @@ test "an activity" do ], "attentions" => [ UserRepresenter.to_map(mentioned_user, %{for: follower}) - ] + ], + "fave_num" => 5, + "repeat_num" => 3, + "favorited" => false, + "repeated" => false } assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 80ec9e4bb..e54177c94 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -2,7 +2,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do use Pleroma.Web.ConnCase alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter} alias Pleroma.Builders.{ActivityBuilder, UserBuilder} - alias Pleroma.{Repo, Activity, User} + alias Pleroma.{Repo, Activity, User, Object} + alias Pleroma.Web.ActivityPub.ActivityPub + + import Pleroma.Factory describe "POST /api/account/verify_credentials" do setup [:valid_user] @@ -158,6 +161,102 @@ test "with credentials", %{conn: conn, user: current_user} do test "returns \"ok\"", %{conn: conn} do conn = get conn, "/api/help/test.json" assert json_response(conn, 200) == "ok" + end + + describe "POST /api/favorites/create/:id" do + setup [:valid_user] + test "without valid credentials", %{conn: conn} do + note_activity = insert(:note_activity) + conn = post conn, "/api/favorites/create/#{note_activity.id}.json" + assert json_response(conn, 403) == %{"error" => "Invalid credentials."} + end + + test "with credentials", %{conn: conn, user: current_user} do + note_activity = insert(:note_activity) + + conn = conn + |> with_credentials(current_user.nickname, "test") + |> post("/api/favorites/create/#{note_activity.id}.json") + + assert json_response(conn, 200) + end + end + + describe "POST /api/favorites/destroy/:id" do + setup [:valid_user] + test "without valid credentials", %{conn: conn} do + note_activity = insert(:note_activity) + conn = post conn, "/api/favorites/destroy/#{note_activity.id}.json" + assert json_response(conn, 403) == %{"error" => "Invalid credentials."} + end + + test "with credentials", %{conn: conn, user: current_user} do + note_activity = insert(:note_activity) + object = Object.get_by_ap_id(note_activity.data["object"]["id"]) + ActivityPub.like(current_user, object) + + conn = conn + |> with_credentials(current_user.nickname, "test") + |> post("/api/favorites/destroy/#{note_activity.id}.json") + + assert json_response(conn, 200) + end + end + + describe "POST /api/statuses/retweet/:id" do + setup [:valid_user] + test "without valid credentials", %{conn: conn} do + note_activity = insert(:note_activity) + conn = post conn, "/api/statuses/retweet/#{note_activity.id}.json" + assert json_response(conn, 403) == %{"error" => "Invalid credentials."} + end + + test "with credentials", %{conn: conn, user: current_user} do + note_activity = insert(:note_activity) + + conn = conn + |> with_credentials(current_user.nickname, "test") + |> post("/api/statuses/retweet/#{note_activity.id}.json") + + assert json_response(conn, 200) + end + end + + describe "POST /api/account/register" do + test "it creates a new user", %{conn: conn} do + data = %{ + "nickname" => "lain", + "email" => "lain@wired.jp", + "fullname" => "lain iwakura", + "bio" => "close the world.", + "password" => "bear", + "confirm" => "bear" + } + + conn = conn + |> post("/api/account/register", data) + + user = json_response(conn, 200) + + fetched_user = Repo.get_by(User, nickname: "lain") + assert user == UserRepresenter.to_map(fetched_user) + end + + test "it returns errors on a problem", %{conn: conn} do + data = %{ + "email" => "lain@wired.jp", + "fullname" => "lain iwakura", + "bio" => "close the world.", + "password" => "bear", + "confirm" => "bear" + } + + conn = conn + |> post("/api/account/register", data) + + errors = json_response(conn, 400) + + assert is_binary(errors["error"]) end end @@ -170,4 +269,10 @@ defp with_credentials(conn, username, password) do header_content = "Basic " <> Base.encode64("#{username}:#{password}") put_req_header(conn, "authorization", header_content) end + + setup do + Supervisor.terminate_child(Pleroma.Supervisor, ConCache) + Supervisor.restart_child(Pleroma.Supervisor, ConCache) + :ok + end end diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index e8853a910..b8bfb4cf9 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -3,7 +3,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do alias Pleroma.Builders.{UserBuilder, ActivityBuilder} alias Pleroma.Web.TwitterAPI.TwitterAPI alias Pleroma.{Activity, User, Object, Repo} - alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter + alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter} + alias Pleroma.Web.ActivityPub.ActivityPub + + import Pleroma.Factory test "create a status" do user = UserBuilder.build(%{ap_id: "142344"}) @@ -24,14 +27,15 @@ test "create a status" do object = Repo.insert!(%Object{data: object_data}) input = %{ - "status" => "Hello again, @shp.", + "status" => "Hello again, @shp.\nThis is on another line.", "media_ids" => [object.id] } { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) - assert get_in(activity.data, ["object", "content"]) == "Hello again, @shp." + assert get_in(activity.data, ["object", "content"]) == "Hello again, @shp.
This is on another line." assert get_in(activity.data, ["object", "type"]) == "Note" + assert get_in(activity.data, ["object", "actor"]) == user.ap_id assert get_in(activity.data, ["actor"]) == user.ap_id assert Enum.member?(get_in(activity.data, ["to"]), User.ap_followers(user)) assert Enum.member?(get_in(activity.data, ["to"]), "https://www.w3.org/ns/activitystreams#Public") @@ -44,6 +48,8 @@ test "create a status" do assert get_in(activity.data, ["statusnetConversationId"]) == activity.id assert is_list(activity.data["object"]["attachment"]) + + assert activity.data["object"] == Object.get_by_ap_id(activity.data["object"]["id"]).data end test "create a status that is a reply" do @@ -176,4 +182,78 @@ test "it adds user links to an existing text" do assert TwitterAPI.add_user_links(text, mentions) == expected_text end + + test "it favorites a status, returns the updated status" do + user = insert(:user) + note_activity = insert(:note_activity) + activity_user = Repo.get_by!(User, ap_id: note_activity.data["actor"]) + + {:ok, status} = TwitterAPI.favorite(user, note_activity) + updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) + + assert status == ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user}) + end + + test "it unfavorites a status, returns the updated status" do + user = insert(:user) + note_activity = insert(:note_activity) + activity_user = Repo.get_by!(User, ap_id: note_activity.data["actor"]) + object = Object.get_by_ap_id(note_activity.data["object"]["id"]) + + {:ok, _like_activity, _object } = ActivityPub.like(user, object) + updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) + assert ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user})["fave_num"] == 1 + + {:ok, status} = TwitterAPI.unfavorite(user, note_activity) + + assert status["fave_num"] == 0 + end + + test "it retweets a status and returns the retweet" do + user = insert(:user) + note_activity = insert(:note_activity) + activity_user = Repo.get_by!(User, ap_id: note_activity.data["actor"]) + + {:ok, status} = TwitterAPI.retweet(user, note_activity) + updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) + + assert status == ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user}) + end + + test "it registers a new user and returns the user." do + data = %{ + "nickname" => "lain", + "email" => "lain@wired.jp", + "fullname" => "lain iwakura", + "bio" => "close the world.", + "password" => "bear", + "confirm" => "bear" + } + + {:ok, user} = TwitterAPI.register_user(data) + + fetched_user = Repo.get_by(User, nickname: "lain") + assert user == UserRepresenter.to_map(fetched_user) + end + + test "it returns the error on registration problems" do + data = %{ + "nickname" => "lain", + "email" => "lain@wired.jp", + "fullname" => "lain iwakura", + "bio" => "close the world.", + "password" => "bear" + } + + {:error, error_object} = TwitterAPI.register_user(data) + + assert is_binary(error_object[:error]) + refute Repo.get_by(User, nickname: "lain") + end + + setup do + Supervisor.terminate_child(Pleroma.Supervisor, ConCache) + Supervisor.restart_child(Pleroma.Supervisor, ConCache) + :ok + end end