@@ -0,0 +1,661 @@ | |||||
GNU AFFERO GENERAL PUBLIC LICENSE | |||||
Version 3, 19 November 2007 | |||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> | |||||
Everyone is permitted to copy and distribute verbatim copies | |||||
of this license document, but changing it is not allowed. | |||||
Preamble | |||||
The GNU Affero General Public License is a free, copyleft license for | |||||
software and other kinds of works, specifically designed to ensure | |||||
cooperation with the community in the case of network server software. | |||||
The licenses for most software and other practical works are designed | |||||
to take away your freedom to share and change the works. By contrast, | |||||
our General Public Licenses are intended to guarantee your freedom to | |||||
share and change all versions of a program--to make sure it remains free | |||||
software for all its users. | |||||
When we speak of free software, we are referring to freedom, not | |||||
price. Our General Public Licenses are designed to make sure that you | |||||
have the freedom to distribute copies of free software (and charge for | |||||
them if you wish), that you receive source code or can get it if you | |||||
want it, that you can change the software or use pieces of it in new | |||||
free programs, and that you know you can do these things. | |||||
Developers that use our General Public Licenses protect your rights | |||||
with two steps: (1) assert copyright on the software, and (2) offer | |||||
you this License which gives you legal permission to copy, distribute | |||||
and/or modify the software. | |||||
A secondary benefit of defending all users' freedom is that | |||||
improvements made in alternate versions of the program, if they | |||||
receive widespread use, become available for other developers to | |||||
incorporate. Many developers of free software are heartened and | |||||
encouraged by the resulting cooperation. However, in the case of | |||||
software used on network servers, this result may fail to come about. | |||||
The GNU General Public License permits making a modified version and | |||||
letting the public access it on a server without ever releasing its | |||||
source code to the public. | |||||
The GNU Affero General Public License is designed specifically to | |||||
ensure that, in such cases, the modified source code becomes available | |||||
to the community. It requires the operator of a network server to | |||||
provide the source code of the modified version running there to the | |||||
users of that server. Therefore, public use of a modified version, on | |||||
a publicly accessible server, gives the public access to the source | |||||
code of the modified version. | |||||
An older license, called the Affero General Public License and | |||||
published by Affero, was designed to accomplish similar goals. This is | |||||
a different license, not a version of the Affero GPL, but Affero has | |||||
released a new version of the Affero GPL which permits relicensing under | |||||
this license. | |||||
The precise terms and conditions for copying, distribution and | |||||
modification follow. | |||||
TERMS AND CONDITIONS | |||||
0. Definitions. | |||||
"This License" refers to version 3 of the GNU Affero General Public License. | |||||
"Copyright" also means copyright-like laws that apply to other kinds of | |||||
works, such as semiconductor masks. | |||||
"The Program" refers to any copyrightable work licensed under this | |||||
License. Each licensee is addressed as "you". "Licensees" and | |||||
"recipients" may be individuals or organizations. | |||||
To "modify" a work means to copy from or adapt all or part of the work | |||||
in a fashion requiring copyright permission, other than the making of an | |||||
exact copy. The resulting work is called a "modified version" of the | |||||
earlier work or a work "based on" the earlier work. | |||||
A "covered work" means either the unmodified Program or a work based | |||||
on the Program. | |||||
To "propagate" a work means to do anything with it that, without | |||||
permission, would make you directly or secondarily liable for | |||||
infringement under applicable copyright law, except executing it on a | |||||
computer or modifying a private copy. Propagation includes copying, | |||||
distribution (with or without modification), making available to the | |||||
public, and in some countries other activities as well. | |||||
To "convey" a work means any kind of propagation that enables other | |||||
parties to make or receive copies. Mere interaction with a user through | |||||
a computer network, with no transfer of a copy, is not conveying. | |||||
An interactive user interface displays "Appropriate Legal Notices" | |||||
to the extent that it includes a convenient and prominently visible | |||||
feature that (1) displays an appropriate copyright notice, and (2) | |||||
tells the user that there is no warranty for the work (except to the | |||||
extent that warranties are provided), that licensees may convey the | |||||
work under this License, and how to view a copy of this License. If | |||||
the interface presents a list of user commands or options, such as a | |||||
menu, a prominent item in the list meets this criterion. | |||||
1. Source Code. | |||||
The "source code" for a work means the preferred form of the work | |||||
for making modifications to it. "Object code" means any non-source | |||||
form of a work. | |||||
A "Standard Interface" means an interface that either is an official | |||||
standard defined by a recognized standards body, or, in the case of | |||||
interfaces specified for a particular programming language, one that | |||||
is widely used among developers working in that language. | |||||
The "System Libraries" of an executable work include anything, other | |||||
than the work as a whole, that (a) is included in the normal form of | |||||
packaging a Major Component, but which is not part of that Major | |||||
Component, and (b) serves only to enable use of the work with that | |||||
Major Component, or to implement a Standard Interface for which an | |||||
implementation is available to the public in source code form. A | |||||
"Major Component", in this context, means a major essential component | |||||
(kernel, window system, and so on) of the specific operating system | |||||
(if any) on which the executable work runs, or a compiler used to | |||||
produce the work, or an object code interpreter used to run it. | |||||
The "Corresponding Source" for a work in object code form means all | |||||
the source code needed to generate, install, and (for an executable | |||||
work) run the object code and to modify the work, including scripts to | |||||
control those activities. However, it does not include the work's | |||||
System Libraries, or general-purpose tools or generally available free | |||||
programs which are used unmodified in performing those activities but | |||||
which are not part of the work. For example, Corresponding Source | |||||
includes interface definition files associated with source files for | |||||
the work, and the source code for shared libraries and dynamically | |||||
linked subprograms that the work is specifically designed to require, | |||||
such as by intimate data communication or control flow between those | |||||
subprograms and other parts of the work. | |||||
The Corresponding Source need not include anything that users | |||||
can regenerate automatically from other parts of the Corresponding | |||||
Source. | |||||
The Corresponding Source for a work in source code form is that | |||||
same work. | |||||
2. Basic Permissions. | |||||
All rights granted under this License are granted for the term of | |||||
copyright on the Program, and are irrevocable provided the stated | |||||
conditions are met. This License explicitly affirms your unlimited | |||||
permission to run the unmodified Program. The output from running a | |||||
covered work is covered by this License only if the output, given its | |||||
content, constitutes a covered work. This License acknowledges your | |||||
rights of fair use or other equivalent, as provided by copyright law. | |||||
You may make, run and propagate covered works that you do not | |||||
convey, without conditions so long as your license otherwise remains | |||||
in force. You may convey covered works to others for the sole purpose | |||||
of having them make modifications exclusively for you, or provide you | |||||
with facilities for running those works, provided that you comply with | |||||
the terms of this License in conveying all material for which you do | |||||
not control copyright. Those thus making or running the covered works | |||||
for you must do so exclusively on your behalf, under your direction | |||||
and control, on terms that prohibit them from making any copies of | |||||
your copyrighted material outside their relationship with you. | |||||
Conveying under any other circumstances is permitted solely under | |||||
the conditions stated below. Sublicensing is not allowed; section 10 | |||||
makes it unnecessary. | |||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law. | |||||
No covered work shall be deemed part of an effective technological | |||||
measure under any applicable law fulfilling obligations under article | |||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or | |||||
similar laws prohibiting or restricting circumvention of such | |||||
measures. | |||||
When you convey a covered work, you waive any legal power to forbid | |||||
circumvention of technological measures to the extent such circumvention | |||||
is effected by exercising rights under this License with respect to | |||||
the covered work, and you disclaim any intention to limit operation or | |||||
modification of the work as a means of enforcing, against the work's | |||||
users, your or third parties' legal rights to forbid circumvention of | |||||
technological measures. | |||||
4. Conveying Verbatim Copies. | |||||
You may convey verbatim copies of the Program's source code as you | |||||
receive it, in any medium, provided that you conspicuously and | |||||
appropriately publish on each copy an appropriate copyright notice; | |||||
keep intact all notices stating that this License and any | |||||
non-permissive terms added in accord with section 7 apply to the code; | |||||
keep intact all notices of the absence of any warranty; and give all | |||||
recipients a copy of this License along with the Program. | |||||
You may charge any price or no price for each copy that you convey, | |||||
and you may offer support or warranty protection for a fee. | |||||
5. Conveying Modified Source Versions. | |||||
You may convey a work based on the Program, or the modifications to | |||||
produce it from the Program, in the form of source code under the | |||||
terms of section 4, provided that you also meet all of these conditions: | |||||
a) The work must carry prominent notices stating that you modified | |||||
it, and giving a relevant date. | |||||
b) The work must carry prominent notices stating that it is | |||||
released under this License and any conditions added under section | |||||
7. This requirement modifies the requirement in section 4 to | |||||
"keep intact all notices". | |||||
c) You must license the entire work, as a whole, under this | |||||
License to anyone who comes into possession of a copy. This | |||||
License will therefore apply, along with any applicable section 7 | |||||
additional terms, to the whole of the work, and all its parts, | |||||
regardless of how they are packaged. This License gives no | |||||
permission to license the work in any other way, but it does not | |||||
invalidate such permission if you have separately received it. | |||||
d) If the work has interactive user interfaces, each must display | |||||
Appropriate Legal Notices; however, if the Program has interactive | |||||
interfaces that do not display Appropriate Legal Notices, your | |||||
work need not make them do so. | |||||
A compilation of a covered work with other separate and independent | |||||
works, which are not by their nature extensions of the covered work, | |||||
and which are not combined with it such as to form a larger program, | |||||
in or on a volume of a storage or distribution medium, is called an | |||||
"aggregate" if the compilation and its resulting copyright are not | |||||
used to limit the access or legal rights of the compilation's users | |||||
beyond what the individual works permit. Inclusion of a covered work | |||||
in an aggregate does not cause this License to apply to the other | |||||
parts of the aggregate. | |||||
6. Conveying Non-Source Forms. | |||||
You may convey a covered work in object code form under the terms | |||||
of sections 4 and 5, provided that you also convey the | |||||
machine-readable Corresponding Source under the terms of this License, | |||||
in one of these ways: | |||||
a) Convey the object code in, or embodied in, a physical product | |||||
(including a physical distribution medium), accompanied by the | |||||
Corresponding Source fixed on a durable physical medium | |||||
customarily used for software interchange. | |||||
b) Convey the object code in, or embodied in, a physical product | |||||
(including a physical distribution medium), accompanied by a | |||||
written offer, valid for at least three years and valid for as | |||||
long as you offer spare parts or customer support for that product | |||||
model, to give anyone who possesses the object code either (1) a | |||||
copy of the Corresponding Source for all the software in the | |||||
product that is covered by this License, on a durable physical | |||||
medium customarily used for software interchange, for a price no | |||||
more than your reasonable cost of physically performing this | |||||
conveying of source, or (2) access to copy the | |||||
Corresponding Source from a network server at no charge. | |||||
c) Convey individual copies of the object code with a copy of the | |||||
written offer to provide the Corresponding Source. This | |||||
alternative is allowed only occasionally and noncommercially, and | |||||
only if you received the object code with such an offer, in accord | |||||
with subsection 6b. | |||||
d) Convey the object code by offering access from a designated | |||||
place (gratis or for a charge), and offer equivalent access to the | |||||
Corresponding Source in the same way through the same place at no | |||||
further charge. You need not require recipients to copy the | |||||
Corresponding Source along with the object code. If the place to | |||||
copy the object code is a network server, the Corresponding Source | |||||
may be on a different server (operated by you or a third party) | |||||
that supports equivalent copying facilities, provided you maintain | |||||
clear directions next to the object code saying where to find the | |||||
Corresponding Source. Regardless of what server hosts the | |||||
Corresponding Source, you remain obligated to ensure that it is | |||||
available for as long as needed to satisfy these requirements. | |||||
e) Convey the object code using peer-to-peer transmission, provided | |||||
you inform other peers where the object code and Corresponding | |||||
Source of the work are being offered to the general public at no | |||||
charge under subsection 6d. | |||||
A separable portion of the object code, whose source code is excluded | |||||
from the Corresponding Source as a System Library, need not be | |||||
included in conveying the object code work. | |||||
A "User Product" is either (1) a "consumer product", which means any | |||||
tangible personal property which is normally used for personal, family, | |||||
or household purposes, or (2) anything designed or sold for incorporation | |||||
into a dwelling. In determining whether a product is a consumer product, | |||||
doubtful cases shall be resolved in favor of coverage. For a particular | |||||
product received by a particular user, "normally used" refers to a | |||||
typical or common use of that class of product, regardless of the status | |||||
of the particular user or of the way in which the particular user | |||||
actually uses, or expects or is expected to use, the product. A product | |||||
is a consumer product regardless of whether the product has substantial | |||||
commercial, industrial or non-consumer uses, unless such uses represent | |||||
the only significant mode of use of the product. | |||||
"Installation Information" for a User Product means any methods, | |||||
procedures, authorization keys, or other information required to install | |||||
and execute modified versions of a covered work in that User Product from | |||||
a modified version of its Corresponding Source. The information must | |||||
suffice to ensure that the continued functioning of the modified object | |||||
code is in no case prevented or interfered with solely because | |||||
modification has been made. | |||||
If you convey an object code work under this section in, or with, or | |||||
specifically for use in, a User Product, and the conveying occurs as | |||||
part of a transaction in which the right of possession and use of the | |||||
User Product is transferred to the recipient in perpetuity or for a | |||||
fixed term (regardless of how the transaction is characterized), the | |||||
Corresponding Source conveyed under this section must be accompanied | |||||
by the Installation Information. But this requirement does not apply | |||||
if neither you nor any third party retains the ability to install | |||||
modified object code on the User Product (for example, the work has | |||||
been installed in ROM). | |||||
The requirement to provide Installation Information does not include a | |||||
requirement to continue to provide support service, warranty, or updates | |||||
for a work that has been modified or installed by the recipient, or for | |||||
the User Product in which it has been modified or installed. Access to a | |||||
network may be denied when the modification itself materially and | |||||
adversely affects the operation of the network or violates the rules and | |||||
protocols for communication across the network. | |||||
Corresponding Source conveyed, and Installation Information provided, | |||||
in accord with this section must be in a format that is publicly | |||||
documented (and with an implementation available to the public in | |||||
source code form), and must require no special password or key for | |||||
unpacking, reading or copying. | |||||
7. Additional Terms. | |||||
"Additional permissions" are terms that supplement the terms of this | |||||
License by making exceptions from one or more of its conditions. | |||||
Additional permissions that are applicable to the entire Program shall | |||||
be treated as though they were included in this License, to the extent | |||||
that they are valid under applicable law. If additional permissions | |||||
apply only to part of the Program, that part may be used separately | |||||
under those permissions, but the entire Program remains governed by | |||||
this License without regard to the additional permissions. | |||||
When you convey a copy of a covered work, you may at your option | |||||
remove any additional permissions from that copy, or from any part of | |||||
it. (Additional permissions may be written to require their own | |||||
removal in certain cases when you modify the work.) You may place | |||||
additional permissions on material, added by you to a covered work, | |||||
for which you have or can give appropriate copyright permission. | |||||
Notwithstanding any other provision of this License, for material you | |||||
add to a covered work, you may (if authorized by the copyright holders of | |||||
that material) supplement the terms of this License with terms: | |||||
a) Disclaiming warranty or limiting liability differently from the | |||||
terms of sections 15 and 16 of this License; or | |||||
b) Requiring preservation of specified reasonable legal notices or | |||||
author attributions in that material or in the Appropriate Legal | |||||
Notices displayed by works containing it; or | |||||
c) Prohibiting misrepresentation of the origin of that material, or | |||||
requiring that modified versions of such material be marked in | |||||
reasonable ways as different from the original version; or | |||||
d) Limiting the use for publicity purposes of names of licensors or | |||||
authors of the material; or | |||||
e) Declining to grant rights under trademark law for use of some | |||||
trade names, trademarks, or service marks; or | |||||
f) Requiring indemnification of licensors and authors of that | |||||
material by anyone who conveys the material (or modified versions of | |||||
it) with contractual assumptions of liability to the recipient, for | |||||
any liability that these contractual assumptions directly impose on | |||||
those licensors and authors. | |||||
All other non-permissive additional terms are considered "further | |||||
restrictions" within the meaning of section 10. If the Program as you | |||||
received it, or any part of it, contains a notice stating that it is | |||||
governed by this License along with a term that is a further | |||||
restriction, you may remove that term. If a license document contains | |||||
a further restriction but permits relicensing or conveying under this | |||||
License, you may add to a covered work material governed by the terms | |||||
of that license document, provided that the further restriction does | |||||
not survive such relicensing or conveying. | |||||
If you add terms to a covered work in accord with this section, you | |||||
must place, in the relevant source files, a statement of the | |||||
additional terms that apply to those files, or a notice indicating | |||||
where to find the applicable terms. | |||||
Additional terms, permissive or non-permissive, may be stated in the | |||||
form of a separately written license, or stated as exceptions; | |||||
the above requirements apply either way. | |||||
8. Termination. | |||||
You may not propagate or modify a covered work except as expressly | |||||
provided under this License. Any attempt otherwise to propagate or | |||||
modify it is void, and will automatically terminate your rights under | |||||
this License (including any patent licenses granted under the third | |||||
paragraph of section 11). | |||||
However, if you cease all violation of this License, then your | |||||
license from a particular copyright holder is reinstated (a) | |||||
provisionally, unless and until the copyright holder explicitly and | |||||
finally terminates your license, and (b) permanently, if the copyright | |||||
holder fails to notify you of the violation by some reasonable means | |||||
prior to 60 days after the cessation. | |||||
Moreover, your license from a particular copyright holder is | |||||
reinstated permanently if the copyright holder notifies you of the | |||||
violation by some reasonable means, this is the first time you have | |||||
received notice of violation of this License (for any work) from that | |||||
copyright holder, and you cure the violation prior to 30 days after | |||||
your receipt of the notice. | |||||
Termination of your rights under this section does not terminate the | |||||
licenses of parties who have received copies or rights from you under | |||||
this License. If your rights have been terminated and not permanently | |||||
reinstated, you do not qualify to receive new licenses for the same | |||||
material under section 10. | |||||
9. Acceptance Not Required for Having Copies. | |||||
You are not required to accept this License in order to receive or | |||||
run a copy of the Program. Ancillary propagation of a covered work | |||||
occurring solely as a consequence of using peer-to-peer transmission | |||||
to receive a copy likewise does not require acceptance. However, | |||||
nothing other than this License grants you permission to propagate or | |||||
modify any covered work. These actions infringe copyright if you do | |||||
not accept this License. Therefore, by modifying or propagating a | |||||
covered work, you indicate your acceptance of this License to do so. | |||||
10. Automatic Licensing of Downstream Recipients. | |||||
Each time you convey a covered work, the recipient automatically | |||||
receives a license from the original licensors, to run, modify and | |||||
propagate that work, subject to this License. You are not responsible | |||||
for enforcing compliance by third parties with this License. | |||||
An "entity transaction" is a transaction transferring control of an | |||||
organization, or substantially all assets of one, or subdividing an | |||||
organization, or merging organizations. If propagation of a covered | |||||
work results from an entity transaction, each party to that | |||||
transaction who receives a copy of the work also receives whatever | |||||
licenses to the work the party's predecessor in interest had or could | |||||
give under the previous paragraph, plus a right to possession of the | |||||
Corresponding Source of the work from the predecessor in interest, if | |||||
the predecessor has it or can get it with reasonable efforts. | |||||
You may not impose any further restrictions on the exercise of the | |||||
rights granted or affirmed under this License. For example, you may | |||||
not impose a license fee, royalty, or other charge for exercise of | |||||
rights granted under this License, and you may not initiate litigation | |||||
(including a cross-claim or counterclaim in a lawsuit) alleging that | |||||
any patent claim is infringed by making, using, selling, offering for | |||||
sale, or importing the Program or any portion of it. | |||||
11. Patents. | |||||
A "contributor" is a copyright holder who authorizes use under this | |||||
License of the Program or a work on which the Program is based. The | |||||
work thus licensed is called the contributor's "contributor version". | |||||
A contributor's "essential patent claims" are all patent claims | |||||
owned or controlled by the contributor, whether already acquired or | |||||
hereafter acquired, that would be infringed by some manner, permitted | |||||
by this License, of making, using, or selling its contributor version, | |||||
but do not include claims that would be infringed only as a | |||||
consequence of further modification of the contributor version. For | |||||
purposes of this definition, "control" includes the right to grant | |||||
patent sublicenses in a manner consistent with the requirements of | |||||
this License. | |||||
Each contributor grants you a non-exclusive, worldwide, royalty-free | |||||
patent license under the contributor's essential patent claims, to | |||||
make, use, sell, offer for sale, import and otherwise run, modify and | |||||
propagate the contents of its contributor version. | |||||
In the following three paragraphs, a "patent license" is any express | |||||
agreement or commitment, however denominated, not to enforce a patent | |||||
(such as an express permission to practice a patent or covenant not to | |||||
sue for patent infringement). To "grant" such a patent license to a | |||||
party means to make such an agreement or commitment not to enforce a | |||||
patent against the party. | |||||
If you convey a covered work, knowingly relying on a patent license, | |||||
and the Corresponding Source of the work is not available for anyone | |||||
to copy, free of charge and under the terms of this License, through a | |||||
publicly available network server or other readily accessible means, | |||||
then you must either (1) cause the Corresponding Source to be so | |||||
available, or (2) arrange to deprive yourself of the benefit of the | |||||
patent license for this particular work, or (3) arrange, in a manner | |||||
consistent with the requirements of this License, to extend the patent | |||||
license to downstream recipients. "Knowingly relying" means you have | |||||
actual knowledge that, but for the patent license, your conveying the | |||||
covered work in a country, or your recipient's use of the covered work | |||||
in a country, would infringe one or more identifiable patents in that | |||||
country that you have reason to believe are valid. | |||||
If, pursuant to or in connection with a single transaction or | |||||
arrangement, you convey, or propagate by procuring conveyance of, a | |||||
covered work, and grant a patent license to some of the parties | |||||
receiving the covered work authorizing them to use, propagate, modify | |||||
or convey a specific copy of the covered work, then the patent license | |||||
you grant is automatically extended to all recipients of the covered | |||||
work and works based on it. | |||||
A patent license is "discriminatory" if it does not include within | |||||
the scope of its coverage, prohibits the exercise of, or is | |||||
conditioned on the non-exercise of one or more of the rights that are | |||||
specifically granted under this License. You may not convey a covered | |||||
work if you are a party to an arrangement with a third party that is | |||||
in the business of distributing software, under which you make payment | |||||
to the third party based on the extent of your activity of conveying | |||||
the work, and under which the third party grants, to any of the | |||||
parties who would receive the covered work from you, a discriminatory | |||||
patent license (a) in connection with copies of the covered work | |||||
conveyed by you (or copies made from those copies), or (b) primarily | |||||
for and in connection with specific products or compilations that | |||||
contain the covered work, unless you entered into that arrangement, | |||||
or that patent license was granted, prior to 28 March 2007. | |||||
Nothing in this License shall be construed as excluding or limiting | |||||
any implied license or other defenses to infringement that may | |||||
otherwise be available to you under applicable patent law. | |||||
12. No Surrender of Others' Freedom. | |||||
If conditions are imposed on you (whether by court order, agreement or | |||||
otherwise) that contradict the conditions of this License, they do not | |||||
excuse you from the conditions of this License. If you cannot convey a | |||||
covered work so as to satisfy simultaneously your obligations under this | |||||
License and any other pertinent obligations, then as a consequence you may | |||||
not convey it at all. For example, if you agree to terms that obligate you | |||||
to collect a royalty for further conveying from those to whom you convey | |||||
the Program, the only way you could satisfy both those terms and this | |||||
License would be to refrain entirely from conveying the Program. | |||||
13. Remote Network Interaction; Use with the GNU General Public License. | |||||
Notwithstanding any other provision of this License, if you modify the | |||||
Program, your modified version must prominently offer all users | |||||
interacting with it remotely through a computer network (if your version | |||||
supports such interaction) an opportunity to receive the Corresponding | |||||
Source of your version by providing access to the Corresponding Source | |||||
from a network server at no charge, through some standard or customary | |||||
means of facilitating copying of software. This Corresponding Source | |||||
shall include the Corresponding Source for any work covered by version 3 | |||||
of the GNU General Public License that is incorporated pursuant to the | |||||
following paragraph. | |||||
Notwithstanding any other provision of this License, you have | |||||
permission to link or combine any covered work with a work licensed | |||||
under version 3 of the GNU General Public License into a single | |||||
combined work, and to convey the resulting work. The terms of this | |||||
License will continue to apply to the part which is the covered work, | |||||
but the work with which it is combined will remain governed by version | |||||
3 of the GNU General Public License. | |||||
14. Revised Versions of this License. | |||||
The Free Software Foundation may publish revised and/or new versions of | |||||
the GNU Affero General Public License from time to time. Such new versions | |||||
will be similar in spirit to the present version, but may differ in detail to | |||||
address new problems or concerns. | |||||
Each version is given a distinguishing version number. If the | |||||
Program specifies that a certain numbered version of the GNU Affero General | |||||
Public License "or any later version" applies to it, you have the | |||||
option of following the terms and conditions either of that numbered | |||||
version or of any later version published by the Free Software | |||||
Foundation. If the Program does not specify a version number of the | |||||
GNU Affero General Public License, you may choose any version ever published | |||||
by the Free Software Foundation. | |||||
If the Program specifies that a proxy can decide which future | |||||
versions of the GNU Affero General Public License can be used, that proxy's | |||||
public statement of acceptance of a version permanently authorizes you | |||||
to choose that version for the Program. | |||||
Later license versions may give you additional or different | |||||
permissions. However, no additional obligations are imposed on any | |||||
author or copyright holder as a result of your choosing to follow a | |||||
later version. | |||||
15. Disclaimer of Warranty. | |||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY | |||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT | |||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY | |||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, | |||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM | |||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF | |||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION. | |||||
16. Limitation of Liability. | |||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | |||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS | |||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY | |||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE | |||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF | |||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD | |||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), | |||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF | |||||
SUCH DAMAGES. | |||||
17. Interpretation of Sections 15 and 16. | |||||
If the disclaimer of warranty and limitation of liability provided | |||||
above cannot be given local legal effect according to their terms, | |||||
reviewing courts shall apply local law that most closely approximates | |||||
an absolute waiver of all civil liability in connection with the | |||||
Program, unless a warranty or assumption of liability accompanies a | |||||
copy of the Program in return for a fee. | |||||
END OF TERMS AND CONDITIONS | |||||
How to Apply These Terms to Your New Programs | |||||
If you develop a new program, and you want it to be of the greatest | |||||
possible use to the public, the best way to achieve this is to make it | |||||
free software which everyone can redistribute and change under these terms. | |||||
To do so, attach the following notices to the program. It is safest | |||||
to attach them to the start of each source file to most effectively | |||||
state the exclusion of warranty; and each file should have at least | |||||
the "copyright" line and a pointer to where the full notice is found. | |||||
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 <http://www.gnu.org/licenses/>. | |||||
Also add information on how to contact you by electronic and paper mail. | |||||
If your software can interact with users remotely through a computer | |||||
network, you should also make sure that it provides a way for users to | |||||
get its source. For example, if your program is a web application, its | |||||
interface could display a "Source" link that leads users to an archive | |||||
of the code. There are many ways you could offer source, and different | |||||
solutions will be better for different programs; see section 13 for the | |||||
specific requirements. | |||||
You should also get your employer (if you work as a programmer) or school, | |||||
if any, to sign a "copyright disclaimer" for the program, if necessary. | |||||
For more information on this, and how to apply and follow the GNU AGPL, see | |||||
<http://www.gnu.org/licenses/>. |
@@ -1 +1,5 @@ | |||||
- Add cache for user fetching / representing. (mostly in TwitterAPI.activity_to_status) | - 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. |
@@ -6,15 +6,17 @@ defmodule Mix.Tasks.RegisterUser do | |||||
@shortdoc "Register user" | @shortdoc "Register user" | ||||
def run([name, nickname, email, bio, password]) do | def run([name, nickname, email, bio, password]) do | ||||
ensure_started(Repo, []) | ensure_started(Repo, []) | ||||
user = %User{ | |||||
params = %{ | |||||
name: name, | name: name, | ||||
nickname: nickname, | nickname: nickname, | ||||
email: email, | email: email, | ||||
password_hash: Comeonin.Pbkdf2.hashpwsalt(password), | |||||
password: password, | |||||
password_confirmation: password, | |||||
bio: bio | bio: bio | ||||
} | } | ||||
user = %{ user | ap_id: User.ap_id(user) } | |||||
user = User.register_changeset(%User{}, params) | |||||
Repo.insert!(user) | Repo.insert!(user) | ||||
end | end | ||||
@@ -1,9 +1,21 @@ | |||||
defmodule Pleroma.Activity do | defmodule Pleroma.Activity do | ||||
use Ecto.Schema | use Ecto.Schema | ||||
alias Pleroma.{Repo, Activity} | |||||
import Ecto.Query | |||||
schema "activities" do | schema "activities" do | ||||
field :data, :map | field :data, :map | ||||
timestamps() | timestamps() | ||||
end | 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 | end |
@@ -14,6 +14,10 @@ defmodule Pleroma.Application do | |||||
supervisor(Pleroma.Web.Endpoint, []), | supervisor(Pleroma.Web.Endpoint, []), | ||||
# Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3) | # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3) | ||||
# worker(Pleroma.Worker, [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 | # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html | ||||
@@ -18,6 +18,31 @@ defmodule Pleroma.Upload do | |||||
} | } | ||||
end | end | ||||
def store(%{"img" => "data:image/" <> image_data}) do | |||||
parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data) | |||||
data = Base.decode64!(parsed["data"]) | |||||
uuid = Ecto.UUID.generate | |||||
upload_folder = Path.join(upload_path(), uuid) | |||||
File.mkdir_p!(upload_folder) | |||||
filename = Base.encode16(:crypto.hash(:sha256, data)) <> ".#{parsed["filetype"]}" | |||||
result_file = Path.join(upload_folder, filename) | |||||
File.write!(result_file, data) | |||||
content_type = "image/#{parsed["filetype"]}" | |||||
%{ | |||||
"type" => "Image", | |||||
"url" => [%{ | |||||
"type" => "Link", | |||||
"mediaType" => content_type, | |||||
"href" => url_for(Path.join(uuid, filename)) | |||||
}], | |||||
"name" => filename, | |||||
"uuid" => uuid | |||||
} | |||||
end | |||||
defp upload_path do | defp upload_path do | ||||
Application.get_env(:pleroma, Pleroma.Upload) | Application.get_env(:pleroma, Pleroma.Upload) | ||||
|> Keyword.fetch!(:uploads) | |> Keyword.fetch!(:uploads) | ||||
@@ -9,8 +9,11 @@ defmodule Pleroma.User do | |||||
field :name, :string | field :name, :string | ||||
field :nickname, :string | field :nickname, :string | ||||
field :password_hash, :string | field :password_hash, :string | ||||
field :password, :string, virtual: true | |||||
field :password_confirmation, :string, virtual: true | |||||
field :following, { :array, :string }, default: [] | field :following, { :array, :string }, default: [] | ||||
field :ap_id, :string | field :ap_id, :string | ||||
field :avatar, :map | |||||
timestamps() | timestamps() | ||||
end | end | ||||
@@ -29,6 +32,27 @@ defmodule Pleroma.User do | |||||
|> validate_required([:following]) | |> validate_required([:following]) | ||||
end | 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 | def follow(%User{} = follower, %User{} = followed) do | ||||
ap_followers = User.ap_followers(followed) | ap_followers = User.ap_followers(followed) | ||||
if following?(follower, followed) do | if following?(follower, followed) do | ||||
@@ -61,4 +85,17 @@ defmodule Pleroma.User do | |||||
def following?(%User{} = follower, %User{} = followed) do | def following?(%User{} = follower, %User{} = followed) do | ||||
Enum.member?(follower.following, User.ap_followers(followed)) | Enum.member?(follower.following, User.ap_followers(followed)) | ||||
end | 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 | end |
@@ -1,10 +1,12 @@ | |||||
defmodule Pleroma.Web.ActivityPub.ActivityPub do | defmodule Pleroma.Web.ActivityPub.ActivityPub do | ||||
alias Pleroma.Repo | alias Pleroma.Repo | ||||
alias Pleroma.{Activity, Object, Upload} | |||||
alias Pleroma.{Activity, Object, Upload, User} | |||||
import Ecto.Query | import Ecto.Query | ||||
def insert(map) when is_map(map) do | 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 | map = if is_map(map["object"]) do | ||||
object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0) | object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0) | ||||
@@ -17,6 +19,77 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do | |||||
Repo.insert(%Activity{data: map}) | Repo.insert(%Activity{data: map}) | ||||
end | 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 | def generate_activity_id do | ||||
generate_id("activities") | generate_id("activities") | ||||
end | end | ||||
@@ -64,14 +137,42 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do | |||||
|> Enum.reverse | |> Enum.reverse | ||||
end | 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 | def fetch_activities_for_context(context) do | ||||
query = from activity in Activity, | query = from activity in Activity, | ||||
where: fragment("? @> ?", activity.data, ^%{ context: context }) | where: fragment("? @> ?", activity.data, ^%{ context: context }) | ||||
Repo.all(query) | Repo.all(query) | ||||
end | end | ||||
def upload(%Plug.Upload{} = file) do | |||||
def upload(file) do | |||||
data = Upload.store(file) | data = Upload.store(file) | ||||
Repo.insert(%Object{data: data}) | Repo.insert(%Object{data: data}) | ||||
end | end | ||||
defp make_date do | |||||
DateTime.utc_now() |> DateTime.to_iso8601 | |||||
end | |||||
end | end |
@@ -26,6 +26,7 @@ defmodule Pleroma.Web.Router do | |||||
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status | get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status | ||||
get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation | get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation | ||||
get "/statusnet/config", TwitterAPI.Controller, :config | get "/statusnet/config", TwitterAPI.Controller, :config | ||||
post "/account/register", TwitterAPI.Controller, :register | |||||
end | end | ||||
scope "/api", Pleroma.Web do | scope "/api", Pleroma.Web do | ||||
@@ -39,5 +40,11 @@ defmodule Pleroma.Web.Router do | |||||
post "/friendships/create", TwitterAPI.Controller, :follow | post "/friendships/create", TwitterAPI.Controller, :follow | ||||
post "/friendships/destroy", TwitterAPI.Controller, :unfollow | post "/friendships/destroy", TwitterAPI.Controller, :unfollow | ||||
post "/statusnet/media/upload", TwitterAPI.Controller, :upload | 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 | |||||
post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar | |||||
end | end | ||||
end | end |
@@ -4,6 +4,51 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do | |||||
alias Pleroma.Activity | 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 | def to_map(%Activity{data: %{"type" => "Follow"}} = activity, %{user: user} = opts) do | ||||
created_at = get_in(activity.data, ["published"]) | created_at = get_in(activity.data, ["published"]) | ||||
|> date_to_asctime | |> date_to_asctime | ||||
@@ -25,6 +70,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do | |||||
content = get_in(activity.data, ["object", "content"]) | content = get_in(activity.data, ["object", "content"]) | ||||
created_at = get_in(activity.data, ["object", "published"]) | created_at = get_in(activity.data, ["object", "published"]) | ||||
|> date_to_asctime | |> 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] || [] | mentions = opts[:mentioned] || [] | ||||
@@ -45,14 +94,18 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do | |||||
"in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"], | "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"], | ||||
"statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"], | "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"], | ||||
"attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts), | "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 | end | ||||
defp date_to_asctime(date) do | defp date_to_asctime(date) do | ||||
with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do | with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do | ||||
Calendar.Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y") | Calendar.Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y") | ||||
else e -> | |||||
else _e -> | |||||
"" | "" | ||||
end | end | ||||
end | end | ||||
@@ -4,8 +4,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do | |||||
alias Pleroma.User | alias Pleroma.User | ||||
def to_map(user, opts) do | def to_map(user, opts) do | ||||
image = "https://placehold.it/48x48" | |||||
image = case user.avatar do | |||||
%{"url" => [%{"href" => href} | _]} -> href | |||||
_ -> "https://placehold.it/48x48" | |||||
end | |||||
following = if opts[:for] do | following = if opts[:for] do | ||||
User.following?(opts[:for], user) | User.following?(opts[:for], user) | ||||
@@ -1,7 +1,7 @@ | |||||
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | ||||
alias Pleroma.{User, Activity, Repo, Object} | alias Pleroma.{User, Activity, Repo, Object} | ||||
alias Pleroma.Web.ActivityPub.ActivityPub | alias Pleroma.Web.ActivityPub.ActivityPub | ||||
alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter | |||||
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter} | |||||
import Ecto.Query | import Ecto.Query | ||||
@@ -13,6 +13,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | |||||
context = ActivityPub.generate_context_id | context = ActivityPub.generate_context_id | ||||
content = HtmlSanitizeEx.strip_tags(data["status"]) | content = HtmlSanitizeEx.strip_tags(data["status"]) | ||||
|> String.replace("\n", "<br>") | |||||
mentions = parse_mentions(content) | mentions = parse_mentions(content) | ||||
@@ -37,7 +38,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | |||||
"content" => content_html, | "content" => content_html, | ||||
"published" => date, | "published" => date, | ||||
"context" => context, | "context" => context, | ||||
"attachment" => attachments | |||||
"attachment" => attachments, | |||||
"actor" => user.ap_id | |||||
}, | }, | ||||
"published" => date, | "published" => date, | ||||
"context" => context | "context" => context | ||||
@@ -127,25 +129,74 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | |||||
end | end | ||||
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) | {:ok, object} = ActivityPub.upload(file) | ||||
url = List.first(object.data["url"]) | url = List.first(object.data["url"]) | ||||
href = url["href"] | href = url["href"] | ||||
type = url["mediaType"] | type = url["mediaType"] | ||||
# Fake this as good as possible... | |||||
""" | |||||
<?xml version="1.0" encoding="UTF-8"?> | |||||
<rsp stat="ok" xmlns:atom="http://www.w3.org/2005/Atom"> | |||||
<mediaid>#{object.id}</mediaid> | |||||
<media_id>#{object.id}</media_id> | |||||
<media_id_string>#{object.id}</media_id_string> | |||||
<media_url>#{href}</media_url> | |||||
<mediaurl>#{href}</mediaurl> | |||||
<atom:link rel="enclosure" href="#{href}" type="#{type}"></atom:link> | |||||
</rsp> | |||||
""" | |||||
case format do | |||||
"xml" -> | |||||
# Fake this as good as possible... | |||||
""" | |||||
<?xml version="1.0" encoding="UTF-8"?> | |||||
<rsp stat="ok" xmlns:atom="http://www.w3.org/2005/Atom"> | |||||
<mediaid>#{object.id}</mediaid> | |||||
<media_id>#{object.id}</media_id> | |||||
<media_id_string>#{object.id}</media_id_string> | |||||
<media_url>#{href}</media_url> | |||||
<mediaurl>#{href}</mediaurl> | |||||
<atom:link rel="enclosure" href="#{href}" type="#{type}"></atom:link> | |||||
</rsp> | |||||
""" | |||||
"json" -> | |||||
%{ | |||||
media_id: object.id, | |||||
media_id_string: "#{object.id}}", | |||||
media_url: href, | |||||
size: 0 | |||||
} |> Poison.encode! | |||||
end | |||||
end | end | ||||
def parse_mentions(text) do | def parse_mentions(text) do | ||||
@@ -155,7 +206,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | |||||
Regex.scan(regex, text) | Regex.scan(regex, text) | ||||
|> List.flatten | |> List.flatten | ||||
|> Enum.uniq | |> 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) | |> Enum.filter(fn ({_match, user}) -> user end) | ||||
end | end | ||||
@@ -171,21 +222,72 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | |||||
|> put_in(["object", "statusnetConversationId"], activity.id) | |> put_in(["object", "statusnetConversationId"], activity.id) | ||||
|> put_in(["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) | changeset = Ecto.Changeset.change(activity, data: data) | ||||
Repo.update(changeset) | Repo.update(changeset) | ||||
end | end | ||||
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 | defp activities_to_statuses(activities, opts) do | ||||
Enum.map(activities, fn(activity) -> | Enum.map(activities, fn(activity) -> | ||||
activity_to_status(activity, opts) | activity_to_status(activity, opts) | ||||
end) | end) | ||||
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 | defp activity_to_status(activity, opts) do | ||||
actor = get_in(activity.data, ["actor"]) | 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})) | ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, mentioned: mentioned_users})) | ||||
end | end | ||||
@@ -2,6 +2,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do | |||||
use Pleroma.Web, :controller | use Pleroma.Web, :controller | ||||
alias Pleroma.Web.TwitterAPI.TwitterAPI | alias Pleroma.Web.TwitterAPI.TwitterAPI | ||||
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter} | alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter} | ||||
alias Pleroma.{Repo, Activity} | |||||
alias Pleroma.Web.ActivityPub.ActivityPub | |||||
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do | def verify_credentials(%{assigns: %{user: user}} = conn, _params) do | ||||
response = user |> UserRepresenter.to_json(%{for: user}) | response = user |> UserRepresenter.to_json(%{for: user}) | ||||
@@ -86,6 +88,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do | |||||
|> send_resp(200, response) | |> send_resp(200, response) | ||||
end | end | ||||
def upload_json(conn, %{"media" => media}) do | |||||
response = TwitterAPI.upload(media, "json") | |||||
conn | |||||
|> json_reply(200, response) | |||||
end | |||||
def config(conn, _params) do | def config(conn, _params) do | ||||
response = %{ | response = %{ | ||||
site: %{ | site: %{ | ||||
@@ -100,6 +108,56 @@ defmodule Pleroma.Web.TwitterAPI.Controller do | |||||
|> json_reply(200, response) | |> json_reply(200, response) | ||||
end | 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 | |||||
def update_avatar(%{assigns: %{user: user}} = conn, params) do | |||||
{:ok, object} = ActivityPub.upload(params) | |||||
change = Ecto.Changeset.change(user, %{avatar: object.data}) | |||||
{:ok, user} = Repo.update(change) | |||||
response = UserRepresenter.to_map(user, %{for: user}) | |||||
|> Poison.encode! | |||||
conn | |||||
|> json_reply(200, response) | |||||
end | |||||
defp json_reply(conn, status, json) do | defp json_reply(conn, status, json) do | ||||
conn | conn | ||||
|> put_resp_content_type("application/json") | |> put_resp_content_type("application/json") | ||||
@@ -38,6 +38,8 @@ defmodule Pleroma.Mixfile do | |||||
{:trailing_format_plug, "~> 0.0.5" }, | {:trailing_format_plug, "~> 0.0.5" }, | ||||
{:html_sanitize_ex, "~> 1.0.0"}, | {:html_sanitize_ex, "~> 1.0.0"}, | ||||
{:calendar, "~> 0.16.1"}, | {:calendar, "~> 0.16.1"}, | ||||
{:con_cache, "~> 0.12.0"}, | |||||
{:ex_machina, "~> 2.0", only: :test}, | |||||
{:mix_test_watch, "~> 0.2", only: :dev}] | {:mix_test_watch, "~> 0.2", only: :dev}] | ||||
end | end | ||||
@@ -1,6 +1,7 @@ | |||||
%{"calendar": {:hex, :calendar, "0.16.1", "782327ad8bae7c797b887840dc4ddb933f05ce6e333e5b04964d7a5d5f79bde3", [:mix], [{:tzdata, "~> 0.5.8 or ~> 0.1.201603", [hex: :tzdata, optional: false]}]}, | %{"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], []}, | "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]}]}, | "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], []}, | "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]}]}, | "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], []}, | "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []}, | ||||
@@ -8,6 +9,8 @@ | |||||
"decimal": {:hex, :decimal, "1.3.1", "157b3cedb2bfcb5359372a7766dd7a41091ad34578296e951f58a946fcab49c6", [:mix], []}, | "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]}]}, | "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], []}, | "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], []}, | "fs": {:hex, :fs, "2.12.0", "ad631efacc9a5683c8eaa1b274e24fa64a1b8eb30747e9595b93bec7e492e25e", [:rebar3], []}, | ||||
"gettext": {:hex, :gettext, "0.13.1", "5e0daf4e7636d771c4c71ad5f3f53ba09a9ae5c250e1ab9c42ba9edccc476263", [:mix], []}, | "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]}]}, | "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]}]}, | ||||
@@ -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 |
@@ -0,0 +1,9 @@ | |||||
defmodule Pleroma.Repo.Migrations.AddAvatarObjectToUsers do | |||||
use Ecto.Migration | |||||
def change do | |||||
alter table(:users) do | |||||
add :avatar, :map | |||||
end | |||||
end | |||||
end |
@@ -1 +1 @@ | |||||
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.c9152df945545cbfad798e27da935399.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.53ddf71d231dbc5f82dc.js></script><script type=text/javascript src=/static/js/vendor.a3ec6a31a96c8e7709d8.js></script><script type=text/javascript src=/static/js/app.8e94b6d65028f6ffaeee.js></script></body></html> | |||||
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.a86c13eb46180b1b975a1acd59b52cc6.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.66d994092e61600982a8.js></script><script type=text/javascript src=/static/js/vendor.d7d8813599feb765b152.js></script><script type=text/javascript src=/static/js/app.d4e0a640b375c4b52997.js></script></body></html> |
@@ -1,6 +1,6 @@ | |||||
{ | { | ||||
"name": "Pleroma FE", | "name": "Pleroma FE", | ||||
"theme": "base16-ashes.css", | |||||
"theme": "base16-pleroma-dark.css", | |||||
"background": "/static/bg.jpg", | "background": "/static/bg.jpg", | ||||
"logo": "/static/logo.png" | "logo": "/static/logo.png" | ||||
} | } |
@@ -0,0 +1,33 @@ | |||||
.base00-background { background-color: #161c20; } | |||||
.base01-background { background-color: #282e32; } | |||||
.base02-background { background-color: #343a3f; } | |||||
.base03-background { background-color: #4e5256; } | |||||
.base04-background { background-color: #ababab; } | |||||
.base05-background { background-color: #b9b9b9; } | |||||
.base06-background { background-color: #d0d0d0; } | |||||
.base07-background { background-color: #e7e7e7; } | |||||
.base08-background { background-color: #baaa9c; } | |||||
.base09-background { background-color: #999999; } | |||||
.base0A-background { background-color: #a0a0a0; } | |||||
.base0B-background { background-color: #8e8e8e; } | |||||
.base0C-background { background-color: #868686; } | |||||
.base0D-background { background-color: #686868; } | |||||
.base0E-background { background-color: #747474; } | |||||
.base0F-background { background-color: #5e5e5e; } | |||||
.base00 { color: #161c20; } | |||||
.base01 { color: #282e32; } | |||||
.base02 { color: #36393e; } | |||||
.base03 { color: #4e5256; } | |||||
.base04 { color: #ababab; } | |||||
.base05 { color: #b9b9b9; } | |||||
.base06 { color: #d0d0d0; } | |||||
.base07 { color: #e7e7e7; } | |||||
.base08 { color: #baaa9c; } | |||||
.base09 { color: #999999; } | |||||
.base0A { color: #a0a0a0; } | |||||
.base0B { color: #8e8e8e; } | |||||
.base0C { color: #868686; } | |||||
.base0D { color: #686868; } | |||||
.base0E { color: #747474; } | |||||
.base0F { color: #5e5e5e; } |
@@ -0,0 +1,33 @@ | |||||
.base00-background { background-color: #f2f4f6; } | |||||
.base01-background { background-color: #dde2e6; } | |||||
.base02-background { background-color: #c0c6cb; } | |||||
.base03-background { background-color: #a4a4a4; } | |||||
.base04-background { background-color: #545454; } | |||||
.base05-background { background-color: #304055; } | |||||
.base06-background { background-color: #040404; } | |||||
.base07-background { background-color: #000000; } | |||||
.base08-background { background-color: #e92f2f; } | |||||
.base09-background { background-color: #e09448; } | |||||
.base0A-background { background-color: #dddd13; } | |||||
.base0B-background { background-color: #0ed839; } | |||||
.base0C-background { background-color: #23edda; } | |||||
.base0D-background { background-color: #3b48e3; } | |||||
.base0E-background { background-color: #f996e2; } | |||||
.base0F-background { background-color: #69542d; } | |||||
.base00 { color: #f2f4f6; } | |||||
.base01 { color: #dde2e6; } | |||||
.base02 { color: #c0c6cb; } | |||||
.base03 { color: #a4a4a4; } | |||||
.base04 { color: #545454; } | |||||
.base05 { color: #304055; } | |||||
.base06 { color: #040404; } | |||||
.base07 { color: #000000; } | |||||
.base08 { color: #e46f0f; } | |||||
.base09 { color: #e09448; } | |||||
.base0A { color: #dddd13; } | |||||
.base0B { color: #0ed839; } | |||||
.base0C { color: #23edda; } | |||||
.base0D { color: #3b48e3; } | |||||
.base0E { color: #f996e2; } | |||||
.base0F { color: #69542d; } |
@@ -1,4 +1,6 @@ | |||||
[ | [ | ||||
"base16-pleroma-dark.css", | |||||
"base16-pleroma-light.css", | |||||
"base16-3024.css", | "base16-3024.css", | ||||
"base16-apathy.css", | "base16-apathy.css", | ||||
"base16-ashes.css", | "base16-ashes.css", | ||||
@@ -1,2 +0,0 @@ | |||||
!function(e){function t(a){if(n[a])return n[a].exports;var r=n[a]={exports:{},id:a,loaded:!1};return e[a].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var a=window.webpackJsonp;window.webpackJsonp=function(c,o){for(var p,s,l=0,i=[];l<c.length;l++)s=c[l],r[s]&&i.push.apply(i,r[s]),r[s]=0;for(p in o)e[p]=o[p];for(a&&a(c,o);i.length;)i.shift().call(null,t);if(o[0])return n[0]=0,t(0)};var n={},r={0:0};t.e=function(e,a){if(0===r[e])return a.call(null,t);if(void 0!==r[e])r[e].push(a);else{r[e]=[a];var n=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.src=t.p+"static/js/"+e+"."+{1:"a3ec6a31a96c8e7709d8",2:"8e94b6d65028f6ffaeee"}[e]+".js",n.appendChild(c)}},t.m=e,t.c=n,t.p="/"}([]); | |||||
//# sourceMappingURL=manifest.53ddf71d231dbc5f82dc.js.map |
@@ -0,0 +1,2 @@ | |||||
!function(e){function t(n){if(r[n])return r[n].exports;var a=r[n]={exports:{},id:n,loaded:!1};return e[n].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n=window.webpackJsonp;window.webpackJsonp=function(o,c){for(var p,s,l=0,i=[];l<o.length;l++)s=o[l],a[s]&&i.push.apply(i,a[s]),a[s]=0;for(p in c)e[p]=c[p];for(n&&n(o,c);i.length;)i.shift().call(null,t);if(c[0])return r[0]=0,t(0)};var r={},a={0:0};t.e=function(e,n){if(0===a[e])return n.call(null,t);if(void 0!==a[e])a[e].push(n);else{a[e]=[n];var r=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.src=t.p+"static/js/"+e+"."+{1:"d7d8813599feb765b152",2:"d4e0a640b375c4b52997"}[e]+".js",r.appendChild(o)}},t.m=e,t.c=r,t.p="/"}([]); | |||||
//# sourceMappingURL=manifest.66d994092e61600982a8.js.map |
@@ -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 |
@@ -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 |
@@ -3,7 +3,7 @@ defmodule Pleroma.Builders.ActivityBuilder do | |||||
alias Pleroma.Web.ActivityPub.ActivityPub | alias Pleroma.Web.ActivityPub.ActivityPub | ||||
def build(data \\ %{}, opts \\ %{}) do | def build(data \\ %{}, opts \\ %{}) do | ||||
user = opts[:user] || UserBuilder.build | |||||
user = opts[:user] || Pleroma.Factory.insert(:user) | |||||
activity = %{ | activity = %{ | ||||
"id" => 1, | "id" => 1, | ||||
"actor" => user.ap_id, | "actor" => user.ap_id, | ||||
@@ -29,7 +29,7 @@ defmodule Pleroma.Builders.ActivityBuilder do | |||||
end | end | ||||
def public_and_non_public do | def public_and_non_public do | ||||
{:ok, user} = UserBuilder.insert | |||||
user = Pleroma.Factory.insert(:user) | |||||
public = build(%{"id" => 1}, %{user: user}) | public = build(%{"id" => 1}, %{user: user}) | ||||
non_public = build(%{"id" => 2, "to" => []}, %{user: user}) | non_public = build(%{"id" => 2, "to" => []}, %{user: user}) | ||||
@@ -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 |
@@ -1,4 +1,5 @@ | |||||
ExUnit.start() | ExUnit.start() | ||||
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual) | Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual) | ||||
{:ok, _} = Application.ensure_all_started(:ex_machina) | |||||
@@ -3,6 +3,8 @@ defmodule Pleroma.UserTest do | |||||
alias Pleroma.User | alias Pleroma.User | ||||
use Pleroma.DataCase | use Pleroma.DataCase | ||||
import Pleroma.Factory | |||||
test "ap_id returns the activity pub id for the user" do | test "ap_id returns the activity pub id for the user" do | ||||
host = | host = | ||||
Application.get_env(:pleroma, Pleroma.Web.Endpoint) | Application.get_env(:pleroma, Pleroma.Web.Endpoint) | ||||
@@ -25,21 +27,21 @@ defmodule Pleroma.UserTest do | |||||
end | end | ||||
test "follow takes a user and another user" do | test "follow takes a user and another user" do | ||||
{ :ok, user } = UserBuilder.insert | |||||
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"}) | |||||
user = insert(:user) | |||||
followed = insert(:user) | |||||
{:ok, user } = User.follow(user, following) | |||||
{:ok, user } = User.follow(user, followed) | |||||
user = Repo.get(User, user.id) | user = Repo.get(User, user.id) | ||||
assert user.following == [User.ap_followers(following)] | |||||
assert user.following == [User.ap_followers(followed)] | |||||
end | end | ||||
test "unfollow takes a user and another user" do | test "unfollow takes a user and another user" do | ||||
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"}) | |||||
{ :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(following)]}) | |||||
followed = insert(:user) | |||||
user = insert(:user, %{following: [User.ap_followers(followed)]}) | |||||
{:ok, user } = User.unfollow(user, following) | |||||
{:ok, user } = User.unfollow(user, followed) | |||||
user = Repo.get(User, user.id) | user = Repo.get(User, user.id) | ||||
@@ -47,10 +49,41 @@ defmodule Pleroma.UserTest do | |||||
end | end | ||||
test "test if a user is following another user" do | test "test if a user is following another user" do | ||||
{ :ok, followed } = UserBuilder.insert(%{nickname: "guy"}) | |||||
{ :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(followed)]}) | |||||
followed = insert(:user) | |||||
user = insert(:user, %{following: [User.ap_followers(followed)]}) | |||||
assert User.following?(user, followed) | assert User.following?(user, followed) | ||||
refute User.following?(followed, user) | refute User.following?(followed, user) | ||||
end | 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 | end |
@@ -2,12 +2,54 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do | |||||
use Pleroma.DataCase | use Pleroma.DataCase | ||||
alias Pleroma.{User, Activity, Object} | alias Pleroma.{User, Activity, Object} | ||||
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter, ObjectRepresenter} | alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter, ObjectRepresenter} | ||||
alias Pleroma.Web.ActivityPub.ActivityPub | |||||
alias Pleroma.Builders.UserBuilder | 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 | test "an activity" do | ||||
{:ok, user} = UserBuilder.insert | {:ok, user} = UserBuilder.insert | ||||
{:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"}) | |||||
{:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]}) | |||||
# {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"}) | |||||
mentioned_user = insert(:user, %{nickname: "shp"}) | |||||
# {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]}) | |||||
follower = insert(:user, %{following: [User.ap_followers(user)]}) | |||||
object = %Object{ | object = %Object{ | ||||
data: %{ | data: %{ | ||||
@@ -23,7 +65,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do | |||||
} | } | ||||
} | } | ||||
content_html = "Some content mentioning <a href='shp'>@shp</shp>" | |||||
content_html = "Some content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>" | |||||
content = HtmlSanitizeEx.strip_tags(content_html) | content = HtmlSanitizeEx.strip_tags(content_html) | ||||
date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601 | date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601 | ||||
@@ -45,7 +87,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do | |||||
"statusnetConversationId" => 4711, | "statusnetConversationId" => 4711, | ||||
"attachment" => [ | "attachment" => [ | ||||
object | object | ||||
] | |||||
], | |||||
"like_count" => 5, | |||||
"announcement_count" => 3 | |||||
}, | }, | ||||
"published" => date | "published" => date | ||||
} | } | ||||
@@ -68,7 +112,11 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do | |||||
], | ], | ||||
"attentions" => [ | "attentions" => [ | ||||
UserRepresenter.to_map(mentioned_user, %{for: follower}) | 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 | assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status | ||||
@@ -5,13 +5,23 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenterTest do | |||||
alias Pleroma.Web.TwitterAPI.Representers.UserRepresenter | alias Pleroma.Web.TwitterAPI.Representers.UserRepresenter | ||||
alias Pleroma.Builders.UserBuilder | alias Pleroma.Builders.UserBuilder | ||||
import Pleroma.Factory | |||||
setup do | setup do | ||||
{:ok, user} = UserBuilder.insert | |||||
user = insert(:user) | |||||
[user: user] | [user: user] | ||||
end | end | ||||
test "A user with an avatar object", %{user: user} do | |||||
image = "image" | |||||
user = %{ user | avatar: %{ "url" => [%{"href" => image}] }} | |||||
represented = UserRepresenter.to_map(user) | |||||
assert represented["profile_image_url"] == image | |||||
end | |||||
test "A user", %{user: user} do | test "A user", %{user: user} do | ||||
image = "https://placehold.it/48x48" | image = "https://placehold.it/48x48" | ||||
represented = %{ | represented = %{ | ||||
"id" => user.id, | "id" => user.id, | ||||
"name" => user.name, | "name" => user.name, | ||||
@@ -2,7 +2,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
use Pleroma.Web.ConnCase | use Pleroma.Web.ConnCase | ||||
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter} | alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter} | ||||
alias Pleroma.Builders.{ActivityBuilder, UserBuilder} | 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 | describe "POST /api/account/verify_credentials" do | ||||
setup [:valid_user] | setup [:valid_user] | ||||
@@ -91,10 +94,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
end | end | ||||
test "with credentials", %{conn: conn, user: current_user} do | test "with credentials", %{conn: conn, user: current_user} do | ||||
{:ok, user} = UserBuilder.insert | |||||
user = insert(:user) | |||||
activities = ActivityBuilder.insert_list(30, %{"to" => [User.ap_followers(user)]}, %{user: user}) | activities = ActivityBuilder.insert_list(30, %{"to" => [User.ap_followers(user)]}, %{user: user}) | ||||
returned_activities = ActivityBuilder.insert_list(10, %{"to" => [User.ap_followers(user)]}, %{user: user}) | returned_activities = ActivityBuilder.insert_list(10, %{"to" => [User.ap_followers(user)]}, %{user: user}) | ||||
{:ok, other_user} = UserBuilder.insert(%{ap_id: "glimmung", nickname: "nockame"}) | |||||
other_user = insert(:user) | |||||
ActivityBuilder.insert_list(10, %{}, %{user: other_user}) | ActivityBuilder.insert_list(10, %{}, %{user: other_user}) | ||||
since_id = List.last(activities).id | since_id = List.last(activities).id | ||||
@@ -107,7 +110,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
response = json_response(conn, 200) | response = json_response(conn, 200) | ||||
assert length(response) == 10 | assert length(response) == 10 | ||||
assert response == Enum.map(returned_activities, fn (activity) -> ActivityRepresenter.to_map(activity, %{user: user, for: current_user}) end) | |||||
assert response == Enum.map(returned_activities, fn (activity) -> ActivityRepresenter.to_map(activity, %{user: User.get_cached_by_ap_id(activity.data["actor"]), for: current_user}) end) | |||||
end | end | ||||
end | end | ||||
@@ -119,7 +122,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
end | end | ||||
test "with credentials", %{conn: conn, user: current_user} do | test "with credentials", %{conn: conn, user: current_user} do | ||||
{:ok, followed } = UserBuilder.insert(%{name: "some guy"}) | |||||
followed = insert(:user) | |||||
conn = conn | conn = conn | ||||
|> with_credentials(current_user.nickname, "test") | |> with_credentials(current_user.nickname, "test") | ||||
@@ -139,7 +142,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
end | end | ||||
test "with credentials", %{conn: conn, user: current_user} do | test "with credentials", %{conn: conn, user: current_user} do | ||||
{:ok, followed } = UserBuilder.insert(%{name: "some guy"}) | |||||
followed = insert(:user) | |||||
{:ok, current_user} = User.follow(current_user, followed) | {:ok, current_user} = User.follow(current_user, followed) | ||||
assert current_user.following == [User.ap_followers(followed)] | assert current_user.following == [User.ap_followers(followed)] | ||||
@@ -154,6 +157,121 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
end | end | ||||
end | end | ||||
describe "POST /api/qvitter/update_avatar.json" do | |||||
setup [:valid_user] | |||||
test "without valid credentials", %{conn: conn} do | |||||
conn = post conn, "/api/qvitter/update_avatar.json" | |||||
assert json_response(conn, 403) == %{"error" => "Invalid credentials."} | |||||
end | |||||
test "with credentials", %{conn: conn, user: current_user} do | |||||
conn = conn | |||||
|> with_credentials(current_user.nickname, "test") | |||||
|> post("/api/qvitter/update_avatar.json", %{img: Pleroma.Web.ActivityPub.ActivityPubTest.data_uri}) | |||||
current_user = Repo.get(User, current_user.id) | |||||
assert is_map(current_user.avatar) | |||||
assert json_response(conn, 200) == UserRepresenter.to_map(current_user, %{for: current_user}) | |||||
end | |||||
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 | |||||
defp valid_user(_context) do | defp valid_user(_context) do | ||||
{ :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"}) | { :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"}) | ||||
[user: user] | [user: user] | ||||
@@ -163,4 +281,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
header_content = "Basic " <> Base.encode64("#{username}:#{password}") | header_content = "Basic " <> Base.encode64("#{username}:#{password}") | ||||
put_req_header(conn, "authorization", header_content) | put_req_header(conn, "authorization", header_content) | ||||
end | end | ||||
setup do | |||||
Supervisor.terminate_child(Pleroma.Supervisor, ConCache) | |||||
Supervisor.restart_child(Pleroma.Supervisor, ConCache) | |||||
:ok | |||||
end | |||||
end | end |
@@ -3,7 +3,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
alias Pleroma.Builders.{UserBuilder, ActivityBuilder} | alias Pleroma.Builders.{UserBuilder, ActivityBuilder} | ||||
alias Pleroma.Web.TwitterAPI.TwitterAPI | alias Pleroma.Web.TwitterAPI.TwitterAPI | ||||
alias Pleroma.{Activity, User, Object, Repo} | 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 | test "create a status" do | ||||
user = UserBuilder.build(%{ap_id: "142344"}) | user = UserBuilder.build(%{ap_id: "142344"}) | ||||
@@ -24,14 +27,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
object = Repo.insert!(%Object{data: object_data}) | object = Repo.insert!(%Object{data: object_data}) | ||||
input = %{ | input = %{ | ||||
"status" => "Hello again, @shp.<script></script>", | |||||
"status" => "Hello again, @shp.<script></script>\nThis is on another line.", | |||||
"media_ids" => [object.id] | "media_ids" => [object.id] | ||||
} | } | ||||
{ :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) | { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) | ||||
assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>." | |||||
assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.<br>This is on another line." | |||||
assert get_in(activity.data, ["object", "type"]) == "Note" | 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 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"]), User.ap_followers(user)) | ||||
assert Enum.member?(get_in(activity.data, ["to"]), "https://www.w3.org/ns/activitystreams#Public") | assert Enum.member?(get_in(activity.data, ["to"]), "https://www.w3.org/ns/activitystreams#Public") | ||||
@@ -44,6 +48,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
assert get_in(activity.data, ["statusnetConversationId"]) == activity.id | assert get_in(activity.data, ["statusnetConversationId"]) == activity.id | ||||
assert is_list(activity.data["object"]["attachment"]) | assert is_list(activity.data["object"]["attachment"]) | ||||
assert activity.data["object"] == Object.get_by_ap_id(activity.data["object"]["id"]).data | |||||
end | end | ||||
test "create a status that is a reply" do | test "create a status that is a reply" do | ||||
@@ -72,7 +78,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
test "fetch public statuses" do | test "fetch public statuses" do | ||||
%{ public: activity, user: user } = ActivityBuilder.public_and_non_public | %{ public: activity, user: user } = ActivityBuilder.public_and_non_public | ||||
{:ok, follower } = UserBuilder.insert(%{name: "dude", ap_id: "idididid", following: [User.ap_followers(user)]}) | |||||
follower = insert(:user, following: [User.ap_followers(user)]) | |||||
statuses = TwitterAPI.fetch_public_statuses(follower) | statuses = TwitterAPI.fetch_public_statuses(follower) | ||||
@@ -81,19 +88,18 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
end | end | ||||
test "fetch friends' statuses" do | test "fetch friends' statuses" do | ||||
ActivityBuilder.public_and_non_public | |||||
user = insert(:user, %{following: ["someguy/followers"]}) | |||||
{:ok, activity} = ActivityBuilder.insert(%{"to" => ["someguy/followers"]}) | {:ok, activity} = ActivityBuilder.insert(%{"to" => ["someguy/followers"]}) | ||||
{:ok, direct_activity} = ActivityBuilder.insert(%{"to" => ["some other id"]}) | |||||
{:ok, user} = UserBuilder.insert(%{ap_id: "some other id", following: ["someguy/followers"]}) | |||||
{:ok, direct_activity} = ActivityBuilder.insert(%{"to" => [user.ap_id]}) | |||||
statuses = TwitterAPI.fetch_friend_statuses(user) | statuses = TwitterAPI.fetch_friend_statuses(user) | ||||
activity_user = Repo.get_by(User, ap_id: activity.data["actor"]) | activity_user = Repo.get_by(User, ap_id: activity.data["actor"]) | ||||
direct_activity_user = Repo.get_by(User, ap_id: direct_activity.data["actor"]) | |||||
assert length(statuses) == 2 | assert length(statuses) == 2 | ||||
assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user}) | assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user}) | ||||
assert Enum.at(statuses, 1) == ActivityRepresenter.to_map(direct_activity, %{user: activity_user, mentioned: [user]}) | |||||
assert Enum.at(statuses, 1) == ActivityRepresenter.to_map(direct_activity, %{user: direct_activity_user, mentioned: [user]}) | |||||
end | end | ||||
test "fetch a single status" do | test "fetch a single status" do | ||||
@@ -107,8 +113,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
end | end | ||||
test "Follow another user" do | test "Follow another user" do | ||||
{ :ok, user } = UserBuilder.insert | |||||
{ :ok, followed } = UserBuilder.insert(%{nickname: "guy"}) | |||||
user = insert(:user) | |||||
followed = insert(:user) | |||||
{ :ok, user, followed, activity } = TwitterAPI.follow(user, followed.id) | { :ok, user, followed, activity } = TwitterAPI.follow(user, followed.id) | ||||
@@ -123,8 +129,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
end | end | ||||
test "Unfollow another user" do | test "Unfollow another user" do | ||||
{ :ok, followed } = UserBuilder.insert(%{nickname: "guy"}) | |||||
{ :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(followed)]}) | |||||
followed = insert(:user) | |||||
user = insert(:user, %{following: [User.ap_followers(followed)]}) | |||||
{ :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id) | { :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id) | ||||
@@ -159,8 +165,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
test "it can parse mentions and return the relevant users" do | test "it can parse mentions and return the relevant users" do | ||||
text = "@gsimg According to @archaeme , that is @daggsy." | text = "@gsimg According to @archaeme , that is @daggsy." | ||||
{:ok, gsimg} = UserBuilder.insert(%{nickname: "gsimg"}) | |||||
{:ok, archaeme} = UserBuilder.insert(%{nickname: "archaeme"}) | |||||
gsimg = insert(:user, %{nickname: "gsimg"}) | |||||
archaeme = insert(:user, %{nickname: "archaeme"}) | |||||
expected_result = [ | expected_result = [ | ||||
{"@gsimg", gsimg}, | {"@gsimg", gsimg}, | ||||
@@ -173,12 +179,86 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||||
test "it adds user links to an existing text" do | test "it adds user links to an existing text" do | ||||
text = "@gsimg According to @archaeme , that is @daggsy." | text = "@gsimg According to @archaeme , that is @daggsy." | ||||
{:ok, _gsimg} = UserBuilder.insert(%{nickname: "gsimg", ap_id: "first_link" }) | |||||
{:ok, _archaeme} = UserBuilder.insert(%{nickname: "archaeme", ap_id: "second_link"}) | |||||
gsimg = insert(:user, %{nickname: "gsimg"}) | |||||
archaeme = insert(:user, %{nickname: "archaeme"}) | |||||
mentions = TwitterAPI.parse_mentions(text) | mentions = TwitterAPI.parse_mentions(text) | ||||
expected_text = "<a href='first_link'>@gsimg</a> According to <a href='second_link'>@archaeme</a> , that is @daggsy." | |||||
expected_text = "<a href='#{gsimg.ap_id}'>@gsimg</a> According to <a href='#{archaeme.ap_id}'>@archaeme</a> , that is @daggsy." | |||||
assert TwitterAPI.add_user_links(text, mentions) == expected_text | assert TwitterAPI.add_user_links(text, mentions) == expected_text | ||||
end | 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 | end |