remove screenshots for twim

.gitignore

@@ -36,7 +36,7 @@ key.properties
 # Generated Files
 *.g.dart
 *.freezed.dart
-/src/
+src/
 
 # Devel Password
 password.txt

LICENSE

@@ -0,0 +1,675 @@
+# GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+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.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        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 <https://www.gnu.org/licenses/>.
+
+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:
+
+        <program>  Copyright (C) <year>  <name of author>
+        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 <https://www.gnu.org/licenses/>.
+
+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 <https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -15,7 +15,10 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
 
 ## Progress
 
+- [ ] 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
@@ -26,6 +29,7 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
 - [x] Login
     - [x] Username / password auth
     - [ ] OAuth / OIDC
+    - [x] Improve initial sync experience
 - [x] Rooms / Spaces
     - [x] Displaying and choosing
     - [x] Reading, showing unread
@@ -33,35 +37,43 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
     - [ ] Searching
     - [ ] Creating (Rooms, Spaces, and DMs)
     - [x] Joining
+        - [ ] Parse vias
         - [x] Using a text/uri/link
             - [x] Plain text
             - [x] `matrix:` Uri
-            -   [ ] Matrix.to link: I just need to fix my regex
+            - [x] Matrix.to link
         - [ ] From space
         - [ ] Exploring
     - [x] Leaving
     - [x] Subspaces
 - [x] Messages
     - [x] Encryption
-        -   [x] Restoring crypto identity from passphrase/key or verification
+        - [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 Giphy
+        - [ ] 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
@@ -72,6 +84,8 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
                 - [ ] 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
@@ -84,15 +98,16 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
     - [ ] Creating
 - [ ] Threads
 - [ ] Profile popouts
--   [x] Copy link to [room, space]
--   [x] Reporting
+- [ ] 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
-    -   [ ] Viewing / accepting
-    -   [ ] Spam filtering
 - [ ] Settings
     - [ ] Light/Dark mode
+    - [ ] SSD or CSD
     - [ ] Show media by default
     - [ ] Dynamic Theming
     - [ ] Devices
@@ -108,7 +123,7 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
     - [ ] About
     - [x] Log Out
 
-## Development
+## Build Instructions
 
 First, clone and open the repo:
 
@@ -122,13 +137,13 @@ 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`).
+- 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:
 
@@ -136,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

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

flake.nix

@@ -39,25 +39,29 @@
             };
           };
 
-          devShells.default = pkgs.mkShell {
+          devShells =
+            let
               packages = with pkgs; [
                 go
                 olm
                 git
-              clang
-              (flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
-
-              (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
               ];
 
               env = {
-              LD_LIBRARY_PATH = "${
-                pkgs.lib.makeLibraryPath ([
-                  pkgs.sqlite
-                ])
-              }:./build/native_assets/linux";
+                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; };
             };
         };
     };

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<IMap<String, AccountData>> {
+  @override
+  IMap<String, AccountData> build() => const IMap.empty();
+
+  void update(IMap<String, AccountData> newData) =>
+      state = IMap({...state.unlock, ...newData.unlock});
+
+  static final provider =
+      NotifierProvider<AccountDataController, IMap<String, AccountData>>(
+        AccountDataController.new,
+      );
+}

lib/controllers/client_controller.dart

@@ -1,10 +1,13 @@
 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: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";
@@ -58,19 +61,32 @@ class ClientController extends AsyncNotifier<int> {
                     .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);
+                }
 
-                if (syncData.clearState) ref.invalidate(roomProvider);
                 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)
@@ -81,9 +97,6 @@ class ClientController extends AsyncNotifier<int> {
                 //     .watch(SyncStatusController.provider.notifier)
                 //     .set(SyncStatus.fromJson(decodedMuksEvent));
                 break;
-              case "typing":
-                //TODO: IMPL
-                break;
               default:
                 debugPrint("Unhandled event: $muksEventType");
             }
@@ -104,9 +117,9 @@ class ClientController extends AsyncNotifier<int> {
   }
 
   Future<dynamic> _sendCommand(
-    String command,
-    Map<String, dynamic> data,
-  ) async {
+    String command, [
+    Map<String, dynamic> data = const {},
+  ]) async {
     final bufferPointer = data.toGomuksBufferPtr();
     final handle = await future;
     final response = await Isolate.run(
@@ -144,11 +157,21 @@ class ClientController extends AsyncNotifier<int> {
     return response["room_id"];
   }
 
+  Future<String?> getAccessToken() async {
+    final response = await _sendCommand("get_account_info", {});
+    return response?["access_token"];
+  }
+
   Future<void> 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<IList<Event>> getRoomState(GetRoomStateRequest request) async {
     final response =
         (await _sendCommand("get_room_state", request.toJson())) as List;
@@ -164,8 +187,12 @@ class ClientController extends AsyncNotifier<int> {
   }
 
   Future<Event?> getEvent(GetEventRequest request) async {
-    final json = await _sendCommand("get_event", request.toJson());
+    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);
   }
 
@@ -179,11 +206,15 @@ class ClientController extends AsyncNotifier<int> {
       _sendCommand("report_event", report.toJson());
 
   Future<void> markRead(Room room) async {
-    if (room.events.isEmpty || room.metadata == null) return;
+    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,
+      "room_id": room.metadata!.id,
       "receipt_type": "m.read",
-      "event_id": room.events.last.eventId,
+      "event_id": event.eventId,
     });
   }
 

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<Event?> {
+  final GetEventRequest request;
+  EventController(this.request);
+
+  @override
+  Future<Event?> build() async {
+    final client = ref.watch(ClientController.provider.notifier);
+    return await client.getEvent(request).onError((_, _) => null);
+  }
+
+  static final provider = AsyncNotifierProvider.family
+      .autoDispose<EventController, Event?, GetEventRequest>(
+        EventController.new,
+      );
+}

lib/controllers/header_controller.dart

@@ -1,23 +1,16 @@
-import "dart:ffi";
-import "dart:isolate";
-import "package:ffi/ffi.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/src/third_party/gomuks.g.dart";
+import "package:nexus/controllers/client_state_controller.dart";
 
 class HeaderController extends AsyncNotifier<Map<String, String>> {
   @override
   Future<Map<String, String>> build() async {
-    final handle = await ref.watch(ClientController.provider.future);
-    final info = await Isolate.run(() => GomuksGetAccountInfo(handle));
-    final headers = {
-      if (info.access_token != nullptr)
-        "authorization":
-            "Bearer ${info.access_token.cast<Utf8>().toDartString()}",
-    };
-
-    await Isolate.run(() => GomuksFreeAccountInfo(info));
-    return headers;
+    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 =

lib/controllers/init_complete_controller.dart

@@ -0,0 +1,11 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+
+class InitCompleteController extends Notifier<bool> {
+  @override
+  bool build() => false;
+  void complete() => state = true;
+
+  static final provider = NotifierProvider<InitCompleteController, bool>(
+    InitCompleteController.new,
+  );
+}

lib/controllers/members_controller.dart

@@ -4,23 +4,21 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/models/room.dart";
 
-class MembersController extends AsyncNotifier<IList<Event>> {
+class MembersController extends Notifier<IList<Event>> {
   final Room room;
   MembersController(this.room);
 
   @override
-  Future<IList<Event>> build() async =>
-      (room.state["m.room.member"]?.values ?? [])
+  IList<Event> build() => (room.state["m.room.member"]?.values ?? [])
       .map(
-            (eventRowId) => room.events.firstWhereOrNull(
-              (event) => event.rowId == eventRowId,
-            ),
+        (eventRowId) =>
+            room.events.firstWhereOrNull((event) => event.rowId == eventRowId),
       )
       .nonNulls
       .where((member) => member.content["membership"] == "join")
       .toIList();
 
-  static final provider = AsyncNotifierProvider.family
+  static final provider = NotifierProvider.family
       .autoDispose<MembersController, IList<Event>, Room>(
         MembersController.new,
       );

lib/controllers/message_controller.dart

@@ -1,12 +1,10 @@
+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_controller.dart";
 import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/profile_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";
-import "package:nexus/models/requests/get_event_request.dart";
-import "package:nexus/models/requests/get_related_events_request.dart";
 
 class MessageController extends AsyncNotifier<Message?> {
   final MessageConfig config;
@@ -14,66 +12,66 @@ class MessageController extends AsyncNotifier<Message?> {
 
   @override
   Future<Message?> build() async {
+    try {
       if (config.event.relationType == "m.replace" && !config.includeEdits) {
         return null;
       }
-    final client = ref.watch(ClientController.provider.notifier);
 
-    final newEvents = await client.getRelatedEvents(
-      GetRelatedEventsRequest(
-        roomId: config.event.roomId,
-        eventId: config.event.eventId,
-        relationType: "m.replace",
-      ),
-    );
       if (!ref.mounted) return null;
-    final event = newEvents?.lastOrNull ?? config.event;
-
-    final replyId =
-        config.event.content["m.relates_to"]?["m.in_reply_to"]?["event_id"];
-    final replyEvent = replyId == null
-        ? null
-        : await client.getEvent(
-            GetEventRequest(roomId: config.event.roomId, eventId: replyId),
-          );
+      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 author = await ref.read(
-      ProfileController.provider(event.authorId).future,
+      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,
-      "formatted":
-          newContent?["formatted_body"] ??
-          newContent?["body"] ??
-          content["formatted_body"] ??
-          content["body"] ??
-          "",
-      if (replyEvent != null)
-        "reply": await ref.read(
-          MessageController.provider(
-            MessageConfig(event: replyEvent, mustBeText: true),
-          ).future,
-        ),
-      "body": newContent?["body"] ?? content["body"],
+        "big": event.localContent?.bigEmoji == true,
         "eventType": type,
-      "avatarUrl": author.avatarUrl,
-      "displayName": author.displayName ?? event.authorId,
+        "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;
+      final editedAt = event.relationType == "m.replace"
+          ? event.timestamp
+          : null;
 
-    if ((event.redactedBy != null && !config.mustBeText) ||
-        (!config.includeEdits && (config.event.relationType == "m.replace"))) {
+      if ((event.redactedBy != null && !config.alwaysReturn) ||
+          (!config.includeEdits &&
+              (config.event.relationType == "m.replace"))) {
         return null;
       }
 
@@ -83,31 +81,30 @@ class MessageController extends AsyncNotifier<Message?> {
       //   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: config.event.redactedBy == null
-                  ? content["body"] ?? ""
-                  : "This message has been deleted...",
+                text:
+                    newContent?["formatted_body"] ??
+                    newContent?["body"] ??
+                    content["formatted_body"] ??
+                    content["body"] ??
+                    "",
                 replyToMessageId: replyId,
                 deliveredAt: config.event.timestamp,
                 editedAt: editedAt,
               )
               as TextMessage;
 
-    if (config.mustBeText) return asText;
-
-    final homeserver = ref.read(ClientStateController.provider)?.homeserverUrl;
-    final source = homeserver == null || content["url"] == null
-        ? "null"
-        : Uri.parse(content["url"]).mxcToHttps(homeserver).toString();
-
       return switch (type) {
         "m.room.encrypted" => asText.copyWith(
           text: "Unable to decrypt message.",
-        metadata: {...metadata, "formatted": "Unable to decrypt message."},
+          metadata: {...metadata, "body": "Unable to decrypt message."},
         ),
         // "org.matrix.msc3381.poll.start" => Message.custom(
         //   metadata: {
@@ -120,29 +117,19 @@ class MessageController extends AsyncNotifier<Message?> {
         //   authorId: senderId,
         // ),
         ("m.sticker" || "m.room.message") => switch (content["msgtype"]) {
-        ("m.sticker" || "m.image") => Message.image(
+          null || "m.image" => Message.image(
             id: config.event.eventId,
-          metadata: metadata,
             authorId: event.authorId,
-          text: event.localContent?.sanitizedHtml,
             source: source,
             replyToMessageId: replyId,
+            metadata: metadata,
+            text: asText.text,
             deliveredAt: config.event.timestamp,
             blurhash: (content["info"] as Map?)?["xyz.amorgan.blurhash"],
           ),
-        "m.audio" => Message.audio(
-          id: config.event.eventId,
-          metadata: metadata,
-          authorId: event.authorId,
-          text: content["body"],
-          replyToMessageId: replyId,
-          source: source,
-          deliveredAt: config.event.timestamp,
-          // TODO: See if we can figure out duration
-          duration: Duration(hours: 1),
-        ),
-        "m.file" => Message.file(
+          "m.audio" || "m.file" => Message.file(
             name: content["filename"].toString(),
+            size: content["info"]["size"],
             metadata: metadata,
             id: config.event.eventId,
             authorId: event.authorId,
@@ -152,8 +139,22 @@ class MessageController extends AsyncNotifier<Message?> {
           ),
           _ => asText,
         },
-      "m.room.member" => Message.system(
-        metadata: metadata,
+        "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,
@@ -167,8 +168,20 @@ class MessageController extends AsyncNotifier<Message?> {
                         _ => "did something relating to",
                       }} the room.",
                 ),
-      "m.room.redaction" => null,
+
+        "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
@@ -178,8 +191,11 @@ class MessageController extends AsyncNotifier<Message?> {
                         authorId: event.authorId,
                         replyToMessageId: replyId,
                       )
-            : null,
+                    : null),
       };
+    } catch (error) {
+      return null;
+    }
   }
 
   static final provider = AsyncNotifierProvider.family

lib/controllers/messages_controller.dart

@@ -2,24 +2,26 @@ 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/event.dart";
 import "package:nexus/models/message_config.dart";
+import "package:nexus/models/messages_config.dart";
 
 class MessagesController extends AsyncNotifier<IList<Message>> {
-  final IList<Event> events;
-  MessagesController(this.events);
+  final MessagesConfig config;
+  MessagesController(this.config);
 
   @override
   Future<IList<Message>> build() async => (await Future.wait(
-    events.map(
+    config.events.map(
       (event) => ref.watch(
-        MessageController.provider(MessageConfig(event: event)).future,
+        MessageController.provider(
+          MessageConfig(event: event, room: config.room),
+        ).future,
       ),
     ),
   )).nonNulls.toIList();
 
   static final provider = AsyncNotifierProvider.family
-      .autoDispose<MessagesController, IList<Message>, IList<Event>>(
+      .autoDispose<MessagesController, IList<Message>, MessagesConfig>(
         MessagesController.new,
       );
 }

lib/controllers/profile_controller.dart

@@ -1,17 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/models/profile.dart";
-
-class ProfileController extends AsyncNotifier<Profile> {
-  final String userId;
-  ProfileController(this.userId);
-
-  @override
-  Future<Profile> build() =>
-      ref.watch(ClientController.provider.notifier).getProfile(userId);
-
-  static final provider =
-      AsyncNotifierProvider.family<ProfileController, Profile, String>(
-        ProfileController.new,
-      );
-}

lib/controllers/room_chat_controller.dart

@@ -1,3 +1,5 @@
+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";
@@ -9,8 +11,8 @@ 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/controllers/selected_room_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";
@@ -18,26 +20,63 @@ 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<ChatController> {
+class RoomChatController extends AsyncNotifier<InMemoryChatController> {
   final String roomId;
   RoomChatController(this.roomId);
 
   @override
-  Future<ChatController> build() async {
+  Future<InMemoryChatController> build() async {
     final client = ref.watch(ClientController.provider.notifier);
-    final room = ref.read(SelectedRoomController.provider);
+    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(
-        room.timeline
+        MessagesConfig(
+          room: room,
+          events: room.timeline
               .map(
-              (timelineRowTuple) => room.events.firstWhereOrNull(
+                (timelineRowTuple) => room!.events.firstWhereOrNull(
                   (event) => event.rowId == timelineRowTuple.eventRowId,
                 ),
               )
               .nonNulls
               .toIList(),
+        ),
       ).future,
     );
     final controller = InMemoryChatController(messages: messages.toList());
@@ -57,7 +96,7 @@ class RoomChatController extends AsyncNotifier<ChatController> {
           } else {
             final message = await ref.watch(
               MessageController.provider(
-                MessageConfig(event: event, includeEdits: true),
+                MessageConfig(event: event, room: room!, includeEdits: true),
               ).future,
             );
             if (event.relationType == "m.replace") {
@@ -67,7 +106,7 @@ class RoomChatController extends AsyncNotifier<ChatController> {
               );
               if (oldMessage == null || message == null || !ref.mounted) return;
 
-              return await updateMessage(
+              return await controller.updateMessage(
                 oldMessage,
                 message.copyWith(
                   id: oldMessage.id,
@@ -96,38 +135,10 @@ class RoomChatController extends AsyncNotifier<ChatController> {
 
     ref.onDispose(controller.dispose);
 
-    if (messages.length < 20) await loadOlder(controller);
-
-    final state = await client.getRoomState(
-      GetRoomStateRequest(
-        roomId: roomId,
-        fetchMembers: room.metadata?.hasMemberList == false,
-        includeMembers: true,
-      ),
-    );
-
-    ref
-        .watch(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(),
-        );
+    // 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;
   }
@@ -161,13 +172,16 @@ class RoomChatController extends AsyncNotifier<ChatController> {
   }
 
   Future<void> loadOlder([InMemoryChatController? chatController]) async {
-    final controller = chatController ?? await future;
-    final client = ref.watch(ClientController.provider.notifier);
-
-    final response = await client.paginate(
+    final response = await ref
+        .watch(ClientController.provider.notifier)
+        .paginate(
           PaginateRequest(
             roomId: roomId,
-        maxTimelineId: controller.messages.firstOrNull?.metadata?["timelineId"],
+            maxTimelineId: ref
+                .read(RoomsController.provider)[roomId]
+                ?.timeline
+                .firstOrNull
+                ?.timelineRowId,
           ),
         );
 
@@ -191,9 +205,16 @@ class RoomChatController extends AsyncNotifier<ChatController> {
           const ISet.empty(),
         );
 
+    final room = ref.read(RoomsController.provider)[roomId];
+    if (room == null) return;
+
     final messages = await ref.watch(
-      MessagesController.provider(response.events.reversed).future,
+      MessagesController.provider(
+        MessagesConfig(room: room, events: response.events.reversed),
+      ).future,
     );
+
+    final controller = chatController ?? await future;
     await controller.insertAllMessages(
       messages
           .where(
@@ -206,11 +227,9 @@ class RoomChatController extends AsyncNotifier<ChatController> {
     );
   }
 
-  Future<void> updateMessage(Message message, Message newMessage) async =>
-      (await future).updateMessage(message, newMessage);
-
   Future<void> send(
     String message, {
+    bool shouldMention = true,
     required Iterable<Tag> tags,
     required RelationType relationType,
     Message? relation,
@@ -233,7 +252,9 @@ class RoomChatController extends AsyncNotifier<ChatController> {
         roomId: roomId,
         mentions: Mentions(
           userIds: [
-            if (relation != null && relationType == RelationType.reply)
+            if (shouldMention == true &&
+                relation != null &&
+                relationType == RelationType.reply)
               relation.authorId,
           ].toIList(),
           room: taggedMessage.contains("@room"),
@@ -261,8 +282,23 @@ class RoomChatController extends AsyncNotifier<ChatController> {
     );
   }
 
+  Future<void> scrollToMessage(Message message) async {
+    final controller = await future;
+    Future<void> 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<RoomChatController, ChatController, String>(
+      .autoDispose<RoomChatController, InMemoryChatController, String>(
         RoomChatController.new,
       );
 }

lib/controllers/secure_storage_controller.dart

@@ -1,19 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:flutter_secure_storage/flutter_secure_storage.dart";
-
-class SecureStorageController extends Notifier<FlutterSecureStorage> {
-  @override
-  FlutterSecureStorage build() => FlutterSecureStorage();
-
-  Future<String?> get(String key) => state.read(key: key);
-
-  Future<void> set(String key, String value) =>
-      state.write(key: key, value: value);
-
-  Future<void> clear() => state.deleteAll();
-
-  static final provider =
-      NotifierProvider<SecureStorageController, FlutterSecureStorage>(
-        SecureStorageController.new,
-      );
-}

lib/controllers/space_edges_controller.dart

@@ -6,7 +6,8 @@ class SpaceEdgesController extends Notifier<IMap<String, IList<SpaceEdge>>> {
   @override
   IMap<String, IList<SpaceEdge>> build() => const IMap.empty();
 
-  void set(IMap<String, IList<SpaceEdge>> newEdges) => state = newEdges;
+  void set(IMap<String, IList<SpaceEdge>> newEdges) =>
+      state = state.addAll(newEdges);
 
   static final provider =
       NotifierProvider<SpaceEdgesController, IMap<String, IList<SpaceEdge>>>(

lib/controllers/spaces_controller.dart

@@ -1,6 +1,7 @@
 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/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";
@@ -40,8 +41,11 @@ class SpacesController extends Notifier<IList<Space>> {
     final allNestedRoomIds = childRoomsBySpaceId.values
         .expand((l) => l)
         .map(
-          (room) =>
-              rooms.entries.firstWhere((entry) => entry.value == room).key,
+          (room) => rooms.entries
+              .firstWhere(
+                (entry) => entry.value.metadata?.id == room.metadata?.id,
+              )
+              .key,
         )
         .toISet();
 
@@ -54,12 +58,28 @@ class SpacesController extends Notifier<IList<Space>> {
         )
         .map((e) => e.value);
 
+    final accountData = ref.watch(AccountDataController.provider);
+
+    final directMessages = IMap(
+      accountData["m.direct"]?.content ?? {},
+    ).values.expand((element) => element);
+
     final homeRooms = otherRooms
-        .where((room) => room.metadata?.dmUserId == null)
+        .where(
+          (room) =>
+              directMessages.any(
+                (directMessage) => directMessage == room.metadata?.id,
+              ) ==
+              false,
+        )
         .toIList();
 
     final dmRooms = otherRooms
-        .where((room) => room.metadata?.dmUserId != null)
+        .where(
+          (room) => directMessages.any(
+            (directMessage) => directMessage == room.metadata?.id,
+          ),
+        )
         .toIList();
 
     final topLevelSpacesList = topLevelSpaceIds

lib/helpers/extensions/color_hex.dart

@@ -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")}";
-  }
-}

lib/helpers/extensions/link_to_mention.dart

@@ -13,7 +13,7 @@ extension LinkToMention on String {
     final trimmed = trim();
 
     final matrixTo = RegExp(
-      r"^https?://matrix\.to/#/([^/?#]+)",
+      r"^https?://matrix\.to/#/(.[^/?#]+)",
       caseSensitive: false,
     );
 

lib/main.dart

@@ -1,4 +1,3 @@
-import "dart:developer";
 import "dart:io";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/foundation.dart";
@@ -6,6 +5,7 @@ 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";
@@ -44,7 +44,6 @@ void showError(Object error, [StackTrace? stackTrace]) {
   if (error.toString().contains("Invalid image data")) return;
 
   debugPrintStack(stackTrace: stackTrace, label: error.toString());
-  debugger();
   if (navigatorKey.currentContext != null) {
     Future.delayed(
       Duration.zero,
@@ -122,6 +121,7 @@ class App extends StatelessWidget {
                     final clientState = ref.watch(
                       ClientStateController.provider,
                     );
+
                     if (clientState == null || !clientState.isInitialized) {
                       return Loading();
                     }
@@ -131,7 +131,9 @@ class App extends StatelessWidget {
                     } else if (!clientState.isVerified) {
                       return VerifyPage();
                     } else {
-                      return ChatPage();
+                      return ref.watch(InitCompleteController.provider)
+                          ? ChatPage()
+                          : Loading();
                     }
                   },
                 ),

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<String, Object?> json) =>
+      _$AccountDataFromJson(json);
+}

lib/models/event.dart

@@ -27,7 +27,7 @@ abstract class Event with _$Event {
     String? decryptionError,
     String? sendError,
     @Default(IMap.empty()) IMap<String, int> reactions,
-    int? lastEditRowId,
+    @JsonKey(name: "last_edit_rowid") int? lastEditRowId,
     @UnreadTypeConverter() UnreadType? unreadType,
   }) = _Event;
 
@@ -38,6 +38,7 @@ abstract class Event with _$Event {
 abstract class LocalContent with _$LocalContent {
   const factory LocalContent({
     String? sanitizedHtml,
+    String? editSource,
     bool? wasPlaintext,
     bool? bigEmoji,
     bool? hasMath,

lib/models/message_config.dart

@@ -1,16 +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 mustBeText,
+    @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<String, Object?> json) =>
       _$MessageConfigFromJson(json);
 }

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<Event> events,
+  }) = _MessagesConfig;
+
+  factory MessagesConfig.fromJson(Map<String, Object?> json) =>
+      _$MessagesConfigFromJson(json);
+}

lib/models/requests/get_event_request.dart

@@ -1,15 +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
+@Freezed(toJson: false)
 abstract class GetEventRequest with _$GetEventRequest {
+  const GetEventRequest._();
   const factory GetEventRequest({
-    required String roomId,
+    required Room room,
     required String eventId,
     @Default(false) bool unredact,
   }) = _GetEventRequest;
 
+  Map<String, dynamic> 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<String, Object?> json) =>
       _$GetEventRequestFromJson(json);
 }

lib/models/sync_data.dart

@@ -1,5 +1,6 @@
 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";
@@ -9,7 +10,7 @@ part "sync_data.g.dart";
 abstract class SyncData with _$SyncData {
   const factory SyncData({
     @Default(false) bool clearState,
-    // required IMap<String, AccountData> accountData,
+    @Default(IMap.empty()) IMap<String, AccountData> accountData,
     @Default(IMap.empty()) IMap<String, Room> rooms,
     @Default(ISet.empty()) ISet<String> leftRooms,
     // required IList<InvitedRoom> invitedRooms,

lib/pages/login_page.dart

@@ -97,6 +97,7 @@ class LoginPage extends HookConsumerWidget {
                     ),
                   ),
                   IconButton.filled(
+                    tooltip: "Confirm homeserver choice",
                     onPressed: isLoading.value
                         ? null
                         : () => setHomeserver(Uri.tryParse(homeserverUrl.text)),
@@ -143,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),
                     ),

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();
   }
 }

lib/widgets/appbar.dart

@@ -49,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),
+            ),
           ],
         ],
       ),

lib/widgets/avatar_or_hash.dart

@@ -40,7 +40,7 @@ class AvatarOrHash extends ConsumerWidget {
           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,

lib/widgets/chat_page/chat_box.dart

@@ -29,19 +29,13 @@ 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() {
@@ -50,6 +44,7 @@ class ChatBox extends HookConsumerWidget {
           .watch(RoomChatController.provider(room.metadata!.id).notifier)
           .send(
             controller.value.formattedText,
+            shouldMention: shouldMention.value,
             relation: relatedMessage,
             relationType: relationType,
             tags: controller.value.tags,
@@ -91,6 +86,9 @@ class ChatBox extends HookConsumerWidget {
           child: Column(
             children: [
               RelationPreview(
+                shouldMention: shouldMention.value,
+                toggleShouldMention: () =>
+                    shouldMention.value = !shouldMention.value,
                 relatedMessage: relatedMessage,
                 relationType: relationType,
                 onDismiss: onDismiss,
@@ -102,7 +100,27 @@ 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, TODO: Permissions check
                     ),
@@ -129,9 +147,10 @@ class ChatBox extends HookConsumerWidget {
                           maxLines: 12,
                           minLines: 1,
                           decoration: InputDecoration(
-                            // hintText: room.canSendDefaultMessages
-                            //     ? "Your message here..."
-                            //     : "You don't have permission to send messages in this room...",
+                            hintText:
+                                true // TODO: room.canSendDefaultMessages
+                                ? "Your message here..."
+                                : "You don't have permission to send messages in this room...",
                             border: InputBorder.none,
                           ),
                           controller: controller.value,
@@ -145,6 +164,7 @@ class ChatBox extends HookConsumerWidget {
                       onPressed: send,
                       // onPressed: room.canSendDefaultMessages ? send : null,
                       icon: Icon(Icons.send),
+                      tooltip: "Send message",
                     ),
                   ],
                 ),

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"),
                   ),
                 ),

lib/widgets/chat_page/html/html.dart

@@ -14,11 +14,13 @@ import "package:nexus/widgets/chat_page/html/quoted.dart";
 
 class Html extends ConsumerWidget {
   final String html;
-  const Html(this.html, {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));
@@ -30,7 +32,11 @@ class Html extends ConsumerWidget {
       return switch (element.localName) {
         "code" =>
           element.parent?.localName == "pre"
-              ? CodeBlock(
+              ? element.outerHtml.contains("<br class=\"fake-break\">")
+                    ? Html(
+                        """<pre>${element.outerHtml.replaceAll("<br class=\"fake-break\">", "\n")}</pre>""",
+                      )
+                    : CodeBlock(
                         element.text,
                         lang: element.className.replaceAll("language-", ""),
                       )
@@ -45,8 +51,9 @@ class Html extends ConsumerWidget {
 
         "img" =>
           element.attributes["src"] == null
-              ? null
+              ? SizedBox.shrink()
               : InlineCustomWidget(
+                  alignment: PlaceholderAlignment.middle,
                   child: Image.network(
                     Uri.parse(element.attributes["src"]!)
                         .mxcToHttps(
@@ -119,9 +126,7 @@ class Html extends ConsumerWidget {
             .mapTo<MapEntry<String, String>?>(
               (key, value) => switch (key) {
                 "data-mx-color" => MapEntry("color", value),
-
                 "data-mx-bg-color" => MapEntry("background-color", value),
-
                 _ => null,
               },
             )

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,
+    ),
+  );
+}

lib/widgets/chat_page/member_list.dart

@@ -1,7 +1,6 @@
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/controllers/members_controller.dart";
-import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 
@@ -10,12 +9,11 @@ class MemberList extends ConsumerWidget {
   const MemberList(this.room, {super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) => Drawer(
+  Widget build(BuildContext context, WidgetRef ref) {
+    final members = ref.watch(MembersController.provider(room));
+    return Drawer(
       shape: Border(),
-    child: ref
-        .watch(MembersController.provider(room))
-        .betterWhen(
-          data: (members) => ListView(
+      child: ListView(
         children: [
           AppBar(
             scrolledUnderElevation: 0,
@@ -27,6 +25,7 @@ class MemberList extends ConsumerWidget {
                 IconButton(
                   onPressed: Scaffold.of(context).closeEndDrawer,
                   icon: Icon(Icons.close),
+                  tooltip: "Close member list",
                 ),
             ],
           ),
@@ -46,13 +45,13 @@ class MemberList extends ConsumerWidget {
                 overflow: TextOverflow.ellipsis,
               ),
               subtitle: Text(
-                    member.authorId,
+                member.stateKey ?? "Unknown User",
                 overflow: TextOverflow.ellipsis,
               ),
             ),
           ),
         ],
       ),
-        ),
     );
+  }
 }

lib/widgets/chat_page/mention_overlay.dart

@@ -2,7 +2,6 @@ import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.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/models/room.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 import "package:nexus/widgets/loading.dart";
@@ -32,25 +31,22 @@ class MentionOverlay extends ConsumerWidget {
           color: Theme.of(context).colorScheme.surfaceContainerHigh,
           padding: EdgeInsets.all(8),
           child: switch (triggerCharacter) {
-            "@" =>
-              ref
-                  .watch(MembersController.provider(room))
-                  .betterWhen(
-                    data: (members) => ListView(
+            "@" => Consumer(
+              builder: (_, ref, _) {
+                final members = ref.watch(MembersController.provider(room));
+                return ListView(
                   children:
                       (query.isEmpty
                               ? members
                               : members.where(
                                   (member) =>
-                                          member.authorId
-                                              .toLowerCase()
-                                              .contains(query.toLowerCase()) ||
-                                          (member.content["displayname"]
-                                                      as String?)
-                                                  ?.toLowerCase()
-                                                  .contains(
+                                      member.stateKey?.toLowerCase().contains(
                                             query.toLowerCase(),
                                           ) ==
+                                          true ||
+                                      (member.content["displayname"] as String?)
+                                              ?.toLowerCase()
+                                              .contains(query.toLowerCase()) ==
                                           true,
                                 ))
                           .map(
@@ -63,19 +59,26 @@ class MentionOverlay extends ConsumerWidget {
                               ),
                               title: Text(
                                 member.content["displayname"] as String? ??
-                                        member.authorId,
+                                    member.stateKey ??
+                                    "Unknown User",
                               ),
+                              subtitle: member.stateKey != null
+                                  ? Text(member.stateKey!)
+                                  : null,
                               onTap: () => addTag(
-                                    id: "[@${member.content["displayname"]}](https://matrix.to/#/${member.authorId})",
-                                    name: member.authorId
-                                        .substring(1)
+                                id: "[@${member.content["displayname"]}](https://matrix.to/#/${member.stateKey})",
+                                name:
+                                    member.stateKey
+                                        ?.substring(1)
                                         .split(":")
-                                        .first,
+                                        .first ??
+                                    "Unknown User",
                               ),
                             ),
                           )
                           .toList(),
-                    ),
+                );
+              },
             ),
             "#" => ListView(
               children:

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,
+              ],
+            ),
+          ),
+        ],
+      ),
+    ),
+  );
+}

lib/widgets/chat_page/relation_preview.dart

@@ -2,15 +2,20 @@ import "package:flutter/material.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/models/relation_type.dart";
+import "package:nexus/widgets/avatar_or_hash.dart";
 
 class RelationPreview extends ConsumerWidget {
   final Message? relatedMessage;
   final RelationType relationType;
   final VoidCallback onDismiss;
+  final bool shouldMention;
+  final VoidCallback toggleShouldMention;
   const RelationPreview({
     required this.relatedMessage,
     required this.relationType,
     required this.onDismiss,
+    required this.shouldMention,
+    required this.toggleShouldMention,
     super.key,
   });
 
@@ -31,18 +36,11 @@ class RelationPreview extends ConsumerWidget {
               "Editing message:",
               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,
-          //   height: 16,
-          // ),
+          AvatarOrHash(
+            Uri.tryParse(relatedMessage?.metadata?["avatarUrl"] ?? ""),
+            relatedMessage?.metadata?["displayName"]?.toString() ?? "",
+            height: 16,
+          ),
           Text(
             relatedMessage!.metadata?["displayName"] ??
                 relatedMessage!.authorId,
@@ -52,16 +50,28 @@ class RelationPreview extends ConsumerWidget {
           ),
           Expanded(
             child: Text(
-              (relatedMessage is TextMessage)
-                  ? (relatedMessage as TextMessage).text
-                  : relatedMessage?.metadata?["body"] ??
+              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,

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,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                );
+                              },
+                            ),
+                ),
+          ),
+        );
+}

lib/widgets/chat_page/room_appbar.dart

@@ -52,9 +52,14 @@ 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),

lib/widgets/chat_page/room_chat.dart

@@ -1,29 +1,25 @@
-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/client_controller.dart";
 import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/cross_cache_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";
@@ -185,6 +181,13 @@ class RoomChat extends HookConsumerWidget {
       ];
     }
 
+    final chatTheme = ChatTheme.fromThemeData(theme).copyWith(
+      colors: ChatColors.fromThemeData(theme).copyWith(
+        primary: theme.colorScheme.primaryContainer,
+        onPrimary: theme.colorScheme.onPrimaryContainer,
+      ),
+    );
+
     return Scaffold(
       appBar: RoomAppbar(
         room,
@@ -206,12 +209,7 @@ class RoomChat extends HookConsumerWidget {
                       .betterWhen(
                         data: (controller) => Chat(
                           currentUserId: userId,
-                          theme: ChatTheme.fromThemeData(theme).copyWith(
-                            colors: ChatColors.fromThemeData(theme).copyWith(
-                              primary: theme.colorScheme.primaryContainer,
-                              onPrimary: theme.colorScheme.onPrimaryContainer,
-                            ),
-                          ),
+                          theme: chatTheme,
                           onMessageSecondaryTap:
                               (
                                 context,
@@ -234,36 +232,9 @@ class RoomChat extends HookConsumerWidget {
                                 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: ref.headers,
-                                          ),
-                                        ),
-                                      ),
-                                    ),
-                                  );
-                                }
-                              },
                           builders: Builders(
                             loadMoreBuilder: (_) => Loading(),
+
                             chatAnimatedListBuilder: (_, itemBuilder) =>
                                 ChatAnimatedList(
                                   itemBuilder: itemBuilder,
@@ -273,6 +244,7 @@ class RoomChat extends HookConsumerWidget {
                                   onStartReached: () => client.markRead(room),
                                   bottomPadding: 72,
                                 ),
+
                             composerBuilder: (_) => ChatBox(
                               relationType: relationType.value,
                               relatedMessage: replyToMessage.value,
@@ -280,104 +252,6 @@ class RoomChat extends HookConsumerWidget {
                               room: room,
                             ),
 
-                            // TODO: Polls
-                            // 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<String>
-                            //                   >)
-                            //               .values
-                            //               .expand((set) => set)
-                            //               .fold(<String, int>{}, (
-                            //                 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,
-                            //           ),
-
-                            //           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,
@@ -385,98 +259,37 @@ class RoomChat extends HookConsumerWidget {
                                   index, {
                                   required bool isSentByMe,
                                   MessageGroupStatus? groupStatus,
-                                }) => FlyerChatTextMessage(
-                                  customWidget: Column(
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.start,
-                                    children: [
-                                      Html(
-                                        (message.metadata?["formatted"]
-                                                as String)
-                                            .replaceAllMapped(
-                                              RegExp(
-                                                "(<a\\b[^>]*>.*?<\\/a>)|(\\bhttps?:\\/\\/[^\\s<]+)",
-                                                caseSensitive: false,
-                                              ),
-                                              (m) {
-                                                // If it's already an <a> tag, leave it unchanged
-                                                if (m.group(1) != null) {
-                                                  return m.group(1)!;
-                                                }
-
-                                                // Otherwise, wrap the bare URL
-                                                final url = m.group(2)!;
-                                                return "<a href=\"$url\">$url</a>";
-                                              },
-                                            )
-                                            .replaceAll("\n", "<br/>"),
-                                      ),
-                                      if (message.editedAt != null)
-                                        Text(
-                                          "(edited)",
-                                          style: theme.textTheme.labelSmall,
-                                        ),
-                                    ],
-                                  ),
-                                  topWidget: TopWidget(
+                                }) => TextMessageWrapper(
+                                  room: room,
                                   message,
+                                  content: message.text,
                                   groupStatus: groupStatus,
+                                  onTapReply: notifier.scrollToMessage,
+                                  updateMessage: controller.updateMessage,
+                                  isSentByMe: isSentByMe,
                                 ),
-                                  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:
                                 (
-                                  _,
+                                  context,
                                   message,
                                   index, {
                                   required bool isSentByMe,
                                   MessageGroupStatus? groupStatus,
-                                }) => FlyerChatImageMessage(
-                                  topWidget: TopWidget(
+                                }) => TextMessageWrapper(
                                   message,
+                                  room: room,
+                                  content: message.text,
                                   groupStatus: groupStatus,
-                                    alwaysShow: true,
-                                  ),
-                                  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,
+                                  onTapReply: notifier.scrollToMessage,
+                                  updateMessage: controller.updateMessage,
+                                  isSentByMe: isSentByMe,
+                                  extra: ExpandableImageMessage(
+                                    message,
                                     index: index,
                                   ),
+                                ),
+
                             fileMessageBuilder:
                                 (
                                   _,
@@ -484,22 +297,31 @@ class RoomChat extends HookConsumerWidget {
                                   index, {
                                   required bool isSentByMe,
                                   MessageGroupStatus? groupStatus,
-                                }) => InkWell(
+                                }) => MessageWrapper(
+                                  message,
+                                  InkWell(
                                     onTap: () => showDialog(
                                       context: context,
                                       builder: (_) => Dialog(
-                                      child: Text("TODO: Download Attachments"),
+                                        child: Text(
+                                          "TODO: Download Attachments",
+                                        ),
                                       ),
                                     ),
                                     child: FlyerChatFileMessage(
-                                    topWidget: TopWidget(
+                                      topWidget: ReplyWidget(
+                                        room: room,
                                         message,
+                                        onTapReply: notifier.scrollToMessage,
                                         groupStatus: groupStatus,
                                       ),
                                       message: message,
                                       index: index,
                                     ),
                                   ),
+                                  groupStatus,
+                                ),
+
                             systemMessageBuilder:
                                 (
                                   _,
@@ -511,6 +333,7 @@ class RoomChat extends HookConsumerWidget {
                                   message: message,
                                   index: index,
                                 ),
+
                             unsupportedMessageBuilder:
                                 (
                                   _,

lib/widgets/chat_page/sidebar.dart

@@ -155,6 +155,7 @@ class Sidebar extends HookConsumerWidget {
                     icon: Icon(Icons.add),
                   ),
                   IconButton(
+                    tooltip: "Explore other rooms",
                     onPressed: () => showDialog(
                       context: context,
                       builder: (context) => AlertDialog(title: Text("To-do")),
@@ -162,6 +163,7 @@ class Sidebar extends HookConsumerWidget {
                     icon: Icon(Icons.explore),
                   ),
                   IconButton(
+                    tooltip: "Open settings",
                     onPressed: () => Navigator.of(
                       context,
                     ).push(MaterialPageRoute(builder: (_) => SettingsPage())),

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<void> 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\\b[^>]*>.*?<\\/a>)|(\\bhttps?:\\/\\/[^\\s<]+)",
+                          caseSensitive: false,
+                        ),
+                        (m) {
+                          // If it's already an <a> tag, leave it unchanged
+                          if (m.group(1) != null) {
+                            return m.group(1)!;
+                          }
+
+                          // Otherwise, wrap the bare URL
+                          final url = m.group(2)!;
+                          return "<a href=\"$url\">$url</a>";
+                        },
+                      )
+                      .replaceAll("\n", "<br class=\"fake-break\"/>"),
+                ),
+              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,
+    );
+  }
+}

lib/widgets/chat_page/top_widget.dart

@@ -1,124 +0,0 @@
-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/widgets/avatar_or_hash.dart";
-import "package:nexus/widgets/chat_page/html/quoted.dart";
-
-class TopWidget extends ConsumerWidget {
-  final Message message;
-  final bool alwaysShow;
-  final MessageGroupStatus? groupStatus;
-  const TopWidget(
-    this.message, {
-    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: [
-                    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,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-      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: [
-              AvatarOrHash(
-                Uri.parse(message.metadata?["avatarUrl"] ?? ""),
-                message.metadata?["displayName"] ?? "",
-              ),
-              Flexible(
-                child: Text(
-                  message.metadata?["displayName"] ?? message.authorId,
-                  overflow: TextOverflow.ellipsis,
-                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      SizedBox(height: 4),
-    ],
-  );
-}

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(
+  Widget build(BuildContext context) => Center(
     child: Padding(
       padding: EdgeInsets.all(16),
-          child: CircularProgressIndicator(),
+      child: SizedBox(height: height, child: CircularProgressIndicator()),
     ),
   );
 }

linux/flutter/generated_plugin_registrant.cc

@@ -8,7 +8,6 @@
 
 #include <dynamic_system_colors/dynamic_color_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
-#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <screen_retriever_linux/screen_retriever_linux_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 #include <window_manager/window_manager_plugin.h>
@@ -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);

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

nix/fake-rustup.sh

@@ -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

pubspec.lock

@@ -509,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:
@@ -533,54 +525,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
-  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:
@@ -639,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:
@@ -688,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:
@@ -928,14 +855,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.1"
-  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:
@@ -1437,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:

pubspec.yaml

@@ -42,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,9 +55,7 @@ dependencies:
   flutter_svg: ^2.2.2
   json_annotation: ^4.9.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

scripts/generate.dart

@@ -25,6 +25,8 @@ void main(List<String> args) async {
   }
 
   print("Generating FFI Bindings...");
+
+  final libclangPath = Platform.environment["LIBCLANG_PATH"];
   FfiGenerator(
     output: Output(
       dartFile: Platform.script.resolve("../lib/src/third_party/gomuks.g.dart"),
@@ -34,6 +36,10 @@ void main(List<String> args) async {
       compilerOptions: ["--no-warnings"],
     ),
     functions: Functions.includeAll,
-  ).generate();
+  ).generate(
+    libclangDylib: libclangPath == null
+        ? null
+        : Uri.file(join(libclangPath, "libclang.so")),
+  );
   print("Done!");
 }

scripts/generate.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
-pushd "$(dirname "$(readlink -f "$0")")"/.. || exit
+pushd "$(dirname "$(readlink -f "$0")")"/.. > /dev/null || exit
 
 mkdir -p build
 touch build/lock
 dart scripts/generate.dart
 rm build/lock
 
-popd || exit 
+popd > /dev/null || exit 

src/gomuks/libgomuks.h

@@ -1,105 +0,0 @@
-/* Code generated by cmd/cgo; DO NOT EDIT. */
-
-/* package go.mau.fi/gomuks/pkg/ffi */
-
-
-#line 1 "cgo-builtin-export-prolog"
-
-#include <stddef.h>
-
-#ifndef GO_CGO_EXPORT_PROLOGUE_H
-#define GO_CGO_EXPORT_PROLOGUE_H
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef struct { const char *p; ptrdiff_t n; } _GoString_;
-extern size_t _GoStringLen(_GoString_ s);
-extern const char *_GoStringPtr(_GoString_ s);
-#endif
-
-#endif
-
-/* Start of preamble from import "C" comments.  */
-
-
-#line 9 "ffi.go"
-
-#include "gomuksffi.h"
-#include <stdlib.h>
-
-static inline void _gomuks_callEventCallback(EventCallback cb, const char *command, int64_t request_id, GomuksOwnedBuffer data) {
-	cb(command, request_id, data);
-}
-
-#line 1 "cgo-generated-wrapper"
-
-
-/* End of preamble from import "C" comments.  */
-
-
-/* Start of boilerplate cgo prologue.  */
-#line 1 "cgo-gcc-export-header-prolog"
-
-#ifndef GO_CGO_PROLOGUE_H
-#define GO_CGO_PROLOGUE_H
-
-typedef signed char GoInt8;
-typedef unsigned char GoUint8;
-typedef short GoInt16;
-typedef unsigned short GoUint16;
-typedef int GoInt32;
-typedef unsigned int GoUint32;
-typedef long long GoInt64;
-typedef unsigned long long GoUint64;
-typedef GoInt64 GoInt;
-typedef GoUint64 GoUint;
-typedef size_t GoUintptr;
-typedef float GoFloat32;
-typedef double GoFloat64;
-#ifdef _MSC_VER
-#if !defined(__cplusplus) || _MSVC_LANG <= 201402L
-#include <complex.h>
-typedef _Fcomplex GoComplex64;
-typedef _Dcomplex GoComplex128;
-#else
-#include <complex>
-typedef std::complex<float> GoComplex64;
-typedef std::complex<double> GoComplex128;
-#endif
-#else
-typedef float _Complex GoComplex64;
-typedef double _Complex GoComplex128;
-#endif
-
-/*
-  static assertion to make sure the file is being used on architecture
-  at least with matching size of GoInt.
-*/
-typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef _GoString_ GoString;
-#endif
-typedef void *GoMap;
-typedef void *GoChan;
-typedef struct { void *t; void *v; } GoInterface;
-typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
-
-#endif
-
-/* End of boilerplate cgo prologue.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern GomuksHandle GomuksInit(void);
-extern int GomuksStart(GomuksHandle handle, EventCallback callback);
-extern void GomuksDestroy(GomuksHandle handle);
-extern GomuksResponse GomuksSubmitCommand(GomuksHandle handle, char* command, GomuksBorrowedBuffer data);
-extern GomuksAccountInfo GomuksGetAccountInfo(GomuksHandle handle);
-extern void GomuksFreeAccountInfo(GomuksAccountInfo info);
-extern void GomuksFreeBuffer(GomuksOwnedBuffer buf);
-
-#ifdef __cplusplus
-}
-#endif

windows/flutter/generated_plugin_registrant.cc

@@ -8,7 +8,6 @@
 
 #include <dynamic_system_colors/dynamic_color_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
-#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <window_manager/window_manager_plugin.h>
@@ -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(

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