diff --git a/.gitignore b/.gitignore index dfaf03d..d6616e1 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ key.properties # Generated Files *.g.dart *.freezed.dart +src/ # Devel Password password.txt \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..496acdb --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ +# GNU GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +## Preamble + +The GNU General Public License is a free, copyleft license for +software and other kinds of works. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use +the GNU General Public License for most of our software; it applies +also to any other work released this way by its authors. You can apply +it to your programs, too. + +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. + +To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you +have certain responsibilities if you distribute copies of the +software, or if you modify it: responsibilities to respect the freedom +of others. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + +Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + +Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the +manufacturer can do so. This is fundamentally incompatible with the +aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for +individuals to use, which is precisely where it is most unacceptable. +Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in +other domains, we stand ready to extend this provision to those +domains in future versions of the GPL, as needed to protect the +freedom of users. + +Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish +to avoid the special danger that patents applied to a free program +could make it effectively proprietary. To prevent this, the GPL +assures that patents cannot be used to render the program non-free. + +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 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. Use with the GNU Affero General Public License. + +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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + +### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU 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 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 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 General Public License can be used, that proxy's public +statement of acceptance of a version permanently authorizes you to +choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +## How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + +To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively state +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper +mail. + +If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands \`show w' and \`show c' should show the +appropriate parts of the General Public License. Of course, your +program's commands might be different; for a GUI interface, you would +use an "about box". + +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 GPL, see . + +The GNU General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the +GNU Lesser General Public License instead of this License. But first, +please read . diff --git a/README.md b/README.md index 4b47df4..1299c71 100644 --- a/README.md +++ b/README.md @@ -15,96 +15,115 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S ## Progress -- [ ] Platform Support - - [x] Linux - - [x] Windows - - [ ] MacOS - - [ ] Android - - [ ] iOS - - [ ] Web (may not be possible) -- [x] Login - - [x] Username / password auth - - [ ] OAuth / OIDC -- [x] Rooms / Spaces - - [x] Displaying and choosing - - [x] Reading, showing unread - - [x] Mark as read button on rooms and spaces - - [ ] Searching - - [ ] Creating (Rooms, Spaces, and DMs) - - [x] Joining - - [x] Using alias/id/link - - [ ] From space - - [ ] Exploring - - [x] Leaving - - [x] Subspaces -- [x] Messages - - [x] Encryption - - [ ] Restoring crypto identity from passphrase/key or verification - - [x] Sending - - [x] Plain text - - [x] HTML/Markdown - - [x] Replies - - [ ] Attachments - - [x] Mentions - - [x] Users - - [x] Rooms - - [ ] Custom emojis/stickers - - [ ] GIFs using Giphy - - [x] Recieving - - [x] Plain text - - [x] HTML - - [x] Replies - - [x] Viewing - - [ ] Jump to original message - - [x] Edits - - [x] Attachments - - [x] Blurhashing - - [ ] Downloading attachments - - [x] Opening attachments in their own view - - [ ] Polls: Waiting on https://github.com/SwanFlutter/dynamic_polls/issues/1 - - [x] Mentions - - [x] Users - - [x] Rooms - - [ ] Plain text (not sure if I want to add this or not, I probably won't unless there's interest) - - [x] Matrix URIs - - [x] Matrix.to links - - [x] Custom emojis/stickers - - [x] History loading - - [x] Backwards - - [ ] Forwards - - [x] Editing - - [x] Deleting -- [ ] Reactions: Waiting on https://github.com/flyerhq/flutter_chat_ui/pull/838 or me doing a custom impl -- [ ] Pins - - [ ] Displaying - - [ ] Creating -- [ ] Threads -- [ ] Profile popouts -- [x] Copy link to [room, space] -- [x] Reporting -- [ ] Notifications using UnifiedPush -- [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195) -- [ ] Invites - - [ ] Viewing / accepting - - [ ] Spam filtering -- [ ] Settings - - [ ] Light/Dark mode - - [ ] Show media by default - - [ ] Dynamic Theming - - [ ] Devices - - [ ] Viewing devices - - [ ] Verifying devices - - [ ] URL preview: Server / Client / None - - [ ] Account changes - - [ ] Display name - - [ ] Profile picture - - [ ] Timezone - - [ ] Pronouns - - [ ] Password - - [ ] About - - [x] Log Out +- [ ] New logo +- [ ] Make context menus appear as bottom sheets on mobile +- [x] Move from the Dart SDK to the Gomuks SDK with Dart bindings: https://git.federated.nexus/Henry-Hiles/nexus/pulls/2 + - [ ] Allow using remote gomuks over websocket +- [ ] Platform Support + - [x] Linux + - [x] Windows + - [ ] MacOS + - [ ] Android + - [ ] iOS + - [ ] Web (may not be possible) +- [x] Login + - [x] Username / password auth + - [ ] OAuth / OIDC + - [x] Improve initial sync experience +- [x] Rooms / Spaces + - [x] Displaying and choosing + - [x] Reading, showing unread + - [x] Mark as read button on rooms and spaces + - [ ] Searching + - [ ] Creating (Rooms, Spaces, and DMs) + - [x] Joining + - [ ] Parse vias + - [x] Using a text/uri/link + - [x] Plain text + - [x] `matrix:` Uri + - [x] Matrix.to link + - [ ] From space + - [ ] Exploring + - [x] Leaving + - [x] Subspaces +- [x] Messages + - [x] Encryption + - [x] Restoring crypto identity from a recovery passphrase/key + - [x] Sending + - [x] Plain text + - [x] HTML/Markdown + - [x] Replies + - [x] Choose ping on/off + - [ ] Attachments + - [ ] Commands with [MSC4391](https://github.com/matrix-org/matrix-spec-proposals/pull/4391) + - [x] Mentions + - [x] Users + - [x] Rooms + - [ ] Inline emoji picker (Putting this here since it'll be implemented the same way as mentions) + - [ ] Custom emojis/stickers + - [ ] GIFs using Gomuks' GIF proxies + - [x] Recieving + - [x] Plain text + - [x] HTML + - [x] Replies + - [x] Viewing + - [ ] Jump to original message + - [x] In loaded timeline + - [ ] Out of loaded timeline + - [x] Edits + - [x] Attachments + - [x] Unencrypted + - [ ] Encrypted + - [x] Blurhashing + - [ ] Downloading attachments + - [x] Opening attachments in their own view + - [ ] Polls: Waiting on https://github.com/SwanFlutter/dynamic_polls/issues/1 + - [x] Mentions + - [x] Users + - [x] Rooms + - [ ] Plain text (not sure if I want to add this or not, I probably won't unless there's interest) + - [x] Matrix URIs + - [x] Matrix.to links + - [ ] Do some fancy fetching to get nice names + - [ ] Make clickable + - [x] Custom emojis/stickers + - [x] History loading + - [x] Backwards + - [ ] Forwards + - [x] Editing + - [x] Deleting +- [ ] Reactions: Waiting on https://github.com/flyerhq/flutter_chat_ui/pull/838 or me doing a custom impl +- [ ] Pins + - [ ] Displaying + - [ ] Creating +- [ ] Threads +- [ ] Profile popouts +- [ ] Copy link to [room, space] +- [ ] Reporting + - [x] Events + - [ ] Rooms +- [ ] Notifications using UnifiedPush +- [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195) +- [ ] Invites +- [ ] Settings + - [ ] Light/Dark mode + - [ ] SSD or CSD + - [ ] Show media by default + - [ ] Dynamic Theming + - [ ] Devices + - [ ] Viewing devices + - [ ] Verifying devices + - [ ] URL preview: Server / Client / None + - [ ] Account changes + - [ ] Display name + - [ ] Profile picture + - [ ] Timezone + - [ ] Pronouns + - [ ] Password + - [ ] About + - [x] Log Out -## Development +## Build Instructions First, clone and open the repo: @@ -117,14 +136,14 @@ cd nexus #### Linux -- With Nix: Either use direnv, or `nix flake develop` -- Without Nix: Install Flutter, Rust, the libsecret dev package for your distro (must be in `PKG_CONFIG_PATH`), and sqlite (must be in `LD_LIBRARY_PATH`). +- With Nix: Either use direnv, or `nix flake develop` +- Without Nix: Install Flutter, Go, Olm, Git, Clang, and GLibc. #### Windows / MacOS -I don't really know. You will need Flutter and Rust, and otherwise I guess just keep installing stuff until there aren't any errors. +I don't really know. You will need Flutter, Git, Olm, Go, and Visual Studio tools, and otherwise I guess just keep installing stuff until there aren't any errors. I will look into this sometimeTM. -### +### Set up Flutter Get dependencies: @@ -132,6 +151,18 @@ Get dependencies: flutter pub get ``` +Get dependencies: + +```sh +flutter pub get +``` + +Clone Gomuks and generate bindings: + +```sh +scripts/generate.sh +``` + Build generated files, and watch for new changes: ```sh @@ -146,4 +177,4 @@ flutter run ## Community -Come chat in the [Federated Nexus Community](https://matrix.to/#/#space:federated.nexus) for questions or help with developing or using Nexus Client. +Join the [Nexus Client Matrix Room](https://matrix.to/#/#nexus:federated.nexus) for questions or help with developing or using Nexus Client. diff --git a/analysis_options.yaml b/analysis_options.yaml index c2aaaa0..a8b1078 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,6 +1,7 @@ analyzer: errors: invalid_annotation_target: ignore + avoid_print: ignore exclude: - "build/**" - "**/*.g.dart" diff --git a/assets/screenshotDark.png b/assets/screenshotDark.png index dec983f..ae75dc7 100644 Binary files a/assets/screenshotDark.png and b/assets/screenshotDark.png differ diff --git a/assets/screenshotLight.png b/assets/screenshotLight.png index 003f6b4..0b2ce0d 100644 Binary files a/assets/screenshotLight.png and b/assets/screenshotLight.png differ diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..5d6aeda --- /dev/null +++ b/build.yaml @@ -0,0 +1,6 @@ +targets: + $default: + builders: + json_serializable: + options: + field_rename: snake diff --git a/flake.nix b/flake.nix index 027db59..de21b13 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ perSystem = { + lib, pkgs, system, ... @@ -32,39 +33,35 @@ _module.args.pkgs = import nixpkgs { inherit system; config = { + permittedInsecurePackages = [ "olm-3.2.16" ]; android_sdk.accept_license = true; allowUnfree = true; }; }; - devShells.default = + devShells = let - # android = pkgs.callPackage ./nix/android.nix { }; - in - pkgs.mkShell { packages = with pkgs; [ - # jdk17 - cargo - (flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; }) - - # android.platform-tools - (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh)) + go + olm + git ]; - env = rec { - LD_LIBRARY_PATH = "${ - pkgs.lib.makeLibraryPath ([ - pkgs.sqlite - ]) - }:./build/linux/x64/debug/plugins/flutter_vodozemac"; - - # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; - # ANDROID_SDK_ROOT = ANDROID_HOME; - # JAVA_HOME = pkgs.jdk17; - - # TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}"; - # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2"; + env = { + LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ]; + LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}"; + CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ]; }; + in + { + default = pkgs.mkShell { + inherit env; + packages = packages ++ [ + pkgs.flutter + ]; + }; + + nix = pkgs.mkShell { inherit packages env; }; }; }; }; diff --git a/hook/build.dart b/hook/build.dart new file mode 100644 index 0000000..4cb2f91 --- /dev/null +++ b/hook/build.dart @@ -0,0 +1,54 @@ +import "dart:io"; +import "package:hooks/hooks.dart"; +import "package:code_assets/code_assets.dart"; + +Future main(List args) => build(args, (input, output) async { + final buildDir = input.packageRoot.resolve("src/"); + if (await File(buildDir.resolve("lock").toFilePath()).exists()) return; + + final targetOS = input.config.code.targetOS; + String libFileName; + switch (targetOS) { + case OS.linux: + libFileName = "libgomuks.so"; + break; + case OS.macOS: + libFileName = "libgomuks.dylib"; + break; + case OS.windows: + libFileName = "libgomuks.dll"; + break; + default: + throw UnsupportedError("Unsupported OS: $targetOS"); + } + + final gomuksBuildDir = buildDir.resolve("gomuks/"); + final libFile = gomuksBuildDir.resolve(libFileName); + + print("Building Gomuks shared library $libFileName from source..."); + final result = await Process.run("go", [ + "build", + "-o", + libFile.path, + "-buildmode=c-shared", + ], workingDirectory: gomuksBuildDir.resolve("source/pkg/ffi/").toFilePath()); + + if (result.exitCode != 0) { + throw Exception("Failed to build Gomuks shared library\n${result.stderr}"); + } + + final generatedFile = "src/third_party/gomuks.g.dart"; + print("Adding $libFileName as asset..."); + output + ..assets.code.add( + CodeAsset( + package: "nexus", + name: generatedFile, + linkMode: DynamicLoadingBundled(), + file: libFile, + ), + ) + ..dependencies.add(libFile) + ..dependencies.add(gomuksBuildDir); + print("Done!"); +}); diff --git a/lib/controllers/account_data_controller.dart b/lib/controllers/account_data_controller.dart new file mode 100644 index 0000000..125d7cf --- /dev/null +++ b/lib/controllers/account_data_controller.dart @@ -0,0 +1,16 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/account_data.dart"; + +class AccountDataController extends Notifier> { + @override + IMap build() => const IMap.empty(); + + void update(IMap newData) => + state = IMap({...state.unlock, ...newData.unlock}); + + static final provider = + NotifierProvider>( + AccountDataController.new, + ); +} diff --git a/lib/controllers/avatar_controller.dart b/lib/controllers/avatar_controller.dart deleted file mode 100644 index 1bb4c72..0000000 --- a/lib/controllers/avatar_controller.dart +++ /dev/null @@ -1,17 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/client_controller.dart"; - -class AvatarController extends AsyncNotifier { - final String mxc; - AvatarController(this.mxc); - @override - Future build() async => Uri.parse(mxc).getThumbnailUri( - await ref.watch(ClientController.provider.future), - width: 24, - height: 24, - ); - - static final provider = AsyncNotifierProvider.family - .autoDispose(AvatarController.new); -} diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 9f69e8f..de6e909 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,106 +1,244 @@ -import "dart:convert"; -import "dart:io"; +import "dart:developer"; +import "dart:ffi"; +import "dart:isolate"; +import "package:collection/collection.dart"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; -import "package:matrix/encryption.dart"; -import "package:nexus/controllers/database_controller.dart"; -import "package:vodozemac/vodozemac.dart" as vod; -import "package:flutter_vodozemac/flutter_vodozemac.dart" as fl_vod; -import "package:matrix/matrix.dart"; +import "package:nexus/controllers/account_data_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/init_complete_controller.dart"; +import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/space_edges_controller.dart"; +import "package:nexus/controllers/sync_status_controller.dart"; +import "package:nexus/controllers/top_level_spaces_controller.dart"; +import "package:nexus/helpers/extensions/gomuks_buffer.dart"; +import "package:nexus/models/client_state.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/paginate.dart"; +import "package:nexus/models/requests/get_event_request.dart"; +import "package:nexus/models/requests/get_related_events_request.dart"; +import "package:nexus/models/requests/get_room_state_request.dart"; +import "package:nexus/models/requests/join_room_request.dart"; +import "package:nexus/models/requests/login_request.dart"; +import "package:nexus/models/profile.dart"; +import "package:nexus/models/requests/paginate_request.dart"; +import "package:nexus/models/requests/redact_event_request.dart"; +import "package:nexus/models/requests/report_request.dart"; +import "package:nexus/models/requests/send_message_request.dart"; +import "package:nexus/models/room.dart"; +import "package:nexus/models/sync_data.dart"; +import "package:nexus/models/sync_status.dart"; +import "package:nexus/src/third_party/gomuks.g.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/secure_storage_controller.dart"; -import "package:nexus/models/session_backup.dart"; -class ClientController extends AsyncNotifier { +class ClientController extends AsyncNotifier { @override - bool updateShouldNotify( - AsyncValue previous, - AsyncValue next, - ) => - previous.hasValue != next.hasValue || - previous.value?.accessToken != next.value?.accessToken; - static const sessionBackupKey = "sessionBackup"; + Future build() async { + final handle = await Isolate.run(GomuksInit); - @override - Future build() async { - if (!vod.isInitialized()) fl_vod.init(); - final client = Client( - "nexus", - logLevel: kReleaseMode ? Level.warning : Level.verbose, - importantStateEvents: {"im.ponies.room_emotes"}, - supportedLoginTypes: {AuthenticationTypes.password}, - verificationMethods: {KeyVerificationMethod.emoji}, - database: await MatrixSdkDatabase.init( - "nexus", - database: await ref.watch(DatabaseController.provider.future), - ), - nativeImplementations: NativeImplementationsIsolate( - compute, - vodozemacInit: fl_vod.init, + final callable = + NativeCallable< + Void Function(Pointer, Int64, GomuksOwnedBuffer) + >.listener(( + Pointer command, + int requestId, + GomuksOwnedBuffer data, + ) { + try { + final muksEventType = command.cast().toDartString(); + debugPrint("Handling $muksEventType..."); + final decodedMuksEvent = data.toJson(); + + switch (muksEventType) { + case "client_state": + ref + .watch(ClientStateController.provider.notifier) + .set(ClientState.fromJson(decodedMuksEvent)); + break; + case "sync_status": + ref + .watch(SyncStatusController.provider.notifier) + .set(SyncStatus.fromJson(decodedMuksEvent)); + break; + case "init_complete": + ref.watch(InitCompleteController.provider.notifier).complete(); + break; + case "sync_complete": + final syncData = SyncData.fromJson(decodedMuksEvent); + final roomProvider = RoomsController.provider; + final accountDataProvider = AccountDataController.provider; + + if (syncData.clearState) { + ref.invalidate(roomProvider); + ref.invalidate(accountDataProvider); + } + + ref + .watch(roomProvider.notifier) + .update(syncData.rooms, syncData.leftRooms); + ref + .watch(accountDataProvider.notifier) + .update(syncData.accountData); + + if (syncData.topLevelSpaces != null) { + ref + .watch(TopLevelSpacesController.provider.notifier) + .set(syncData.topLevelSpaces!); + } + + if (syncData.spaceEdges != null) { + ref + .watch(SpaceEdgesController.provider.notifier) + .set(syncData.spaceEdges!); + } + + // ref + // .watch(SyncStatusController.provider.notifier) + // .set(SyncStatus.fromJson(decodedMuksEvent)); + break; + default: + debugPrint("Unhandled event: $muksEventType"); + } + debugPrint("Finished handling $muksEventType..."); + } catch (error, stackTrace) { + debugger(); + debugPrintStack(stackTrace: stackTrace, label: error.toString()); + } + }); + + ref.onDispose(() => GomuksDestroy(handle)); + ref.onDispose(callable.close); + + final errorCode = GomuksStart(handle, callable.nativeFunction); + + if (errorCode == 0) return handle; + throw Exception("GomuksStart returned error code $errorCode"); + } + + Future _sendCommand( + String command, [ + Map data = const {}, + ]) async { + final bufferPointer = data.toGomuksBufferPtr(); + final handle = await future; + final response = await Isolate.run( + () => GomuksSubmitCommand( + handle, + command.toNativeUtf8().cast(), + bufferPointer.ref, ), ); - final backupJson = await ref - .watch(SecureStorageController.provider.notifier) - .get(sessionBackupKey); + calloc.free(bufferPointer); - if (backupJson != null) { - final backup = SessionBackup.fromJson(json.decode(backupJson)); - - await client.init( - waitForFirstSync: false, - newToken: backup.accessToken, - newHomeserver: backup.homeserver, - newUserID: backup.userID, - newDeviceID: backup.deviceID, - newDeviceName: backup.deviceName, - ); - } - - return client; + final json = response.buf.toJson(); + if (json is String) throw json; + return json; } - Future setHomeserver(Uri homeserverUrl) async { - final client = await future; + Future redactEvent(RedactEventRequest report) => + _sendCommand("redact_event", report.toJson()); + + Future sendMessage(SendMessageRequest request) => + _sendCommand("send_message", request.toJson()); + + Future verify(String recoveryKey) async { try { - await client.checkHomeserver(homeserverUrl); + await _sendCommand("verify", {"recovery_key": recoveryKey}); return true; - } catch (_) { + } catch (error) { return false; } } - Future login(String username, String password) async { - final client = await future; + Future joinRoom(JoinRoomRequest request) async { + final response = await _sendCommand("join_room", request.toJson()); + return response["room_id"]; + } + + Future getAccessToken() async { + final response = await _sendCommand("get_account_info", {}); + return response?["access_token"]; + } + + Future leaveRoom(Room room) async { + if (room.metadata == null) return; + await _sendCommand("leave_room", {"room_id": room.metadata!.id}); + } + + // (await _sendCommand("get_event_context", { + // "room_id": request.roomId, + // "event_id": r"$OqZT4NuTj0J1-771IOEEWRI4XdumRNu6ighlvO3K3gc", + // })); + + Future> getRoomState(GetRoomStateRequest request) async { + final response = + (await _sendCommand("get_room_state", request.toJson())) as List; + return response.map((event) => Event.fromJson(event)).toIList(); + } + + Future?> getRelatedEvents( + GetRelatedEventsRequest request, + ) async { + final response = + (await _sendCommand("get_related_events", request.toJson())) as List?; + return response?.map((event) => Event.fromJson(event)).toIList(); + } + + Future getEvent(GetEventRequest request) async { + final event = request.room.events.firstWhereOrNull( + (event) => event.eventId == request.eventId, + ); + if (event != null) return event; + + final json = await _sendCommand("get_event", request.toJson()); + return json == null ? null : Event.fromJson(json); + } + + Future paginate(PaginateRequest request) async => + Paginate.fromJson(await _sendCommand("paginate", request.toJson())); + + Future getProfile(String userId) async => + Profile.fromJson(await _sendCommand("get_profile", {"user_id": userId})); + + Future reportEvent(ReportRequest report) => + _sendCommand("report_event", report.toJson()); + + Future markRead(Room room) async { + final event = room.events.firstWhereOrNull( + (event) => event.rowId == room.timeline.last.eventRowId, + ); + if (event == null || room.metadata == null) return; + + await _sendCommand("mark_read", { + "room_id": room.metadata!.id, + "receipt_type": "m.read", + "event_id": event.eventId, + }); + } + + Future login(LoginRequest login) async { try { - final deviceName = "Nexus Client login on ${Platform.localHostname}"; - final details = await MatrixApi(homeserver: client.homeserver).login( - LoginType.mLoginPassword, - initialDeviceDisplayName: deviceName, - identifier: AuthenticationUserIdentifier(user: username), - password: password, - ); - await ref - .watch(SecureStorageController.provider.notifier) - .set( - sessionBackupKey, - json.encode( - SessionBackup( - accessToken: details.accessToken, - homeserver: client.homeserver!, - userID: details.userId, - deviceID: details.deviceId, - deviceName: deviceName, - ).toJson(), - ), - ); - ref.invalidateSelf(asReload: true); + await _sendCommand("login", login.toJson()); return true; - } catch (_) { + } catch (error) { return false; } } - static final provider = AsyncNotifierProvider( + Future discoverHomeserver(Uri homeserver) async { + try { + final response = await _sendCommand("discover_homeserver", { + "user_id": "@fakeuser:${homeserver.host}", + }); + return response["m.homeserver"]?["base_url"]; + } catch (error) { + return null; + } + } + + static final provider = AsyncNotifierProvider( ClientController.new, ); } diff --git a/lib/controllers/client_state_controller.dart b/lib/controllers/client_state_controller.dart new file mode 100644 index 0000000..998d4a1 --- /dev/null +++ b/lib/controllers/client_state_controller.dart @@ -0,0 +1,15 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/client_state.dart"; + +class ClientStateController extends Notifier { + @override + Null build() => null; + + void set(ClientState newState) { + state = newState; + } + + static final provider = NotifierProvider( + ClientStateController.new, + ); +} diff --git a/lib/controllers/database_controller.dart b/lib/controllers/database_controller.dart deleted file mode 100644 index 706560b..0000000 --- a/lib/controllers/database_controller.dart +++ /dev/null @@ -1,18 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:path/path.dart"; -import "package:path_provider/path_provider.dart"; -import "package:sqflite_common_ffi/sqflite_ffi.dart"; - -class DatabaseController extends AsyncNotifier { - @override - Future build() async { - databaseFactory = databaseFactoryFfi; - return databaseFactoryFfi.openDatabase( - join((await getApplicationSupportDirectory()).path, "database.db"), - ); - } - - static final provider = AsyncNotifierProvider( - DatabaseController.new, - ); -} diff --git a/lib/controllers/event_controller.dart b/lib/controllers/event_controller.dart new file mode 100644 index 0000000..4f72963 --- /dev/null +++ b/lib/controllers/event_controller.dart @@ -0,0 +1,20 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/requests/get_event_request.dart"; + +class EventController extends AsyncNotifier { + final GetEventRequest request; + EventController(this.request); + + @override + Future build() async { + final client = ref.watch(ClientController.provider.notifier); + return await client.getEvent(request).onError((_, _) => null); + } + + static final provider = AsyncNotifierProvider.family + .autoDispose( + EventController.new, + ); +} diff --git a/lib/controllers/events_controller.dart b/lib/controllers/events_controller.dart deleted file mode 100644 index e7a192d..0000000 --- a/lib/controllers/events_controller.dart +++ /dev/null @@ -1,18 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; - -class EventsController extends AsyncNotifier { - EventsController(this.room); - final Room room; - - @override - Future build({String? from}) => room.getTimeline(); - - Future prev() async { - final timeline = await future; - await timeline.requestHistory(); - } - - static final provider = AsyncNotifierProvider.autoDispose - .family(EventsController.new); -} diff --git a/lib/controllers/header_controller.dart b/lib/controllers/header_controller.dart new file mode 100644 index 0000000..295cf04 --- /dev/null +++ b/lib/controllers/header_controller.dart @@ -0,0 +1,20 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; + +class HeaderController extends AsyncNotifier> { + @override + Future> build() async { + if (ref.watch(ClientStateController.provider)?.isLoggedIn != true) { + return {}; + } + final client = ref.watch(ClientController.provider.notifier); + final accessToken = await client.getAccessToken(); + return {"authorization": "Bearer $accessToken"}; + } + + static final provider = + AsyncNotifierProvider>( + HeaderController.new, + ); +} diff --git a/lib/controllers/init_complete_controller.dart b/lib/controllers/init_complete_controller.dart new file mode 100644 index 0000000..c011472 --- /dev/null +++ b/lib/controllers/init_complete_controller.dart @@ -0,0 +1,11 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; + +class InitCompleteController extends Notifier { + @override + bool build() => false; + void complete() => state = true; + + static final provider = NotifierProvider( + InitCompleteController.new, + ); +} diff --git a/lib/controllers/members_controller.dart b/lib/controllers/members_controller.dart index df15c1c..268a30d 100644 --- a/lib/controllers/members_controller.dart +++ b/lib/controllers/members_controller.dart @@ -1,22 +1,25 @@ +import "package:collection/collection.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/room.dart"; -class MembersController extends AsyncNotifier> { +class MembersController extends Notifier> { final Room room; MembersController(this.room); @override - Future> build() async => IList( - (await room.client.getMembersByRoom( - room.id, - notMembership: Membership.leave, - )) ?? - [], - ); + IList build() => (room.state["m.room.member"]?.values ?? []) + .map( + (eventRowId) => + room.events.firstWhereOrNull((event) => event.rowId == eventRowId), + ) + .nonNulls + .where((member) => member.content["membership"] == "join") + .toIList(); - static final provider = AsyncNotifierProvider.family - .autoDispose, Room>( + static final provider = NotifierProvider.family + .autoDispose, Room>( MembersController.new, ); } diff --git a/lib/controllers/message_controller.dart b/lib/controllers/message_controller.dart new file mode 100644 index 0000000..f3ef13b --- /dev/null +++ b/lib/controllers/message_controller.dart @@ -0,0 +1,205 @@ +import "package:collection/collection.dart"; +import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/members_controller.dart"; +import "package:nexus/helpers/extensions/mxc_to_https.dart"; +import "package:nexus/models/message_config.dart"; + +class MessageController extends AsyncNotifier { + final MessageConfig config; + MessageController(this.config); + + @override + Future build() async { + try { + if (config.event.relationType == "m.replace" && !config.includeEdits) { + return null; + } + + if (!ref.mounted) return null; + final event = config.event.lastEditRowId == null + ? config.event + : config.room.events.firstWhereOrNull( + (e) => e.rowId == config.event.lastEditRowId, + ) ?? + config.event; + + if (!ref.mounted) return null; + + final members = ref.read(MembersController.provider(config.room)); + final author = members.firstWhereOrNull( + (member) => member.stateKey == event.authorId, + ); + if (!ref.mounted) return null; + + final content = (event.decrypted ?? event.content); + final type = (config.event.decryptedType ?? config.event.type); + final newContent = content["m.new_content"] as Map?; + + final homeserver = ref + .read(ClientStateController.provider) + ?.homeserverUrl; + final source = homeserver == null || content["url"] == null + ? "null" + : Uri.parse(content["url"]).mxcToHttps(homeserver).toString(); + + final metadata = { + "body": config.event.redactedBy == null + ? (newContent?["body"] ?? content["body"] ?? "") + : "Deleted Message", + "flashing": false, + "timelineId": event.timelineRowId, + "big": event.localContent?.bigEmoji == true, + "eventType": type, + "avatarUrl": author?.content["avatar_url"], + "editSource": + event.localContent?.editSource ?? + newContent?["body"] ?? + content["body"], + "displayName": author?.content["displayname"]?.isNotEmpty == true + ? author?.content["displayname"] + : event.authorId.substring(1).split(":")[0], + "txnId": config.event.transactionId, + }; + + if (!ref.mounted) return null; + + final editedAt = event.relationType == "m.replace" + ? event.timestamp + : null; + + if ((event.redactedBy != null && !config.alwaysReturn) || + (!config.includeEdits && + (config.event.relationType == "m.replace"))) { + return null; + } + + // TODO: Use server-generated preview if enabled + + // final match = Uri.tryParse( + // RegExp(regexLink, caseSensitive: false).firstMatch(body)?.group(0) ?? "", + // ); + + final replyId = + config.event.content["m.relates_to"]?["m.in_reply_to"]?["event_id"]; + + final asText = + Message.text( + metadata: metadata, + id: config.event.eventId, + authorId: event.authorId, + text: + newContent?["formatted_body"] ?? + newContent?["body"] ?? + content["formatted_body"] ?? + content["body"] ?? + "", + replyToMessageId: replyId, + deliveredAt: config.event.timestamp, + editedAt: editedAt, + ) + as TextMessage; + + return switch (type) { + "m.room.encrypted" => asText.copyWith( + text: "Unable to decrypt message.", + metadata: {...metadata, "body": "Unable to decrypt message."}, + ), + // "org.matrix.msc3381.poll.start" => Message.custom( + // metadata: { + // ...metadata, + // "poll": event.parsedPollEventContent.pollStartContent, + // "responses": event.getPollResponses(timeline), + // }, + // id: eventId, + // deliveredAt: originServerTs, + // authorId: senderId, + // ), + ("m.sticker" || "m.room.message") => switch (content["msgtype"]) { + null || "m.image" => Message.image( + id: config.event.eventId, + authorId: event.authorId, + source: source, + replyToMessageId: replyId, + metadata: metadata, + text: asText.text, + deliveredAt: config.event.timestamp, + blurhash: (content["info"] as Map?)?["xyz.amorgan.blurhash"], + ), + "m.audio" || "m.file" => Message.file( + name: content["filename"].toString(), + size: content["info"]["size"], + metadata: metadata, + id: config.event.eventId, + authorId: event.authorId, + source: source, + replyToMessageId: replyId, + deliveredAt: config.event.timestamp, + ), + _ => asText, + }, + "m.room.member" => + content["membership"] == event.unsigned["prev_content"]?["membership"] + ? null + : Message.system( + metadata: { + ...metadata, + "body": + "${content["displayname"] ?? event.stateKey} ${switch (content["membership"]) { + "invite" => "was invited to", + "join" => "joined", + "leave" => "left", + "knock" => "asked to join", + "ban" => "was banned from", + _ => "did something relating to", + }} the room.", + }, + id: config.event.eventId, + authorId: event.authorId, + deliveredAt: config.event.timestamp, + text: + "${content["displayname"] ?? event.stateKey} ${switch (content["membership"]) { + "invite" => "was invited to", + "join" => "joined", + "leave" => "left", + "knock" => "asked to join", + "ban" => "was banned from", + _ => "did something relating to", + }} the room.", + ), + + "m.room.redaction" => + config.alwaysReturn + ? asText.copyWith( + metadata: { + ...(asText.metadata ?? {}), + "body": "Deleted Message", + }, + ) + : null, + _ => + config.alwaysReturn + ? asText + : ( + // Turn this on for debugging purposes + false + // ignore: dead_code + ? Message.unsupported( + metadata: metadata, + id: config.event.eventId, + authorId: event.authorId, + replyToMessageId: replyId, + ) + : null), + }; + } catch (error) { + return null; + } + } + + static final provider = AsyncNotifierProvider.family + .autoDispose( + MessageController.new, + ); +} diff --git a/lib/controllers/messages_controller.dart b/lib/controllers/messages_controller.dart new file mode 100644 index 0000000..83bd815 --- /dev/null +++ b/lib/controllers/messages_controller.dart @@ -0,0 +1,27 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/message_controller.dart"; +import "package:nexus/models/message_config.dart"; +import "package:nexus/models/messages_config.dart"; + +class MessagesController extends AsyncNotifier> { + final MessagesConfig config; + MessagesController(this.config); + + @override + Future> build() async => (await Future.wait( + config.events.map( + (event) => ref.watch( + MessageController.provider( + MessageConfig(event: event, room: config.room), + ).future, + ), + ), + )).nonNulls.toIList(); + + static final provider = AsyncNotifierProvider.family + .autoDispose, MessagesConfig>( + MessagesController.new, + ); +} diff --git a/lib/controllers/multi_provider_controller.dart b/lib/controllers/multi_provider_controller.dart new file mode 100644 index 0000000..e23ecaa --- /dev/null +++ b/lib/controllers/multi_provider_controller.dart @@ -0,0 +1,20 @@ +import "dart:async"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; + +class MultiProviderController extends AsyncNotifier { + MultiProviderController(this.providers); + final IList providers; + + @override + FutureOr build() async => await Future.wait( + providers.map((provider) => ref.watch(provider.future)), + ); + + static final provider = + AsyncNotifierProvider.family< + MultiProviderController, + void, + IList + >(MultiProviderController.new); +} diff --git a/lib/controllers/new_events_controller.dart b/lib/controllers/new_events_controller.dart new file mode 100644 index 0000000..215ebd3 --- /dev/null +++ b/lib/controllers/new_events_controller.dart @@ -0,0 +1,18 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/event.dart"; + +class NewEventsController extends Notifier> { + final String roomId; + NewEventsController(this.roomId); + + @override + IList build() => const IList.empty(); + + void add(IList newEvents) => state = newEvents; + + static final provider = NotifierProvider.autoDispose + .family, String>( + NewEventsController.new, + ); +} diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 9175e36..4a4dba2 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -1,67 +1,146 @@ +import "dart:async"; + import "package:collection/collection.dart"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_core/flutter_chat_core.dart" as chat; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; -import "package:nexus/controllers/events_controller.dart"; -import "package:nexus/helpers/extensions/event_to_message.dart"; -import "package:nexus/helpers/extensions/list_to_messages.dart"; -import "package:fluttertagger/fluttertagger.dart" as tagger; +import "package:fluttertagger/fluttertagger.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/message_controller.dart"; +import "package:nexus/controllers/messages_controller.dart"; +import "package:nexus/controllers/new_events_controller.dart"; +import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/models/message_config.dart"; +import "package:nexus/models/messages_config.dart"; +import "package:nexus/models/requests/get_room_state_request.dart"; +import "package:nexus/models/requests/paginate_request.dart"; +import "package:nexus/models/requests/redact_event_request.dart"; import "package:nexus/models/relation_type.dart"; +import "package:nexus/models/requests/send_message_request.dart"; +import "package:nexus/models/room.dart"; -class RoomChatController extends AsyncNotifier { - final Room room; - RoomChatController(this.room); +class RoomChatController extends AsyncNotifier { + final String roomId; + RoomChatController(this.roomId); @override - Future build() async { - final timeline = await ref.watch(EventsController.provider(room).future); + Future build() async { + final client = ref.watch(ClientController.provider.notifier); + var room = ref.read(RoomsController.provider)[roomId]; + if (room == null) return InMemoryChatController(); + + final state = await client.getRoomState( + GetRoomStateRequest( + roomId: roomId, + fetchMembers: room.metadata?.hasMemberList == false, + includeMembers: true, + ), + ); + + ref + .read(RoomsController.provider.notifier) + .update( + { + roomId: Room( + events: state, + state: state.fold( + const IMap.empty(), + (previousValue, stateEvent) => previousValue.add( + stateEvent.type, + (previousValue[stateEvent.type] ?? const IMap.empty()).addAll( + IMap({ + if (stateEvent.stateKey != null) + stateEvent.stateKey!: stateEvent.rowId, + }), + ), + ), + ), + ), + }.toIMap(), + const ISet.empty(), + ); + + room = ref.read(RoomsController.provider)[roomId]; + if (room == null) return InMemoryChatController(); + + final messages = await ref.watch( + MessagesController.provider( + MessagesConfig( + room: room, + events: room.timeline + .map( + (timelineRowTuple) => room!.events.firstWhereOrNull( + (event) => event.rowId == timelineRowTuple.eventRowId, + ), + ) + .nonNulls + .toIList(), + ), + ).future, + ); + final controller = InMemoryChatController(messages: messages.toList()); ref.onDispose( - room.client.onTimelineEvent.stream.listen((event) async { - if (event.roomId != room.id) return; - - if (event.type == EventTypes.Redaction) { - final controller = await future; - final message = controller.messages.firstWhereOrNull( - (message) => message.id == event.redacts, - ); - if (message == null) return; - - await controller.removeMessage(message); - } else { - final message = await event.toMessage(includeEdits: true, timeline); - if (event.relationshipType == RelationshipTypes.edit) { + ref.listen(NewEventsController.provider(roomId), (_, next) async { + final controller = await future; + for (final event in next) { + if (event.type == "m.room.redaction") { final controller = await future; - final oldMessage = controller.messages.firstWhereOrNull( - (element) => element.id == event.relationshipEventId, + final message = controller.messages.firstWhereOrNull( + (message) => message.id == event.content["redacts"], ); - if (oldMessage == null || message == null) return; - return await updateMessage( - oldMessage, - message.copyWith( - id: oldMessage.id, - replyToMessageId: oldMessage.replyToMessageId, - metadata: { - ...(oldMessage.metadata ?? {}), - ...((message.metadata ?? {}).filterMap( - (key, value) => value == null ? null : MapEntry(key, value), - )), - }, - ), + if (message == null || !ref.mounted) return; + + await controller.removeMessage(message); + } else { + final message = await ref.watch( + MessageController.provider( + MessageConfig(event: event, room: room!, includeEdits: true), + ).future, ); - } - if (message != null) { - return await insertMessage(message); + if (event.relationType == "m.replace") { + final controller = await future; + final oldMessage = controller.messages.firstWhereOrNull( + (element) => element.id == event.relatesTo, + ); + if (oldMessage == null || message == null || !ref.mounted) return; + + return await controller.updateMessage( + oldMessage, + message.copyWith( + id: oldMessage.id, + replyToMessageId: oldMessage.replyToMessageId, + metadata: { + ...(oldMessage.metadata ?? {}), + ...(message.metadata ?? {}) + .toIMap() + .where((key, value) => value != null) + .unlock, + }, + ), + ); + } + if (message != null && + !controller.messages.any( + (oldMessage) => oldMessage.id == message.id, + ) && + ref.mounted) { + await controller.insertMessage(message); + } } } - }).cancel, + }, weak: true).close, ); - return InMemoryChatController( - messages: await timeline.events.toMessages(room, timeline), - ); + ref.onDispose(controller.dispose); + + // While there are under 20 messages, try up to two times to load more messages. + for (var i = 0; i < 2 && messages.length < 20; i++) { + await loadOlder(controller); + } + + return controller; } Future insertMessage(Message message) async { @@ -81,43 +160,77 @@ class RoomChatController extends AsyncNotifier { Future deleteMessage(Message message, {String? reason}) async { final controller = await future; await controller.removeMessage(message); - await room.redactEvent(message.id, reason: reason); + await ref + .watch(ClientController.provider.notifier) + .redactEvent( + RedactEventRequest( + eventId: message.id, + roomId: roomId, + reason: reason, + ), + ); } - Future loadOlder() async { - final currentEvents = await future; - await ref.watch(EventsController.provider(room).notifier).prev(); - final timeline = await ref.watch(EventsController.provider(room).future); + Future loadOlder([InMemoryChatController? chatController]) async { + final response = await ref + .watch(ClientController.provider.notifier) + .paginate( + PaginateRequest( + roomId: roomId, + maxTimelineId: ref + .read(RoomsController.provider)[roomId] + ?.timeline + .firstOrNull + ?.timelineRowId, + ), + ); - final controller = await future; + ref + .watch(RoomsController.provider.notifier) + .update( + IMap({ + roomId: Room( + events: response.events.addAll(response.relatedEvents), + hasMore: response.hasMore, + timeline: response.events + .map( + (event) => TimelineRowTuple( + timelineRowId: event.timelineRowId, + eventRowId: event.rowId, + ), + ) + .toIList(), + ), + }), + const ISet.empty(), + ); + + final room = ref.read(RoomsController.provider)[roomId]; + if (room == null) return; + + final messages = await ref.watch( + MessagesController.provider( + MessagesConfig(room: room, events: response.events.reversed), + ).future, + ); + + final controller = chatController ?? await future; await controller.insertAllMessages( - await timeline.events + messages .where( - (event) => !currentEvents.messages.any( - (existingEvent) => existingEvent.id == event.eventId, + (newMessage) => !controller.messages.any( + (message) => message.id == newMessage.id, ), ) - .toList() - .toMessages(room, timeline), + .toList(), index: 0, ); - ref.notifyListeners(); } - Future markRead() async { - if (!room.hasNewMessages) return; - final controller = await future; - final id = controller.messages.last.id; - - await room.setReadMarker(id, mRead: id); - } - - Future updateMessage(Message message, Message newMessage) async => - (await future).updateMessage(message, newMessage); - Future send( String message, { - required Iterable tags, + bool shouldMention = true, + required Iterable tags, required RelationType relationType, Message? relation, }) async { @@ -133,30 +246,59 @@ class RoomChatController extends AsyncNotifier { ); } - await room.sendTextEvent( - taggedMessage, - editEventId: relationType == RelationType.edit ? relation?.id : null, - inReplyTo: (relationType == RelationType.reply && relation != null) - ? await room.getEventById(relation.id) - : null, + final client = ref.watch(ClientController.provider.notifier); + client.sendMessage( + SendMessageRequest( + roomId: roomId, + mentions: Mentions( + userIds: [ + if (shouldMention == true && + relation != null && + relationType == RelationType.reply) + relation.authorId, + ].toIList(), + room: taggedMessage.contains("@room"), + ), + text: taggedMessage, + relation: relation == null + ? null + : Relation(eventId: relation.id, relationType: relationType), + ), ); } Future resolveUser(String id) async { - final user = await room.client.getUserProfile(id); + final user = await ref + .watch(ClientController.provider.notifier) + .getProfile(id); return chat.User( id: id, - name: user.displayname, - imageSource: user.avatarUrl == null - ? null - : (await ref.watch( - AvatarController.provider(user.avatarUrl!.toString()).future, - )).toString(), + name: user.displayName, + // imageSource: user.avatarUrl == null + // ? null + // : (await ref.watch( + // AvatarController.provider(user.avatarUrl!.toString()).future, + // )).toString(), ); } + Future scrollToMessage(Message message) async { + final controller = await future; + Future setFlashing(bool flashing) => controller.updateMessage( + message, + message.copyWith( + metadata: {...(message.metadata ?? {}), "flashing": flashing}, + ), + ); + + await setFlashing(true); + Timer(Duration(seconds: 1), () => setFlashing(false)); + + return await controller.scrollToMessage(message.id); + } + static final provider = AsyncNotifierProvider.family - .autoDispose( + .autoDispose( RoomChatController.new, ); } diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms_controller.dart index 864d656..0945644 100644 --- a/lib/controllers/rooms_controller.dart +++ b/lib/controllers/rooms_controller.dart @@ -1,23 +1,83 @@ +import "package:collection/collection.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/helpers/extensions/get_full_room.dart"; -import "package:nexus/models/full_room.dart"; +import "package:nexus/controllers/new_events_controller.dart"; +import "package:nexus/models/read_receipt.dart"; +import "package:nexus/models/room.dart"; -class RoomsController extends AsyncNotifier> { +class RoomsController extends Notifier> { @override - Future> build() async { - final client = await ref.watch(ClientController.provider.future); + IMap build() => const IMap.empty(); - ref.onDispose( - client.onSync.stream.listen((_) => ref.invalidateSelf()).cancel, + void update(IMap rooms, ISet leftRooms) { + final merged = rooms.entries.fold(state, (acc, entry) { + final roomId = entry.key; + final incoming = entry.value; + final existing = acc[roomId]; + + final events = existing?.events.updateById( + incoming.events, + (item) => item.eventId, + ); + + ref + .watch(NewEventsController.provider(roomId).notifier) + .add( + incoming.timeline + .map( + (timelineTuple) => events?.firstWhereOrNull( + (event) => timelineTuple.eventRowId == event.rowId, + ), + ) + .nonNulls + .toIList(), + ); + + return acc.add( + roomId, + existing?.copyWith( + metadata: incoming.metadata ?? existing.metadata, + events: events!, + state: incoming.state.entries.fold( + existing.state, + (previousValue, event) => previousValue.add( + event.key, + (previousValue[event.key] ?? const IMap.empty()).addAll( + event.value, + ), + ), + ), + timeline: + (incoming.reset + ? incoming.timeline + : existing.timeline.updateById( + incoming.timeline, + (item) => item.timelineRowId, + )) + .sortedBy((element) => element.timelineRowId) + .toIList(), + receipts: incoming.receipts.entries.fold( + existing.receipts, + (receiptAcc, event) => receiptAcc.add( + event.key, + (receiptAcc[event.key] ?? IList()).addAll( + event.value, + ), + ), + ), + ) ?? + incoming, + ); + }); + + final prunedList = leftRooms.fold( + merged, + (acc, roomId) => acc.remove(roomId), ); - - return IList(await Future.wait(client.rooms.map((room) => room.fullRoom))); + state = prunedList; } - static final provider = - AsyncNotifierProvider>( - RoomsController.new, - ); + static final provider = NotifierProvider>( + RoomsController.new, + ); } diff --git a/lib/controllers/secure_storage_controller.dart b/lib/controllers/secure_storage_controller.dart deleted file mode 100644 index 4a5781b..0000000 --- a/lib/controllers/secure_storage_controller.dart +++ /dev/null @@ -1,19 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:flutter_secure_storage/flutter_secure_storage.dart"; - -class SecureStorageController extends Notifier { - @override - FlutterSecureStorage build() => FlutterSecureStorage(); - - Future get(String key) => state.read(key: key); - - Future set(String key, String value) => - state.write(key: key, value: value); - - Future clear() => state.deleteAll(); - - static final provider = - NotifierProvider( - SecureStorageController.new, - ); -} diff --git a/lib/controllers/selected_room_controller.dart b/lib/controllers/selected_room_controller.dart index cfeead6..ffba78c 100644 --- a/lib/controllers/selected_room_controller.dart +++ b/lib/controllers/selected_room_controller.dart @@ -2,24 +2,23 @@ import "package:collection/collection.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/selected_space_controller.dart"; -import "package:nexus/models/full_room.dart"; +import "package:nexus/models/room.dart"; -class SelectedRoomController extends AsyncNotifier { +class SelectedRoomController extends Notifier { @override - Future build() async { - final space = await ref.watch(SelectedSpaceController.provider.future); + Room? build() { + final space = ref.watch(SelectedSpaceController.provider); final selectedRoomId = ref.watch( KeyController.provider(KeyController.roomKey), ); return space.children.firstWhereOrNull( - (room) => room.roomData.id == selectedRoomId, + (room) => room.metadata?.id == selectedRoomId, ) ?? space.children.firstOrNull; } - static final provider = - AsyncNotifierProvider( - SelectedRoomController.new, - ); + static final provider = NotifierProvider( + SelectedRoomController.new, + ); } diff --git a/lib/controllers/selected_space_controller.dart b/lib/controllers/selected_space_controller.dart index 75bf287..dbeb71f 100644 --- a/lib/controllers/selected_space_controller.dart +++ b/lib/controllers/selected_space_controller.dart @@ -4,12 +4,10 @@ import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; import "package:nexus/models/space.dart"; -class SelectedSpaceController extends AsyncNotifier { +class SelectedSpaceController extends Notifier { @override - Future build() async { - final spaces = await ref.watch( - SpacesController.provider.selectAsync((data) => data), - ); + Space build() { + final spaces = ref.watch(SpacesController.provider); final selectedSpaceId = ref.watch( KeyController.provider(KeyController.spaceKey), ); @@ -18,7 +16,7 @@ class SelectedSpaceController extends AsyncNotifier { spaces.first; } - static final provider = AsyncNotifierProvider( + static final provider = NotifierProvider( SelectedSpaceController.new, ); } diff --git a/lib/controllers/space_edges_controller.dart b/lib/controllers/space_edges_controller.dart new file mode 100644 index 0000000..12694d6 --- /dev/null +++ b/lib/controllers/space_edges_controller.dart @@ -0,0 +1,16 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/space_edge.dart"; + +class SpaceEdgesController extends Notifier>> { + @override + IMap> build() => const IMap.empty(); + + void set(IMap> newEdges) => + state = state.addAll(newEdges); + + static final provider = + NotifierProvider>>( + SpaceEdgesController.new, + ); +} diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart index 408dc00..ca217a5 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces_controller.dart @@ -1,77 +1,116 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/helpers/extensions/get_full_room.dart"; -import "package:nexus/helpers/extensions/room_to_children.dart"; +import "package:nexus/controllers/account_data_controller.dart"; +import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/top_level_spaces_controller.dart"; +import "package:nexus/controllers/space_edges_controller.dart"; import "package:nexus/models/space.dart"; +import "package:nexus/models/room.dart"; +import "package:nexus/models/space_edge.dart"; -class SpacesController extends AsyncNotifier> { +class SpacesController extends Notifier> { @override - Future> build() async { - final client = await ref.watch(ClientController.provider.future); + IList build() { + final rooms = ref.watch(RoomsController.provider); + final topLevelSpaceIds = ref.watch(TopLevelSpacesController.provider); + final spaceEdges = ref.watch(SpaceEdgesController.provider); - ref.onDispose( - client.onSync.stream.listen((_) => ref.invalidateSelf()).cancel, + final childRoomsBySpaceId = IMap.fromEntries( + topLevelSpaceIds.map((spaceId) { + ISet walk(String currentId) { + final children = spaceEdges[currentId] ?? IList(); + + return children.fold>(const ISet.empty(), (acc, edge) { + final childId = edge.childId; + final isSpace = spaceEdges.containsKey(childId); + + return acc + .addAll(!isSpace ? ISet([childId]) : const ISet.empty()) + .addAll(isSpace ? walk(childId) : const ISet.empty()); + }); + } + + return MapEntry( + spaceId, + walk(spaceId).map((id) => rooms[id]).nonNulls.toIList(), + ); + }), ); - final topLevel = IList( - await Future.wait( - client.rooms - .where((room) => !room.isDirectChat) - .where( - (room) => client.rooms - .where((room) => room.isSpace) - .every( - (match) => match.spaceChildren.every( - (child) => child.roomId != room.id, - ), - ), - ) - .map((room) => room.fullRoom), - ), - ); + final allNestedRoomIds = childRoomsBySpaceId.values + .expand((l) => l) + .map( + (room) => rooms.entries + .firstWhere( + (entry) => entry.value.metadata?.id == room.metadata?.id, + ) + .key, + ) + .toISet(); - final topLevelSpaces = topLevel.where((r) => r.roomData.isSpace).toIList(); - final topLevelRooms = topLevel.where((r) => !r.roomData.isSpace).toIList(); + final otherRooms = rooms.entries + .where( + (e) => + !allNestedRoomIds.contains(e.key) && + !topLevelSpaceIds.contains(e.key) && + !spaceEdges.containsKey(e.key), + ) + .map((e) => e.value); - return IList([ + final accountData = ref.watch(AccountDataController.provider); + + final directMessages = IMap( + accountData["m.direct"]?.content ?? {}, + ).values.expand((element) => element); + + final homeRooms = otherRooms + .where( + (room) => + directMessages.any( + (directMessage) => directMessage == room.metadata?.id, + ) == + false, + ) + .toIList(); + + final dmRooms = otherRooms + .where( + (room) => directMessages.any( + (directMessage) => directMessage == room.metadata?.id, + ), + ) + .toIList(); + + final topLevelSpacesList = topLevelSpaceIds + .map((id) { + final room = rooms[id]; + if (room == null) return null; + + final children = childRoomsBySpaceId[id] ?? IList(); + return Space( + id: id, + title: room.metadata?.name ?? "Unnamed Room", + room: room, + children: children, + ); + }) + .nonNulls + .toIList(); + + return [ + Space(id: "home", title: "Home", icon: Icons.home, children: homeRooms), Space( - client: client, - title: "Home", - id: "home", - children: topLevelRooms, - icon: Icons.home, - ), - Space( - client: client, - title: "Direct Messages", id: "dms", - children: IList( - await Future.wait( - client.rooms - .where((room) => room.isDirectChat) - .map((room) => room.fullRoom), - ), - ), - icon: Icons.person, + title: "Direct Messages", + icon: Icons.people, + children: dmRooms, ), - ...(await Future.wait( - topLevelSpaces.map( - (space) async => Space( - client: client, - title: space.title, - avatar: space.avatar, - id: space.roomData.id, - roomData: space.roomData, - children: IList(await space.roomData.getAllChildren()), - ), - ), - )), - ]); + ...topLevelSpacesList, + ].toIList(); } - static final provider = AsyncNotifierProvider>( + static final provider = NotifierProvider>( SpacesController.new, ); } diff --git a/lib/controllers/sync_status_controller.dart b/lib/controllers/sync_status_controller.dart new file mode 100644 index 0000000..fe65732 --- /dev/null +++ b/lib/controllers/sync_status_controller.dart @@ -0,0 +1,13 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/sync_status.dart"; + +class SyncStatusController extends Notifier { + @override + Null build() => null; + + void set(SyncStatus newStatus) => state = newStatus; + + static final provider = NotifierProvider( + SyncStatusController.new, + ); +} diff --git a/lib/controllers/thumbnail_controller.dart b/lib/controllers/thumbnail_controller.dart deleted file mode 100644 index 4500523..0000000 --- a/lib/controllers/thumbnail_controller.dart +++ /dev/null @@ -1,22 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/models/image_data.dart"; - -class ThumbnailController extends AsyncNotifier { - ThumbnailController(this.data); - final ImageData data; - - @override - Future build({String? from}) async { - final client = await ref.watch(ClientController.provider.future); - final uri = await Uri.tryParse(data.uri)?.getDownloadUri(client); - - return uri.toString(); - } - - static final provider = AsyncNotifierProvider.family - .autoDispose( - ThumbnailController.new, - ); -} diff --git a/lib/controllers/top_level_spaces_controller.dart b/lib/controllers/top_level_spaces_controller.dart new file mode 100644 index 0000000..e1f9c88 --- /dev/null +++ b/lib/controllers/top_level_spaces_controller.dart @@ -0,0 +1,14 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; + +class TopLevelSpacesController extends Notifier> { + @override + IList build() => const IList.empty(); + + void set(IList newSpaces) => state = newSpaces; + + static final provider = + NotifierProvider>( + TopLevelSpacesController.new, + ); +} diff --git a/lib/helpers/extensions/color_hex.dart b/lib/helpers/extensions/color_hex.dart deleted file mode 100644 index 3f04629..0000000 --- a/lib/helpers/extensions/color_hex.dart +++ /dev/null @@ -1,8 +0,0 @@ -import "package:flutter/widgets.dart"; - -extension ColorHex on Color { - String get hex { - final rgb = toARGB32() & 0x00FFFFFF; - return "#${rgb.toRadixString(16).padLeft(6, "0")}"; - } -} diff --git a/lib/helpers/extensions/event_to_message.dart b/lib/helpers/extensions/event_to_message.dart deleted file mode 100644 index 5591952..0000000 --- a/lib/helpers/extensions/event_to_message.dart +++ /dev/null @@ -1,145 +0,0 @@ -import "package:collection/collection.dart"; -import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:matrix/matrix.dart"; - -extension EventToMessage on Event { - Future toMessage( - Timeline timeline, { - bool mustBeText = false, - bool includeEdits = false, - }) async { - final replyId = inReplyToEventId(); - final newEvent = (unsigned?["m.relations"] as Map?)?["m.replace"]; - final event = newEvent == null ? this : Event.fromJson(newEvent, room); - - final replyEvent = replyId == null - ? null - : await room.getEventById(replyId); - - final sender = - await event.fetchSenderUser() ?? event.senderFromMemoryOrFallback; - final newContent = event.content["m.new_content"] as Map?; - final metadata = { - "formatted": - newContent?["formatted_body"] ?? - newContent?["body"] ?? - event.content["formatted_body"] ?? - event.content["body"] ?? - "", - "reply": await replyEvent?.toMessage(mustBeText: true, timeline), - "body": newContent?["body"] ?? event.content["body"], - "eventType": event.type, - "avatarUrl": sender.avatarUrl.toString(), - "displayName": sender.displayName ?? sender.id, - "txnId": transactionId, - }; - - final editedAt = event.relationshipType == RelationshipTypes.edit - ? event.originServerTs - : null; - - if ((redacted && !mustBeText) || - (!includeEdits && (relationshipType == RelationshipTypes.edit))) { - return null; - } - - // TODO: Use server-generated preview if enabled when https://github.com/famedly/matrix-dart-sdk/issues/2195 is fixed. - - // final match = Uri.tryParse( - // RegExp(regexLink, caseSensitive: false).firstMatch(body)?.group(0) ?? "", - // ); - - // final preview = match == null - // ? null - // : await room.client.getUrlPreview(match); - - final asText = - Message.text( - metadata: metadata, - id: eventId, - authorId: senderId, - text: redacted ? "This message has been deleted..." : event.body, - replyToMessageId: replyId, - deliveredAt: originServerTs, - editedAt: editedAt, - ) - as TextMessage; - - if (mustBeText) return asText; - return switch (type) { - EventTypes.Encrypted => asText.copyWith( - text: "Unable to decrypt message.", - metadata: {...metadata, "formatted": "Unable to decrypt message."}, - ), - PollEventContent.startType => Message.custom( - metadata: { - ...metadata, - "poll": event.parsedPollEventContent.pollStartContent, - "responses": event.getPollResponses(timeline), - }, - id: eventId, - deliveredAt: originServerTs, - authorId: senderId, - ), - (EventTypes.Sticker || EventTypes.Message) => switch (messageType) { - (MessageTypes.Sticker || MessageTypes.Image) => Message.image( - metadata: metadata, - id: eventId, - authorId: senderId, - text: event.text, - source: (await getAttachmentUri()).toString(), - replyToMessageId: replyId, - deliveredAt: originServerTs, - blurhash: (event.content["info"] as Map?)?["xyz.amorgan.blurhash"], - ), - MessageTypes.Audio => Message.audio( - metadata: metadata, - id: eventId, - authorId: senderId, - text: event.text, - replyToMessageId: replyId, - source: (await event.getAttachmentUri()).toString(), - deliveredAt: originServerTs, - // TODO: See if we can figure out duration - duration: Duration(hours: 1), - ), - MessageTypes.File => Message.file( - name: event.content["filename"].toString(), - metadata: metadata, - id: eventId, - authorId: senderId, - source: (await event.getAttachmentUri()).toString(), - replyToMessageId: replyId, - deliveredAt: originServerTs, - ), - _ => asText, - }, - EventTypes.RoomMember => Message.system( - metadata: metadata, - id: eventId, - authorId: senderId, - text: - "${event.asUser.displayName ?? event.asUser.id} ${switch (Membership.values.firstWhereOrNull((membership) => membership.name == event.content["membership"])) { - Membership.invite => "was invited to", - Membership.join => "joined", - Membership.leave => "left", - Membership.knock => "asked to join", - Membership.ban => "was banned from", - _ => "did something relating to", - }} the room.", - ), - EventTypes.Redaction => null, - _ => - // Turn this on for debugging purposes - false - // ignore: dead_code - ? Message.unsupported( - metadata: metadata, - id: eventId, - authorId: senderId, - replyToMessageId: replyId, - ) - : null, - }; - } -} diff --git a/lib/helpers/extensions/get_full_room.dart b/lib/helpers/extensions/get_full_room.dart deleted file mode 100644 index bbd0bc5..0000000 --- a/lib/helpers/extensions/get_full_room.dart +++ /dev/null @@ -1,13 +0,0 @@ -import "package:matrix/matrix.dart"; -import "package:nexus/models/full_room.dart"; - -extension GetFullRoom on Room { - Future get fullRoom async { - await loadHeroUsers(); - return FullRoom( - roomData: this, - title: getLocalizedDisplayname(), - avatar: await avatar?.getThumbnailUri(client, width: 24, height: 24), - ); - } -} diff --git a/lib/helpers/extensions/get_headers.dart b/lib/helpers/extensions/get_headers.dart index b8b1fde..e1bb5f3 100644 --- a/lib/helpers/extensions/get_headers.dart +++ b/lib/helpers/extensions/get_headers.dart @@ -1,5 +1,7 @@ -import "package:matrix/matrix.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/header_controller.dart"; -extension GetHeaders on Client { - Map get headers => {"authorization": "Bearer $accessToken"}; +extension GetHeaders on WidgetRef { + Map get headers => + watch(HeaderController.provider).requireValue; } diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart new file mode 100644 index 0000000..88cfd5a --- /dev/null +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -0,0 +1,36 @@ +import "dart:convert"; +import "dart:ffi"; +import "dart:typed_data"; +import "package:ffi/ffi.dart"; +import "package:nexus/src/third_party/gomuks.g.dart"; + +extension GomuksOwnedBufferToX on GomuksOwnedBuffer { + Uint8List toBytes() { + try { + if (base == nullptr || length <= 0) return Uint8List(0); + return Uint8List.fromList(base.asTypedList(length)); + } finally { + calloc.free(base); + } + } + + dynamic toJson() => jsonDecode(utf8.decode(toBytes())); +} + +extension JsonToGomuksBuffer on Map { + Pointer toGomuksBufferPtr() { + final jsonString = json.encode(this); + final bytes = utf8.encode(jsonString); + + final dataPtr = calloc(bytes.length); + dataPtr.asTypedList(bytes.length).setAll(0, bytes); + + final ptr = calloc(); + + ptr.ref + ..base = dataPtr + ..length = bytes.length; + + return ptr; + } +} diff --git a/lib/helpers/extensions/join_room_with_snackbars.dart b/lib/helpers/extensions/join_room_with_snackbars.dart index 0c7b1b3..05b045d 100644 --- a/lib/helpers/extensions/join_room_with_snackbars.dart +++ b/lib/helpers/extensions/join_room_with_snackbars.dart @@ -1,42 +1,47 @@ import "package:collection/collection.dart"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; +import "package:nexus/helpers/extensions/link_to_mention.dart"; +import "package:nexus/models/requests/join_room_request.dart"; -extension JoinRoomWithSnackbars on Client { +extension JoinRoomWithSnackbars on ClientController { Future joinRoomWithSnackBars( BuildContext context, String roomAlias, WidgetRef ref, ) async { - final parsed = roomAlias.parseIdentifierIntoParts(); - final alias = parsed?.primaryIdentifier ?? roomAlias; + final roomIdOrAlias = roomAlias.mention ?? roomAlias; final scaffoldMessenger = ScaffoldMessenger.of(context); final snackbar = scaffoldMessenger.showSnackBar( SnackBar( - content: Text("Joining room $alias."), + content: Text("Joining room $roomIdOrAlias."), duration: Duration(days: 999), ), ); try { - final id = await joinRoom(alias, via: parsed?.via.toList()); + final id = await joinRoom( + JoinRoomRequest( + roomIdOrAlias: roomIdOrAlias, + via: IList(Uri.tryParse(roomAlias)?.queryParametersAll["via"] ?? []), + ), + ); snackbar.close(); scaffoldMessenger.showSnackBar( SnackBar( - content: Text("Room $alias successfully joined."), + content: Text("Room $roomIdOrAlias successfully joined."), action: SnackBarAction( label: "Open", onPressed: () async { - final spaces = await ref.refresh( - SpacesController.provider.future, - ); + final spaces = ref.watch(SpacesController.provider); final space = spaces.firstWhereOrNull((space) => space.id == id); await ref @@ -47,11 +52,9 @@ extension JoinRoomWithSnackbars on Client { space?.id ?? spaces .firstWhere( - (space) => - space.children.firstWhereOrNull( - (child) => child.roomData.id == id, - ) != - null, + (space) => space.children.any( + (child) => child.metadata?.id == id, + ), ) .id, ); diff --git a/lib/helpers/extensions/link_to_mention.dart b/lib/helpers/extensions/link_to_mention.dart new file mode 100644 index 0000000..b0e62aa --- /dev/null +++ b/lib/helpers/extensions/link_to_mention.dart @@ -0,0 +1,44 @@ +extension LinkToMention on String { + /// Extracts a Matrix identifier from this string. + /// + /// Supports: + /// - https://matrix.to/#/... + /// - matrix:roomid/... + /// - matrix:r/... + /// - matrix:u/... + /// + /// Returns the decoded identifier (e.g. "#room:matrix.org") + /// or null if this is not a Matrix link. + String? get mention { + final trimmed = trim(); + + final matrixTo = RegExp( + r"^https?://matrix\.to/#/(.[^/?#]+)", + caseSensitive: false, + ); + + final matrixToMatch = matrixTo.firstMatch(trimmed); + if (matrixToMatch != null) { + return Uri.decodeComponent(matrixToMatch.group(1)!); + } + + if (trimmed.toLowerCase().startsWith("matrix:")) { + try { + final uri = Uri.parse(trimmed); + + if (uri.pathSegments.isNotEmpty) { + final identifier = uri.pathSegments.last; + if (identifier.isNotEmpty) { + return "${switch (uri.pathSegments.firstOrNull) { + "r" || "roomid" => "#", + "u" => "@", + _ => "", + }}${Uri.decodeComponent(identifier)}"; + } + } + } catch (_) {} + } + + return null; + } +} diff --git a/lib/helpers/extensions/list_to_messages.dart b/lib/helpers/extensions/list_to_messages.dart deleted file mode 100644 index edddb25..0000000 --- a/lib/helpers/extensions/list_to_messages.dart +++ /dev/null @@ -1,10 +0,0 @@ -import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/helpers/extensions/event_to_message.dart"; - -extension ListToMessages on List { - Future> toMessages(Room room, Timeline timeline) async => - (await Future.wait( - map((event) => Event.fromMatrixEvent(event, room).toMessage(timeline)), - )).nonNulls.toList().reversed.toList(); -} diff --git a/lib/helpers/extensions/mxc_to_https.dart b/lib/helpers/extensions/mxc_to_https.dart new file mode 100644 index 0000000..468da12 --- /dev/null +++ b/lib/helpers/extensions/mxc_to_https.dart @@ -0,0 +1,4 @@ +extension MxcToHttps on Uri { + Uri mxcToHttps(String homeserver) => + Uri.parse("${homeserver}_matrix/client/v1/media/download/$host$path"); +} diff --git a/lib/helpers/extensions/room_to_children.dart b/lib/helpers/extensions/room_to_children.dart deleted file mode 100644 index d115f9a..0000000 --- a/lib/helpers/extensions/room_to_children.dart +++ /dev/null @@ -1,27 +0,0 @@ -import "package:collection/collection.dart"; -import "package:fast_immutable_collections/fast_immutable_collections.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/helpers/extensions/get_full_room.dart"; -import "package:nexus/models/full_room.dart"; - -extension RoomToChildren on Room { - Future> getAllChildren() async { - final direct = await Future.wait( - spaceChildren - .map( - (child) => client.rooms - .firstWhereOrNull((r) => r.id == child.roomId) - ?.fullRoom, - ) - .nonNulls, - ); - - return (await Future.wait( - direct.map( - (child) async => child.roomData.isSpace - ? await child.roomData.getAllChildren() - : [child], - ), - )).expand((list) => list).toIList(); - } -} diff --git a/lib/main.dart b/lib/main.dart index 9e829a7..5ad6c24 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,15 +1,18 @@ import "dart:io"; - +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/foundation.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/header_controller.dart"; +import "package:nexus/controllers/init_complete_controller.dart"; +import "package:nexus/controllers/multi_provider_controller.dart"; import "package:nexus/controllers/shared_prefs_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/scheme_to_theme.dart"; import "package:nexus/pages/chat_page.dart"; import "package:nexus/pages/login_page.dart"; -import "package:nexus/pages/settings_page.dart"; -import "package:nexus/widgets/appbar.dart"; +import "package:nexus/pages/verify_page.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/loading.dart"; import "package:window_manager/window_manager.dart"; @@ -35,6 +38,7 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue} void showError(Object error, [StackTrace? stackTrace]) { if (error.toString().contains("DioException")) return; + if (error.toString().contains("Invalid source")) return; if (error.toString().contains("UTF-16")) return; if (error.toString().contains("HTTP request failed")) return; if (error.toString().contains("Invalid image data")) return; @@ -81,11 +85,11 @@ void main() async { ); } -class App extends ConsumerWidget { +class App extends StatelessWidget { const App({super.key}); @override - Widget build(BuildContext context, WidgetRef ref) => DynamicColorBuilder( + Widget build(BuildContext context) => DynamicColorBuilder( builder: (lightDynamic, darkDynamic) => MaterialApp( navigatorKey: navigatorKey, debugShowCheckedModeBanner: false, @@ -99,42 +103,42 @@ class App extends ConsumerWidget { brightness: Brightness.dark, )) .theme, - home: Builder( - builder: (context) => ref - .watch(SharedPrefsController.provider) - .betterWhen( - data: (_) => ref - .watch(ClientController.provider) - .betterWhen( - data: (client) => - client.accessToken == null ? LoginPage() : ChatPage(), - loading: () => Scaffold( - body: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - spacing: 16, - children: [ - Text( - "Syncing...", - style: Theme.of(context).textTheme.headlineMedium, - ), - Loading(), - ], - ), - ), - appBar: Appbar( - actions: [ - IconButton( - onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => SettingsPage()), - ), - icon: Icon(Icons.settings), - ), - ], - ), - ), - ), - ), + home: Scaffold( + body: Consumer( + builder: (_, ref, _) => ref + .watch( + MultiProviderController.provider( + IListConst([ + SharedPrefsController.provider, + ClientController.provider, + HeaderController.provider, + ]), + ), + ) + .betterWhen( + data: (_) => Consumer( + builder: (_, ref, _) { + final clientState = ref.watch( + ClientStateController.provider, + ); + + if (clientState == null || !clientState.isInitialized) { + return Loading(); + } + + if (!clientState.isLoggedIn) { + return LoginPage(); + } else if (!clientState.isVerified) { + return VerifyPage(); + } else { + return ref.watch(InitCompleteController.provider) + ? ChatPage() + : Loading(); + } + }, + ), + ), + ), ), ), ); diff --git a/lib/models/account_data.dart b/lib/models/account_data.dart new file mode 100644 index 0000000..a325ffe --- /dev/null +++ b/lib/models/account_data.dart @@ -0,0 +1,16 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "account_data.freezed.dart"; +part "account_data.g.dart"; + +@freezed +abstract class AccountData with _$AccountData { + const factory AccountData({ + required String userId, + required String? roomId, + required String type, + required dynamic content, + }) = _AccountData; + + factory AccountData.fromJson(Map json) => + _$AccountDataFromJson(json); +} diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart new file mode 100644 index 0000000..1e15136 --- /dev/null +++ b/lib/models/client_state.dart @@ -0,0 +1,17 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "client_state.freezed.dart"; +part "client_state.g.dart"; + +@freezed +abstract class ClientState with _$ClientState { + const factory ClientState({ + required bool isInitialized, + required bool isLoggedIn, + required bool isVerified, + required String? userId, + required String? homeserverUrl, + }) = _ClientState; + + factory ClientState.fromJson(Map json) => + _$ClientStateFromJson(json); +} diff --git a/lib/models/epoch_date_time_converter.dart b/lib/models/epoch_date_time_converter.dart new file mode 100644 index 0000000..c26d020 --- /dev/null +++ b/lib/models/epoch_date_time_converter.dart @@ -0,0 +1,11 @@ +import "package:freezed_annotation/freezed_annotation.dart"; + +class EpochDateTimeConverter implements JsonConverter { + const EpochDateTimeConverter(); + + @override + DateTime fromJson(int json) => DateTime.fromMillisecondsSinceEpoch(json); + + @override + int toJson(DateTime object) => object.millisecondsSinceEpoch; +} diff --git a/lib/models/event.dart b/lib/models/event.dart new file mode 100644 index 0000000..734f667 --- /dev/null +++ b/lib/models/event.dart @@ -0,0 +1,80 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/epoch_date_time_converter.dart"; +part "event.freezed.dart"; +part "event.g.dart"; + +@freezed +abstract class Event with _$Event { + const factory Event({ + @JsonKey(name: "rowid") required int rowId, + @JsonKey(name: "timeline_rowid") required int timelineRowId, + required String roomId, + required String eventId, + @JsonKey(name: "sender") required String authorId, + required String type, + String? stateKey, + @EpochDateTimeConverter() required DateTime timestamp, + required IMap content, + IMap? decrypted, + String? decryptedType, + @Default(IMap.empty()) IMap unsigned, + LocalContent? localContent, + String? transactionId, + String? redactedBy, + String? relatesTo, + String? relationType, + String? decryptionError, + String? sendError, + @Default(IMap.empty()) IMap reactions, + @JsonKey(name: "last_edit_rowid") int? lastEditRowId, + @UnreadTypeConverter() UnreadType? unreadType, + }) = _Event; + + factory Event.fromJson(Map json) => _$EventFromJson(json); +} + +@freezed +abstract class LocalContent with _$LocalContent { + const factory LocalContent({ + String? sanitizedHtml, + String? editSource, + bool? wasPlaintext, + bool? bigEmoji, + bool? hasMath, + bool? replyFallbackRemoved, + }) = _LocalContent; + + factory LocalContent.fromJson(Map json) => + _$LocalContentFromJson(json); +} + +class UnreadTypeConverter implements JsonConverter { + const UnreadTypeConverter(); + + @override + UnreadType? fromJson(int? json) => json == null ? null : UnreadType(json); + + @override + int? toJson(UnreadType? object) => object?.value; +} + +// I think this is correct but I'm not sure, its some type of bitmask. +@immutable +class UnreadType { + final int value; + + const UnreadType(this.value); + + static const none = UnreadType(0); + static const normal = UnreadType(1); + static const notify = UnreadType(2); + static const highlight = UnreadType(4); + static const sound = UnreadType(8); + + bool get isNone => value == 0; + bool get isNormal => (value & 1) != 0; + bool get shouldNotify => (value & 2) != 0; + bool get isHighlighted => (value & 4) != 0; + bool get playsSound => (value & 8) != 0; +} diff --git a/lib/models/full_room.dart b/lib/models/full_room.dart deleted file mode 100644 index ee61da6..0000000 --- a/lib/models/full_room.dart +++ /dev/null @@ -1,13 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -import "package:matrix/matrix.dart"; -part "full_room.freezed.dart"; - -@freezed -abstract class FullRoom with _$FullRoom { - const FullRoom._(); - const factory FullRoom({ - required Room roomData, - required String title, - required Uri? avatar, - }) = _FullRoom; -} diff --git a/lib/models/image_data.dart b/lib/models/image_data.dart deleted file mode 100644 index e5bc57e..0000000 --- a/lib/models/image_data.dart +++ /dev/null @@ -1,11 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "image_data.freezed.dart"; - -@freezed -abstract class ImageData with _$ImageData { - const factory ImageData({ - required String uri, - required int? height, - required int? width, - }) = _ImageData; -} diff --git a/lib/models/lazy_load_summary.dart b/lib/models/lazy_load_summary.dart new file mode 100644 index 0000000..0cd250f --- /dev/null +++ b/lib/models/lazy_load_summary.dart @@ -0,0 +1,16 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +part "lazy_load_summary.freezed.dart"; +part "lazy_load_summary.g.dart"; + +@freezed +abstract class LazyLoadSummary with _$LazyLoadSummary { + const factory LazyLoadSummary({ + required IList? heroes, + required int? joinedMemberCount, + required int? invitedMemberCount, + }) = _LazyLoadSummary; + + factory LazyLoadSummary.fromJson(Map json) => + _$LazyLoadSummaryFromJson(json); +} diff --git a/lib/models/message_config.dart b/lib/models/message_config.dart new file mode 100644 index 0000000..9020f78 --- /dev/null +++ b/lib/models/message_config.dart @@ -0,0 +1,28 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/room.dart"; +part "message_config.freezed.dart"; +part "message_config.g.dart"; + +@freezed +abstract class MessageConfig with _$MessageConfig { + const MessageConfig._(); + const factory MessageConfig({ + @Default(false) bool alwaysReturn, + @Default(false) bool includeEdits, + required Room room, + required Event event, + }) = _MessageConfig; + + @override + bool operator ==(Object other) => + other.runtimeType == runtimeType && + other is MessageConfig && + other.event.eventId == event.eventId; + + @override + int get hashCode => Object.hash(runtimeType, event.eventId); + + factory MessageConfig.fromJson(Map json) => + _$MessageConfigFromJson(json); +} diff --git a/lib/models/messages_config.dart b/lib/models/messages_config.dart new file mode 100644 index 0000000..b33a71c --- /dev/null +++ b/lib/models/messages_config.dart @@ -0,0 +1,17 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/room.dart"; +part "messages_config.freezed.dart"; +part "messages_config.g.dart"; + +@freezed +abstract class MessagesConfig with _$MessagesConfig { + const factory MessagesConfig({ + required Room room, + required IList events, + }) = _MessagesConfig; + + factory MessagesConfig.fromJson(Map json) => + _$MessagesConfigFromJson(json); +} diff --git a/lib/models/paginate.dart b/lib/models/paginate.dart new file mode 100644 index 0000000..df0a0f6 --- /dev/null +++ b/lib/models/paginate.dart @@ -0,0 +1,17 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/event.dart"; +part "paginate.freezed.dart"; +part "paginate.g.dart"; + +@freezed +abstract class Paginate with _$Paginate { + const factory Paginate({ + required IList events, + required IList relatedEvents, + required bool hasMore, + }) = _Paginate; + + factory Paginate.fromJson(Map json) => + _$PaginateFromJson(json); +} diff --git a/lib/models/profile.dart b/lib/models/profile.dart new file mode 100644 index 0000000..d92b4f6 --- /dev/null +++ b/lib/models/profile.dart @@ -0,0 +1,29 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +part "profile.freezed.dart"; +part "profile.g.dart"; + +@freezed +abstract class Profile with _$Profile { + const factory Profile({ + String? avatarUrl, + @JsonKey(name: "displayname") String? displayName, + @JsonKey(name: "us.cloke.msc4175.tz") String? timezone, + + @Default(IList.empty()) + @JsonKey(name: "io.fsky.nyx.pronouns") + IList pronouns, + }) = _Profile; + + factory Profile.fromJson(Map json) => + _$ProfileFromJson(json); +} + +@freezed +abstract class Pronoun with _$Pronoun { + const factory Pronoun({required String language, required String summary}) = + _Pronoun; + + factory Pronoun.fromJson(Map json) => + _$PronounFromJson(json); +} diff --git a/lib/models/read_receipt.dart b/lib/models/read_receipt.dart new file mode 100644 index 0000000..d533e2d --- /dev/null +++ b/lib/models/read_receipt.dart @@ -0,0 +1,18 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/epoch_date_time_converter.dart"; +part "read_receipt.freezed.dart"; +part "read_receipt.g.dart"; + +@freezed +abstract class ReadReceipt with _$ReadReceipt { + const factory ReadReceipt({ + String? roomId, + required String userId, + String? threadId, + required String eventId, + @EpochDateTimeConverter() required DateTime timestamp, + }) = _ReadReceipt; + + factory ReadReceipt.fromJson(Map json) => + _$ReadReceiptFromJson(json); +} diff --git a/lib/models/requests/get_event_request.dart b/lib/models/requests/get_event_request.dart new file mode 100644 index 0000000..9374f3a --- /dev/null +++ b/lib/models/requests/get_event_request.dart @@ -0,0 +1,32 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/room.dart"; +part "get_event_request.freezed.dart"; +part "get_event_request.g.dart"; + +@Freezed(toJson: false) +abstract class GetEventRequest with _$GetEventRequest { + const GetEventRequest._(); + const factory GetEventRequest({ + required Room room, + required String eventId, + @Default(false) bool unredact, + }) = _GetEventRequest; + + Map toJson() => { + "room_id": room.metadata?.id, + "event_id": eventId, + "unredact": unredact, + }; + + @override + bool operator ==(Object other) => + other.runtimeType == runtimeType && + other is GetEventRequest && + other.eventId == eventId; + + @override + int get hashCode => Object.hash(runtimeType, eventId); + + factory GetEventRequest.fromJson(Map json) => + _$GetEventRequestFromJson(json); +} diff --git a/lib/models/requests/get_related_events_request.dart b/lib/models/requests/get_related_events_request.dart new file mode 100644 index 0000000..7e2244f --- /dev/null +++ b/lib/models/requests/get_related_events_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "get_related_events_request.freezed.dart"; +part "get_related_events_request.g.dart"; + +@freezed +abstract class GetRelatedEventsRequest with _$GetRelatedEventsRequest { + const factory GetRelatedEventsRequest({ + required String roomId, + required String eventId, + required String relationType, + }) = _GetRelatedEventsRequest; + + factory GetRelatedEventsRequest.fromJson(Map json) => + _$GetRelatedEventsRequestFromJson(json); +} diff --git a/lib/models/requests/get_room_state_request.dart b/lib/models/requests/get_room_state_request.dart new file mode 100644 index 0000000..a154d5f --- /dev/null +++ b/lib/models/requests/get_room_state_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "get_room_state_request.freezed.dart"; +part "get_room_state_request.g.dart"; + +@freezed +abstract class GetRoomStateRequest with _$GetRoomStateRequest { + const factory GetRoomStateRequest({ + required String roomId, + required bool fetchMembers, + @Default(false) bool includeMembers, + }) = _GetRoomStateRequest; + + factory GetRoomStateRequest.fromJson(Map json) => + _$GetRoomStateRequestFromJson(json); +} diff --git a/lib/models/requests/join_room_request.dart b/lib/models/requests/join_room_request.dart new file mode 100644 index 0000000..d6b411e --- /dev/null +++ b/lib/models/requests/join_room_request.dart @@ -0,0 +1,15 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +part "join_room_request.freezed.dart"; +part "join_room_request.g.dart"; + +@freezed +abstract class JoinRoomRequest with _$JoinRoomRequest { + const factory JoinRoomRequest({ + required String roomIdOrAlias, + required IList via, + }) = _JoinRoomRequest; + + factory JoinRoomRequest.fromJson(Map json) => + _$JoinRoomRequestFromJson(json); +} diff --git a/lib/models/requests/login_request.dart b/lib/models/requests/login_request.dart new file mode 100644 index 0000000..b3704fa --- /dev/null +++ b/lib/models/requests/login_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "login_request.freezed.dart"; +part "login_request.g.dart"; + +@freezed +abstract class LoginRequest with _$LoginRequest { + const factory LoginRequest({ + required String username, + required String password, + required String homeserverUrl, + }) = _LoginRequest; + + factory LoginRequest.fromJson(Map json) => + _$LoginRequestFromJson(json); +} diff --git a/lib/models/requests/paginate_request.dart b/lib/models/requests/paginate_request.dart new file mode 100644 index 0000000..44cf8ec --- /dev/null +++ b/lib/models/requests/paginate_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "paginate_request.freezed.dart"; +part "paginate_request.g.dart"; + +@freezed +abstract class PaginateRequest with _$PaginateRequest { + const factory PaginateRequest({ + required String roomId, + required int? maxTimelineId, + @Default(20) int limit, + }) = _PaginateRequest; + + factory PaginateRequest.fromJson(Map json) => + _$PaginateRequestFromJson(json); +} diff --git a/lib/models/requests/redact_event_request.dart b/lib/models/requests/redact_event_request.dart new file mode 100644 index 0000000..fed2255 --- /dev/null +++ b/lib/models/requests/redact_event_request.dart @@ -0,0 +1,3 @@ +import "package:nexus/models/requests/report_request.dart"; + +typedef RedactEventRequest = ReportRequest; diff --git a/lib/models/requests/report_request.dart b/lib/models/requests/report_request.dart new file mode 100644 index 0000000..749ad60 --- /dev/null +++ b/lib/models/requests/report_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "report_request.freezed.dart"; +part "report_request.g.dart"; + +@freezed +abstract class ReportRequest with _$ReportRequest { + const factory ReportRequest({ + required String roomId, + required String eventId, + String? reason, + }) = _ReportRequest; + + factory ReportRequest.fromJson(Map json) => + _$ReportRequestFromJson(json); +} diff --git a/lib/models/requests/send_message_request.dart b/lib/models/requests/send_message_request.dart new file mode 100644 index 0000000..883c585 --- /dev/null +++ b/lib/models/requests/send_message_request.dart @@ -0,0 +1,54 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/relation_type.dart"; +part "send_message_request.freezed.dart"; +part "send_message_request.g.dart"; + +@freezed +abstract class SendMessageRequest with _$SendMessageRequest { + const factory SendMessageRequest({ + required String roomId, + required String text, + @Default(Mentions()) @JsonKey(name: "mentions") Mentions mentions, + @JsonKey(name: "relates_to") Relation? relation, + }) = _SendMessageRequest; + + factory SendMessageRequest.fromJson(Map json) => + _$SendMessageRequestFromJson(json); +} + +@freezed +abstract class Mentions with _$Mentions { + const factory Mentions({ + @Default(false) bool room, + @Default(IList.empty()) IList userIds, + }) = _Mentions; + + factory Mentions.fromJson(Map json) => + _$MentionsFromJson(json); +} + +@Freezed(toJson: false) +abstract class Relation with _$Relation { + const Relation._(); + + const factory Relation({ + required String eventId, + required RelationType relationType, + }) = _Relation; + + Map toJson() { + switch (relationType) { + case RelationType.reply: + return { + "m.in_reply_to": {"event_id": eventId}, + }; + + case RelationType.edit: + return {"rel_type": "m.replace", "event_id": eventId}; + } + } + + factory Relation.fromJson(Map json) => + _$RelationFromJson(json); +} diff --git a/lib/models/room.dart b/lib/models/room.dart new file mode 100644 index 0000000..3c3eec0 --- /dev/null +++ b/lib/models/room.dart @@ -0,0 +1,36 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/read_receipt.dart"; +import "package:nexus/models/room_metadata.dart"; +part "room.freezed.dart"; +part "room.g.dart"; + +@freezed +abstract class Room with _$Room { + const factory Room({ + @JsonKey(name: "meta") RoomMetadata? metadata, + @Default(IList.empty()) IList timeline, + @Default(false) bool reset, + @Default(IMap.empty()) IMap> state, + // required IMap accountData, + @Default(IList.empty()) IList events, + @Default(IMap.empty()) IMap> receipts, + @Default(false) bool dismissNotifications, + @Default(true) bool hasMore, + // required IList notifications, + }) = _Room; + + factory Room.fromJson(Map json) => _$RoomFromJson(json); +} + +@freezed +abstract class TimelineRowTuple with _$TimelineRowTuple { + const factory TimelineRowTuple({ + @JsonKey(name: "timeline_rowid") required int timelineRowId, + @JsonKey(name: "event_rowid") int? eventRowId, + }) = _TimelineRowTuple; + + factory TimelineRowTuple.fromJson(Map json) => + _$TimelineRowTupleFromJson(json); +} diff --git a/lib/models/room_metadata.dart b/lib/models/room_metadata.dart new file mode 100644 index 0000000..7c16cae --- /dev/null +++ b/lib/models/room_metadata.dart @@ -0,0 +1,30 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/epoch_date_time_converter.dart"; +import "package:nexus/models/lazy_load_summary.dart"; +part "room_metadata.freezed.dart"; +part "room_metadata.g.dart"; + +@freezed +abstract class RoomMetadata with _$RoomMetadata { + const factory RoomMetadata({ + @JsonKey(name: "room_id") required String id, + + // required CreateEventContent creationContent, + // required TombstoneEventContent tombstoneEventContent, + String? name, + Uri? avatar, + String? dmUserId, + String? topic, + String? canonicalAlias, + LazyLoadSummary? lazyLoadSummary, + required bool hasMemberList, + @JsonKey(name: "preview_event_rowid") required int previewEventRowID, + @EpochDateTimeConverter() required DateTime sortingTimestamp, + required int unreadHighlights, + required int unreadNotifications, + required int unreadMessages, + }) = _RoomMetadata; + + factory RoomMetadata.fromJson(Map json) => + _$RoomMetadataFromJson(json); +} diff --git a/lib/models/session_backup.dart b/lib/models/session_backup.dart deleted file mode 100644 index 0245c7e..0000000 --- a/lib/models/session_backup.dart +++ /dev/null @@ -1,17 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "session_backup.freezed.dart"; -part "session_backup.g.dart"; - -@freezed -abstract class SessionBackup with _$SessionBackup { - const factory SessionBackup({ - required String accessToken, - required Uri homeserver, - required String userID, - required String deviceID, - required String deviceName, - }) = _SessionBackup; - - factory SessionBackup.fromJson(Map json) => - _$SessionBackupFromJson(json); -} diff --git a/lib/models/space.dart b/lib/models/space.dart index d64dcc9..631759a 100644 --- a/lib/models/space.dart +++ b/lib/models/space.dart @@ -1,20 +1,16 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/widgets.dart"; import "package:freezed_annotation/freezed_annotation.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/models/full_room.dart"; +import "package:nexus/models/room.dart"; part "space.freezed.dart"; @freezed abstract class Space with _$Space { - const Space._(); const factory Space({ - required String title, required String id, - required IList children, - required Client client, - Room? roomData, - Uri? avatar, + required String title, IconData? icon, + Room? room, + required IList children, }) = _Space; } diff --git a/lib/models/space_edge.dart b/lib/models/space_edge.dart new file mode 100644 index 0000000..192af31 --- /dev/null +++ b/lib/models/space_edge.dart @@ -0,0 +1,14 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "space_edge.freezed.dart"; +part "space_edge.g.dart"; + +@freezed +abstract class SpaceEdge with _$SpaceEdge { + const factory SpaceEdge({ + required String childId, + @Default(false) bool suggested, + }) = _SpaceEdge; + + factory SpaceEdge.fromJson(Map json) => + _$SpaceEdgeFromJson(json); +} diff --git a/lib/models/sync_data.dart b/lib/models/sync_data.dart new file mode 100644 index 0000000..0f98bb2 --- /dev/null +++ b/lib/models/sync_data.dart @@ -0,0 +1,23 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/account_data.dart"; +import "package:nexus/models/room.dart"; +import "package:nexus/models/space_edge.dart"; +part "sync_data.freezed.dart"; +part "sync_data.g.dart"; + +@freezed +abstract class SyncData with _$SyncData { + const factory SyncData({ + @Default(false) bool clearState, + @Default(IMap.empty()) IMap accountData, + @Default(IMap.empty()) IMap rooms, + @Default(ISet.empty()) ISet leftRooms, + // required IList invitedRooms, + IMap>? spaceEdges, + IList? topLevelSpaces, + }) = _SyncData; + + factory SyncData.fromJson(Map json) => + _$SyncDataFromJson(json); +} diff --git a/lib/models/sync_status.dart b/lib/models/sync_status.dart new file mode 100644 index 0000000..42c5f2a --- /dev/null +++ b/lib/models/sync_status.dart @@ -0,0 +1,18 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "sync_status.freezed.dart"; +part "sync_status.g.dart"; + +@freezed +abstract class SyncStatus with _$SyncStatus { + const factory SyncStatus({ + required SyncStatusType type, + String? error, + required int errorCount, + }) = _SyncStatus; + + factory SyncStatus.fromJson(Map json) => + _$SyncStatusFromJson(json); +} + +@JsonEnum(fieldRename: FieldRename.snake) +enum SyncStatusType { ok, waiting, erroring, permanentlyFailed } diff --git a/lib/pages/chat_page.dart b/lib/pages/chat_page.dart index c60cc45..ee2f4d0 100644 --- a/lib/pages/chat_page.dart +++ b/lib/pages/chat_page.dart @@ -1,12 +1,13 @@ import "package:flutter/material.dart"; -import "package:nexus/widgets/chat_page/room_chat.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/widgets/chat_page/sidebar.dart"; +import "package:nexus/widgets/chat_page/room_chat.dart"; -class ChatPage extends StatelessWidget { +class ChatPage extends ConsumerWidget { const ChatPage({super.key}); @override - Widget build(BuildContext context) => LayoutBuilder( + Widget build(BuildContext context, WidgetRef ref) => LayoutBuilder( builder: (context, constraints) { final isDesktop = constraints.maxWidth > 650; final showMembersByDefault = constraints.maxWidth > 1000; diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index a31498c..bd41d51 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -5,6 +5,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/helpers/launch_helper.dart"; import "package:nexus/models/homeserver.dart"; +import "package:nexus/models/requests/login_request.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/divider_text.dart"; import "package:nexus/widgets/loading.dart"; @@ -15,27 +16,25 @@ class LoginPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final theme = Theme.of(context); + final client = ref.watch(ClientController.provider.notifier); final isLoading = useState(false); - final allowLogin = useState(false); + final homeserver = useState(null); final launch = ref.watch(LaunchHelper.provider).launchUrl; - Future setHomeserver(Uri? homeserver) async { + Future setHomeserver(Uri? newHomeserver) async { isLoading.value = true; - final succeeded = homeserver == null - ? false - : await ref - .watch(ClientController.provider.notifier) - .setHomeserver( - homeserver.hasScheme - ? homeserver - : Uri.https(homeserver.path), - ); - if (succeeded) { - allowLogin.value = true; - } else if (context.mounted) { + homeserver.value = newHomeserver == null + ? null + : await client.discoverHomeserver( + newHomeserver.hasScheme + ? newHomeserver + : Uri.https(newHomeserver.path), + ); + + if (homeserver.value == null && context.mounted) { ScaffoldMessenger.of(context).showSnackBar( SnackBar( content: Text( @@ -98,6 +97,7 @@ class LoginPage extends HookConsumerWidget { ), ), IconButton.filled( + tooltip: "Confirm homeserver choice", onPressed: isLoading.value ? null : () => setHomeserver(Uri.tryParse(homeserverUrl.text)), @@ -144,6 +144,7 @@ class LoginPage extends HookConsumerWidget { ? null : () => setHomeserver(homeserver.url), trailing: IconButton( + tooltip: "Launch homeserver info page", onPressed: () => launch(homeserver.url), icon: Icon(Icons.info_outline), ), @@ -157,7 +158,7 @@ class LoginPage extends HookConsumerWidget { ), if (isLoading.value) Padding(padding: EdgeInsets.only(top: 32), child: Loading()) - else if (allowLogin.value) ...[ + else if (homeserver.value != null) ...[ DividerText("Then, sign in:"), SizedBox(height: 4), TextField( @@ -174,9 +175,13 @@ class LoginPage extends HookConsumerWidget { ElevatedButton( onPressed: () async { isLoading.value = true; - final succeeded = await ref - .watch(ClientController.provider.notifier) - .login(username.text, password.text); + final succeeded = await client.login( + LoginRequest( + username: username.text, + password: password.text, + homeserverUrl: homeserver.value!, + ), + ); if (!succeeded && context.mounted) { ScaffoldMessenger.of(context).showSnackBar( diff --git a/lib/pages/settings_page.dart b/lib/pages/settings_page.dart index b348aac..505904c 100644 --- a/lib/pages/settings_page.dart +++ b/lib/pages/settings_page.dart @@ -1,18 +1,11 @@ import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/secure_storage_controller.dart"; class SettingsPage extends ConsumerWidget { const SettingsPage({super.key}); @override Widget build(BuildContext context, WidgetRef ref) { - return Scaffold( - appBar: AppBar(title: Text("Settings")), - body: ElevatedButton( - onPressed: ref.watch(SecureStorageController.provider.notifier).clear, - child: Text("Log out"), - ), - ); + return Placeholder(); } } diff --git a/lib/pages/verify_page.dart b/lib/pages/verify_page.dart new file mode 100644 index 0000000..1011f80 --- /dev/null +++ b/lib/pages/verify_page.dart @@ -0,0 +1,82 @@ +import "package:flutter/material.dart"; +import "package:flutter_hooks/flutter_hooks.dart"; +import "package:hooks_riverpod/hooks_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/widgets/form_text_input.dart"; + +class VerifyPage extends HookConsumerWidget { + const VerifyPage({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final passphraseController = useTextEditingController(); + final isVerifying = useState(false); + return AlertDialog( + title: Text("Verify"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Enter your recovery key or passphrase below to unlock encrypted messages.\nYour passphrase is usually not the same as your password.", + ), + SizedBox(height: 12), + FormTextInput( + required: false, + autofocus: true, + capitalize: true, + controller: passphraseController, + obscure: true, + title: "Recovery Key or Passphrase", + ), + ], + ), + actions: [ + TextButton( + onPressed: isVerifying.value + ? null + : () async { + final scaffoldMessenger = ScaffoldMessenger.of(context); + final snackbar = scaffoldMessenger.showSnackBar( + SnackBar( + content: Text( + "Attempting to verify with recovery key...", + ), + duration: Duration(days: 999), + ), + ); + + isVerifying.value = true; + + final success = await ref + .watch(ClientController.provider.notifier) + .verify(passphraseController.text); + + snackbar.close(); + if (!success) { + isVerifying.value = false; + if (context.mounted) { + scaffoldMessenger.showSnackBar( + SnackBar( + backgroundColor: Theme.of( + context, + ).colorScheme.errorContainer, + content: Text( + "Verification failed. Is your passphrase correct?", + style: TextStyle( + color: Theme.of( + context, + ).colorScheme.onErrorContainer, + ), + ), + ), + ); + } + } + }, + child: Text("Verify"), + ), + ], + ); + } +} diff --git a/lib/widgets/appbar.dart b/lib/widgets/appbar.dart index fa2088d..5b14244 100644 --- a/lib/widgets/appbar.dart +++ b/lib/widgets/appbar.dart @@ -1,4 +1,5 @@ import "dart:io"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:window_manager/window_manager.dart"; @@ -7,7 +8,7 @@ class Appbar extends StatelessWidget implements PreferredSizeWidget { final Widget? title; final Color? backgroundColor; final double? scrolledUnderElevation; - final List actions; + final IList actions; const Appbar({ super.key, @@ -15,7 +16,7 @@ class Appbar extends StatelessWidget implements PreferredSizeWidget { this.backgroundColor, this.scrolledUnderElevation, this.leading, - this.actions = const [], + this.actions = const IList.empty(), }); @override @@ -48,10 +49,15 @@ class Appbar extends StatelessWidget implements PreferredSizeWidget { if (!(Platform.isAndroid || Platform.isIOS)) ...[ if (!Platform.isLinux) IconButton( + tooltip: "Maximize window", onPressed: maximize, icon: const Icon(Icons.fullscreen), ), - IconButton(onPressed: () => exit(0), icon: const Icon(Icons.close)), + IconButton( + tooltip: "Close window", + onPressed: () => exit(0), + icon: const Icon(Icons.close), + ), ], ], ), diff --git a/lib/widgets/avatar_or_hash.dart b/lib/widgets/avatar_or_hash.dart index a077810..8e93b6b 100644 --- a/lib/widgets/avatar_or_hash.dart +++ b/lib/widgets/avatar_or_hash.dart @@ -1,28 +1,34 @@ import "package:color_hash/color_hash.dart"; +import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/helpers/extensions/get_headers.dart"; +import "package:nexus/helpers/extensions/mxc_to_https.dart"; -class AvatarOrHash extends StatelessWidget { +class AvatarOrHash extends ConsumerWidget { final Uri? avatar; final String title; final Widget? fallback; final bool hasBadge; + final int badgeNumber; final double height; - final Map headers; const AvatarOrHash( this.avatar, this.title, { this.fallback, + this.badgeNumber = 0, this.hasBadge = false, this.height = 24, - required this.headers, super.key, }); @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { final box = ColoredBox( color: ColorHash(title).color, - child: Center(child: Text(title[0])), + child: Center(child: Text(title.isEmpty ? "" : title[0])), ); return SizedBox( width: height, @@ -30,18 +36,31 @@ class AvatarOrHash extends StatelessWidget { child: Center( child: Badge( isLabelVisible: hasBadge, + label: badgeNumber != 0 ? Text(badgeNumber.toString()) : null, smallSize: 12, backgroundColor: Theme.of(context).colorScheme.primary, child: ClipRRect( - borderRadius: BorderRadius.all(Radius.circular(4)), + borderRadius: BorderRadius.all(Radius.circular((height - 8) / 2.5)), child: SizedBox( width: height, height: height, child: avatar == null ? fallback ?? box - : Image.network( - avatar.toString(), - headers: headers, + : Image( + image: CachedNetworkImage( + avatar! + .mxcToHttps( + ref.watch( + ClientStateController.provider.select( + (value) => value?.homeserverUrl, + ), + ) ?? + "", + ) + .toString(), + ref.watch(CrossCacheController.provider), + headers: ref.headers, + ), fit: BoxFit.contain, errorBuilder: (_, _, _) => box, ), diff --git a/lib/widgets/chat_page/chat_box.dart b/lib/widgets/chat_page/chat_box.dart index 8fd5acb..b9e7dbb 100644 --- a/lib/widgets/chat_page/chat_box.dart +++ b/lib/widgets/chat_page/chat_box.dart @@ -5,9 +5,9 @@ import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:fluttertagger/fluttertagger.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; import "package:nexus/controllers/room_chat_controller.dart"; import "package:nexus/models/relation_type.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/chat_page/mention_overlay.dart"; import "package:nexus/widgets/chat_page/relation_preview.dart"; @@ -29,27 +29,22 @@ class ChatBox extends HookConsumerWidget { final theme = Theme.of(context); final controller = useRef(FlutterTaggerController()); final triggerCharacter = useState(""); + final shouldMention = useState(true); final query = useState(""); if (relationType == RelationType.edit && relatedMessage is TextMessage && controller.value.text.isEmpty) { - final text = (relatedMessage as TextMessage).text; - final splitText = relatedMessage?.replyToMessageId == null - ? text - : text.split("\n\n").sublist(1).join("\n\n"); - final notEmpty = splitText.isEmpty ? text : splitText; - controller.value.text = notEmpty.startsWith("* ") - ? notEmpty.substring(2) - : notEmpty; + controller.value.text = relatedMessage?.metadata?["editSource"] ?? ""; } void send() { - if (controller.value.text.trim().isEmpty) return; + if (controller.value.text.trim().isEmpty || room.metadata == null) return; ref - .watch(RoomChatController.provider(room).notifier) + .watch(RoomChatController.provider(room.metadata!.id).notifier) .send( controller.value.formattedText, + shouldMention: shouldMention.value, relation: relatedMessage, relationType: relationType, tags: controller.value.tags, @@ -91,10 +86,12 @@ class ChatBox extends HookConsumerWidget { child: Column( children: [ RelationPreview( + shouldMention: shouldMention.value, + toggleShouldMention: () => + shouldMention.value = !shouldMention.value, relatedMessage: relatedMessage, relationType: relationType, onDismiss: onDismiss, - room: room, ), Container( color: theme.colorScheme.surfaceContainerHighest, @@ -103,9 +100,29 @@ class ChatBox extends HookConsumerWidget { spacing: 8, children: [ PopupMenuButton( - itemBuilder: (context) => [], + tooltip: "Add media", + itemBuilder: (context) => [ + PopupMenuItem( + child: ListTile( + title: Text("Camera"), + leading: Icon(Icons.add_a_photo), + ), + ), + PopupMenuItem( + child: ListTile( + title: Text("Gallery"), + leading: Icon(Icons.add_photo_alternate), + ), + ), + PopupMenuItem( + child: ListTile( + title: Text("Files"), + leading: Icon(Icons.attachment), + ), + ), + ], icon: Icon(Icons.add), - enabled: room.canSendDefaultMessages, + // enabled: room.canSendDefaultMessages, TODO: Permissions check ), Expanded( child: FlutterTagger( @@ -126,11 +143,12 @@ class ChatBox extends HookConsumerWidget { }, triggerCharacterAndStyles: {"@": style, "#": style}, builder: (context, key) => TextFormField( - enabled: room.canSendDefaultMessages, + // enabled: room.canSendDefaultMessages, maxLines: 12, minLines: 1, decoration: InputDecoration( - hintText: room.canSendDefaultMessages + hintText: + true // TODO: room.canSendDefaultMessages ? "Your message here..." : "You don't have permission to send messages in this room...", border: InputBorder.none, @@ -143,8 +161,10 @@ class ChatBox extends HookConsumerWidget { ), ), IconButton( - onPressed: room.canSendDefaultMessages ? send : null, + onPressed: send, + // onPressed: room.canSendDefaultMessages ? send : null, icon: Icon(Icons.send), + tooltip: "Send message", ), ], ), diff --git a/lib/widgets/chat_page/html/code_block.dart b/lib/widgets/chat_page/html/code_block.dart index fe5b492..80950ce 100644 --- a/lib/widgets/chat_page/html/code_block.dart +++ b/lib/widgets/chat_page/html/code_block.dart @@ -41,6 +41,8 @@ class CodeBlock extends StatelessWidget { padding: EdgeInsets.all(8), child: SelectableText( code, + minLines: 1, + maxLines: 99, style: TextStyle(fontFamily: "monospace"), ), ), diff --git a/lib/widgets/chat_page/html/html.dart b/lib/widgets/chat_page/html/html.dart index 04a5a1b..1e1ab82 100644 --- a/lib/widgets/chat_page/html/html.dart +++ b/lib/widgets/chat_page/html/html.dart @@ -2,25 +2,25 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/thumbnail_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; +import "package:nexus/helpers/extensions/link_to_mention.dart"; +import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/helpers/launch_helper.dart"; -import "package:nexus/models/image_data.dart"; import "package:nexus/widgets/chat_page/html/mention_chip.dart"; import "package:nexus/widgets/chat_page/html/spoiler_text.dart"; import "package:nexus/widgets/chat_page/html/code_block.dart"; import "package:nexus/widgets/chat_page/html/quoted.dart"; -import "package:nexus/widgets/error_dialog.dart"; class Html extends ConsumerWidget { final String html; - final Client client; - const Html(this.html, {required this.client, super.key}); + final TextStyle? textStyle; + const Html(this.html, {this.textStyle, super.key}); @override Widget build(BuildContext context, WidgetRef ref) => HtmlWidget( html, + textStyle: textStyle, customWidgetBuilder: (element) { if (element.attributes.keys.contains("data-mx-spoiler")) { return InlineCustomWidget(child: SpoilerText(text: element.text)); @@ -32,67 +32,54 @@ class Html extends ConsumerWidget { return switch (element.localName) { "code" => element.parent?.localName == "pre" - ? CodeBlock( - element.text, - lang: element.className.replaceAll("language-", ""), - ) + ? element.outerHtml.contains("
") + ? Html( + """
${element.outerHtml.replaceAll("
", "\n")}
""", + ) + : CodeBlock( + element.text, + lang: element.className.replaceAll("language-", ""), + ) : null, - "blockquote" => Quoted(Html(element.innerHtml, client: client)), + "blockquote" => Quoted(Html(element.innerHtml)), "a" => - element.attributes["href"]?.parseIdentifierIntoParts() == null + element.attributes["href"]?.mention == null ? null : InlineCustomWidget(child: MentionChip(element.text)), "img" => element.attributes["src"] == null - ? null - : Consumer( - builder: (_, ref, _) => ref - .watch( - ThumbnailController.provider( - ImageData( - uri: element.attributes["src"]!, - height: height, - width: width, - ), - ), - ) - .when( - data: (uri) { - if (uri == null) return SizedBox.shrink(); - - return InlineCustomWidget( - child: Image.network( - uri, - headers: client.headers, - errorBuilder: (_, error, _) => Text( - "Image Failed to Load", - style: TextStyle( - color: Theme.of(context).colorScheme.error, + ? SizedBox.shrink() + : InlineCustomWidget( + alignment: PlaceholderAlignment.middle, + child: Image.network( + Uri.parse(element.attributes["src"]!) + .mxcToHttps( + ref.watch( + ClientStateController.provider.select( + (value) => value?.homeserverUrl, ), - ), - height: height.toDouble(), - width: width?.toDouble(), - loadingBuilder: (_, child, loadingProgress) => - loadingProgress == null - ? child - : CircularProgressIndicator(), - ), - ); - }, - error: ErrorDialog.new, - loading: () => InlineCustomWidget( - child: SizedBox( - width: width?.toDouble(), - height: height.toDouble(), - child: CircularProgressIndicator(), - ), - ), + ) ?? + "", + ) + .toString(), + headers: ref.headers, + errorBuilder: (_, error, _) => Text( + "Image Failed to Load", + style: TextStyle( + color: Theme.of(context).colorScheme.error, ), + ), + height: height.toDouble(), + width: width?.toDouble(), + loadingBuilder: (_, child, loadingProgress) => + loadingProgress == null + ? child + : CircularProgressIndicator(), + ), ), - ("del" || "h1" || "h2" || @@ -139,9 +126,7 @@ class Html extends ConsumerWidget { .mapTo?>( (key, value) => switch (key) { "data-mx-color" => MapEntry("color", value), - "data-mx-bg-color" => MapEntry("background-color", value), - _ => null, }, ) diff --git a/lib/widgets/chat_page/html/mention_chip.dart b/lib/widgets/chat_page/html/mention_chip.dart index e2c5003..c2b832d 100644 --- a/lib/widgets/chat_page/html/mention_chip.dart +++ b/lib/widgets/chat_page/html/mention_chip.dart @@ -1,5 +1,5 @@ import "package:flutter/material.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/helpers/extensions/link_to_mention.dart"; class MentionChip extends StatelessWidget { final String label; @@ -8,7 +8,7 @@ class MentionChip extends StatelessWidget { @override Widget build(BuildContext context) => ActionChip( label: Text( - label.parseIdentifierIntoParts()?.primaryIdentifier ?? label, + label.mention ?? label, style: TextStyle( fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.onPrimary, @@ -19,7 +19,7 @@ class MentionChip extends StatelessWidget { context: context, builder: (_) => Dialog( child: Text("TODO: Open room or join room dialog, or user popover"), - ), // TODO + ), ), ); } diff --git a/lib/widgets/chat_page/image_message.dart b/lib/widgets/chat_page/image_message.dart new file mode 100644 index 0000000..103fdd2 --- /dev/null +++ b/lib/widgets/chat_page/image_message.dart @@ -0,0 +1,58 @@ +import "dart:math"; +import "package:cross_cache/cross_cache.dart"; +import "package:flutter/material.dart"; +import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:flyer_chat_image_message/flyer_chat_image_message.dart"; +import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/helpers/extensions/get_headers.dart"; + +class ExpandableImageMessage extends ConsumerWidget { + final ImageMessage message; + final int index; + + const ExpandableImageMessage(this.message, {required this.index, super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) => InkWell( + onTap: () => showDialog( + context: context, + builder: (_) => LayoutBuilder( + builder: (context, constraints) => Dialog( + backgroundColor: Colors.transparent, + insetPadding: EdgeInsets.all(constraints.maxWidth / 100), + child: ConstrainedBox( + constraints: BoxConstraints( + minWidth: min(constraints.maxWidth, 1000), + ), + child: InteractiveViewer( + child: Image( + fit: BoxFit.contain, + image: CachedNetworkImage( + message.source, + ref.watch(CrossCacheController.provider), + headers: ref.headers, + ), + ), + ), + ), + ), + ), + ), + child: FlyerChatImageMessage( + customImageProvider: CachedNetworkImage( + message.source, + ref.watch(CrossCacheController.provider), + headers: ref.headers, + ), + errorBuilder: (context, error, stackTrace) => Center( + child: Text( + "Image Failed to Load", + style: TextStyle(color: Theme.of(context).colorScheme.error), + ), + ), + message: message, + index: index, + ), + ); +} diff --git a/lib/widgets/chat_page/member_list.dart b/lib/widgets/chat_page/member_list.dart index 8130de8..24d22e4 100644 --- a/lib/widgets/chat_page/member_list.dart +++ b/lib/widgets/chat_page/member_list.dart @@ -1,10 +1,7 @@ import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; import "package:nexus/controllers/members_controller.dart"; -import "package:nexus/helpers/extensions/better_when.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; class MemberList extends ConsumerWidget { @@ -12,54 +9,49 @@ class MemberList extends ConsumerWidget { const MemberList(this.room, {super.key}); @override - Widget build(BuildContext context, WidgetRef ref) => Drawer( - shape: Border(), - child: ref - .watch(MembersController.provider(room)) - .betterWhen( - data: (members) => ListView( - children: [ - AppBar( - scrolledUnderElevation: 0, - leading: Icon(Icons.people), - title: Text("Members"), - actionsPadding: EdgeInsets.only(right: 4), - actions: [ - if (Scaffold.of(context).hasEndDrawer) - IconButton( - onPressed: Scaffold.of(context).closeEndDrawer, - icon: Icon(Icons.close), - ), - ], - ), - ...members - .where( - (membership) => - membership.content["membership"] == - Membership.join.name, - ) - .map( - (member) => ListTile( - onTap: () {}, - leading: AvatarOrHash( - ref - .watch( - AvatarController.provider( - member.content["avatar_url"].toString(), - ), - ) - .whenOrNull(data: (data) => data), - member.content["displayname"].toString(), - headers: room.client.headers, - ), - title: Text( - member.content["displayname"].toString(), - overflow: TextOverflow.ellipsis, - ), - ), - ), + Widget build(BuildContext context, WidgetRef ref) { + final members = ref.watch(MembersController.provider(room)); + return Drawer( + shape: Border(), + child: ListView( + children: [ + AppBar( + scrolledUnderElevation: 0, + leading: Icon(Icons.people), + title: Text("Members (${members.length})"), + actionsPadding: EdgeInsets.only(right: 4), + actions: [ + if (Scaffold.of(context).hasEndDrawer) + IconButton( + onPressed: Scaffold.of(context).closeEndDrawer, + icon: Icon(Icons.close), + tooltip: "Close member list", + ), ], ), - ), - ); + ...members.map( + (member) => ListTile( + onTap: () => showDialog( + context: context, + builder: (context) => + Dialog(child: Text("TODO: Open member popover")), + ), + leading: AvatarOrHash( + Uri.tryParse(member.content["avatar_url"] ?? ""), + member.content["displayname"].toString(), + ), + title: Text( + member.content["displayname"].toString(), + overflow: TextOverflow.ellipsis, + ), + subtitle: Text( + member.stateKey ?? "Unknown User", + overflow: TextOverflow.ellipsis, + ), + ), + ), + ], + ), + ); + } } diff --git a/lib/widgets/chat_page/mention_overlay.dart b/lib/widgets/chat_page/mention_overlay.dart index f6c7fe3..9858574 100644 --- a/lib/widgets/chat_page/mention_overlay.dart +++ b/lib/widgets/chat_page/mention_overlay.dart @@ -1,11 +1,8 @@ import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; import "package:nexus/controllers/members_controller.dart"; import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/helpers/extensions/better_when.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/loading.dart"; @@ -23,108 +20,105 @@ class MentionOverlay extends ConsumerWidget { }); @override - Widget build(BuildContext context, WidgetRef ref) => Padding( - padding: EdgeInsets.all(8), - child: ClipRRect( - borderRadius: BorderRadius.all(Radius.circular(12)), - child: Container( - color: Theme.of(context).colorScheme.surfaceContainerHigh, - padding: EdgeInsets.all(8), - child: switch (triggerCharacter) { - "@" => - ref - .watch(MembersController.provider(room)) - .betterWhen( - data: (members) => ListView( - children: - (query.isEmpty - ? members - : members.where( - (member) => - member.senderId.toLowerCase().contains( - query.toLowerCase(), - ) || - (member.content["displayname"] - as String?) - ?.toLowerCase() - .contains( - query.toLowerCase(), - ) == - true, - )) - .map( - (member) => ListTile( - leading: AvatarOrHash( - ref - .watch( - AvatarController.provider( - member.content["avatar_url"] - .toString(), - ), - ) - .whenOrNull(data: (data) => data), - member.content["displayname"].toString(), - headers: room.client.headers, - ), - title: Text( - member.content["displayname"] as String? ?? - member.senderId, - ), - onTap: () => addTag( - id: member.senderId, - name: member.senderId - .substring(1) - .split(":") - .first, + Widget build(BuildContext context, WidgetRef ref) { + final rooms = ref.watch(RoomsController.provider); + + return Padding( + padding: EdgeInsets.all(8), + child: ClipRRect( + borderRadius: BorderRadius.all(Radius.circular(12)), + child: Container( + color: Theme.of(context).colorScheme.surfaceContainerHigh, + padding: EdgeInsets.all(8), + child: switch (triggerCharacter) { + "@" => Consumer( + builder: (_, ref, _) { + final members = ref.watch(MembersController.provider(room)); + return ListView( + children: + (query.isEmpty + ? members + : members.where( + (member) => + member.stateKey?.toLowerCase().contains( + query.toLowerCase(), + ) == + true || + (member.content["displayname"] as String?) + ?.toLowerCase() + .contains(query.toLowerCase()) == + true, + )) + .map( + (member) => ListTile( + leading: AvatarOrHash( + Uri.tryParse( + member.content["avatar_url"] ?? "", ), + member.content["displayname"] ?? "", ), - ) - .toList(), - ), - ), - "#" => - ref - .watch(RoomsController.provider) - .betterWhen( - data: (rooms) => ListView( - children: - (query.isEmpty - ? rooms - : rooms.where( - (room) => room.title.toLowerCase().contains( - query.toLowerCase(), - ), - )) - .map( - (room) => ListTile( - leading: AvatarOrHash( - room.avatar, - room.title, - fallback: Icon(Icons.numbers), - headers: room.roomData.client.headers, - ), - title: Text(room.title), - subtitle: room.roomData.topic.isEmpty - ? null - : Text(room.roomData.topic, maxLines: 1), - onTap: () => addTag( - id: "[#${room.roomData.getLocalizedDisplayname()}](https://matrix.to/#/${room.roomData.id})", - name: - (room.roomData.canonicalAlias.isEmpty - ? room.roomData.id - : room.roomData.canonicalAlias) - .substring(1) - .split(":") - .first, - ), + title: Text( + member.content["displayname"] as String? ?? + member.stateKey ?? + "Unknown User", ), - ) - .toList(), - ), - ), - _ => Loading(), - }, + subtitle: member.stateKey != null + ? Text(member.stateKey!) + : null, + onTap: () => addTag( + id: "[@${member.content["displayname"]}](https://matrix.to/#/${member.stateKey})", + name: + member.stateKey + ?.substring(1) + .split(":") + .first ?? + "Unknown User", + ), + ), + ) + .toList(), + ); + }, + ), + "#" => ListView( + children: + (query.isEmpty + ? rooms.values + : rooms.values.where( + (room) => (room.metadata?.name ?? "Unnamed Room") + .toLowerCase() + .contains(query.toLowerCase()), + )) + .map( + (room) => ListTile( + leading: AvatarOrHash( + room.metadata?.avatar, + room.metadata?.name ?? "Unnamed Room", + fallback: Icon(Icons.numbers), + ), + title: Text(room.metadata?.name ?? "Unnamed Room"), + subtitle: room.metadata?.topic == null + ? null + : Text(room.metadata!.topic!, maxLines: 1), + onTap: () => addTag( + id: "[#${room.metadata?.name ?? "Unnamed Room"}](https://matrix.to/#/${room.metadata?.id})", + name: + (room.metadata?.canonicalAlias ?? + room.metadata?.id) + ?.substring(1) + .split(":") + .first ?? + "", + ), + ), + ) + .toList(), + ), + + _ => Loading(), + }, + ), ), - ), - ); + ); + } } diff --git a/lib/widgets/chat_page/message_wrapper.dart b/lib/widgets/chat_page/message_wrapper.dart new file mode 100644 index 0000000..da53be0 --- /dev/null +++ b/lib/widgets/chat_page/message_wrapper.dart @@ -0,0 +1,54 @@ +import "package:flutter/material.dart"; +import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:nexus/widgets/avatar_or_hash.dart"; + +class MessageWrapper extends StatelessWidget { + final Message message; + final Widget child; + final MessageGroupStatus? groupStatus; + const MessageWrapper(this.message, this.child, this.groupStatus, {super.key}); + + @override + Widget build(BuildContext context) => ClipRRect( + borderRadius: BorderRadius.all(Radius.circular(12)), + child: AnimatedContainer( + padding: message.metadata?["flashing"] == true + ? EdgeInsets.all(8) + : EdgeInsets.all(0), + color: message.metadata?["flashing"] == true + ? Theme.of(context).colorScheme.onSurface.withAlpha(50) + : Colors.transparent, + duration: Duration(milliseconds: 250), + child: Row( + spacing: 8, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + groupStatus?.isFirst != false + ? AvatarOrHash( + Uri.parse(message.metadata?["avatarUrl"] ?? ""), + height: 40, + message.metadata?["displayName"] ?? "", + ) + : SizedBox(width: 40), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + spacing: 4, + children: [ + if (groupStatus?.isFirst != false) + Text( + message.metadata?["displayName"] ?? message.authorId, + overflow: TextOverflow.ellipsis, + style: Theme.of(context).textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.bold, + ), + ), + child, + ], + ), + ), + ], + ), + ), + ); +} diff --git a/lib/widgets/chat_page/relation_preview.dart b/lib/widgets/chat_page/relation_preview.dart index 07bac4e..7aa3ae8 100644 --- a/lib/widgets/chat_page/relation_preview.dart +++ b/lib/widgets/chat_page/relation_preview.dart @@ -1,9 +1,6 @@ import "package:flutter/material.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/models/relation_type.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; @@ -11,12 +8,14 @@ class RelationPreview extends ConsumerWidget { final Message? relatedMessage; final RelationType relationType; final VoidCallback onDismiss; - final Room room; + final bool shouldMention; + final VoidCallback toggleShouldMention; const RelationPreview({ required this.relatedMessage, required this.relationType, required this.onDismiss, - required this.room, + required this.shouldMention, + required this.toggleShouldMention, super.key, }); @@ -38,15 +37,8 @@ class RelationPreview extends ConsumerWidget { style: TextStyle(fontWeight: FontWeight.bold), ), AvatarOrHash( - ref - .watch( - AvatarController.provider( - relatedMessage!.metadata!["avatarUrl"], - ), - ) - .whenOrNull(data: (data) => data), - relatedMessage!.metadata!["displayName"].toString(), - headers: room.client.headers, + Uri.tryParse(relatedMessage?.metadata?["avatarUrl"] ?? ""), + relatedMessage?.metadata?["displayName"]?.toString() ?? "", height: 16, ), Text( @@ -58,16 +50,28 @@ class RelationPreview extends ConsumerWidget { ), Expanded( child: Text( - (relatedMessage is TextMessage) - ? (relatedMessage as TextMessage).text - : relatedMessage?.metadata?["body"] ?? - relatedMessage?.metadata?["eventType"], + relatedMessage?.metadata?["body"] ?? + relatedMessage?.metadata?["eventType"], overflow: TextOverflow.ellipsis, style: theme.textTheme.labelMedium, maxLines: 1, ), ), + + if (relationType == RelationType.reply) + TextButton( + onPressed: toggleShouldMention, + child: Text( + shouldMention ? "@On" : "@Off", + style: TextStyle( + fontWeight: FontWeight.w900, + color: shouldMention ? null : Theme.of(context).disabledColor, + ), + ), + ), IconButton( + tooltip: + "Cancel ${relationType == RelationType.edit ? "edit" : "reply"}", onPressed: onDismiss, icon: Icon(Icons.close), iconSize: 20, diff --git a/lib/widgets/chat_page/reply_widget.dart b/lib/widgets/chat_page/reply_widget.dart new file mode 100644 index 0000000..cd30acc --- /dev/null +++ b/lib/widgets/chat_page/reply_widget.dart @@ -0,0 +1,146 @@ +import "dart:math"; +import "package:flutter/material.dart"; +import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/event_controller.dart"; +import "package:nexus/controllers/message_controller.dart"; +import "package:nexus/helpers/extensions/better_when.dart"; +import "package:nexus/models/message_config.dart"; +import "package:nexus/models/requests/get_event_request.dart"; +import "package:nexus/models/room.dart"; +import "package:nexus/widgets/avatar_or_hash.dart"; +import "package:nexus/widgets/chat_page/html/quoted.dart"; + +typedef OnTapReply = void Function(Message message)?; + +class ReplyWidget extends ConsumerWidget { + final Message message; + final bool alwaysShow; + final Room room; + final MessageGroupStatus? groupStatus; + final OnTapReply onTapReply; + const ReplyWidget( + this.message, { + required this.room, + required this.groupStatus, + this.onTapReply, + this.alwaysShow = false, + super.key, + }); + + @override + Widget build(BuildContext context, WidgetRef ref) => + message.replyToMessageId == null + ? SizedBox.shrink() + : Padding( + padding: EdgeInsets.only(bottom: 12), + child: Quoted( + ref + .watch( + EventController.provider( + GetEventRequest( + room: room, + eventId: message.replyToMessageId!, + ), + ), + ) + .betterWhen( + loading: () => Text("Fetching event..."), + data: (event) => event == null + ? SizedBox.shrink() + : ref + .watch( + MessageController.provider( + MessageConfig(room: room, event: event), + ), + ) + .betterWhen( + loading: () => Text("Parsing message..."), + data: (replyMessage) { + if (replyMessage == null) { + return SizedBox.shrink(); + } + + final smallerText = + message is TextMessage && + replyMessage.metadata?["body"] != null + ? replyMessage.metadata!["body"].substring( + 0, + min( + max( + max( + (message as TextMessage) + .text + .length - + (replyMessage + .metadata?["displayName"] + as String) + .length - + 5, + message + .metadata?["displayName"] + .length, + ), + 5, + ), + replyMessage.metadata!["body"].length, + ), + ) + : null; + final replyText = + (smallerText == null || + smallerText.length == + replyMessage + .metadata!["body"] + .length) + ? replyMessage.metadata!["body"] + : "$smallerText..."; + + return InkWell( + onTap: () => onTapReply?.call(replyMessage), + child: Row( + mainAxisSize: MainAxisSize.min, + spacing: 8, + children: [ + AvatarOrHash( + Uri.tryParse( + replyMessage.metadata?["avatarUrl"] ?? + "", + ), + replyMessage.metadata?["displayName"] ?? + "", + height: 16, + ), + Flexible( + child: Text( + replyMessage + .metadata?["displayName"] ?? + replyMessage.authorId, + style: Theme.of(context) + .textTheme + .labelMedium + ?.copyWith( + fontWeight: FontWeight.bold, + ), + overflow: TextOverflow.ellipsis, + ), + ), + Flexible( + child: Text( + replyText, + overflow: TextOverflow.ellipsis, + style: Theme.of( + context, + ).textTheme.labelMedium, + maxLines: 1, + ), + ), + ], + ), + ); + }, + ), + ), + ), + ); +} diff --git a/lib/widgets/chat_page/room_appbar.dart b/lib/widgets/chat_page/room_appbar.dart index b36a3ad..436bcb9 100644 --- a/lib/widgets/chat_page/room_appbar.dart +++ b/lib/widgets/chat_page/room_appbar.dart @@ -1,13 +1,13 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; -import "package:nexus/models/full_room.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/chat_page/room_menu.dart"; class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { final bool isDesktop; - final FullRoom room; + final Room room; final void Function(BuildContext context) onOpenMemberList; final void Function(BuildContext context) onOpenDrawer; const RoomAppbar( @@ -25,21 +25,24 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { Widget build(BuildContext context) => Appbar( leading: isDesktop ? AvatarOrHash( - room.avatar, - room.title, + room.metadata?.avatar, + room.metadata?.name ?? "Unnamed Rooms", height: 24, fallback: Icon(Icons.numbers), - headers: room.roomData.client.headers, ) : DrawerButton(onPressed: () => onOpenDrawer(context)), scrolledUnderElevation: 0, title: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(room.title, overflow: TextOverflow.ellipsis, maxLines: 1), - if (room.roomData.topic.isNotEmpty) + Text( + room.metadata?.name ?? "Unnamed Room", + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), + if (room.metadata?.topic?.isNotEmpty == true) Text( - room.roomData.topic, + room.metadata!.topic!, maxLines: 1, overflow: TextOverflow.ellipsis, style: Theme.of(context).textTheme.labelMedium?.copyWith( @@ -49,12 +52,17 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { ], ), actions: [ - IconButton(onPressed: () {}, icon: Icon(Icons.push_pin)), + IconButton( + onPressed: null, + icon: Icon(Icons.push_pin), + tooltip: "Open pinned messages", + ), IconButton( onPressed: () => onOpenMemberList(context), + tooltip: "Open member list", icon: Icon(Icons.people), ), - RoomMenu(room.roomData), - ], + RoomMenu(room), + ].toIList(), ); } diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart index 0d57663..839109f 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/chat_page/room_chat.dart @@ -1,30 +1,28 @@ -import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_ui/flutter_chat_ui.dart"; import "package:flutter_hooks/flutter_hooks.dart"; -import "package:flutter_link_previewer/flutter_link_previewer.dart"; import "package:flyer_chat_file_message/flyer_chat_file_message.dart"; -import "package:flyer_chat_image_message/flyer_chat_image_message.dart"; import "package:flyer_chat_system_message/flyer_chat_system_message.dart"; -import "package:flyer_chat_text_message/flyer_chat_text_message.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/controllers/room_chat_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/show_context_menu.dart"; import "package:nexus/models/relation_type.dart"; +import "package:nexus/models/requests/report_request.dart"; import "package:nexus/widgets/chat_page/chat_box.dart"; -import "package:nexus/widgets/chat_page/html/html.dart"; +import "package:nexus/widgets/chat_page/image_message.dart"; import "package:nexus/widgets/chat_page/member_list.dart"; +import "package:nexus/widgets/chat_page/message_wrapper.dart"; import "package:nexus/widgets/chat_page/room_appbar.dart"; -import "package:nexus/widgets/chat_page/top_widget.dart"; +import "package:nexus/widgets/chat_page/text_message_wrapper.dart"; +import "package:nexus/widgets/chat_page/reply_widget.dart"; import "package:nexus/widgets/form_text_input.dart"; import "package:nexus/widgets/loading.dart"; // import "package:dynamic_polls/dynamic_polls.dart"; -// import "package:matrix/matrix.dart"; class RoomChat extends HookConsumerWidget { final bool isDesktop; @@ -37,112 +35,70 @@ class RoomChat extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { + final client = ref.watch(ClientController.provider.notifier); final replyToMessage = useState(null); final memberListOpened = useState(showMembersByDefault); final relationType = useState(RelationType.reply); + final room = ref.watch(SelectedRoomController.provider); + final userId = ref.watch(ClientStateController.provider)?.userId; + final theme = Theme.of(context); final danger = theme.colorScheme.error; - return ref - .watch(SelectedRoomController.provider) - .betterWhen( - data: (room) { - if (room == null) { - return Center( - child: Text( - "Nothing to see here...", - style: theme.textTheme.headlineMedium, - ), - ); - } - final controllerProvider = RoomChatController.provider( - room.roomData, - ); - final notifier = ref.watch(controllerProvider.notifier); + if (room == null || userId == null || room.metadata?.id == null) { + return Center( + child: Text( + "Nothing to see here...", + style: theme.textTheme.headlineMedium, + ), + ); + } - List getMessageOptions(Message message) => [ - PopupMenuItem( - onTap: () { - replyToMessage.value = message; - relationType.value = RelationType.reply; - }, - child: ListTile( - leading: Icon(Icons.reply), - title: Text("Reply"), - ), - ), - // Should check if is state event (has state_key), if so, don't show edit option - if (message is TextMessage && - message.authorId == room.roomData.client.userID) - PopupMenuItem( - onTap: () { - replyToMessage.value = message; - relationType.value = RelationType.edit; - }, - child: ListTile( - leading: Icon(Icons.edit), - title: Text("Edit"), - ), - ), - if (message.authorId == room.roomData.client.userID || - room.roomData.canRedact) - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (context) => HookBuilder( - builder: (_) { - final deleteReasonController = - useTextEditingController(); - return AlertDialog( - title: Text("Delete Message"), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Are you sure you want to delete this message? This can not be reversed.", - ), - SizedBox(height: 12), - FormTextInput( - required: false, - capitalize: true, - controller: deleteReasonController, - title: "Reason for deletion (optional)", - ), - ], - ), - actions: [ - TextButton( - onPressed: Navigator.of(context).pop, - child: Text("Cancel"), - ), - TextButton( - onPressed: () async { - notifier.deleteMessage( - message, - reason: deleteReasonController.text, - ); - Navigator.of(context).pop(); - }, - child: Text("Delete"), - ), - ], - ); - }, - ), - ), - child: ListTile( - leading: Icon(Icons.delete), - title: Text("Delete"), - ), - ), - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text("Report"), - content: Text( - "Report this message to your server administrators, who can take action like banning that user or blocking that server from federating.", + final controllerProvider = RoomChatController.provider(room.metadata!.id); + final notifier = ref.watch(controllerProvider.notifier); + + List getMessageOptions(Message message) { + final isSentByMe = message.authorId == userId; + return [ + PopupMenuItem( + onTap: () { + replyToMessage.value = message; + relationType.value = RelationType.reply; + }, + child: ListTile(leading: Icon(Icons.reply), title: Text("Reply")), + ), + if (message is TextMessage && isSentByMe) + PopupMenuItem( + onTap: () { + replyToMessage.value = message; + relationType.value = RelationType.edit; + }, + child: ListTile(leading: Icon(Icons.edit), title: Text("Edit")), + ), + if (isSentByMe) // TODO: Or if user has permission to redact others' messages + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (context) => HookBuilder( + builder: (_) { + final deleteReasonController = useTextEditingController(); + return AlertDialog( + title: Text("Delete Message"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Are you sure you want to delete this message? This can not be reversed.", + ), + SizedBox(height: 12), + FormTextInput( + required: false, + capitalize: true, + controller: deleteReasonController, + title: "Reason for deletion (optional)", + ), + ], ), actions: [ TextButton( @@ -150,418 +106,263 @@ class RoomChat extends HookConsumerWidget { child: Text("Cancel"), ), TextButton( - onPressed: () { - room.roomData.client.reportEvent( - room.roomData.id, - message.id, + onPressed: () async { + notifier.deleteMessage( + message, + reason: deleteReasonController.text, ); Navigator.of(context).pop(); }, - child: Text("Report"), + child: Text("Delete"), + ), + ], + ); + }, + ), + ), + child: ListTile(leading: Icon(Icons.delete), title: Text("Delete")), + ), + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (context) => HookBuilder( + builder: (_) { + final reasonController = useTextEditingController(); + return AlertDialog( + title: Text("Report"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Report this event to your server administrators, who can take action like banning this server or room.", + ), + + SizedBox(height: 12), + FormTextInput( + required: false, + capitalize: true, + controller: reasonController, + title: "Reason for report (optional)", ), ], ), - ), - child: ListTile( - leading: Icon(Icons.report, color: danger), - title: Text("Report", style: TextStyle(color: danger)), - ), - ), - ]; - - return Scaffold( - appBar: RoomAppbar( - room, - isDesktop: isDesktop, - onOpenDrawer: (_) => Scaffold.of(context).openDrawer(), - onOpenMemberList: (thisContext) { - memberListOpened.value = !memberListOpened.value; - Scaffold.of(thisContext).openEndDrawer(); - }, - ), - body: Row( - children: [ - Expanded( - child: Column( - children: [ - Expanded( - child: ref - .watch(controllerProvider) - .betterWhen( - data: (controller) => Chat( - currentUserId: room.roomData.client.userID!, - theme: ChatTheme.fromThemeData(theme) - .copyWith( - colors: ChatColors.fromThemeData(theme) - .copyWith( - primary: theme - .colorScheme - .primaryContainer, - onPrimary: theme - .colorScheme - .onPrimaryContainer, - ), - ), - onMessageSecondaryTap: - ( - context, - message, { - required index, - TapUpDetails? details, - }) => details?.globalPosition == null - ? null - : context.showContextMenu( - globalPosition: - details!.globalPosition, - children: getMessageOptions(message), - ), - onMessageLongPress: - ( - context, - message, { - required details, - required index, - }) => context.showContextMenu( - globalPosition: details.globalPosition, - children: getMessageOptions(message), - ), - onMessageTap: - ( - context, - message, { - required details, - required index, - }) { - if (message is ImageMessage) { - showDialog( - context: context, - builder: (_) => Dialog( - backgroundColor: - Colors.transparent, - insetPadding: EdgeInsets.all(64), - child: InteractiveViewer( - child: Image( - image: CachedNetworkImage( - message.source, - ref.watch( - CrossCacheController - .provider, - ), - headers: room - .roomData - .client - .headers, - ), - ), - ), - ), - ); - } - }, - builders: Builders( - loadMoreBuilder: (_) => Loading(), - chatAnimatedListBuilder: (_, itemBuilder) => - ChatAnimatedList( - itemBuilder: itemBuilder, - onEndReached: notifier.loadOlder, - onStartReached: notifier.markRead, - bottomPadding: 72, - ), - composerBuilder: (_) => ChatBox( - relationType: relationType.value, - relatedMessage: replyToMessage.value, - onDismiss: () => - replyToMessage.value = null, - room: room.roomData, - ), - - // customMessageBuilder: - // ( - // context, - // message, - // index, { - // required bool isSentByMe, - // MessageGroupStatus? groupStatus, - // }) { - // final poll = - // message.metadata?["poll"] - // as PollStartContent; - // final responses = - // (message.metadata?["responses"] - // as Map< - // String, - // Set - // >) - // .values - // .expand((set) => set) - // .fold({}, ( - // acc, - // value, - // ) { - // acc[value] = - // (acc[value] ?? 0) + 1; - // return acc; - // }); - - // return Column( - // crossAxisAlignment: - // CrossAxisAlignment.start, - // spacing: 4, - // children: [ - // TopWidget( - // message, - // headers: room - // .roomData - // .client - // .headers, - // groupStatus: groupStatus, - // ), - - // // TODO: Make this actually work - // DynamicPolls( - // startDate: DateTime.now(), - // endDate: DateTime.now(), - // private: - // poll.kind == - // PollKind.undisclosed, - // allowReselection: true, - // backgroundDecoration: - // BoxDecoration( - // borderRadius: - // BorderRadius.all( - // Radius.circular(16), - // ), - // border: Border.all( - // color: theme - // .colorScheme - // .primaryContainer, - // width: 4, - // ), - // ), - // allStyle: Styles( - // titleStyle: TitleStyle( - // style: theme - // .textTheme - // .headlineSmall, - // ), - // optionStyle: OptionStyle( - // fillColor: theme - // .colorScheme - // .primaryContainer, - // selectedBorderColor: theme - // .colorScheme - // .primary, - // borderColor: theme - // .colorScheme - // .primary, - // unselectedBorderColor: - // Colors.transparent, - // textSelectColor: theme - // .colorScheme - // .primary, - // ), - // ), - // onOptionSelected: - // (int index) {}, - // title: poll.question.mText, - // options: poll.answers - // .map( - // (option) => option.mText, - // ) - // .toList(), - // ), - // ], - // ); - // }, - textMessageBuilder: - ( - context, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => FlyerChatTextMessage( - customWidget: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Html( - (message.metadata?["formatted"] - as String) - .replaceAllMapped( - RegExp( - "(]*>.*?<\\/a>)|(\\bhttps?:\\/\\/[^\\s<]+)", - caseSensitive: false, - ), - (m) { - // If it's already an tag, leave it unchanged - if (m.group(1) != - null) { - return m.group(1)!; - } - - // Otherwise, wrap the bare URL - final url = m.group(2)!; - return "$url"; - }, - ) - .replaceAll("\n", "
"), - client: room.roomData.client, - ), - if (message.editedAt != null) - Text( - "(edited)", - style: theme - .textTheme - .labelSmall, - ), - ], - ), - topWidget: TopWidget( - message, - headers: - room.roomData.client.headers, - groupStatus: groupStatus, - ), - message: message, - showTime: true, - index: index, - ), - linkPreviewBuilder: - (_, message, isSentByMe) => LinkPreview( - text: message.text, - backgroundColor: isSentByMe - ? theme.colorScheme.inversePrimary - : theme - .colorScheme - .surfaceContainerLow, - insidePadding: EdgeInsets.symmetric( - vertical: 8, - horizontal: 16, - ), - linkPreviewData: - message.linkPreviewData, - onLinkPreviewDataFetched: - (linkPreviewData) => - notifier.updateMessage( - message, - message.copyWith( - linkPreviewData: - linkPreviewData, - ), - ), - ), - imageMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => FlyerChatImageMessage( - topWidget: TopWidget( - message, - headers: - room.roomData.client.headers, - groupStatus: groupStatus, - alwaysShow: true, - ), - customImageProvider: - CachedNetworkImage( - message.source, - ref.watch( - CrossCacheController.provider, - ), - headers: room - .roomData - .client - .headers, - ), - errorBuilder: - (context, error, stackTrace) => - Center( - child: Text( - "Image Failed to Load", - style: TextStyle( - color: Theme.of( - context, - ).colorScheme.error, - ), - ), - ), - message: message, - index: index, - ), - fileMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => InkWell( - onTap: () => showDialog( - context: context, - builder: (_) => Dialog( - child: Text( - "TODO: Download Attachments", // TODO - ), - ), - ), - child: FlyerChatFileMessage( - topWidget: TopWidget( - message, - headers: - room.roomData.client.headers, - groupStatus: groupStatus, - ), - message: message, - index: index, - ), - ), - systemMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => FlyerChatSystemMessage( - message: message, - index: index, - ), - unsupportedMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => Text( - "${message.authorId} sent ${message.metadata?["eventType"]}", - style: theme.textTheme.labelSmall - ?.copyWith(color: Colors.grey), - ), - ), - resolveUser: notifier.resolveUser, - chatController: controller, - ), - ), - ), - ], + actions: [ + TextButton( + onPressed: Navigator.of(context).pop, + child: Text("Cancel"), ), - ), + TextButton( + onPressed: () { + if (room.metadata == null) return; + client.reportEvent( + ReportRequest( + roomId: room.metadata!.id, + eventId: message.id, + reason: reasonController.text.isEmpty + ? null + : reasonController.text, + ), + ); + Navigator.of(context).pop(); + }, + child: Text("Report"), + ), + ], + ); + }, + ), + ), + child: ListTile( + leading: Icon(Icons.report, color: danger), + title: Text("Report", style: TextStyle(color: danger)), + ), + ), + ]; + } - if (memberListOpened.value == true && showMembersByDefault) - MemberList(room.roomData), - ], - ), + final chatTheme = ChatTheme.fromThemeData(theme).copyWith( + colors: ChatColors.fromThemeData(theme).copyWith( + primary: theme.colorScheme.primaryContainer, + onPrimary: theme.colorScheme.onPrimaryContainer, + ), + ); - endDrawer: showMembersByDefault - ? null - : MemberList(room.roomData), - ); - }, - ); + return Scaffold( + appBar: RoomAppbar( + room, + isDesktop: isDesktop, + onOpenDrawer: (_) => Scaffold.of(context).openDrawer(), + onOpenMemberList: (thisContext) { + memberListOpened.value = !memberListOpened.value; + Scaffold.of(thisContext).openEndDrawer(); + }, + ), + body: Row( + children: [ + Expanded( + child: Column( + children: [ + Expanded( + child: ref + .watch(controllerProvider) + .betterWhen( + data: (controller) => Chat( + currentUserId: userId, + theme: chatTheme, + onMessageSecondaryTap: + ( + context, + message, { + required index, + TapUpDetails? details, + }) => details?.globalPosition == null + ? null + : context.showContextMenu( + globalPosition: details!.globalPosition, + children: getMessageOptions(message), + ), + onMessageLongPress: + ( + context, + message, { + required details, + required index, + }) => context.showContextMenu( + globalPosition: details.globalPosition, + children: getMessageOptions(message), + ), + builders: Builders( + loadMoreBuilder: (_) => Loading(), + + chatAnimatedListBuilder: (_, itemBuilder) => + ChatAnimatedList( + itemBuilder: itemBuilder, + onEndReached: room.hasMore + ? notifier.loadOlder + : null, + onStartReached: () => client.markRead(room), + bottomPadding: 72, + ), + + composerBuilder: (_) => ChatBox( + relationType: relationType.value, + relatedMessage: replyToMessage.value, + onDismiss: () => replyToMessage.value = null, + room: room, + ), + + textMessageBuilder: + ( + context, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => TextMessageWrapper( + room: room, + message, + content: message.text, + groupStatus: groupStatus, + onTapReply: notifier.scrollToMessage, + updateMessage: controller.updateMessage, + isSentByMe: isSentByMe, + ), + + imageMessageBuilder: + ( + context, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => TextMessageWrapper( + message, + room: room, + content: message.text, + groupStatus: groupStatus, + onTapReply: notifier.scrollToMessage, + updateMessage: controller.updateMessage, + isSentByMe: isSentByMe, + extra: ExpandableImageMessage( + message, + index: index, + ), + ), + + fileMessageBuilder: + ( + _, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => MessageWrapper( + message, + InkWell( + onTap: () => showDialog( + context: context, + builder: (_) => Dialog( + child: Text( + "TODO: Download Attachments", + ), + ), + ), + child: FlyerChatFileMessage( + topWidget: ReplyWidget( + room: room, + message, + onTapReply: notifier.scrollToMessage, + groupStatus: groupStatus, + ), + message: message, + index: index, + ), + ), + groupStatus, + ), + + systemMessageBuilder: + ( + _, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => FlyerChatSystemMessage( + message: message, + index: index, + ), + + unsupportedMessageBuilder: + ( + _, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => Text( + "${message.authorId} sent ${message.metadata?["eventType"]}", + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.grey, + ), + ), + ), + resolveUser: notifier.resolveUser, + chatController: controller, + ), + ), + ), + ], + ), + ), + + if (memberListOpened.value == true && showMembersByDefault) + MemberList(room), + ], + ), + + endDrawer: showMembersByDefault ? null : MemberList(room), + ); } } diff --git a/lib/widgets/chat_page/room_menu.dart b/lib/widgets/chat_page/room_menu.dart index ea123fd..2687bc8 100644 --- a/lib/widgets/chat_page/room_menu.dart +++ b/lib/widgets/chat_page/room_menu.dart @@ -1,38 +1,33 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; -import "package:flutter/services.dart"; -import "package:flutter_hooks/flutter_hooks.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/helpers/extensions/room_to_children.dart"; -import "package:nexus/widgets/form_text_input.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/models/room.dart"; -class RoomMenu extends StatelessWidget { +class RoomMenu extends ConsumerWidget { final Room room; - const RoomMenu(this.room, {super.key}); + final IList children; + const RoomMenu(this.room, {this.children = const IList.empty(), super.key}); @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { final danger = Theme.of(context).colorScheme.error; - - void markRead(String roomId) async { - for (final child in await room.getAllChildren()) { - await child.roomData.setReadMarker( - child.roomData.lastEvent?.eventId, - mRead: child.roomData.lastEvent?.eventId, - ); - } - } + final client = ref.watch(ClientController.provider.notifier); return PopupMenuButton( itemBuilder: (_) => [ + // PopupMenuItem( + // onTap: () async { + // final link = await room.matrixToInviteLink(); + // await Clipboard.setData(ClipboardData(text: link.toString())); + // }, + // child: ListTile(leading: Icon(Icons.link), title: Text("Copy Link")), + // ), PopupMenuItem( onTap: () async { - final link = await room.matrixToInviteLink(); - await Clipboard.setData(ClipboardData(text: link.toString())); + await client.markRead(room); + await Future.wait(children.map((child) => client.markRead(child))); }, - child: ListTile(leading: Icon(Icons.link), title: Text("Copy Link")), - ), - PopupMenuItem( - onTap: () => markRead(room.id), child: ListTile( leading: Icon(Icons.check), title: Text("Mark as Read"), @@ -44,7 +39,7 @@ class RoomMenu extends StatelessWidget { builder: (context) => AlertDialog( title: Text("Leave Room"), content: Text( - "Are you sure you want to leave \"${room.getLocalizedDisplayname()}\"?", + "Are you sure you want to leave \"${room.metadata?.name ?? "Unnamed Room"}\"?", ), actions: [ TextButton( @@ -54,10 +49,13 @@ class RoomMenu extends StatelessWidget { TextButton( onPressed: () async { Navigator.of(context).pop(); - final snackbar = ScaffoldMessenger.of( - context, - ).showSnackBar(SnackBar(content: Text("Leaving room..."))); - await room.leave(); + final snackbar = ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text("Leaving room..."), + duration: Duration(days: 1), + ), + ); + await client.leaveRoom(room); snackbar.close(); }, child: Text("Leave"), @@ -70,53 +68,53 @@ class RoomMenu extends StatelessWidget { title: Text("Leave", style: TextStyle(color: danger)), ), ), - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (context) => HookBuilder( - builder: (_) { - final reasonController = useTextEditingController(); - return AlertDialog( - title: Text("Report"), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Report this room to your server administrators, who can take action like banning this room.", - ), + // PopupMenuItem( + // onTap: () => showDialog( + // context: context, + // builder: (context) => HookBuilder( + // builder: (_) { + // final reasonController = useTextEditingController(); + // return AlertDialog( + // title: Text("Report"), + // content: Column( + // mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // "Report this room to your server administrators, who can take action like banning this room.", + // ), - SizedBox(height: 12), - FormTextInput( - required: false, - capitalize: true, - controller: reasonController, - title: "Reason for report (optional)", - ), - ], - ), - actions: [ - TextButton( - onPressed: Navigator.of(context).pop, - child: Text("Cancel"), - ), - TextButton( - onPressed: () { - room.client.reportRoom(room.id, reasonController.text); - Navigator.of(context).pop(); - }, - child: Text("Report"), - ), - ], - ); - }, - ), - ), - child: ListTile( - leading: Icon(Icons.report, color: danger), - title: Text("Report", style: TextStyle(color: danger)), - ), - ), + // SizedBox(height: 12), + // FormTextInput( + // required: false, + // capitalize: true, + // controller: reasonController, + // title: "Reason for report (optional)", + // ), + // ], + // ), + // actions: [ + // TextButton( + // onPressed: Navigator.of(context).pop, + // child: Text("Cancel"), + // ), + // TextButton( + // onPressed: () { + // room.client.reportRoom(room.id, reasonController.text); + // Navigator.of(context).pop(); + // }, + // child: Text("Report"), + // ), + // ], + // ); + // }, + // ), + // ), + // child: ListTile( + // leading: Icon(Icons.report, color: danger), + // title: Text("Report", style: TextStyle(color: danger)), + // ), + // ), ], ); } diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart index a5e1425..4642a58 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/chat_page/sidebar.dart @@ -1,4 +1,3 @@ -import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; @@ -6,8 +5,6 @@ import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/selected_space_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; -import "package:nexus/helpers/extensions/better_when.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/join_room_with_snackbars.dart"; import "package:nexus/pages/settings_page.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; @@ -22,228 +19,212 @@ class Sidebar extends HookConsumerWidget { final selectedSpaceProvider = KeyController.provider( KeyController.spaceKey, ); - final selectedSpace = ref.watch(selectedSpaceProvider); - final selectedSpaceNotifier = ref.watch(selectedSpaceProvider.notifier); + final selectedSpaceId = ref.watch(selectedSpaceProvider); + final selectedSpaceIdNotifier = ref.watch(selectedSpaceProvider.notifier); final selectedRoomController = KeyController.provider( KeyController.roomKey, ); - final selectedRoom = ref.watch(selectedRoomController); - final selectedRoomNotifier = ref.watch(selectedRoomController.notifier); + final selectedRoomId = ref.watch(selectedRoomController); + final selectedRoomIdNotifier = ref.watch(selectedRoomController.notifier); + + final spaces = ref.watch(SpacesController.provider); + final indexOfSelected = spaces.indexWhere( + (space) => space.id == selectedSpaceId, + ); + final selectedIndex = indexOfSelected == -1 ? 0 : indexOfSelected; + + final selectedSpace = ref.watch(SelectedSpaceController.provider); + + final indexOfSelectedRoom = selectedSpace.children.indexWhere( + (room) => room.metadata?.id == selectedRoomId, + ); + final selectedRoomIndex = indexOfSelectedRoom == -1 + ? selectedSpace.children.isEmpty + ? null + : 0 + : indexOfSelectedRoom; return Drawer( shape: Border(), child: Row( children: [ - ref - .watch(SpacesController.provider) - .when( - loading: SizedBox.shrink, - error: (error, stack) { - debugPrintStack(label: error.toString(), stackTrace: stack); - throw error; - }, - data: (spaces) { - final indexOfSelected = spaces.indexWhere( - (space) => space.id == selectedSpace, - ); - final selectedIndex = indexOfSelected == -1 - ? 0 - : indexOfSelected; - - return NavigationRail( - scrollable: true, - onDestinationSelected: (value) { - selectedSpaceNotifier.set(spaces[value].id); - selectedRoomNotifier.set( - spaces[value].children.firstOrNull?.roomData.id, - ); - }, - destinations: spaces - .map( - (space) => NavigationRailDestination( - icon: AvatarOrHash( - space.avatar, - fallback: space.icon == null - ? null - : Icon(space.icon), - space.title, - headers: space.client.headers, - hasBadge: - space.children.firstWhereOrNull( - (room) => room.roomData.hasNewMessages, - ) != - null, - ), - label: Text(space.title), - padding: EdgeInsets.only(top: 4), - ), - ) - .toList(), - selectedIndex: selectedIndex, - trailingAtBottom: true, - trailing: Padding( - padding: EdgeInsets.symmetric(vertical: 16), - child: Column( - spacing: 8, - children: [ - PopupMenuButton( - itemBuilder: (_) => [ - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (alertContext) => HookBuilder( - builder: (_) { - final roomAlias = - useTextEditingController(); - return AlertDialog( - title: Text("Join a Room"), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - "Enter the room alias, ID, or a Matrix.to link.", - ), - SizedBox(height: 12), - FormTextInput( - required: false, - capitalize: true, - controller: roomAlias, - title: "#room:server", - ), - ], - ), - actions: [ - TextButton( - onPressed: Navigator.of( - context, - ).pop, - child: Text("Cancel"), - ), - TextButton( - onPressed: () async { - Navigator.of(alertContext).pop(); - - final client = await ref.watch( - ClientController - .provider - .future, - ); - if (context.mounted) { - client.joinRoomWithSnackBars( - context, - roomAlias.text, - ref, - ); - } - }, - child: Text("Join"), - ), - ], - ); - }, - ), - ), - child: ListTile( - title: Text( - "Join an existing room (or space)", - ), - leading: Icon(Icons.numbers), - ), - ), - PopupMenuItem( - onTap: () {}, - child: ListTile( - title: Text("Create a new room"), - leading: Icon(Icons.add), - ), - ), - ], - icon: Icon(Icons.add), - ), - IconButton( - onPressed: () => showDialog( - context: context, - builder: (context) => - AlertDialog(title: Text("To-do")), - ), - icon: Icon(Icons.explore), - ), - IconButton( - onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => SettingsPage()), - ), - icon: Icon(Icons.settings), - ), - ], + NavigationRail( + scrollable: true, + onDestinationSelected: (value) { + selectedSpaceIdNotifier.set(spaces[value].id); + selectedRoomIdNotifier.set( + spaces[value].children.firstOrNull?.metadata?.id, + ); + }, + destinations: spaces + .map( + (space) => NavigationRailDestination( + icon: AvatarOrHash( + space.room?.metadata?.avatar, + fallback: space.icon == null ? null : Icon(space.icon), + space.title, + hasBadge: space.children.any( + (room) => room.metadata?.unreadMessages != 0, + ), + badgeNumber: space.children.fold( + 0, + (previousValue, room) => + previousValue + + (room.metadata?.unreadNotifications ?? 0), ), ), - ); - }, - ), - Expanded( - child: ref - .watch(SelectedSpaceController.provider) - .betterWhen( - data: (space) { - final indexOfSelected = space.children.indexWhere( - (room) => room.roomData.id == selectedRoom, - ); - final selectedIndex = indexOfSelected == -1 - ? space.children.isEmpty - ? null - : 0 - : indexOfSelected; - - return Scaffold( - backgroundColor: Colors.transparent, - appBar: AppBar( - leading: AvatarOrHash( - space.avatar, - fallback: space.icon == null - ? null - : Icon(space.icon), - space.title, - headers: space.client.headers, - ), - title: Text( - space.title, - overflow: TextOverflow.ellipsis, - ), - backgroundColor: Colors.transparent, - actions: [ - if (space.roomData != null) RoomMenu(space.roomData!), - ], - ), - body: NavigationRail( - scrollable: true, - backgroundColor: Colors.transparent, - extended: true, - selectedIndex: selectedIndex, - destinations: space.children - .map( - (room) => NavigationRailDestination( - label: Text(room.title), - icon: AvatarOrHash( - hasBadge: room.roomData.hasNewMessages, - room.avatar, - room.title, - fallback: selectedSpace == "dms" - ? null - : Icon(Icons.numbers), - headers: space.client.headers, + label: Text(space.title), + padding: EdgeInsets.only(top: 4), + ), + ) + .toList(), + selectedIndex: selectedIndex, + trailingAtBottom: true, + trailing: Padding( + padding: EdgeInsets.symmetric(vertical: 16), + child: Column( + spacing: 8, + children: [ + PopupMenuButton( + itemBuilder: (_) => [ + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (alertContext) => HookBuilder( + builder: (_) { + final roomAlias = useTextEditingController(); + return AlertDialog( + title: Text("Join a Room"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Enter the room alias, ID, or a Matrix.to link.", + ), + SizedBox(height: 12), + FormTextInput( + required: false, + capitalize: true, + controller: roomAlias, + title: "#room:server", + ), + ], ), - ), - ) - .toList(), - onDestinationSelected: (value) => selectedRoomNotifier - .set(space.children[value].roomData.id), + actions: [ + TextButton( + onPressed: Navigator.of(context).pop, + child: Text("Cancel"), + ), + TextButton( + onPressed: () async { + Navigator.of(alertContext).pop(); + + final client = ref.watch( + ClientController.provider.notifier, + ); + if (context.mounted) { + client.joinRoomWithSnackBars( + context, + roomAlias.text, + ref, + ); + } + }, + child: Text("Join"), + ), + ], + ); + }, + ), + ), + child: ListTile( + title: Text("Join an existing room (or space)"), + leading: Icon(Icons.numbers), + ), ), - ); - }, + PopupMenuItem( + onTap: () {}, + child: ListTile( + title: Text("Create a new room"), + leading: Icon(Icons.add), + ), + ), + ], + icon: Icon(Icons.add), + ), + IconButton( + tooltip: "Explore other rooms", + onPressed: () => showDialog( + context: context, + builder: (context) => AlertDialog(title: Text("To-do")), + ), + icon: Icon(Icons.explore), + ), + IconButton( + tooltip: "Open settings", + onPressed: () => Navigator.of( + context, + ).push(MaterialPageRoute(builder: (_) => SettingsPage())), + icon: Icon(Icons.settings), + ), + ], + ), + ), + ), + Expanded( + child: Scaffold( + backgroundColor: Colors.transparent, + appBar: AppBar( + leading: AvatarOrHash( + selectedSpace.room?.metadata?.avatar, + fallback: selectedSpace.icon == null + ? null + : Icon(selectedSpace.icon), + + selectedSpace.title, ), + title: Text( + selectedSpace.title, + overflow: TextOverflow.ellipsis, + ), + backgroundColor: Colors.transparent, + actions: [ + if (selectedSpace.room != null) + RoomMenu( + selectedSpace.room!, + children: selectedSpace.children, + ), + ], + ), + body: NavigationRail( + scrollable: true, + backgroundColor: Colors.transparent, + extended: true, + selectedIndex: selectedRoomIndex, + destinations: selectedSpace.children + .map( + (room) => NavigationRailDestination( + label: Text(room.metadata?.name ?? "Unnamed Room"), + icon: AvatarOrHash( + room.metadata?.avatar, + hasBadge: room.metadata?.unreadMessages != 0, + badgeNumber: room.metadata?.unreadNotifications ?? 0, + room.metadata?.name ?? "Unnamed Room", + fallback: selectedSpaceId == "dms" + ? null + : Icon(Icons.numbers), + // space.client.headers, + ), + ), + ) + .toList(), + onDestinationSelected: (value) => selectedRoomIdNotifier.set( + selectedSpace.children[value].metadata?.id, + ), + ), + ), ), ], ), diff --git a/lib/widgets/chat_page/text_message_wrapper.dart b/lib/widgets/chat_page/text_message_wrapper.dart new file mode 100644 index 0000000..9734a34 --- /dev/null +++ b/lib/widgets/chat_page/text_message_wrapper.dart @@ -0,0 +1,114 @@ +import "package:flutter/material.dart"; +import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:flutter_link_previewer/flutter_link_previewer.dart"; +import "package:nexus/models/room.dart"; +import "package:nexus/widgets/chat_page/html/html.dart"; +import "package:nexus/widgets/chat_page/message_wrapper.dart"; +import "package:nexus/widgets/chat_page/reply_widget.dart"; + +class TextMessageWrapper extends StatelessWidget { + final Message message; + final String? content; + final Room room; + final MessageGroupStatus? groupStatus; + final Future Function(Message oldMessage, Message newMessage) + updateMessage; + final bool isSentByMe; + final Widget? extra; + final OnTapReply onTapReply; + + const TextMessageWrapper( + this.message, { + this.content, + this.onTapReply, + required this.room, + required this.updateMessage, + required this.groupStatus, + required this.isSentByMe, + this.extra, + super.key, + }); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final colorScheme = theme.colorScheme; + final textMessage = message is TextMessage ? message as TextMessage : null; + + return MessageWrapper( + message, + ClipRRect( + borderRadius: BorderRadius.all(Radius.circular(8)), + child: Container( + padding: EdgeInsets.symmetric(vertical: 8, horizontal: 12), + decoration: BoxDecoration( + color: isSentByMe + ? colorScheme.primaryContainer + : colorScheme.surfaceContainer, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ReplyWidget( + message, + room: room, + groupStatus: groupStatus, + onTapReply: onTapReply, + ), + if (content != null) + Html( + textStyle: message.metadata?["big"] == true + ? TextStyle(fontSize: 32) + : null, + content! + .replaceAllMapped( + RegExp( + "(]*>.*?<\\/a>)|(\\bhttps?:\\/\\/[^\\s<]+)", + caseSensitive: false, + ), + (m) { + // If it's already an tag, leave it unchanged + if (m.group(1) != null) { + return m.group(1)!; + } + + // Otherwise, wrap the bare URL + final url = m.group(2)!; + return "$url"; + }, + ) + .replaceAll("\n", "
"), + ), + if (textMessage?.editedAt != null) + Text("(edited)", style: theme.textTheme.labelSmall), + if (textMessage != null) + LinkPreview( + text: textMessage.text, + backgroundColor: isSentByMe + ? colorScheme.inversePrimary + : colorScheme.surfaceContainerLow, + outsidePadding: EdgeInsets.only(top: 4), + insidePadding: EdgeInsets.symmetric( + vertical: 8, + horizontal: 16, + ), + linkPreviewData: message.metadata?["linkPreviewData"], + onLinkPreviewDataFetched: (linkPreviewData) => updateMessage( + message, + message.copyWith( + metadata: { + ...(message.metadata ?? {}), + "linkPreviewData": linkPreviewData, + }, + ), + ), + ), + if (extra != null) extra!, + ], + ), + ), + ), + groupStatus, + ); + } +} diff --git a/lib/widgets/chat_page/top_widget.dart b/lib/widgets/chat_page/top_widget.dart deleted file mode 100644 index 7831cb9..0000000 --- a/lib/widgets/chat_page/top_widget.dart +++ /dev/null @@ -1,123 +0,0 @@ -import "dart:math"; -import "package:flutter/material.dart"; -import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:flutter_chat_ui/flutter_chat_ui.dart"; -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/widgets/chat_page/html/quoted.dart"; - -class TopWidget extends ConsumerWidget { - final Message message; - final bool alwaysShow; - final Map headers; - final MessageGroupStatus? groupStatus; - const TopWidget( - this.message, { - required this.headers, - required this.groupStatus, - this.alwaysShow = false, - super.key, - }); - - @override - Widget build(BuildContext context, WidgetRef ref) => Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Builder( - builder: (_) { - final replyMessage = message.metadata?["reply"] as TextMessage?; - - if (replyMessage == null) return SizedBox.shrink(); - final smallerText = message is TextMessage - ? replyMessage.text.substring( - 0, - min( - max( - max( - (message as TextMessage).text.length - 20, - message.metadata?["displayName"].length, - ), - 5, - ), - replyMessage.text.length, - ), - ) - : null; - final replyText = - (smallerText == null || - smallerText.length == replyMessage.text.length) - ? replyMessage.text - : "$smallerText..."; - - return Padding( - padding: EdgeInsets.only(bottom: 12), - child: InkWell( - onTap: () => showDialog( - context: context, - builder: (_) => Dialog( - child: Text("TODO: Scroll to original message"), - ), // TODO - ), - child: Quoted( - Row( - mainAxisSize: MainAxisSize.min, - spacing: 8, - children: [ - Avatar( - userId: replyMessage.authorId, - headers: headers, - size: 16, - ), - Flexible( - child: Text( - replyMessage.metadata?["displayName"] ?? - replyMessage.authorId, - style: Theme.of(context).textTheme.labelMedium - ?.copyWith(fontWeight: FontWeight.bold), - overflow: TextOverflow.ellipsis, - ), - ), - Flexible( - child: Text( - replyText, - overflow: TextOverflow.ellipsis, - style: Theme.of(context).textTheme.labelMedium, - maxLines: 1, - ), - ), - ], - ), - ), - ), - ); - }, - ), - if (alwaysShow || - groupStatus?.isFirst != false || - message.metadata?["reply"] != null) - InkWell( - onTap: () => showDialog( - context: context, - builder: (_) => - Dialog(child: Text("TODO: Show user profile")), // TODO - ), - child: Row( - mainAxisSize: MainAxisSize.min, - spacing: 8, - children: [ - Avatar(userId: message.authorId, headers: headers), - Flexible( - child: Text( - message.metadata?["displayName"] ?? message.authorId, - overflow: TextOverflow.ellipsis, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - ), - ], - ), - ), - SizedBox(height: 4), - ], - ); -} diff --git a/lib/widgets/form_text_input.dart b/lib/widgets/form_text_input.dart index 492439b..21b2e5c 100644 --- a/lib/widgets/form_text_input.dart +++ b/lib/widgets/form_text_input.dart @@ -20,11 +20,13 @@ class FormTextInput extends StatelessWidget { final Widget? trailing; final InputBorder? border; final List? formatters; + final bool autofocus; const FormTextInput({ super.key, this.border, this.controller, + this.autofocus = false, this.title, this.obscure = false, this.readOnly = false, @@ -45,6 +47,7 @@ class FormTextInput extends StatelessWidget { @override Widget build(BuildContext context) => TextFormField( + autofocus: autofocus, controller: controller, keyboardType: keyboardType, readOnly: readOnly, diff --git a/lib/widgets/loading.dart b/lib/widgets/loading.dart index aadc43c..9bb2858 100644 --- a/lib/widgets/loading.dart +++ b/lib/widgets/loading.dart @@ -1,13 +1,14 @@ import "package:flutter/material.dart"; class Loading extends StatelessWidget { - const Loading({super.key}); + final double? height; + const Loading({this.height, super.key}); @override - Widget build(BuildContext context) => const Center( - child: Padding( - padding: EdgeInsets.all(16), - child: CircularProgressIndicator(), - ), - ); + Widget build(BuildContext context) => Center( + child: Padding( + padding: EdgeInsets.all(16), + child: SizedBox(height: height, child: CircularProgressIndicator()), + ), + ); } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index dffacff..f70fb6e 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -21,9 +20,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); - g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); - flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin"); screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 1cac43c..78dcf40 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -5,7 +5,6 @@ list(APPEND FLUTTER_PLUGIN_LIST dynamic_system_colors file_selector_linux - flutter_secure_storage_linux screen_retriever_linux url_launcher_linux window_manager @@ -13,7 +12,6 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - flutter_vodozemac ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/nix/fake-rustup.sh b/nix/fake-rustup.sh deleted file mode 100644 index 7884c05..0000000 --- a/nix/fake-rustup.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -# Fake rustup for nix-managed Rust toolchains - -case "$1" in - run) - if [[ "$2" == "stable" ]]; then - shift 2 - if [[ $# -eq 0 ]]; then - echo "fake rustup: no command given" >&2 - exit 1 - fi - exec "$@" - exit 0 - fi - ;; - - toolchain) - if [[ "$2" == "list" ]]; then - echo "stable (default)" - exit 0 - fi - ;; - - target) - if [[ "$2" == "list" && "$3" == "--toolchain" && "$4" == "stable" && "$5" == "--installed" ]]; then - echo "x86_64-unknown-linux-gnu" - exit 0 - fi - ;; -esac - -echo "fake rustup: the command:" >&2 -echo " rustup $*" >&2 -echo "…is not mocked yet" >&2 -exit 1 \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 01d55a5..da5de89 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -73,14 +73,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.13.0" - base58check: - dependency: transitive - description: - name: base58check - sha256: "6c300dfc33e598d2fe26319e13f6243fea81eaf8204cb4c6b69ef20a625319a5" - url: "https://pub.dev" - source: hosted - version: "2.0.0" blurhash_dart: dependency: transitive description: @@ -105,14 +97,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.3" - build_cli_annotations: - dependency: transitive - description: - name: build_cli_annotations - sha256: e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95 - url: "https://pub.dev" - source: hosted - version: "2.1.1" build_config: dependency: transitive description: @@ -153,14 +137,6 @@ packages: url: "https://pub.dev" source: hosted version: "8.12.1" - canonical_json: - dependency: transitive - description: - name: canonical_json - sha256: d6be1dd66b420c6ac9f42e3693e09edf4ff6edfee26cb4c28c1c019fdb8c0c15 - url: "https://pub.dev" - source: hosted - version: "1.1.2" characters: dependency: transitive description: @@ -217,6 +193,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.2" + code_assets: + dependency: "direct main" + description: + name: code_assets + sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687" + url: "https://pub.dev" + source: hosted + version: "1.0.0" code_builder: dependency: transitive description: @@ -394,13 +378,21 @@ packages: source: hosted version: "11.1.0" ffi: - dependency: transitive + dependency: "direct main" description: name: ffi sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c url: "https://pub.dev" source: hosted version: "2.1.5" + ffigen: + dependency: "direct main" + description: + name: ffigen + sha256: b7803707faeec4ce3c1b0c2274906504b796e3b70ad573577e72333bd1c9b3ba + url: "https://pub.dev" + source: hosted + version: "20.1.1" file: dependency: transitive description: @@ -517,14 +509,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_math_fork: - dependency: transitive - description: - name: flutter_math_fork - sha256: "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407" - url: "https://pub.dev" - source: hosted - version: "0.7.4" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -541,62 +525,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.0" - flutter_rust_bridge: - dependency: transitive - description: - name: flutter_rust_bridge - sha256: "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e" - url: "https://pub.dev" - source: hosted - version: "2.11.1" - flutter_secure_storage: - dependency: "direct main" - description: - name: flutter_secure_storage - sha256: da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40 - url: "https://pub.dev" - source: hosted - version: "10.0.0" - flutter_secure_storage_darwin: - dependency: transitive - description: - name: flutter_secure_storage_darwin - sha256: "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3" - url: "https://pub.dev" - source: hosted - version: "0.2.0" - flutter_secure_storage_linux: - dependency: transitive - description: - name: flutter_secure_storage_linux - sha256: "2b5c76dce569ab752d55a1cee6a2242bcc11fdba927078fb88c503f150767cda" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_secure_storage_platform_interface: - dependency: transitive - description: - name: flutter_secure_storage_platform_interface - sha256: "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6" - url: "https://pub.dev" - source: hosted - version: "2.0.1" - flutter_secure_storage_web: - dependency: transitive - description: - name: flutter_secure_storage_web - sha256: "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3" - url: "https://pub.dev" - source: hosted - version: "2.1.0" - flutter_secure_storage_windows: - dependency: transitive - description: - name: flutter_secure_storage_windows - sha256: "3b7c8e068875dfd46719ff57c90d8c459c87f2302ed6b00ff006b3c9fcad1613" - url: "https://pub.dev" - source: hosted - version: "4.1.0" flutter_svg: dependency: "direct main" description: @@ -610,14 +538,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_vodozemac: - dependency: "direct main" - description: - name: flutter_vodozemac - sha256: "16d4b44dd338689441fe42a80d0184e5c864e9563823de9e7e6371620d2c0590" - url: "https://pub.dev" - source: hosted - version: "0.4.1" flutter_web_plugins: dependency: transitive description: flutter @@ -663,15 +583,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.0" - flyer_chat_text_message: - dependency: "direct main" - description: - path: "packages/flyer_chat_text_message" - ref: HEAD - resolved-ref: "03be67c8c81c8f637672ee03dd8f082d2c223627" - url: "https://github.com/Henry-Hiles/flutter_chat_ui" - source: git - version: "2.6.0" freezed: dependency: "direct dev" description: @@ -712,14 +623,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.3" - gpt_markdown: - dependency: transitive - description: - name: gpt_markdown - sha256: "9b88dfaffea644070b648c204ca4a55745a49f4ad0b58ed0ab70913ad593c7a1" - url: "https://pub.dev" - source: hosted - version: "1.1.5" graphs: dependency: transitive description: @@ -728,6 +631,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" + hooks: + dependency: "direct main" + description: + name: hooks + sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7" + url: "https://pub.dev" + source: hosted + version: "1.0.0" hooks_riverpod: dependency: "direct main" description: @@ -744,14 +655,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.15.6" - html_unescape: - dependency: transitive - description: - name: html_unescape - sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3" - url: "https://pub.dev" - source: hosted - version: "2.0.0" http: dependency: transitive description: @@ -936,14 +839,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" - markdown: - dependency: transitive - description: - name: markdown - sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1" - url: "https://pub.dev" - source: hosted - version: "7.3.0" matcher: dependency: transitive description: @@ -960,22 +855,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.11.1" - matrix: - dependency: "direct main" - description: - name: matrix - sha256: fb116ee89f6871441f22f76a988db15cfcfb6dfac97e3e2d654c240080015707 - url: "https://pub.dev" - source: hosted - version: "4.1.0" - mention_tag_text_field: - dependency: "direct main" - description: - name: mention_tag_text_field - sha256: ba7b9d8003e0f340a65c6dcdb7770f4340f653ae1612a9e31e11d12f7f1dd80f - url: "https://pub.dev" - source: hosted - version: "0.0.9" meta: dependency: transitive description: @@ -1160,14 +1039,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" - random_string: + quiver: dependency: transitive description: - name: random_string - sha256: "03b52435aae8cbdd1056cf91bfc5bf845e9706724dd35ae2e99fa14a1ef79d02" + name: quiver + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "3.2.2" riverpod: dependency: transitive description: @@ -1248,14 +1127,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.26.3" - sdp_transform: - dependency: transitive - description: - name: sdp_transform - sha256: "73e412a5279a5c2de74001535208e20fff88f225c9a4571af0f7146202755e45" - url: "https://pub.dev" - source: hosted - version: "0.3.2" sembast: dependency: transitive description: @@ -1357,14 +1228,6 @@ packages: description: flutter source: sdk version: "0.0.0" - slugify: - dependency: transitive - description: - name: slugify - sha256: b272501565cb28050cac2d96b7bf28a2d24c8dae359280361d124f3093d337c3 - url: "https://pub.dev" - source: hosted - version: "2.0.0" source_gen: dependency: "direct overridden" description: @@ -1405,30 +1268,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.1" - sqflite_common: - dependency: transitive - description: - name: sqflite_common - sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6" - url: "https://pub.dev" - source: hosted - version: "2.5.6" - sqflite_common_ffi: - dependency: "direct main" - description: - name: sqflite_common_ffi - sha256: "8d7b8749a516cbf6e9057f9b480b716ad14fc4f3d3873ca6938919cc626d9025" - url: "https://pub.dev" - source: hosted - version: "2.3.7+1" - sqlite3: - dependency: transitive - description: - name: sqlite3 - sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2" - url: "https://pub.dev" - source: hosted - version: "2.9.4" stack_trace: dependency: transitive description: @@ -1517,14 +1356,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.1.0+1" - tuple: - dependency: transitive - description: - name: tuple - sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 - url: "https://pub.dev" - source: hosted - version: "2.0.2" typed_data: dependency: transitive description: @@ -1549,14 +1380,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.1" - unorm_dart: - dependency: transitive - description: - name: unorm_dart - sha256: "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b" - url: "https://pub.dev" - source: hosted - version: "0.2.0" url_launcher: dependency: "direct main" description: @@ -1669,15 +1492,6 @@ packages: url: "https://pub.dev" source: hosted version: "15.0.2" - vodozemac: - dependency: "direct main" - description: - path: dart - ref: "krille/use-specced-olm-session-config" - resolved-ref: "8770e0555b1bb692e3e1a43a7726b27eae285b20" - url: "https://github.com/famedly/dart-vodozemac" - source: git - version: "0.4.0" watcher: dependency: transitive description: @@ -1718,14 +1532,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - webrtc_interface: - dependency: transitive - description: - name: webrtc_interface - sha256: "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233" - url: "https://pub.dev" - source: hosted - version: "1.3.0" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index e733f2e..3c0198d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,11 +12,6 @@ environment: sdk: "^3.9.2" dependency_overrides: - vodozemac: - git: - url: https://github.com/famedly/dart-vodozemac - ref: krille/use-specced-olm-session-config - path: dart analyzer: ^8.4.0 source_gen: ^4.0.2 flutter_hooks: ^0.21.2 @@ -47,10 +42,6 @@ dependencies: flyer_chat_image_message: ^2.2.2 flyer_chat_system_message: ^2.1.13 flyer_chat_file_message: ^2.3.1 - flyer_chat_text_message: - git: - url: https://github.com/Henry-Hiles/flutter_chat_ui - path: packages/flyer_chat_text_message flutter_chat_ui: git: url: https://github.com/Henry-Hiles/flutter_chat_ui @@ -59,21 +50,19 @@ dependencies: git: url: https://github.com/Henry-Hiles/flutter_chat_ui path: packages/flutter_link_previewer - matrix: ^4.1.0 - sqflite_common_ffi: ^2.3.6 color_hash: ^1.0.1 - flutter_vodozemac: ^0.4.1 flutter_widget_from_html_core: ^0.17.0 flutter_svg: ^2.2.2 json_annotation: ^4.9.0 - vodozemac: ^0.4.0 shared_preferences: ^2.5.3 - mention_tag_text_field: ^0.0.9 fluttertagger: ^2.3.1 - flutter_secure_storage: ^10.0.0 dynamic_polls: ^0.0.6 flutter_hooks: ^0.21.3+1 cross_cache: ^1.1.0 + ffi: ^2.1.5 + hooks: ^1.0.0 + code_assets: ^1.0.0 + ffigen: ^20.1.1 dev_dependencies: build_runner: ^2.4.11 diff --git a/scripts/generate.dart b/scripts/generate.dart new file mode 100644 index 0000000..b240d98 --- /dev/null +++ b/scripts/generate.dart @@ -0,0 +1,45 @@ +import "dart:io"; +import "package:ffigen/ffigen.dart"; +import "package:path/path.dart"; + +void main(List args) async { + final repoDir = Directory.fromUri( + Platform.script.resolve("../src/gomuks/source"), + ); + if (await repoDir.exists()) await repoDir.delete(recursive: true); + await repoDir.create(recursive: true); + + print("Cloning Gomuks repository..."); + final cloneResult = await Process.run("git", [ + "clone", + "--depth", + "1", + "https://mau.dev/gomuks/gomuks", + repoDir.path, + ]); + + if (cloneResult.exitCode != 0) { + throw Exception( + "Failed to clone Gomuks repository: \n${cloneResult.stderr}", + ); + } + + print("Generating FFI Bindings..."); + + final libclangPath = Platform.environment["LIBCLANG_PATH"]; + FfiGenerator( + output: Output( + dartFile: Platform.script.resolve("../lib/src/third_party/gomuks.g.dart"), + ), + headers: Headers( + entryPoints: [File(join(repoDir.path, "pkg", "ffi", "gomuksffi.h")).uri], + compilerOptions: ["--no-warnings"], + ), + functions: Functions.includeAll, + ).generate( + libclangDylib: libclangPath == null + ? null + : Uri.file(join(libclangPath, "libclang.so")), + ); + print("Done!"); +} diff --git a/scripts/generate.sh b/scripts/generate.sh new file mode 100755 index 0000000..6076ab8 --- /dev/null +++ b/scripts/generate.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +pushd "$(dirname "$(readlink -f "$0")")"/.. > /dev/null || exit + +mkdir -p build +touch build/lock +dart scripts/generate.dart +rm build/lock + +popd > /dev/null || exit \ No newline at end of file diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index b12edca..55fb066 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -19,8 +18,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("DynamicColorPluginCApi")); FileSelectorWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("FileSelectorWindows")); - FlutterSecureStorageWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 3c6fdca..9333a2f 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -5,7 +5,6 @@ list(APPEND FLUTTER_PLUGIN_LIST dynamic_system_colors file_selector_windows - flutter_secure_storage_windows screen_retriever_windows url_launcher_windows window_manager @@ -13,7 +12,6 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - flutter_vodozemac ) set(PLUGIN_BUNDLED_LIBRARIES)