diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 00000000..dc1e9c77
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,39 @@
+name: "Build APK"
+
+on:
+ push:
+ branches: ["main"]
+ tags: ["*"]
+ workflow_dispatch:
+
+jobs:
+ build-apk:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v6
+ with:
+ submodules: recursive
+
+ - name: Lix GHA Installer Action
+ uses: samueldr/lix-gha-installer-action@v2026-02-22
+ with:
+ extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
+
+ - name: Decode keystore
+ run: echo "$KEYSTORE_CONTENT" | base64 --decode > keystore.jks
+ env:
+ KEYSTORE_CONTENT: ${{ secrets.KEYSTORE_CONTENT }}
+
+ - name: Build app
+ run: nix develop --command bash -c "flutter pub get && dart scripts/generate.dart && flutter pub run build_runner build && flutter build apk --release"
+ env:
+ KEYSTORE_PATH: ../../keystore.jks
+ KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+
+ - name: Upload installer artifact
+ uses: actions/upload-artifact@v6
+ with:
+ name: APK
+ path: build/app/outputs/flutter-apk/app-release.apk
\ No newline at end of file
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
new file mode 100644
index 00000000..5e693f04
--- /dev/null
+++ b/.github/workflows/flatpak.yml
@@ -0,0 +1,37 @@
+name: "Build Flatpaks"
+
+on:
+ push:
+ branches: ["main"]
+ tags: ["*"]
+ workflow_dispatch:
+
+jobs:
+ build-flatpak:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - arch: x86_64
+ runner: ubuntu-latest
+ - arch: aarch64
+ runner: ubuntu-24.04-arm
+ runs-on: ${{ matrix.runner }}
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v6
+
+ - name: Lix GHA Installer Action
+ uses: samueldr/lix-gha-installer-action@v2026-02-22
+ with:
+ extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
+
+ - name: Build app
+ run: nix build .#flatpak
+
+ - name: Upload installer artifact
+ uses: actions/upload-artifact@v6
+ with:
+ name: flatpak-${{ matrix.arch }}
+ path: result/nexus.federated.Nexus.flatpak
\ No newline at end of file
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 00000000..c07f0ade
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,57 @@
+name: "Build EXE"
+
+on:
+ push:
+ branches: ["main"]
+ tags: ["*"]
+ workflow_dispatch:
+
+jobs:
+ build-exe:
+ runs-on: windows-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v6
+ with:
+ submodules: recursive
+
+ - name: Set up Flutter
+ uses: subosito/flutter-action@v2
+ with:
+ flutter-version: 3.41.5
+
+ - name: Set up Go
+ uses: actions/setup-go@v6
+ with:
+ go-version-file: gomuks/go.mod
+
+ - name: Go build
+ run: |
+ cd gomuks/pkg/ffi
+ go build -tags goolm -o ../../../libgomuks.dll -buildmode=c-shared
+
+ - name: Build with Flutter
+ run: |
+ flutter pub get
+ dart scripts/generate.dart
+ flutter pub run build_runner build
+ flutter build windows --release
+
+ - name: Upload exe zip
+ uses: actions/upload-artifact@v6
+ with:
+ name: windows-portable
+ path: build/windows/x64/runner/Release/
+
+ - name: Install Inno Setup
+ run: choco install innosetup -y
+
+ - name: Build Inno Setup installer
+ run: iscc windows/installer.iss
+
+ - name: Upload installer artifact
+ uses: actions/upload-artifact@v6
+ with:
+ name: windows-installer
+ path: windows/dist/Nexus-Setup.exe
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index dfaf03dc..2bec5830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,7 @@ key.properties
*.freezed.dart
# Devel Password
-password.txt
\ No newline at end of file
+password.txt
+
+# Nix
+/result
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..145276a5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "gomuks"]
+ path = gomuks
+ url = https://github.com/gomuks/gomuks
+ branch = main
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 30f42545..da80f4bc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,12 @@
{
- "cSpell.words": ["Appbar", "Displayname", "prefs"]
+ "cSpell.words": [
+ "Appbar",
+ "Displayname",
+ "fluttertagger",
+ "Gomuks",
+ "Homeserver",
+ "localpart",
+ "muks",
+ "prefs"
+ ]
}
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..496acdb2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,675 @@
+# GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+## Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+- a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+- b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under
+ section 7. This requirement modifies the requirement in section 4
+ to "keep intact all notices".
+- c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+- d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+- a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+- b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the Corresponding
+ Source from a network server at no charge.
+- c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+- d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+- e) Convey the object code using peer-to-peer transmission,
+ provided you inform other peers where the object code and
+ Corresponding Source of the work are being offered to the general
+ public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+- a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+- b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+- c) Prohibiting misrepresentation of the origin of that material,
+ or requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+- d) Limiting the use for publicity purposes of names of licensors
+ or authors of the material; or
+- e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+- f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions
+ of it) with contractual assumptions of liability to the recipient,
+ for any liability that these contractual assumptions directly
+ impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see .
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read .
diff --git a/README.md b/README.md
index 670e20e8..0fe2a1bc 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# Nexus Client
> [!WARNING]
-> Nexus Client is still heavily in development, and is not ready for use!
+> Nexus Client is still in development, and doesn't support everything needed for daily use.
## Description
-A simple and user-friendly Matrix client made with Flutter and the Matrix Dart SDK.
+A simple and user-friendly Matrix client made with Flutter and a Gomuks backend.
## Screenshots
@@ -15,98 +15,173 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
## Progress
-- [ ] Platform Support
- - [x] Linux
- - [x] Windows (untested, if you are interested in helping to test, open an issue)
- - [ ] MacOS
- - [ ] Android
- - [ ] iOS
- - [ ] Web (may not be possible)
-- [x] Login
- - [x] Username / password auth
- - [ ] OAuth / OIDC
-- [x] Rooms / Spaces
- - [x] Displaying and choosing
- - [x] Reading, showing unread
- - [ ] Mark as read button on rooms and spaces
- - [ ] Searching
- - [ ] Creating (Rooms, Spaces, and DMs)
- - [ ] Joining
- - [ ] Using alias
- - [ ] From space
- - [ ] Exploring
- - [x] Leaving
- - [x] Subspaces
-- [x] Messages
- - [x] Sending
- - [x] Plain text
- - [x] HTML/Markdown
- - [x] Replies
- - [ ] Attachments
- - [x] Mentions
- - [x] Users
- - [x] Rooms
- - [ ] Custom emojis/stickers
- - [ ] GIFs, maybe through Tenor or something
- - [ ] Encrypted messages
- - [x] Recieving
- - [x] Plain text
- - [x] HTML
- - [x] Replies
- - [x] Viewing
- - [ ] Jump to original message
- - [x] Edits
- - [x] Attachments
- - [ ] Downloading attachments
- - [ ] Opening attachments in their own view
- - [x] Mentions
- - [x] Users
- - [x] Rooms
- - [ ] Plain text
- - [x] Matrix URIs
- - [x] Matrix.to links
- - [x] Custom emojis/stickers
- - [ ] Encrypted messages
- - [x] History loading
- - [x] Backwards
- - [ ] Forwards
- - [ ] Editing
- - [x] Deleting
-- [ ] Reactions: Waiting on https://github.com/flyerhq/flutter_chat_ui/pull/838
-- [ ] Pins
- - [ ] Displaying
- - [ ] Creating
-- [ ] Threads
-- [ ] Profile popouts
-- [x] Copy link to [room, space]
-- [x] Reporting
-- [ ] Notifications using UnifiedPush
-- [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
-- [ ] Invites
- - [ ] Viewing / accepting
- - [ ] Spam filtering
-- [ ] Settings
- - [ ] Light/Dark mode
- - [ ] Dynamic Theming
- - [ ] Devices
- - [ ] Viewing devices
- - [ ] Verifying devices
- - [ ] URL preview: Server / Client / None
- - [ ] Account changes
- - [ ] Display name
- - [ ] Profile picture
- - [ ] Timezone
- - [ ] Pronouns
- - [ ] Password
- - [ ] About
- - [x] Log Out
+- [ ] New logo
+- [ ] Make context menus appear as bottom sheets on mobile
+- [x] Move from the Dart SDK to the Gomuks Backend with Dart bindings: https://git.federated.nexus/Henry-Hiles/nexus/pulls/2
+ - [ ] Allow using remote Gomuks over websocket
+- [ ] Platform Support
+ - [x] Linux
+ - [ ] Windows (WIP)
+ - [ ] MacOS
+ - [x] Android
+ - [ ] iOS
+ - [ ] Web (may not be possible)
+- [x] Login
+ - [x] Username / password auth
+ - [ ] OAuth / OIDC
+ - [x] Improve initial sync experience
+- [x] Rooms / Spaces
+ - [x] Displaying and choosing
+ - [x] Reading, showing unread
+ - [x] Mark as read button on rooms and spaces
+ - [ ] Searching
+ - [ ] Creating (Rooms, Spaces, and DMs)
+ - [x] Joining
+ - [x] Parse vias
+ - [x] Using a text/uri/link
+ - [x] Plain text
+ - [x] `matrix:` Uri
+ - [x] Matrix.to link
+ - [ ] From space
+ - [ ] Exploring
+ - [x] Leaving
+ - [x] Subspaces
+- [x] Messages
+ - [x] Encryption
+ - [x] Restoring crypto identity from a recovery passphrase/key
+ - [x] Sending
+ - [x] Plain text
+ - [x] HTML/Markdown
+ - [x] Replies
+ - [x] Choose ping on/off
+ - [ ] Per message profiles
+ - [ ] Attachments
+ - [ ] Commands with [MSC4391](https://github.com/matrix-org/matrix-spec-proposals/pull/4391)
+ - [x] Mentions
+ - [x] Users
+ - [x] Rooms
+ - [ ] Inline emoji picker (Putting this here since it'll be implemented the same way as mentions)
+ - [ ] Custom emojis/stickers
+ - [ ] GIFs using Gomuks' GIF proxies
+ - [x] Receiving
+ - [x] Plain text
+ - [x] Per message profiles
+ - [x] HTML
+ - [x] URL Previews
+ - [x] Replies
+ - [x] Viewing
+ - [ ] Jump to original message
+ - [x] In loaded timeline
+ - [ ] Out of loaded timeline
+ - [x] Edits
+ - [x] Attachments
+ - [x] Unencrypted
+ - [ ] Encrypted
+ - [x] Blurhashing
+ - [ ] Downloading attachments
+ - [x] Opening attachments in their own view
+ - [ ] Polls
+ - [x] Mentions
+ - [x] Users
+ - [x] Clickable
+ - [x] Rooms
+ - [x] Clickable
+ - [x] Matrix URIs
+ - [x] Matrix.to links
+ - [x] Events
+ - [ ] Render more nicely
+ - [ ] Clickable
+ - [x] Custom emojis/stickers
+ - [x] History loading
+ - [x] Backwards
+ - [ ] Forwards
+ - [x] Editing
+ - [x] Deleting
+- [x] Reactions
+- [ ] Pins
+ - [ ] Displaying
+ - [ ] Creating
+- [ ] Threads
+- [x] Profile popouts
+ - [x] Working actions
+- [x] Copy link to:
+ - [x] Room
+ - [x] Space
+ - [x] Message
+- [ ] Reporting
+ - [x] Events
+ - [ ] Rooms
+- [ ] Notifications using UnifiedPush
+- [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
+- [ ] Invites
+- [ ] Settings
+ - [ ] Matrix: URIs vs Matrix.to links
+ - [ ] Light/Dark mode
+ - [ ] SSD or CSD
+ - [ ] Show media by default
+ - [ ] Dynamic Theming
+ - [ ] Devices
+ - [ ] Viewing devices
+ - [ ] Verifying devices
+ - [ ] URL preview: Server / Sending Client (Beeper spec) / None
+ - [ ] Account changes
+ - [ ] Display name
+ - [ ] Profile picture
+ - [ ] Timezone
+ - [ ] Pronouns
+ - [ ] Password
+ - [ ] About
+ - [x] Log Out
-## Development
+## Try it out
-Fork and clone the project, then:
+If you want to try out Nexus, grab one of the following artifacts from CI:
-- 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`).
+- [Android APK](https://nightly.link/Henry-Hiles/nexus/workflows/android/main/APK.zip)
+- Windows
+ - [Portable Build](https://nightly.link/Henry-Hiles/nexus/workflows/windows/main/windows-portable.zip)
+ - [Installer](https://nightly.link/Henry-Hiles/nexus/workflows/windows/main/windows-installer.zip)
+- Flatpak
+ - [AArch64/Arm64](https://nightly.link/Henry-Hiles/nexus/workflows/flatpak/main/flatpak-aarch64.zip)
+ - [x86_64/AMD64](https://nightly.link/Henry-Hiles/nexus/workflows/flatpak/main/flatpak-x86_64.zip)
+
+Or, try the Nix package: `nix run git+https://git.federated.nexus/Henry-Hiles/nexus`
+
+## Build it yourself
+
+### Prerequisites
+
+#### Linux
+
+- With Nix: Either use direnv and `direnv allow`, or `nix flake develop`
+- Without Nix: Install Flutter, Go, Git, Libclang, and Glibc. Do not use any Snap packages, they cause various compilation issues.
+
+#### Windows / MacOS
+
+I don't really know. You will need Flutter, Git, 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.
+
+### Clone repo
+
+First, clone and open the repo:
+
+```sh
+git clone --recurse-submodules https://git.federated.nexus/Henry-Hiles/nexus
+cd nexus
+```
+
+### Set up Flutter
+
+Get dependencies:
+
+```sh
+flutter pub get
+```
+
+Generate Gomuks bindings:
+
+```sh
+dart scripts/generate.dart
+```
Build generated files, and watch for new changes:
@@ -114,8 +189,12 @@ Build generated files, and watch for new changes:
flutter pub run build_runner watch --delete-conflicting-outputs
```
-Run `flutter run` to run the app.
+Run the app:
+
+```sh
+flutter run
+```
## Community
-Come chat in the [Federated Nexus Community](https://matrix.to/#/#space:federated.nexus) for questions or help with developing or using Nexus Client.
+Join the [Nexus Client Matrix Room](https://matrix.to/#/#nexus:federated.nexus) for questions or help with developing or using Nexus Client.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index c2aaaa0d..a8b10780 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,6 +1,7 @@
analyzer:
errors:
invalid_annotation_target: ignore
+ avoid_print: ignore
exclude:
- "build/**"
- "**/*.g.dart"
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ce5f4654..fd51ea0e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,6 +39,11 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}
+ kotlinOptions {
+ // do we want to update.. eventually?
+ jvmTarget = "17"
+ }
+
defaultConfig {
applicationId = "nexus.federated.Nexus"
minSdk = 29
@@ -50,7 +55,8 @@ android {
signingConfigs {
release {
keyAlias "key"
- storeFile keystoreProperties['path'] ? file(keystoreProperties['path']) : file(System.getenv("KEYSTORE_PATH"))
+ def storePath = keystoreProperties['path'] ?: System.getenv("KEYSTORE_PATH")
+ storeFile storePath ? file(storePath) : null
keyPassword keystoreProperties['password'] ?: System.getenv("KEYSTORE_PASSWORD")
storePassword keystoreProperties['password'] ?: System.getenv("KEYSTORE_PASSWORD")
}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1c369c91..666977e9 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
android:label="Nexus"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
- android:roundIcon="@mipmap/nexus_round"
+ android:roundIcon="@mipmap/ic_launcher"
android:allowBackup="false"
android:fullBackupContent="false">
-
+
+
+
+
diff --git a/assets/foreground.png b/assets/foreground.png
index 42499899..76a446a9 100644
Binary files a/assets/foreground.png and b/assets/foreground.png differ
diff --git a/assets/reactions.png b/assets/reactions.png
new file mode 100644
index 00000000..c413051e
Binary files /dev/null and b/assets/reactions.png differ
diff --git a/assets/screenshotDark.png b/assets/screenshotDark.png
index dec983f5..ae75dc79 100644
Binary files a/assets/screenshotDark.png and b/assets/screenshotDark.png differ
diff --git a/assets/screenshotLight.png b/assets/screenshotLight.png
index 003f6b4b..0b2ce0d5 100644
Binary files a/assets/screenshotLight.png and b/assets/screenshotLight.png differ
diff --git a/assets/smallerForeground.png b/assets/smallerForeground.png
new file mode 100644
index 00000000..c962d2b9
Binary files /dev/null and b/assets/smallerForeground.png differ
diff --git a/assets/smallerForeground.svg b/assets/smallerForeground.svg
new file mode 100644
index 00000000..a821be90
--- /dev/null
+++ b/assets/smallerForeground.svg
@@ -0,0 +1,126 @@
+
+
+
+
diff --git a/build.yaml b/build.yaml
new file mode 100644
index 00000000..5d6aeda6
--- /dev/null
+++ b/build.yaml
@@ -0,0 +1,6 @@
+targets:
+ $default:
+ builders:
+ json_serializable:
+ options:
+ field_rename: snake
diff --git a/flake.lock b/flake.lock
index b627cd33..8070c6c3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1759362264,
- "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+ "lastModified": 1767609335,
+ "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+ "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"type": "github"
},
"original": {
@@ -18,13 +18,81 @@
"type": "github"
}
},
+ "flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "nix2flatpak": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1774604963,
+ "narHash": "sha256-MtAW1FIdirSlUAAO7s1u9auv5y3I6t3uJ+GeEbqiqxI=",
+ "owner": "neobrain",
+ "repo": "nix2flatpak",
+ "rev": "3e04657fbcb49956ac301410b071a7f0b2ad5988",
+ "type": "github"
+ },
+ "original": {
+ "owner": "neobrain",
+ "repo": "nix2flatpak",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1759381078,
- "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+ "lastModified": 1773389992,
+ "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-lib": {
+ "locked": {
+ "lastModified": 1765674936,
+ "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1767640445,
+ "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+ "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
"type": "github"
},
"original": {
@@ -34,25 +102,26 @@
"type": "github"
}
},
- "nixpkgs-lib": {
- "locked": {
- "lastModified": 1754788789,
- "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "type": "github"
- }
- },
"root": {
"inputs": {
"flake-parts": "flake-parts",
- "nixpkgs": "nixpkgs"
+ "nix2flatpak": "nix2flatpak",
+ "nixpkgs": "nixpkgs_2"
+ }
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
}
}
},
diff --git a/flake.nix b/flake.nix
index 027db592..4c06ac64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,10 @@
description = "Nexus Flutter Flake";
inputs = {
+ self.submodules = true;
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
+ nix2flatpak.url = "github:neobrain/nix2flatpak";
};
outputs =
@@ -23,6 +25,7 @@
perSystem =
{
+ lib,
pkgs,
system,
...
@@ -37,35 +40,37 @@
};
};
- devShells.default =
+ packages =
let
- # android = pkgs.callPackage ./nix/android.nix { };
+ default = pkgs.callPackage ./linux/nix/pkg {
+ src = self;
+ };
in
- pkgs.mkShell {
- packages = with pkgs; [
- # jdk17
- cargo
- (flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
+ {
+ inherit default;
- # android.platform-tools
- (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
- ];
+ flatpak = inputs.nix2flatpak.lib.${system}.mkFlatpak {
+ appName = "Nexus";
+ developer = "QuadRadical";
+ appId = "nexus.federated.Nexus";
+ package = default;
+ runtime = "org.gnome.Platform/49";
+ permissions = {
+ share = [ "network" ];
+ sockets = [
+ "fallback-x11"
+ "wayland"
+ ];
+ devices = [ "dri" ];
+ };
+ };
- env = rec {
- LD_LIBRARY_PATH = "${
- pkgs.lib.makeLibraryPath ([
- pkgs.sqlite
- ])
- }:./build/linux/x64/debug/plugins/flutter_vodozemac";
-
- # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
- # ANDROID_SDK_ROOT = ANDROID_HOME;
- # JAVA_HOME = pkgs.jdk17;
-
- # TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
- # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
+ gomuks = pkgs.callPackage ./linux/nix/pkg/gomuks.nix {
+ src = self;
};
};
+
+ devShells.default = pkgs.callPackage ./linux/nix/devshell.nix { };
};
};
}
diff --git a/gomuks b/gomuks
new file mode 160000
index 00000000..daa0ba02
--- /dev/null
+++ b/gomuks
@@ -0,0 +1 @@
+Subproject commit daa0ba028e7d89ba9fc7580fc8099348e6145cb3
diff --git a/hook/build.dart b/hook/build.dart
new file mode 100644
index 00000000..165e613c
--- /dev/null
+++ b/hook/build.dart
@@ -0,0 +1,129 @@
+import "dart:io";
+import "package:hooks/hooks.dart";
+import "package:code_assets/code_assets.dart";
+
+Future main(List args) => build(args, (input, output) async {
+ final codeConfig = input.config.code;
+ final targetOS = codeConfig.targetOS;
+ final targetArch = codeConfig.targetArchitecture;
+
+ String libFileName;
+ Map env = {};
+ switch (targetOS) {
+ case OS.linux:
+ libFileName = "libgomuks.so";
+ break;
+ case OS.macOS:
+ libFileName = "libgomuks.dylib";
+ break;
+ case OS.windows:
+ libFileName = "libgomuks.dll";
+ break;
+ case OS.android:
+ libFileName = "libgomuks.so";
+
+ final targetNdkApi = codeConfig.android.targetNdkApi;
+
+ final ndkHome =
+ Platform.environment["ANDROID_NDK_HOME"] ??
+ Platform.environment["ANDROID_NDK_ROOT"] ??
+ Platform.environment["NDK_HOME"] ??
+ await _findNdkFromSdk();
+ if (ndkHome == null) {
+ throw Exception(
+ "Could not find Android NDK. Set ANDROID_NDK_HOME or install via sdkmanager.",
+ );
+ }
+
+ final hostTag = _ndkHostTag();
+ final (goArch, ccTriple) = _androidArch(targetArch);
+ final cc =
+ "$ndkHome/toolchains/llvm/prebuilt/$hostTag/bin/$ccTriple$targetNdkApi-clang";
+
+ env = {"CGO_ENABLED": "1", "GOOS": "android", "GOARCH": goArch, "CC": cc};
+ break;
+ default:
+ throw UnsupportedError("Unsupported OS: $targetOS");
+ }
+
+ var libFile = input.packageRoot.resolve(libFileName);
+ final gomuksBuildDir = input.packageRoot.resolve("gomuks/");
+
+ if (!(await File.fromUri(libFile).exists())) {
+ final buildDir = input.packageRoot.resolve("build/");
+ libFile = buildDir.resolve("${targetArch.name}/$libFileName");
+
+ // goheif/dav1d supported on Android would need to fix upstream
+ final tags = targetOS == OS.android ? "goolm,noheic" : "goolm";
+ print(
+ "Building Gomuks shared library $libFileName (${targetOS.name}/${targetArch.name}) to ${libFile.path}...",
+ );
+ final result = await Process.run(
+ "go",
+ ["build", "-tags", tags, "-o", libFile.path, "-buildmode=c-shared"],
+ workingDirectory: gomuksBuildDir.resolve("pkg/ffi/").toFilePath(),
+ environment: env.isNotEmpty ? env : null,
+ );
+
+ if (result.exitCode != 0) {
+ throw Exception(
+ "Failed to build Gomuks shared library\n${result.stderr}",
+ );
+ }
+ }
+
+ final generatedFile = "src/third_party/gomuks.g.dart";
+ print("Adding $libFileName as asset...");
+ output
+ ..assets.code.add(
+ CodeAsset(
+ package: "nexus",
+ name: generatedFile,
+ linkMode: DynamicLoadingBundled(),
+ file: libFile,
+ ),
+ )
+ ..dependencies.add(libFile)
+ ..dependencies.add(gomuksBuildDir);
+ print("Done!");
+});
+
+Future _findNdkFromSdk() async {
+ // pretty sure this wont be needed with nix, i'll get this removed
+ final androidHome =
+ Platform.environment["ANDROID_HOME"] ??
+ Platform.environment["ANDROID_SDK_ROOT"];
+ if (androidHome == null) return null;
+ final ndkDir = Directory("$androidHome/ndk");
+ if (!await ndkDir.exists()) return null;
+ final versions = await ndkDir.list().toList();
+ if (versions.isEmpty) return null;
+ versions.sort((a, b) => a.path.compareTo(b.path));
+ return versions.last.path;
+}
+
+String _ndkHostTag() {
+ if (Platform.isMacOS) {
+ return "darwin-x86_64";
+ } else if (Platform.isLinux) {
+ return "linux-x86_64";
+ } else if (Platform.isWindows) {
+ return "windows-x86_64";
+ }
+ throw UnsupportedError("Unsupported host platform for Android NDK");
+}
+
+(String goArch, String ccTriple) _androidArch(Architecture arch) {
+ switch (arch) {
+ case Architecture.arm64:
+ return ("arm64", "aarch64-linux-android");
+ case Architecture.arm:
+ return ("arm", "armv7a-linux-androideabi");
+ case Architecture.x64:
+ return ("amd64", "x86_64-linux-android");
+ case Architecture.ia32:
+ return ("386", "i686-linux-android");
+ default:
+ throw UnsupportedError("Unsupported Android architecture: $arch");
+ }
+}
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index d4af5a19..44f96daf 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -387,7 +387,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.nexus;
+ PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.Nexus;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@@ -519,7 +519,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.nexus;
+ PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.Nexus;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -545,7 +545,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.nexus;
+ PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.Nexus;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
diff --git a/lib/controllers/account_data_controller.dart b/lib/controllers/account_data_controller.dart
new file mode 100644
index 00000000..125d7cfc
--- /dev/null
+++ b/lib/controllers/account_data_controller.dart
@@ -0,0 +1,16 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/models/account_data.dart";
+
+class AccountDataController extends Notifier> {
+ @override
+ IMap build() => const IMap.empty();
+
+ void update(IMap newData) =>
+ state = IMap({...state.unlock, ...newData.unlock});
+
+ static final provider =
+ NotifierProvider>(
+ AccountDataController.new,
+ );
+}
diff --git a/lib/controllers/author_controller.dart b/lib/controllers/author_controller.dart
new file mode 100644
index 00000000..70b73437
--- /dev/null
+++ b/lib/controllers/author_controller.dart
@@ -0,0 +1,47 @@
+import "dart:async";
+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/client_state_controller.dart";
+import "package:nexus/controllers/user_controller.dart";
+import "package:nexus/helpers/extensions/get_localpart.dart";
+import "package:nexus/models/membership.dart";
+import "package:nexus/models/membership_status.dart";
+
+class AuthorController extends AsyncNotifier {
+ final Message message;
+ AuthorController(this.message);
+
+ @override
+ Future build() async {
+ final member = await ref.watch(
+ UserController.provider(message.authorId).future,
+ );
+
+ final pmp = message.metadata?["pmp"] == null
+ ? null
+ : Membership.fromContent(
+ IMap(message.metadata?["pmp"]),
+ message.authorId,
+ ref.watch(
+ ClientStateController.provider.select(
+ (value) => value?.homeserverUrl,
+ ),
+ ) ??
+ "",
+ );
+
+ return Membership(
+ status: member?.status ?? MembershipStatus.leave,
+ avatarUrl: pmp?.avatarUrl ?? member?.avatarUrl,
+ displayName:
+ pmp?.displayName ?? member?.displayName ?? message.authorId.localpart,
+ userId: message.authorId,
+ );
+ }
+
+ static final provider =
+ AsyncNotifierProvider.family(
+ AuthorController.new,
+ );
+}
diff --git a/lib/controllers/avatar_controller.dart b/lib/controllers/avatar_controller.dart
deleted file mode 100644
index 1bb4c720..00000000
--- a/lib/controllers/avatar_controller.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:matrix/matrix.dart";
-import "package:nexus/controllers/client_controller.dart";
-
-class AvatarController extends AsyncNotifier {
- final String mxc;
- AvatarController(this.mxc);
- @override
- Future build() async => Uri.parse(mxc).getThumbnailUri(
- await ref.watch(ClientController.provider.future),
- width: 24,
- height: 24,
- );
-
- static final provider = AsyncNotifierProvider.family
- .autoDispose(AvatarController.new);
-}
diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart
index 1a885261..cc688711 100644
--- a/lib/controllers/client_controller.dart
+++ b/lib/controllers/client_controller.dart
@@ -1,100 +1,280 @@
-import "dart:convert";
+import "dart:developer";
+import "dart:ffi";
import "dart:io";
+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/database_controller.dart";
-import "package:flutter_vodozemac/flutter_vodozemac.dart";
-import "package:matrix/matrix.dart";
+import "package:nexus/controllers/account_data_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/init_complete_controller.dart";
+import "package:nexus/controllers/new_events_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/space_edges_controller.dart";
+import "package:nexus/controllers/sync_status_controller.dart";
+import "package:nexus/controllers/top_level_spaces_controller.dart";
+import "package:nexus/helpers/extensions/gomuks_buffer.dart";
+import "package:nexus/main.dart";
+import "package:nexus/models/client_state.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/models/paginate.dart";
+import "package:nexus/models/requests/get_event_request.dart";
+import "package:nexus/models/requests/get_related_events_request.dart";
+import "package:nexus/models/requests/get_room_state_request.dart";
+import "package:nexus/models/requests/join_room_request.dart";
+import "package:nexus/models/requests/login_request.dart";
+import "package:nexus/models/profile.dart";
+import "package:nexus/models/requests/paginate_request.dart";
+import "package:nexus/models/requests/redact_event_request.dart";
+import "package:nexus/models/requests/report_request.dart";
+import "package:nexus/models/requests/send_event_request.dart";
+import "package:nexus/models/requests/send_message_request.dart";
+import "package:nexus/models/requests/set_membership_request.dart";
+import "package:nexus/models/room.dart";
+import "package:nexus/models/sync_data.dart";
+import "package:nexus/models/sync_status.dart";
+import "package:nexus/src/third_party/gomuks.g.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/secure_storage_controller.dart";
-import "package:nexus/models/session_backup.dart";
+import "package:path_provider/path_provider.dart";
-class ClientController extends AsyncNotifier {
+class ClientController extends AsyncNotifier {
@override
- bool updateShouldNotify(
- AsyncValue previous,
- AsyncValue next,
- ) => previous.hasValue != next.hasValue;
- static const sessionBackupKey = "sessionBackup";
+ Future build() async {
+ final Pointer root;
+ if (Platform.isAndroid) {
+ final dir = await getApplicationSupportDirectory();
+ root = "${dir.path}/gomuks".toNativeUtf8().cast();
+ } else {
+ root = nullptr.cast();
+ }
- @override
- Future build() async {
- final client = Client(
- "nexus",
- logLevel: kReleaseMode ? Level.warning : Level.verbose,
- importantStateEvents: {"im.ponies.room_emotes"},
- supportedLoginTypes: {AuthenticationTypes.password},
- database: await MatrixSdkDatabase.init(
- "nexus",
- database: await ref.watch(DatabaseController.provider.future),
- ),
- nativeImplementations: NativeImplementationsIsolate(
- compute,
- vodozemacInit: init,
+ final handle = GomuksInit(root);
+
+ final callable =
+ NativeCallable<
+ Void Function(Pointer, Int64, GomuksOwnedBuffer)
+ >.listener((
+ Pointer command,
+ int requestId,
+ GomuksOwnedBuffer data,
+ ) {
+ try {
+ final muksEventType = command.cast().toDartString();
+ debugPrint("Handling $muksEventType...");
+ final decodedMuksEvent = data.toJson();
+
+ switch (muksEventType) {
+ case "client_state":
+ ref
+ .watch(ClientStateController.provider.notifier)
+ .set(ClientState.fromJson(decodedMuksEvent));
+ break;
+ case "sync_status":
+ ref
+ .watch(SyncStatusController.provider.notifier)
+ .set(SyncStatus.fromJson(decodedMuksEvent));
+ break;
+ case "init_complete":
+ ref.watch(InitCompleteController.provider.notifier).complete();
+ break;
+ case "send_complete":
+ final event = Event.fromJson(decodedMuksEvent["event"]);
+
+ if (event.type == "m.room.message") {
+ ref
+ .watch(
+ NewEventsController.provider(event.roomId).notifier,
+ )
+ .add(IList([event]));
+ }
+ break;
+ case "sync_complete":
+ final syncData = SyncData.fromJson(decodedMuksEvent);
+ final roomProvider = RoomsController.provider;
+ final accountDataProvider = AccountDataController.provider;
+
+ if (syncData.clearState) {
+ ref.invalidate(roomProvider);
+ ref.invalidate(accountDataProvider);
+ }
+
+ ref
+ .watch(roomProvider.notifier)
+ .update(syncData.rooms, syncData.leftRooms);
+ ref
+ .watch(accountDataProvider.notifier)
+ .update(syncData.accountData);
+
+ if (syncData.topLevelSpaces != null) {
+ ref
+ .watch(TopLevelSpacesController.provider.notifier)
+ .set(syncData.topLevelSpaces!);
+ }
+
+ if (syncData.spaceEdges != null) {
+ ref
+ .watch(SpaceEdgesController.provider.notifier)
+ .set(syncData.spaceEdges!);
+ }
+
+ // ref
+ // .watch(SyncStatusController.provider.notifier)
+ // .set(SyncStatus.fromJson(decodedMuksEvent));
+ break;
+ default:
+ debugPrint("Unhandled event: $muksEventType");
+ }
+ debugPrint("Finished handling $muksEventType...");
+ } catch (error, stackTrace) {
+ debugger();
+ showError(error, stackTrace);
+ debugPrintStack(stackTrace: stackTrace, label: error.toString());
+ }
+ });
+
+ ref.onDispose(() => GomuksDestroy(handle));
+ ref.onDispose(callable.close);
+
+ final errorCode = GomuksStart(handle, callable.nativeFunction);
+
+ if (errorCode == 0) return handle;
+ throw Exception("GomuksStart returned error code $errorCode");
+ }
+
+ Future _sendCommand(
+ String command, [
+ Map data = const {},
+ ]) async {
+ final bufferPointer = data.toGomuksBufferPtr();
+ final handle = await future;
+ final response = await Isolate.run(
+ () => GomuksSubmitCommand(
+ handle,
+ command.toNativeUtf8().cast(),
+ bufferPointer.ref,
),
);
- final backupJson = await ref
- .watch(SecureStorageController.provider.notifier)
- .get(sessionBackupKey);
+ calloc.free(bufferPointer);
- if (backupJson != null) {
- final backup = SessionBackup.fromJson(json.decode(backupJson));
-
- await client.init(
- waitForFirstSync: false,
- newToken: backup.accessToken,
- newHomeserver: backup.homeserver,
- newUserID: backup.userID,
- newDeviceID: backup.deviceID,
- newDeviceName: backup.deviceName,
- );
- }
-
- return client;
+ final json = response.buf.toJson();
+ if (json is String) throw json;
+ return json;
}
- Future setHomeserver(Uri homeserverUrl) async {
- final client = await future;
+ Future redactEvent(RedactEventRequest report) =>
+ _sendCommand("redact_event", report.toJson());
+
+ Future sendMessage(SendMessageRequest request) async =>
+ Event.fromJson(await _sendCommand("send_message", request.toJson()));
+
+ Future sendEvent(SendEventRequest request) async =>
+ Event.fromJson(await _sendCommand("send_event", request.toJson()));
+
+ Future verify(String recoveryKey) async {
try {
- await client.checkHomeserver(homeserverUrl);
- return true;
- } catch (_) {
- return false;
+ await _sendCommand("verify", {"recovery_key": recoveryKey});
+ return null;
+ } catch (error) {
+ return error.toString();
}
}
- Future login(String username, String password) async {
- final client = await future;
+ Future joinRoom(JoinRoomRequest request) async {
+ final response = await _sendCommand("join_room", request.toJson());
+ return response["room_id"];
+ }
+
+ Future getAccessToken() async {
+ final response = await _sendCommand("get_account_info", {});
+ return response?["access_token"];
+ }
+
+ Future leaveRoom(Room room) async {
+ if (room.metadata == null) return;
+ await _sendCommand("leave_room", {"room_id": room.metadata!.id});
+ }
+
+ // (await _sendCommand("get_event_context", {
+ // "room_id": request.roomId,
+ // "event_id": r"$OqZT4NuTj0J1-771IOEEWRI4XdumRNu6ighlvO3K3gc",
+ // }));
+
+ Future> getRoomState(GetRoomStateRequest request) async {
+ Future getState(GetRoomStateRequest request) async =>
+ (await _sendCommand("get_room_state", request.toJson())) as List?;
+ final response = await getState(request);
+
+ return (response ?? await getState(request.copyWith(refetch: true)) ?? [])
+ .map((event) => Event.fromJson(event))
+ .toIList();
+ }
+
+ Future?> getRelatedEvents(
+ GetRelatedEventsRequest request,
+ ) async {
+ final response =
+ (await _sendCommand("get_related_events", request.toJson())) as List?;
+ return response?.map((event) => Event.fromJson(event)).toIList();
+ }
+
+ Future getEvent(GetEventRequest request) async {
+ final event = request.room.events.firstWhereOrNull(
+ (event) => event.eventId == request.eventId,
+ );
+ if (event != null) return event;
+
+ final json = await _sendCommand("get_event", request.toJson());
+ return json == null ? null : Event.fromJson(json);
+ }
+
+ Future paginate(PaginateRequest request) async =>
+ Paginate.fromJson(await _sendCommand("paginate", request.toJson()));
+
+ Future getProfile(String userId) async =>
+ Profile.fromJson(await _sendCommand("get_profile", {"user_id": userId}));
+
+ Future reportEvent(ReportRequest request) =>
+ _sendCommand("report_event", request.toJson());
+
+ Future setMembership(SetMembershipRequest request) =>
+ _sendCommand("set_membership", request.toJson());
+
+ Future markRead(Room room) async {
+ final event = room.events.firstWhereOrNull(
+ (event) => event.rowId == room.timeline.last.eventRowId,
+ );
+ if (event == null || room.metadata == null) return;
+
+ await _sendCommand("mark_read", {
+ "room_id": room.metadata!.id,
+ "receipt_type": "m.read",
+ "event_id": event.eventId,
+ });
+ }
+
+ Future login(LoginRequest login) async {
try {
- final deviceName = "Nexus Client login on ${Platform.localHostname}";
- final details = await MatrixApi(homeserver: client.homeserver).login(
- LoginType.mLoginPassword,
- initialDeviceDisplayName: deviceName,
- identifier: AuthenticationUserIdentifier(user: username),
- password: password,
- );
- await ref
- .watch(SecureStorageController.provider.notifier)
- .set(
- sessionBackupKey,
- json.encode(
- SessionBackup(
- accessToken: details.accessToken,
- homeserver: client.homeserver!,
- userID: details.userId,
- deviceID: details.deviceId,
- deviceName: deviceName,
- ).toJson(),
- ),
- );
- ref.invalidateSelf(asReload: true);
- return true;
- } catch (_) {
- return false;
+ await _sendCommand("login", login.toJson());
+ return null;
+ } catch (error) {
+ return error.toString();
}
}
- static final provider = AsyncNotifierProvider(
+ Future discoverHomeserver(Uri homeserver) async {
+ try {
+ final response = await _sendCommand("discover_homeserver", {
+ "user_id": "@fake-user:${homeserver.host}",
+ });
+ return response["m.homeserver"]?["base_url"];
+ } catch (error) {
+ return null;
+ }
+ }
+
+ static final provider = AsyncNotifierProvider(
ClientController.new,
);
}
diff --git a/lib/controllers/client_state_controller.dart b/lib/controllers/client_state_controller.dart
new file mode 100644
index 00000000..998d4a1e
--- /dev/null
+++ b/lib/controllers/client_state_controller.dart
@@ -0,0 +1,15 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/models/client_state.dart";
+
+class ClientStateController extends Notifier {
+ @override
+ Null build() => null;
+
+ void set(ClientState newState) {
+ state = newState;
+ }
+
+ static final provider = NotifierProvider(
+ ClientStateController.new,
+ );
+}
diff --git a/lib/controllers/cross_cache_controller.dart b/lib/controllers/cross_cache_controller.dart
new file mode 100644
index 00000000..1d6d4b65
--- /dev/null
+++ b/lib/controllers/cross_cache_controller.dart
@@ -0,0 +1,14 @@
+import "package:cross_cache/cross_cache.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+
+class CrossCacheController extends Notifier {
+ static const String spaceKey = "space";
+ static const String roomKey = "room";
+
+ @override
+ CrossCache build() => CrossCache();
+
+ static final provider = NotifierProvider(
+ CrossCacheController.new,
+ );
+}
diff --git a/lib/controllers/database_controller.dart b/lib/controllers/database_controller.dart
deleted file mode 100644
index 706560b8..00000000
--- a/lib/controllers/database_controller.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:path/path.dart";
-import "package:path_provider/path_provider.dart";
-import "package:sqflite_common_ffi/sqflite_ffi.dart";
-
-class DatabaseController extends AsyncNotifier {
- @override
- Future build() async {
- databaseFactory = databaseFactoryFfi;
- return databaseFactoryFfi.openDatabase(
- join((await getApplicationSupportDirectory()).path, "database.db"),
- );
- }
-
- static final provider = AsyncNotifierProvider(
- DatabaseController.new,
- );
-}
diff --git a/lib/controllers/event_controller.dart b/lib/controllers/event_controller.dart
new file mode 100644
index 00000000..4f729636
--- /dev/null
+++ b/lib/controllers/event_controller.dart
@@ -0,0 +1,20 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/models/requests/get_event_request.dart";
+
+class EventController extends AsyncNotifier {
+ final GetEventRequest request;
+ EventController(this.request);
+
+ @override
+ Future build() async {
+ final client = ref.watch(ClientController.provider.notifier);
+ return await client.getEvent(request).onError((_, _) => null);
+ }
+
+ static final provider = AsyncNotifierProvider.family
+ .autoDispose(
+ EventController.new,
+ );
+}
diff --git a/lib/controllers/events_controller.dart b/lib/controllers/events_controller.dart
deleted file mode 100644
index 37b9ff29..00000000
--- a/lib/controllers/events_controller.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:matrix/matrix.dart";
-import "package:nexus/controllers/from_controller.dart";
-
-class EventsController extends AsyncNotifier {
- EventsController(this.room);
- final Room room;
-
- @override
- Future build({String? from}) async {
- final response = await room.client.getRoomEvents(
- room.id,
- Direction.b,
- from: from,
- limit: 32,
- );
- if (ref.mounted) {
- ref.watch(FromController.provider(room).notifier).set(response.end);
- }
- return response;
- }
-
- Future prev() async =>
- build(from: ref.read(FromController.provider(room)));
-
- static final provider = AsyncNotifierProvider.autoDispose
- .family(
- EventsController.new,
- );
-}
diff --git a/lib/controllers/from_controller.dart b/lib/controllers/from_controller.dart
deleted file mode 100644
index 54c850a0..00000000
--- a/lib/controllers/from_controller.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:matrix/matrix.dart";
-
-class FromController extends Notifier {
- FromController(_);
- @override
- String? build() => null;
-
- void set(String? value) => state = value;
-
- static final provider =
- NotifierProvider.family(
- FromController.new,
- );
-}
diff --git a/lib/controllers/header_controller.dart b/lib/controllers/header_controller.dart
new file mode 100644
index 00000000..295cf043
--- /dev/null
+++ b/lib/controllers/header_controller.dart
@@ -0,0 +1,20 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+
+class HeaderController extends AsyncNotifier> {
+ @override
+ Future> build() async {
+ if (ref.watch(ClientStateController.provider)?.isLoggedIn != true) {
+ return {};
+ }
+ final client = ref.watch(ClientController.provider.notifier);
+ final accessToken = await client.getAccessToken();
+ return {"authorization": "Bearer $accessToken"};
+ }
+
+ static final provider =
+ AsyncNotifierProvider>(
+ HeaderController.new,
+ );
+}
diff --git a/lib/controllers/init_complete_controller.dart b/lib/controllers/init_complete_controller.dart
new file mode 100644
index 00000000..c0114721
--- /dev/null
+++ b/lib/controllers/init_complete_controller.dart
@@ -0,0 +1,11 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+
+class InitCompleteController extends Notifier {
+ @override
+ bool build() => false;
+ void complete() => state = true;
+
+ static final provider = NotifierProvider(
+ InitCompleteController.new,
+ );
+}
diff --git a/lib/controllers/members_by_type_controller.dart b/lib/controllers/members_by_type_controller.dart
new file mode 100644
index 00000000..cdc8d07f
--- /dev/null
+++ b/lib/controllers/members_by_type_controller.dart
@@ -0,0 +1,25 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/members_controller.dart";
+import "package:nexus/models/membership.dart";
+import "package:nexus/models/membership_status.dart";
+
+class MembersByTypeController extends AsyncNotifier> {
+ final MembershipStatus status;
+ MembersByTypeController(this.status);
+
+ @override
+ Future> build() => ref.watch(
+ MembersController.provider.selectAsync(
+ (members) =>
+ members.where((membership) => membership.status == status).toIList(),
+ ),
+ );
+
+ static final provider =
+ AsyncNotifierProvider.family<
+ MembersByTypeController,
+ IList,
+ MembershipStatus
+ >(MembersByTypeController.new);
+}
diff --git a/lib/controllers/members_controller.dart b/lib/controllers/members_controller.dart
index fae5433f..39666d4f 100644
--- a/lib/controllers/members_controller.dart
+++ b/lib/controllers/members_controller.dart
@@ -1,22 +1,52 @@
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:matrix/matrix.dart";
-
-class MembersController extends AsyncNotifier> {
- final Room room;
- MembersController(this.room);
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/selected_room_controller.dart";
+import "package:nexus/models/membership.dart";
+import "package:nexus/models/requests/get_room_state_request.dart";
+class MembersController extends AsyncNotifier> {
@override
- Future> build() async => IList(
- (await room.client.getMembersByRoom(
- room.id,
- notMembership: Membership.leave,
- )) ??
- [],
- );
+ Future> build() async {
+ final data = ref.watch(
+ SelectedRoomController.provider.select(
+ (value) => value?.metadata == null
+ ? null
+ : (value!.metadata!.id, value.metadata!.hasMemberList),
+ ),
+ );
+ if (data == null) return const IList.empty();
+
+ final state = await ref
+ .watch(ClientController.provider.notifier)
+ .getRoomState(
+ GetRoomStateRequest(
+ roomId: data.$1,
+ fetchMembers: data.$2 == false,
+ includeMembers: true,
+ ),
+ );
+
+ return state.nonNulls
+ .where((state) => state.type == "m.room.member")
+ .map(
+ (membership) => Membership.fromContent(
+ membership.content,
+ membership.stateKey!,
+ ref.watch(
+ ClientStateController.provider.select(
+ (value) => value?.homeserverUrl,
+ ),
+ ) ??
+ "",
+ ),
+ )
+ .toIList();
+ }
static final provider =
- AsyncNotifierProvider.family, Room>(
+ AsyncNotifierProvider>(
MembersController.new,
);
}
diff --git a/lib/controllers/message_controller.dart b/lib/controllers/message_controller.dart
new file mode 100644
index 00000000..c65d18d1
--- /dev/null
+++ b/lib/controllers/message_controller.dart
@@ -0,0 +1,214 @@
+import "package:collection/collection.dart";
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_chat_core/flutter_chat_core.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/helpers/extensions/mxc_to_https.dart";
+import "package:nexus/models/configs/message_config.dart";
+import "package:nexus/models/requests/get_related_events_request.dart";
+
+class MessageController extends AsyncNotifier {
+ final MessageConfig config;
+ MessageController(this.config);
+
+ @override
+ Future build() async {
+ try {
+ final isEdit = config.event.relationType == "m.replace";
+ if ((isEdit && !config.includeEdits) || config.room.metadata == null) {
+ return null;
+ }
+
+ final event = config.event.lastEditRowId == null
+ ? config.event
+ : config.room.events.firstWhereOrNull(
+ (e) => e.rowId == config.event.lastEditRowId,
+ ) ??
+ config.event;
+
+ final decrypted = (event.decrypted ?? event.content);
+ final type = (config.event.decryptedType ?? config.event.type);
+ final content = decrypted["m.new_content"] == null
+ ? decrypted
+ : IMap(decrypted["m.new_content"]);
+
+ 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
+ ? (content["body"] ?? "")
+ : "Deleted Message",
+ "flashing": false,
+ "timelineId": event.timelineRowId,
+ "big": event.localContent?.bigEmoji == true,
+ "eventType": type,
+ "pmp": content["com.beeper.per_message_profile"],
+ "error": event.sendError,
+ "format": content["format"] ?? content["format"],
+ "editSource": event.localContent?.editSource ?? content["body"],
+ "txnId": config.event.transactionId,
+ };
+
+ final editedAt = event.relationType == "m.replace"
+ ? event.timestamp
+ : null;
+
+ if ((event.redactedBy != null && !config.alwaysReturn) ||
+ (!config.includeEdits &&
+ (config.event.relationType == "m.replace"))) {
+ return null;
+ }
+
+ final replyId =
+ config.event.content["m.relates_to"]?["m.in_reply_to"]?["event_id"];
+
+ final reactionEvents = config.event.reactions.isEmpty && !isEdit
+ ? null
+ : await ref
+ .watch(ClientController.provider.notifier)
+ .getRelatedEvents(
+ GetRelatedEventsRequest(
+ roomId: config.room.metadata!.id,
+ eventId:
+ (isEdit ? config.event.relatesTo : null) ??
+ config.event.eventId,
+ relationType: "m.annotation",
+ ),
+ );
+
+ final reactions = reactionEvents
+ ?.where((event) => event.redactedBy == null)
+ .fold>>(IMap(), (acc, event) {
+ final key = event.content["m.relates_to"]?["key"];
+ if (key == null) return acc;
+
+ return acc.update(
+ key,
+ (list) => list.add(event.authorId),
+ ifAbsent: () => IList([event.authorId]),
+ );
+ })
+ .map((key, value) => MapEntry(key, value.unlock))
+ .unlock;
+
+ final asText =
+ Message.text(
+ metadata: metadata,
+ id: config.event.eventId,
+ reactions: reactions,
+ authorId: event.authorId,
+ text: content["formatted_body"] ?? content["body"] ?? "",
+ replyToMessageId: replyId,
+ deliveredAt: config.event.timestamp,
+ editedAt: editedAt,
+ )
+ as TextMessage;
+
+ Message toSystemMessage(String content) => Message.system(
+ metadata: {...metadata, "body": content},
+ id: config.event.eventId,
+ reactions: reactions,
+ authorId: event.authorId,
+ deliveredAt: config.event.timestamp,
+ text: content,
+ );
+
+ return switch (type) {
+ "m.room.encrypted" => asText.copyWith(
+ text: "Unable to decrypt message.",
+ metadata: {...metadata, "body": "Unable to decrypt message."},
+ ),
+ // "org.matrix.msc3381.poll.start" => Message.custom(
+ // metadata: {
+ // ...metadata,
+ // "poll": event.parsedPollEventContent.pollStartContent,
+ // "responses": event.getPollResponses(timeline),
+ // },
+ // id: eventId,
+ // deliveredAt: originServerTs,
+ // authorId: senderId,
+ // ),
+ ("m.sticker" || "m.room.message") => switch (content["msgtype"]) {
+ null || "m.image" => Message.image(
+ id: config.event.eventId,
+ authorId: event.authorId,
+ reactions: reactions,
+ source: source,
+ replyToMessageId: replyId,
+ metadata: metadata,
+ text: asText.text,
+ deliveredAt: config.event.timestamp,
+ blurhash: (content["info"] as Map?)?["xyz.amorgan.blurhash"],
+ ),
+ "m.audio" || "m.file" => Message.file(
+ name: content["filename"].toString(),
+ size: content["info"]["size"],
+ metadata: metadata,
+ id: config.event.eventId,
+ reactions: reactions,
+ authorId: event.authorId,
+ source: source,
+ replyToMessageId: replyId,
+ deliveredAt: config.event.timestamp,
+ ),
+ _ => asText,
+ },
+ "m.room.member" =>
+ content["membership"] == event.unsigned["prev_content"]?["membership"]
+ ? null
+ : toSystemMessage(
+ "${content["displayname"] ?? event.stateKey} ${switch (content["membership"]) {
+ "invite" => "was invited to",
+ "join" => "joined",
+ "leave" => event.authorId == event.stateKey ? "left" : (event.unsigned["prev_content"]?["membership"] == "ban" ? "was unbanned from" : "was kicked from"),
+ "ban" => "was banned from",
+ "knock" => "asked to join",
+ _ => "did something relating to",
+ }} the room. ${content["reason"] ?? ""}",
+ ),
+
+ "m.room.server_acl" => toSystemMessage(
+ "${event.authorId} updated the server ban list.",
+ ),
+
+ "m.room.redaction" =>
+ config.alwaysReturn
+ ? asText.copyWith(
+ metadata: {
+ ...(asText.metadata ?? {}),
+ "body": "Deleted Message",
+ },
+ )
+ : null,
+ _ =>
+ config.alwaysReturn
+ ? asText
+ : (
+ // Turn this on for debugging purposes
+ false
+ // ignore: dead_code
+ ? Message.unsupported(
+ metadata: metadata,
+ reactions: reactions,
+ id: config.event.eventId,
+ authorId: event.authorId,
+ replyToMessageId: replyId,
+ )
+ : null),
+ };
+ } catch (error) {
+ return null;
+ }
+ }
+
+ static final provider = AsyncNotifierProvider.family
+ .autoDispose(
+ MessageController.new,
+ );
+}
diff --git a/lib/controllers/messages_controller.dart b/lib/controllers/messages_controller.dart
new file mode 100644
index 00000000..28885fba
--- /dev/null
+++ b/lib/controllers/messages_controller.dart
@@ -0,0 +1,27 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_chat_core/flutter_chat_core.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/message_controller.dart";
+import "package:nexus/models/configs/message_config.dart";
+import "package:nexus/models/configs/messages_config.dart";
+
+class MessagesController extends AsyncNotifier> {
+ final MessagesConfig config;
+ MessagesController(this.config);
+
+ @override
+ Future> build() async => (await Future.wait(
+ config.events.map(
+ (event) => ref.watch(
+ MessageController.provider(
+ MessageConfig(event: event, room: config.room),
+ ).future,
+ ),
+ ),
+ )).nonNulls.toIList();
+
+ static final provider = AsyncNotifierProvider.family
+ .autoDispose, MessagesConfig>(
+ MessagesController.new,
+ );
+}
diff --git a/lib/controllers/multi_provider_controller.dart b/lib/controllers/multi_provider_controller.dart
new file mode 100644
index 00000000..e23ecaa9
--- /dev/null
+++ b/lib/controllers/multi_provider_controller.dart
@@ -0,0 +1,20 @@
+import "dart:async";
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+
+class MultiProviderController extends AsyncNotifier {
+ MultiProviderController(this.providers);
+ final IList providers;
+
+ @override
+ FutureOr build() async => await Future.wait(
+ providers.map((provider) => ref.watch(provider.future)),
+ );
+
+ static final provider =
+ AsyncNotifierProvider.family<
+ MultiProviderController,
+ void,
+ IList
+ >(MultiProviderController.new);
+}
diff --git a/lib/controllers/new_events_controller.dart b/lib/controllers/new_events_controller.dart
new file mode 100644
index 00000000..215ebd32
--- /dev/null
+++ b/lib/controllers/new_events_controller.dart
@@ -0,0 +1,18 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/models/event.dart";
+
+class NewEventsController extends Notifier> {
+ final String roomId;
+ NewEventsController(this.roomId);
+
+ @override
+ IList build() => const IList.empty();
+
+ void add(IList newEvents) => state = newEvents;
+
+ static final provider = NotifierProvider.autoDispose
+ .family, String>(
+ NewEventsController.new,
+ );
+}
diff --git a/lib/controllers/power_level_controller.dart b/lib/controllers/power_level_controller.dart
new file mode 100644
index 00000000..41b5f19d
--- /dev/null
+++ b/lib/controllers/power_level_controller.dart
@@ -0,0 +1,70 @@
+import "package:collection/collection.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/selected_room_controller.dart";
+import "package:nexus/models/configs/power_level_config.dart";
+import "package:nexus/models/requests/membership_action.dart";
+
+class PowerLevelController extends Notifier {
+ final PowerLevelConfig config;
+ PowerLevelController(this.config);
+
+ @override
+ bool build() {
+ final room = ref.watch(SelectedRoomController.provider);
+ final event = room?.events.firstWhereOrNull(
+ (event) => event.rowId == room.state["m.room.power_levels"]?[""],
+ );
+ final user = ref.watch(ClientStateController.provider)?.userId;
+ if (event == null || user == null) return false;
+
+ final users = (event.content["users"] as Map? ?? {});
+ final events = (event.content["events"] as Map? ?? {});
+
+ int powerLevelOf(String userId) => users.containsKey(userId)
+ ? (users[userId] as int)
+ : (event.content["users_default"] as int? ?? 0);
+
+ final userLevel = powerLevelOf(user);
+ final targetLevel = config.targetUser != null
+ ? powerLevelOf(config.targetUser!)
+ : null;
+
+ if (config.action != null) {
+ return switch (config.action!) {
+ MembershipAction.invite =>
+ userLevel >= (event.content["invite"] as int? ?? 0),
+
+ MembershipAction.kick =>
+ targetLevel != null &&
+ userLevel >= (event.content["kick"] as int? ?? 50) &&
+ userLevel > targetLevel,
+
+ MembershipAction.ban =>
+ targetLevel != null &&
+ userLevel >= (event.content["ban"] as int? ?? 50) &&
+ userLevel > targetLevel,
+
+ MembershipAction.unban =>
+ userLevel >= (event.content["ban"] as int? ?? 50),
+ };
+ }
+
+ if (config.eventType == "m.room.redaction") {
+ return userLevel >= (event.content["redact"] as int? ?? 50);
+ }
+
+ final requiredLevel = events.containsKey(config.eventType)
+ ? (events[config.eventType] as int)
+ : (config.isStateEvent
+ ? (event.content["state_default"] as int? ?? 50)
+ : (event.content["events_default"] as int? ?? 0));
+
+ return userLevel >= requiredLevel;
+ }
+
+ static final provider = NotifierProvider.autoDispose
+ .family(
+ PowerLevelController.new,
+ );
+}
diff --git a/lib/controllers/profile_controller.dart b/lib/controllers/profile_controller.dart
new file mode 100644
index 00000000..120d4e49
--- /dev/null
+++ b/lib/controllers/profile_controller.dart
@@ -0,0 +1,17 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/models/profile.dart";
+
+class ProfileController extends AsyncNotifier {
+ final String userId;
+ ProfileController(this.userId);
+
+ @override
+ Future build() {
+ final client = ref.watch(ClientController.provider.notifier);
+ return client.getProfile(userId);
+ }
+
+ static final provider = AsyncNotifierProvider.autoDispose
+ .family(ProfileController.new);
+}
diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart
index 1a1be397..fa32bf85 100644
--- a/lib/controllers/room_chat_controller.dart
+++ b/lib/controllers/room_chat_controller.dart
@@ -1,58 +1,190 @@
+import "dart:async";
import "package:collection/collection.dart";
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_chat_core/flutter_chat_core.dart";
-import "package:flutter_chat_core/flutter_chat_core.dart" as chat;
import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:matrix/matrix.dart";
-import "package:nexus/controllers/avatar_controller.dart";
-import "package:nexus/controllers/events_controller.dart";
-import "package:nexus/helpers/extensions/event_to_message.dart";
-import "package:nexus/helpers/extensions/list_to_messages.dart";
-import "package:fluttertagger/fluttertagger.dart" as tagger;
+import "package:fluttertagger/fluttertagger.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/message_controller.dart";
+import "package:nexus/controllers/messages_controller.dart";
+import "package:nexus/controllers/new_events_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/selected_room_controller.dart";
+import "package:nexus/models/configs/messages_config.dart";
+import "package:nexus/models/configs/message_config.dart";
+import "package:nexus/models/requests/get_related_events_request.dart";
+import "package:nexus/models/requests/get_room_state_request.dart";
+import "package:nexus/models/requests/paginate_request.dart";
+import "package:nexus/models/requests/redact_event_request.dart";
import "package:nexus/models/relation_type.dart";
+import "package:nexus/models/requests/send_event_request.dart";
+import "package:nexus/models/requests/send_message_request.dart";
+import "package:nexus/models/room.dart";
-class RoomChatController extends AsyncNotifier {
- final Room room;
- RoomChatController(this.room);
+class RoomChatController extends AsyncNotifier {
+ final String roomId;
+ RoomChatController(this.roomId);
@override
- Future build() async {
- final response = await ref.watch(EventsController.provider(room).future);
+ Future build() async {
+ final client = ref.watch(ClientController.provider.notifier);
+ var room = ref.read(RoomsController.provider)[roomId];
+ if (room == null) return InMemoryChatController();
+ final state = await client.getRoomState(
+ GetRoomStateRequest(roomId: roomId),
+ );
+
+ ref
+ .read(RoomsController.provider.notifier)
+ .update(
+ {
+ roomId: Room(
+ events: state,
+ state: state.fold(
+ const IMap.empty(),
+ (previousValue, stateEvent) => previousValue.add(
+ stateEvent.type,
+ (previousValue[stateEvent.type] ?? const IMap.empty()).addAll(
+ IMap({
+ if (stateEvent.stateKey != null)
+ stateEvent.stateKey!: stateEvent.rowId,
+ }),
+ ),
+ ),
+ ),
+ ),
+ }.toIMap(),
+ const ISet.empty(),
+ );
+
+ room = ref.read(RoomsController.provider)[roomId];
+ if (room == null) return InMemoryChatController();
+
+ final messages = await ref.watch(
+ MessagesController.provider(
+ MessagesConfig(
+ room: room,
+ events: room.timeline
+ .map(
+ (timelineRowTuple) => room!.events.firstWhereOrNull(
+ (event) => event.rowId == timelineRowTuple.eventRowId,
+ ),
+ )
+ .nonNulls
+ .toIList(),
+ ),
+ ).future,
+ );
+ final controller = InMemoryChatController(messages: messages.toList());
ref.onDispose(
- room.client.onTimelineEvent.stream.listen((event) async {
- if (event.roomId != room.id) return;
-
- if (event.type == EventTypes.Redaction) {
- final controller = await future;
- final message = controller.messages.firstWhereOrNull(
- (message) => message.id == event.redacts,
- );
- if (message == null) return;
-
- await controller.removeMessage(message);
- } else {
- final message = await event.toMessage(includeEdits: true);
- if (event.relationshipType == RelationshipTypes.edit) {
- final controller = await future;
- final oldMessage = controller.messages.firstWhereOrNull(
- (element) => element.id == event.relationshipEventId,
+ ref.listen(NewEventsController.provider(roomId), (_, next) async {
+ for (final event in next) {
+ if (event.type == "m.reaction") {
+ final message = controller.messages.firstWhereOrNull(
+ (message) =>
+ message.id == event.content["m.relates_to"]?["event_id"],
);
- if (oldMessage == null || message == null) return;
- return await updateMessage(
- oldMessage,
- message.copyWith(id: oldMessage.id),
+ final key = event.content["m.relates_to"]?["key"];
+ if (message == null || key == null || !ref.mounted) return;
+
+ return await controller.updateMessage(
+ message,
+ message.copyWith(
+ reactions: IMap(message.reactions)
+ .update(
+ key,
+ (reactors) => [...reactors, event.authorId],
+ ifAbsent: () => [event.authorId],
+ )
+ .unlock,
+ ),
);
}
- if (message != null) {
- return await insertMessage(message);
+
+ if (event.type == "m.room.redaction") {
+ final controller = await future;
+ final redactsId = event.content["redacts"];
+ final originalMessage = controller.messages.firstWhereOrNull(
+ (message) => message.id == redactsId,
+ );
+ if (!ref.mounted) return;
+
+ if (originalMessage != null) {
+ return await controller.removeMessage(originalMessage);
+ }
+
+ final redacts = ref
+ .read(SelectedRoomController.provider)
+ ?.events
+ .firstWhere((event) => event.eventId == redactsId);
+
+ if (redacts?.type == "m.reaction") {
+ final message = controller.messages.firstWhereOrNull(
+ (message) =>
+ message.id == redacts!.content["m.relates_to"]?["event_id"],
+ );
+ final key = redacts!.content["m.relates_to"]?["key"];
+ if (message == null || key == null || !ref.mounted) return;
+
+ return await controller.updateMessage(
+ message,
+ message.copyWith(
+ reactions: IMap(message.reactions)
+ .update(
+ key,
+ (reactors) =>
+ IList(reactors).remove(redacts.authorId).unlock,
+ )
+ .where((_, value) => value.isNotEmpty)
+ .unlock,
+ ),
+ );
+ }
+ } else {
+ final message = await ref.watch(
+ MessageController.provider(
+ MessageConfig(event: event, room: room!, includeEdits: true),
+ ).future,
+ );
+ if (event.relationType == "m.replace") {
+ final controller = await future;
+ final oldMessage = controller.messages.firstWhereOrNull(
+ (element) => element.id == event.relatesTo,
+ );
+ if (oldMessage == null || message == null || !ref.mounted) return;
+
+ return await controller.updateMessage(
+ oldMessage,
+ message.copyWith(
+ id: oldMessage.id,
+ replyToMessageId: oldMessage.replyToMessageId,
+ metadata: {
+ ...(oldMessage.metadata ?? {}),
+ ...(message.metadata ?? {})
+ .toIMap()
+ .where((key, value) => value != null)
+ .unlock,
+ },
+ ),
+ );
+ }
+ if (message != null && ref.mounted) {
+ await insertMessage(message);
+ }
}
}
- }).cancel,
+ }, weak: true).close,
);
- return InMemoryChatController(
- messages: await response.chunk.toMessages(room),
- );
+ ref.onDispose(controller.dispose);
+
+ // While there are under 20 messages, try up to load more messages until theres no more or we have 20 messages.
+ for (var more = true; more == true && controller.messages.length < 20;) {
+ more = await loadOlder(controller);
+ }
+
+ return controller;
}
Future insertMessage(Message message) async {
@@ -69,42 +201,78 @@ class RoomChatController extends AsyncNotifier {
: controller.updateMessage(oldMessage, message);
}
- Future deleteMessage(Message message, {String? reason}) async {
- final controller = await future;
- await controller.removeMessage(message);
- await room.redactEvent(message.id, reason: reason);
- }
+ Future deleteMessage(Message message, {String? reason}) => ref
+ .watch(ClientController.provider.notifier)
+ .redactEvent(
+ RedactEventRequest(eventId: message.id, roomId: roomId, reason: reason),
+ );
- Future loadOlder() async {
- final controller = await future;
+ Future loadOlder([InMemoryChatController? chatController]) async {
final response = await ref
- .watch(EventsController.provider(room).notifier)
- .prev();
+ .watch(ClientController.provider.notifier)
+ .paginate(
+ PaginateRequest(
+ roomId: roomId,
+ maxTimelineId: ref
+ .read(RoomsController.provider)[roomId]
+ ?.timeline
+ .firstOrNull
+ ?.timelineRowId,
+ ),
+ );
- final messages = await response.chunk.toMessages(room);
+ ref
+ .watch(RoomsController.provider.notifier)
+ .update(
+ IMap({
+ roomId: Room(
+ events: response.events.addAll(response.relatedEvents),
+ hasMore: response.hasMore,
+ timeline: response.events
+ .map(
+ (event) => TimelineRowTuple(
+ timelineRowId: event.timelineRowId,
+ eventRowId: event.rowId,
+ ),
+ )
+ .toIList(),
+ ),
+ }),
+ const ISet.empty(),
+ addToNewEvents: false,
+ );
- await controller.insertAllMessages(messages, index: 0);
- ref.notifyListeners();
+ final room = ref.read(RoomsController.provider)[roomId];
+ if (room != null) {
+ final messages = await ref.watch(
+ MessagesController.provider(
+ MessagesConfig(room: room, events: response.events.reversed),
+ ).future,
+ );
+
+ final controller = chatController ?? await future;
+ await controller.insertAllMessages(
+ messages
+ .where(
+ (newMessage) => !controller.messages.any(
+ (message) => message.id == newMessage.id,
+ ),
+ )
+ .toList(),
+ index: 0,
+ );
+ }
+ return response.hasMore;
}
- Future markRead() async {
- if (!room.hasNewMessages) return;
- final controller = await future;
- final id = controller.messages.last.id;
-
- await room.setReadMarker(id, mRead: id);
- }
-
- Future updateMessage(Message message, Message newMessage) async =>
- (await future).updateMessage(message, newMessage);
-
Future send(
- String message, {
- required Iterable tags,
+ String text, {
+ bool shouldMention = true,
+ required IList tags,
required RelationType relationType,
Message? relation,
}) async {
- var taggedMessage = message;
+ var taggedMessage = text;
for (final tag in tags) {
final escaped = RegExp.escape(tag.id);
@@ -116,30 +284,107 @@ class RoomChatController extends AsyncNotifier {
);
}
- await room.sendTextEvent(
- taggedMessage,
- editEventId: relationType == RelationType.edit ? relation?.id : null,
- inReplyTo: (relationType == RelationType.reply && relation != null)
- ? await room.getEventById(relation.id)
- : null,
+ final client = ref.watch(ClientController.provider.notifier);
+ final room = ref.read(RoomsController.provider)[roomId];
+ final event = await client.sendMessage(
+ SendMessageRequest(
+ roomId: roomId,
+ mentions: Mentions(
+ userIds: [
+ if (shouldMention == true &&
+ relation != null &&
+ relationType == RelationType.reply)
+ relation.authorId,
+ ].toIList(),
+ room: taggedMessage.contains("@room"),
+ ),
+ text: taggedMessage,
+ relation: relation == null
+ ? null
+ : Relation(eventId: relation.id, relationType: relationType),
+ ),
);
+ final message = room == null
+ ? null
+ : await ref.watch(
+ MessageController.provider(
+ MessageConfig(room: room, event: event),
+ ).future,
+ );
+
+ if (message != null) insertMessage(message);
}
- Future resolveUser(String id) async {
- final user = await room.client.getUserProfile(id);
- return chat.User(
- id: id,
- name: user.displayname,
- imageSource: user.avatarUrl == null
- ? null
- : (await ref.watch(
- AvatarController.provider(user.avatarUrl!.toString()).future,
- )).toString(),
+ Future scrollToMessage(Message message) async {
+ final controller = await future;
+ Future setFlashing(bool flashing) => controller.updateMessage(
+ message,
+ message.copyWith(
+ metadata: {...(message.metadata ?? {}), "flashing": flashing},
+ ),
+ );
+
+ await setFlashing(true);
+ Timer(Duration(seconds: 1), () => setFlashing(false));
+
+ return await controller.scrollToMessage(message.id);
+ }
+
+ Future removeReaction(
+ String reaction,
+ Message message,
+ String userId,
+ ) async {
+ final client = ref.watch(ClientController.provider.notifier);
+ final allReactionEvents = await client.getRelatedEvents(
+ GetRelatedEventsRequest(
+ roomId: roomId,
+ eventId: message.id,
+ relationType: "m.annotation",
+ ),
+ );
+
+ final reactionEvents = allReactionEvents
+ ?.where((event) => event.redactedBy == null)
+ .toIList();
+
+ final reactionEvent = reactionEvents?.firstWhereOrNull(
+ (event) =>
+ event.authorId == userId &&
+ event.content["m.relates_to"]?["key"] == reaction,
+ );
+
+ if (reactionEvent != null) {
+ await ref
+ .watch(ClientController.provider.notifier)
+ .redactEvent(
+ RedactEventRequest(eventId: reactionEvent.eventId, roomId: roomId),
+ );
+ }
+ }
+
+ Future sendReaction(String reaction, Message message) async {
+ final client = ref.watch(ClientController.provider.notifier);
+
+ await client.sendEvent(
+ SendEventRequest(
+ roomId: roomId,
+ type: "m.reaction",
+ content: {
+ "m.relates_to": {
+ "event_id": message.id,
+ "rel_type": "m.annotation",
+ "key": reaction,
+ },
+ },
+ synchronous: true,
+ disableEncryption: true,
+ ),
);
}
static final provider = AsyncNotifierProvider.family
- .autoDispose(
+ .autoDispose(
RoomChatController.new,
);
}
diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms_controller.dart
index 864d656d..7013de0c 100644
--- a/lib/controllers/rooms_controller.dart
+++ b/lib/controllers/rooms_controller.dart
@@ -1,23 +1,109 @@
+import "package:collection/collection.dart";
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/helpers/extensions/get_full_room.dart";
-import "package:nexus/models/full_room.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/new_events_controller.dart";
+import "package:nexus/helpers/extensions/mxc_to_https.dart";
+import "package:nexus/models/read_receipt.dart";
+import "package:nexus/models/room.dart";
-class RoomsController extends AsyncNotifier> {
+class RoomsController extends Notifier> {
@override
- Future> build() async {
- final client = await ref.watch(ClientController.provider.future);
+ IMap build() => const IMap.empty();
- ref.onDispose(
- client.onSync.stream.listen((_) => ref.invalidateSelf()).cancel,
+ void update(
+ IMap rooms,
+ ISet leftRooms, {
+ bool addToNewEvents = true,
+ }) {
+ final homeserver =
+ ref.watch(
+ ClientStateController.provider.select(
+ (value) => value?.homeserverUrl,
+ ),
+ ) ??
+ "";
+ final merged = rooms.entries.fold(state, (acc, entry) {
+ final roomId = entry.key;
+ final incoming = entry.value;
+ final existing = acc[roomId];
+
+ final events = existing?.events.updateById(
+ incoming.events,
+ (item) => item.eventId,
+ );
+
+ if (addToNewEvents) {
+ ref
+ .watch(NewEventsController.provider(roomId).notifier)
+ .add(
+ incoming.timeline
+ .map(
+ (timelineTuple) => events?.firstWhereOrNull(
+ (event) => timelineTuple.eventRowId == event.rowId,
+ ),
+ )
+ .nonNulls
+ .toIList(),
+ );
+ }
+
+ return acc.add(
+ roomId,
+ existing?.copyWith(
+ hasMore: incoming.hasMore,
+ metadata:
+ incoming.metadata?.copyWith(
+ avatar:
+ incoming.metadata?.avatar?.mxcToHttps(homeserver) ??
+ existing.metadata?.avatar,
+ ) ??
+ existing.metadata,
+ events: events!,
+ state: incoming.state.entries.fold(
+ existing.state,
+ (previousValue, event) => previousValue.add(
+ event.key,
+ (previousValue[event.key] ?? const IMap.empty()).addAll(
+ event.value,
+ ),
+ ),
+ ),
+ timeline:
+ (incoming.reset
+ ? incoming.timeline
+ : existing.timeline.updateById(
+ incoming.timeline,
+ (item) => item.timelineRowId,
+ ))
+ .sortedBy((element) => element.timelineRowId)
+ .toIList(),
+ receipts: incoming.receipts.entries.fold(
+ existing.receipts,
+ (receiptAcc, event) => receiptAcc.add(
+ event.key,
+ (receiptAcc[event.key] ?? IList()).addAll(
+ event.value,
+ ),
+ ),
+ ),
+ ) ??
+ incoming.copyWith(
+ metadata: incoming.metadata?.copyWith(
+ avatar: incoming.metadata?.avatar?.mxcToHttps(homeserver),
+ ),
+ ),
+ );
+ });
+
+ final prunedList = leftRooms.fold(
+ merged,
+ (acc, roomId) => acc.remove(roomId),
);
-
- return IList(await Future.wait(client.rooms.map((room) => room.fullRoom)));
+ state = prunedList;
}
- static final provider =
- AsyncNotifierProvider>(
- RoomsController.new,
- );
+ static final provider = NotifierProvider>(
+ RoomsController.new,
+ );
}
diff --git a/lib/controllers/secure_storage_controller.dart b/lib/controllers/secure_storage_controller.dart
deleted file mode 100644
index 8a579f52..00000000
--- a/lib/controllers/secure_storage_controller.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:simple_secure_storage/simple_secure_storage.dart";
-
-class SecureStorageController extends AsyncNotifier {
- @override
- Future build() => SimpleSecureStorage.initialize();
-
- Future get(String key) async {
- await future;
- return SimpleSecureStorage.read(key);
- }
-
- Future set(String key, String value) async {
- await future;
- return SimpleSecureStorage.write(key, value);
- }
-
- Future clear() async {
- await future;
- return SimpleSecureStorage.clear();
- }
-
- static final provider = AsyncNotifierProvider(
- SecureStorageController.new,
- );
-}
diff --git a/lib/controllers/selected_room_controller.dart b/lib/controllers/selected_room_controller.dart
index cfeead63..ffba78c6 100644
--- a/lib/controllers/selected_room_controller.dart
+++ b/lib/controllers/selected_room_controller.dart
@@ -2,24 +2,23 @@ import "package:collection/collection.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:nexus/controllers/key_controller.dart";
import "package:nexus/controllers/selected_space_controller.dart";
-import "package:nexus/models/full_room.dart";
+import "package:nexus/models/room.dart";
-class SelectedRoomController extends AsyncNotifier {
+class SelectedRoomController extends Notifier {
@override
- Future build() async {
- final space = await ref.watch(SelectedSpaceController.provider.future);
+ Room? build() {
+ final space = ref.watch(SelectedSpaceController.provider);
final selectedRoomId = ref.watch(
KeyController.provider(KeyController.roomKey),
);
return space.children.firstWhereOrNull(
- (room) => room.roomData.id == selectedRoomId,
+ (room) => room.metadata?.id == selectedRoomId,
) ??
space.children.firstOrNull;
}
- static final provider =
- AsyncNotifierProvider(
- SelectedRoomController.new,
- );
+ static final provider = NotifierProvider(
+ SelectedRoomController.new,
+ );
}
diff --git a/lib/controllers/selected_space_controller.dart b/lib/controllers/selected_space_controller.dart
index 75bf2877..dbeb71fe 100644
--- a/lib/controllers/selected_space_controller.dart
+++ b/lib/controllers/selected_space_controller.dart
@@ -4,12 +4,10 @@ import "package:nexus/controllers/key_controller.dart";
import "package:nexus/controllers/spaces_controller.dart";
import "package:nexus/models/space.dart";
-class SelectedSpaceController extends AsyncNotifier {
+class SelectedSpaceController extends Notifier {
@override
- Future build() async {
- final spaces = await ref.watch(
- SpacesController.provider.selectAsync((data) => data),
- );
+ Space build() {
+ final spaces = ref.watch(SpacesController.provider);
final selectedSpaceId = ref.watch(
KeyController.provider(KeyController.spaceKey),
);
@@ -18,7 +16,7 @@ class SelectedSpaceController extends AsyncNotifier {
spaces.first;
}
- static final provider = AsyncNotifierProvider(
+ static final provider = NotifierProvider(
SelectedSpaceController.new,
);
}
diff --git a/lib/controllers/space_edges_controller.dart b/lib/controllers/space_edges_controller.dart
new file mode 100644
index 00000000..12694d67
--- /dev/null
+++ b/lib/controllers/space_edges_controller.dart
@@ -0,0 +1,16 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/models/space_edge.dart";
+
+class SpaceEdgesController extends Notifier>> {
+ @override
+ IMap> build() => const IMap.empty();
+
+ void set(IMap> newEdges) =>
+ state = state.addAll(newEdges);
+
+ static final provider =
+ NotifierProvider>>(
+ SpaceEdgesController.new,
+ );
+}
diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart
index 3501de6e..7a503ad2 100644
--- a/lib/controllers/spaces_controller.dart
+++ b/lib/controllers/spaces_controller.dart
@@ -1,77 +1,139 @@
+import "package:collection/collection.dart";
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/helpers/extensions/get_full_room.dart";
-import "package:nexus/helpers/extensions/room_to_children.dart";
+import "package:nexus/controllers/account_data_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/top_level_spaces_controller.dart";
+import "package:nexus/controllers/space_edges_controller.dart";
import "package:nexus/models/space.dart";
+import "package:nexus/models/room.dart";
+import "package:nexus/models/space_edge.dart";
-class SpacesController extends AsyncNotifier> {
+class SpacesController extends Notifier> {
@override
- Future> build() async {
- final client = await ref.watch(ClientController.provider.future);
+ IList build() {
+ final rooms = ref.watch(RoomsController.provider);
+ final topLevelSpaceIds = ref.watch(TopLevelSpacesController.provider);
+ final spaceEdges = ref.watch(SpaceEdgesController.provider);
- ref.onDispose(
- client.onSync.stream.listen((_) => ref.invalidateSelf()).cancel,
+ final childRoomsBySpaceId = IMap.fromEntries(
+ topLevelSpaceIds.map((spaceId) {
+ ISet walk(String currentId) {
+ final children = spaceEdges[currentId] ?? IList();
+
+ return children.fold>(const ISet.empty(), (acc, edge) {
+ final childId = edge.childId;
+ final isSpace = spaceEdges.containsKey(childId);
+
+ return acc
+ .addAll(!isSpace ? ISet([childId]) : const ISet.empty())
+ .addAll(isSpace ? walk(childId) : const ISet.empty());
+ });
+ }
+
+ return MapEntry(
+ spaceId,
+ walk(spaceId).map((id) => rooms[id]).nonNulls.toIList(),
+ );
+ }),
);
- final topLevel = IList(
- await Future.wait(
- client.rooms
- .where((room) => !room.isDirectChat)
- .where(
- (room) => client.rooms
- .where((room) => room.isSpace)
- .every(
- (match) => match.spaceChildren.every(
- (child) => child.roomId != room.id,
- ),
- ),
- )
- .map((room) => room.fullRoom),
- ),
- );
+ final allNestedRoomIds = childRoomsBySpaceId.values
+ .expand((l) => l)
+ .map(
+ (room) => rooms.entries
+ .firstWhere(
+ (entry) => entry.value.metadata?.id == room.metadata?.id,
+ )
+ .key,
+ )
+ .toISet();
- final topLevelSpaces = topLevel.where((r) => r.roomData.isSpace).toIList();
- final topLevelRooms = topLevel.where((r) => !r.roomData.isSpace).toIList();
+ final otherRooms = rooms.entries
+ .where(
+ (e) =>
+ !allNestedRoomIds.contains(e.key) &&
+ !topLevelSpaceIds.contains(e.key) &&
+ !spaceEdges.containsKey(e.key),
+ )
+ .map((e) => e.value);
- return IList([
- Space(
- client: client,
- title: "Home",
- id: "home",
- children: topLevelRooms,
- icon: Icons.home,
- ),
- Space(
- client: client,
- title: "Direct Messages",
- id: "dms",
- children: IList(
- await Future.wait(
- client.rooms
- .where((room) => room.isDirectChat)
- .map((room) => room.fullRoom),
+ final accountData = ref.watch(AccountDataController.provider);
+
+ final directMessages = IMap(
+ accountData["m.direct"]?.content ?? {},
+ ).values.expand((element) => element);
+
+ final homeRooms = otherRooms
+ .where(
+ (room) =>
+ directMessages.any(
+ (directMessage) => directMessage == room.metadata?.id,
+ ) ==
+ false,
+ )
+ .toIList();
+
+ final dmRooms = otherRooms
+ .where(
+ (room) => directMessages.any(
+ (directMessage) => directMessage == room.metadata?.id,
),
- ),
- icon: Icons.person,
- ),
- ...(await Future.wait(
- topLevelSpaces.map(
- (space) async => Space(
- client: client,
- title: space.title,
- avatar: space.avatar,
- id: space.roomData.id,
- roomData: space.roomData,
- children: IList(await space.roomData.getAllChildren(client)),
+ )
+ .toIList();
+
+ final topLevelSpacesList = topLevelSpaceIds
+ .map((id) {
+ final room = rooms[id];
+ if (room == null) return null;
+
+ final children = childRoomsBySpaceId[id] ?? IList();
+ return Space(
+ id: id,
+ title: room.metadata?.name ?? "Unnamed Room",
+ room: room,
+ children: children,
+ );
+ })
+ .nonNulls
+ .toIList();
+
+ return [
+ Space(
+ id: "home",
+ title: "Home",
+ icon: Icons.home,
+ children: homeRooms,
),
- ),
- )),
- ]);
+ Space(
+ id: "dms",
+ title: "Direct Messages",
+ icon: Icons.people,
+ children: dmRooms,
+ ),
+ ...topLevelSpacesList,
+ ]
+ .map(
+ (space) => space.copyWith(
+ children: space.children
+ .sortedBy(
+ (element) =>
+ element
+ .metadata
+ ?.sortingTimestamp
+ .millisecondsSinceEpoch ??
+ 0,
+ )
+ .sortedBy((room) => room.metadata?.unreadMessages ?? 0)
+ .reversed
+ .toIList(),
+ ),
+ )
+ .toIList();
}
- static final provider = AsyncNotifierProvider>(
+ static final provider = NotifierProvider>(
SpacesController.new,
);
}
diff --git a/lib/controllers/sync_status_controller.dart b/lib/controllers/sync_status_controller.dart
new file mode 100644
index 00000000..8475d9d1
--- /dev/null
+++ b/lib/controllers/sync_status_controller.dart
@@ -0,0 +1,19 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/main.dart";
+import "package:nexus/models/sync_status.dart";
+
+class SyncStatusController extends Notifier {
+ @override
+ Null build() => null;
+
+ void set(SyncStatus newStatus) {
+ if (newStatus.type == SyncStatusType.permanentlyFailed) {
+ showError(newStatus.error ?? "Syncing failed");
+ }
+ state = newStatus;
+ }
+
+ static final provider = NotifierProvider(
+ SyncStatusController.new,
+ );
+}
diff --git a/lib/controllers/thumbnail_controller.dart b/lib/controllers/thumbnail_controller.dart
deleted file mode 100644
index 4500523d..00000000
--- a/lib/controllers/thumbnail_controller.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:matrix/matrix.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/models/image_data.dart";
-
-class ThumbnailController extends AsyncNotifier {
- ThumbnailController(this.data);
- final ImageData data;
-
- @override
- Future build({String? from}) async {
- final client = await ref.watch(ClientController.provider.future);
- final uri = await Uri.tryParse(data.uri)?.getDownloadUri(client);
-
- return uri.toString();
- }
-
- static final provider = AsyncNotifierProvider.family
- .autoDispose(
- ThumbnailController.new,
- );
-}
diff --git a/lib/controllers/top_level_spaces_controller.dart b/lib/controllers/top_level_spaces_controller.dart
new file mode 100644
index 00000000..e1f9c88a
--- /dev/null
+++ b/lib/controllers/top_level_spaces_controller.dart
@@ -0,0 +1,14 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+
+class TopLevelSpacesController extends Notifier> {
+ @override
+ IList build() => const IList.empty();
+
+ void set(IList newSpaces) => state = newSpaces;
+
+ static final provider =
+ NotifierProvider>(
+ TopLevelSpacesController.new,
+ );
+}
diff --git a/lib/controllers/url_preview_controller.dart b/lib/controllers/url_preview_controller.dart
new file mode 100644
index 00000000..c2161d5e
--- /dev/null
+++ b/lib/controllers/url_preview_controller.dart
@@ -0,0 +1,60 @@
+import "dart:convert";
+import "package:flutter_chat_core/flutter_chat_core.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:http/http.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/header_controller.dart";
+import "package:nexus/helpers/extensions/mxc_to_https.dart";
+
+class UrlPreviewController extends AsyncNotifier {
+ final String link;
+ UrlPreviewController(this.link);
+
+ @override
+ Future build() async {
+ final homeserver = ref.watch(ClientStateController.provider)?.homeserverUrl;
+
+ if (homeserver != null && !link.contains("matrix.to")) {
+ {
+ final response = await get(
+ Uri.parse(homeserver)
+ .resolve("/_matrix/client/v1/media/preview_url")
+ .replace(queryParameters: {"url": link}),
+ headers: await ref.watch(HeaderController.provider.future),
+ );
+
+ if (response.statusCode == 200) {
+ final decodedValue = json.decode(response.body);
+ final mxc = decodedValue["og:image"];
+ final image = mxc == null
+ ? null
+ : Uri.tryParse(mxc)?.mxcToHttps(homeserver);
+
+ return LinkPreviewData(
+ link: link,
+ title: decodedValue["og:title"],
+ description: decodedValue["og:description"],
+ image: image == null
+ ? null
+ : ImagePreviewData(
+ url: image.toString(),
+ width:
+ (decodedValue["og:image:width"] as int?)?.toDouble() ??
+ 0,
+ height:
+ (decodedValue["og:image:height"] as int?)?.toDouble() ??
+ 0,
+ ),
+ );
+ }
+ }
+ }
+
+ return null;
+ }
+
+ static final provider = AsyncNotifierProvider.autoDispose
+ .family(
+ UrlPreviewController.new,
+ );
+}
diff --git a/lib/controllers/user_controller.dart b/lib/controllers/user_controller.dart
new file mode 100644
index 00000000..e7ca9739
--- /dev/null
+++ b/lib/controllers/user_controller.dart
@@ -0,0 +1,40 @@
+import "dart:async";
+import "package:collection/collection.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/members_controller.dart";
+import "package:nexus/controllers/profile_controller.dart";
+import "package:nexus/helpers/extensions/get_localpart.dart";
+import "package:nexus/models/membership.dart";
+import "package:nexus/models/membership_status.dart";
+
+class UserController extends AsyncNotifier {
+ final String userId;
+ UserController(this.userId);
+
+ @override
+ Future build() async {
+ final member = await ref.watch(
+ MembersController.provider.selectAsync(
+ (value) =>
+ value.firstWhereOrNull((membership) => membership.userId == userId),
+ ),
+ );
+
+ if (member != null) return member;
+
+ final profile = await ref.watch(ProfileController.provider(userId).future);
+ return Membership(
+ status: MembershipStatus.leave,
+ avatarUrl: profile.avatarUrl == null
+ ? null
+ : Uri.tryParse(profile.avatarUrl!),
+ displayName: profile.displayName ?? userId.localpart,
+ userId: userId,
+ );
+ }
+
+ static final provider =
+ AsyncNotifierProvider.family(
+ UserController.new,
+ );
+}
diff --git a/lib/controllers/via_controller.dart b/lib/controllers/via_controller.dart
new file mode 100644
index 00000000..b4239478
--- /dev/null
+++ b/lib/controllers/via_controller.dart
@@ -0,0 +1,54 @@
+import "package:collection/collection.dart";
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/models/room.dart";
+
+class ViaController extends Notifier {
+ final Room room;
+ ViaController(this.room);
+
+ @override
+ String build() {
+ final servers = {};
+
+ void addUserId(String? userId) {
+ final server = userId?.split(":").lastOrNull;
+ if (server != null) {
+ servers.add(server);
+ }
+ }
+
+ addUserId(ref.watch(ClientStateController.provider)?.userId);
+
+ final powerLevels = room.events.firstWhereOrNull(
+ (event) => event.rowId == room.state["m.room.power_levels"]?[""],
+ );
+
+ for (final userId in IMap(powerLevels?.content["users"]).keys) {
+ addUserId(userId);
+ if (servers.length >= 5) break;
+ }
+
+ final members = room.state["m.room.member"]?.values.toIList();
+ for (var i = 0; servers.length < 5; i++) {
+ final member = room.events.firstWhereOrNull(
+ (event) => event.rowId == members?.getOrNull(i),
+ );
+
+ if (member?.content["membership"] == "join") {
+ addUserId(member?.stateKey);
+ }
+
+ if (members?.getOrNull(i) == null) break;
+ }
+
+ return servers.isEmpty
+ ? ""
+ : "?${servers.map((server) => "via=$server").join("&")}";
+ }
+
+ static final provider = NotifierProvider.family(
+ ViaController.new,
+ );
+}
diff --git a/lib/helpers/extensions/color_hex.dart b/lib/helpers/extensions/color_hex.dart
deleted file mode 100644
index 3f046298..00000000
--- a/lib/helpers/extensions/color_hex.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-import "package:flutter/widgets.dart";
-
-extension ColorHex on Color {
- String get hex {
- final rgb = toARGB32() & 0x00FFFFFF;
- return "#${rgb.toRadixString(16).padLeft(6, "0")}";
- }
-}
diff --git a/lib/helpers/extensions/event_to_message.dart b/lib/helpers/extensions/event_to_message.dart
deleted file mode 100644
index c003180b..00000000
--- a/lib/helpers/extensions/event_to_message.dart
+++ /dev/null
@@ -1,134 +0,0 @@
-import "package:collection/collection.dart";
-import "package:flutter/foundation.dart";
-import "package:flutter_chat_core/flutter_chat_core.dart";
-import "package:matrix/matrix.dart";
-
-extension EventToMessage on Event {
- Future toMessage({
- bool mustBeText = false,
- bool includeEdits = false,
- }) async {
- final replyId = inReplyToEventId();
-
- final newEvent = (unsigned?["m.relations"] as Map?)?["m.replace"];
- final event = newEvent == null ? this : Event.fromJson(newEvent, room);
-
- final replyEvent = replyId == null
- ? null
- : await room.getEventById(replyId);
-
- final sender =
- await event.fetchSenderUser() ?? event.senderFromMemoryOrFallback;
- final newContent = event.content["m.new_content"] as Map?;
- final metadata = {
- "formatted":
- newContent?["formatted_body"] ??
- newContent?["body"] ??
- event.content["formatted_body"] ??
- event.content["body"] ??
- "",
- "reply": await replyEvent?.toMessage(mustBeText: true),
- "body": newContent?["body"] ?? event.content["body"],
- "eventType": event.type,
- "avatarUrl": sender.avatarUrl.toString(),
- "displayName": sender.displayName ?? sender.id,
- "txnId": transactionId,
- };
-
- final editedAt = event.relationshipType == RelationshipTypes.edit
- ? event.originServerTs
- : null;
-
- if ((redacted && !mustBeText) ||
- (!includeEdits && (relationshipType == RelationshipTypes.edit))) {
- return null;
- }
-
- // TODO: Use server-generated preview if enabled when https://github.com/famedly/matrix-dart-sdk/issues/2195 is fixed.
-
- // final match = Uri.tryParse(
- // RegExp(regexLink, caseSensitive: false).firstMatch(body)?.group(0) ?? "",
- // );
-
- // final preview = match == null
- // ? null
- // : await room.client.getUrlPreview(match);
-
- final asText =
- Message.text(
- metadata: metadata,
- id: eventId,
- authorId: senderId,
- text: redacted ? "This message has been deleted..." : event.body,
- replyToMessageId: replyId,
- deliveredAt: originServerTs,
- editedAt: editedAt,
- )
- as TextMessage;
-
- if (mustBeText) return asText;
-
- return switch (type) {
- EventTypes.Encrypted => asText.copyWith(
- text: "Unable to decrypt message.",
- metadata: {...metadata, "formatted": "Unable to decrypt message."},
- ),
- (EventTypes.Sticker || EventTypes.Message) => switch (messageType) {
- (MessageTypes.Sticker || MessageTypes.Image) => Message.image(
- metadata: metadata,
- id: eventId,
- authorId: senderId,
- text: event.text,
- source: (await getAttachmentUri()).toString(),
- replyToMessageId: replyId,
- deliveredAt: originServerTs,
- ),
- MessageTypes.Audio => Message.audio(
- metadata: metadata,
- id: eventId,
- authorId: senderId,
- text: event.text,
- replyToMessageId: replyId,
- source: (await event.getAttachmentUri()).toString(),
- deliveredAt: originServerTs,
- // TODO: See if we can figure out duration
- duration: Duration(hours: 1),
- ),
- MessageTypes.File => Message.file(
- name: event.content["filename"].toString(),
- metadata: metadata,
- id: eventId,
- authorId: senderId,
- source: (await event.getAttachmentUri()).toString(),
- replyToMessageId: replyId,
- deliveredAt: originServerTs,
- ),
- _ => asText,
- },
- EventTypes.RoomMember => Message.system(
- metadata: metadata,
- id: eventId,
- authorId: senderId,
- text:
- "${event.asUser.displayName ?? event.asUser.id} ${switch (Membership.values.firstWhereOrNull((membership) => membership.name == event.content["membership"])) {
- Membership.invite => "was invited to",
- Membership.join => "joined",
- Membership.leave => "left",
- Membership.knock => "asked to join",
- Membership.ban => "was banned from",
- _ => "did something relating to",
- }} the room.",
- ),
- EventTypes.Redaction => null,
- _ =>
- kDebugMode
- ? Message.unsupported(
- metadata: metadata,
- id: eventId,
- authorId: senderId,
- replyToMessageId: replyId,
- )
- : null,
- };
- }
-}
diff --git a/lib/helpers/extensions/get_full_room.dart b/lib/helpers/extensions/get_full_room.dart
deleted file mode 100644
index bbd0bc57..00000000
--- a/lib/helpers/extensions/get_full_room.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import "package:matrix/matrix.dart";
-import "package:nexus/models/full_room.dart";
-
-extension GetFullRoom on Room {
- Future get fullRoom async {
- await loadHeroUsers();
- return FullRoom(
- roomData: this,
- title: getLocalizedDisplayname(),
- avatar: await avatar?.getThumbnailUri(client, width: 24, height: 24),
- );
- }
-}
diff --git a/lib/helpers/extensions/get_headers.dart b/lib/helpers/extensions/get_headers.dart
index b8b1fde8..e1bb5f3e 100644
--- a/lib/helpers/extensions/get_headers.dart
+++ b/lib/helpers/extensions/get_headers.dart
@@ -1,5 +1,7 @@
-import "package:matrix/matrix.dart";
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/header_controller.dart";
-extension GetHeaders on Client {
- Map get headers => {"authorization": "Bearer $accessToken"};
+extension GetHeaders on WidgetRef {
+ Map get headers =>
+ watch(HeaderController.provider).requireValue;
}
diff --git a/lib/helpers/extensions/get_localpart.dart b/lib/helpers/extensions/get_localpart.dart
new file mode 100644
index 00000000..445351f9
--- /dev/null
+++ b/lib/helpers/extensions/get_localpart.dart
@@ -0,0 +1,3 @@
+extension GetLocalpart on String {
+ String get localpart => substring(1).split(":").first;
+}
diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart
new file mode 100644
index 00000000..88cfd5ae
--- /dev/null
+++ b/lib/helpers/extensions/gomuks_buffer.dart
@@ -0,0 +1,36 @@
+import "dart:convert";
+import "dart:ffi";
+import "dart:typed_data";
+import "package:ffi/ffi.dart";
+import "package:nexus/src/third_party/gomuks.g.dart";
+
+extension GomuksOwnedBufferToX on GomuksOwnedBuffer {
+ Uint8List toBytes() {
+ try {
+ if (base == nullptr || length <= 0) return Uint8List(0);
+ return Uint8List.fromList(base.asTypedList(length));
+ } finally {
+ calloc.free(base);
+ }
+ }
+
+ dynamic toJson() => jsonDecode(utf8.decode(toBytes()));
+}
+
+extension JsonToGomuksBuffer on Map {
+ Pointer toGomuksBufferPtr() {
+ final jsonString = json.encode(this);
+ final bytes = utf8.encode(jsonString);
+
+ final dataPtr = calloc(bytes.length);
+ dataPtr.asTypedList(bytes.length).setAll(0, bytes);
+
+ final ptr = calloc();
+
+ ptr.ref
+ ..base = dataPtr
+ ..length = bytes.length;
+
+ return ptr;
+ }
+}
diff --git a/lib/helpers/extensions/link_to_mention.dart b/lib/helpers/extensions/link_to_mention.dart
new file mode 100644
index 00000000..f4868d3f
--- /dev/null
+++ b/lib/helpers/extensions/link_to_mention.dart
@@ -0,0 +1,45 @@
+extension LinkToMention on String {
+ /// Extracts a Matrix identifier from this string.
+ ///
+ /// Supports:
+ /// - https://matrix.to/#/...
+ /// - matrix:roomid/...
+ /// - matrix:r/...
+ /// - matrix:u/...
+ ///
+ /// Returns the decoded identifier (e.g. "#room:matrix.org")
+ /// or null if this is not a Matrix link.
+ String? get mention {
+ final trimmed = trim();
+
+ final matrixTo = RegExp(
+ r"^https?://matrix\.to/#/(.[^/?#]+)",
+ caseSensitive: false,
+ );
+
+ final matrixToMatch = matrixTo.firstMatch(trimmed);
+ if (matrixToMatch != null) {
+ return Uri.decodeComponent(matrixToMatch.group(1)!);
+ }
+
+ if (trimmed.toLowerCase().startsWith("matrix:")) {
+ try {
+ final uri = Uri.parse(trimmed);
+
+ if (uri.pathSegments.isNotEmpty) {
+ final identifier = uri.pathSegments.last;
+ if (identifier.isNotEmpty) {
+ return "${switch (uri.pathSegments.firstOrNull) {
+ "r" => "#",
+ "roomid" => "!",
+ "u" => "@",
+ _ => "",
+ }}${Uri.decodeComponent(identifier)}";
+ }
+ }
+ } catch (_) {}
+ }
+
+ return null;
+ }
+}
diff --git a/lib/helpers/extensions/list_to_messages.dart b/lib/helpers/extensions/list_to_messages.dart
deleted file mode 100644
index c14618b0..00000000
--- a/lib/helpers/extensions/list_to_messages.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-import "package:flutter_chat_core/flutter_chat_core.dart";
-import "package:matrix/matrix.dart";
-import "package:nexus/helpers/extensions/event_to_message.dart";
-
-extension ListToMessages on List {
- Future> toMessages(Room room) async => (await Future.wait(
- map((event) => Event.fromMatrixEvent(event, room).toMessage()),
- )).nonNulls.toList().reversed.toList();
-}
diff --git a/lib/helpers/extensions/mxc_to_https.dart b/lib/helpers/extensions/mxc_to_https.dart
new file mode 100644
index 00000000..910f87d4
--- /dev/null
+++ b/lib/helpers/extensions/mxc_to_https.dart
@@ -0,0 +1,5 @@
+extension MxcToHttps on Uri {
+ Uri mxcToHttps(String homeserver) => Uri.parse(
+ homeserver,
+ ).resolve("_matrix/client/v1/media/download/$host$path");
+}
diff --git a/lib/helpers/extensions/room_to_children.dart b/lib/helpers/extensions/room_to_children.dart
deleted file mode 100644
index afdc99e8..00000000
--- a/lib/helpers/extensions/room_to_children.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import "package:collection/collection.dart";
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:matrix/matrix.dart";
-import "package:nexus/helpers/extensions/get_full_room.dart";
-import "package:nexus/models/full_room.dart";
-
-extension RoomToChildren on Room {
- Future> getAllChildren(Client client) async {
- final direct = await Future.wait(
- spaceChildren
- .map(
- (child) => client.rooms
- .firstWhereOrNull((r) => r.id == child.roomId)
- ?.fullRoom,
- )
- .nonNulls,
- );
-
- return (await Future.wait(
- direct.map(
- (child) async => child.roomData.isSpace
- ? await child.roomData.getAllChildren(client)
- : [child],
- ),
- )).expand((list) => list).toIList();
- }
-}
diff --git a/lib/helpers/extensions/scheme_to_theme.dart b/lib/helpers/extensions/scheme_to_theme.dart
index e238cf9c..df68a05b 100644
--- a/lib/helpers/extensions/scheme_to_theme.dart
+++ b/lib/helpers/extensions/scheme_to_theme.dart
@@ -7,6 +7,15 @@ extension SchemeToTheme on ColorScheme {
titleSpacing: 0,
backgroundColor: surfaceContainerLow,
),
+ menuTheme: MenuThemeData(
+ style: MenuStyle(
+ backgroundColor: WidgetStatePropertyAll(primaryContainer),
+ ),
+ ),
+ textTheme: ThemeData(
+ fontFamilyFallback: ["sans", "emoji"],
+ brightness: brightness,
+ ).textTheme,
inputDecorationTheme: const InputDecorationTheme(
border: OutlineInputBorder(),
),
diff --git a/lib/helpers/extensions/show_context_menu.dart b/lib/helpers/extensions/show_context_menu.dart
index f4762c38..7d8cab64 100644
--- a/lib/helpers/extensions/show_context_menu.dart
+++ b/lib/helpers/extensions/show_context_menu.dart
@@ -9,6 +9,7 @@ extension ShowContextMenu on BuildContext {
showMenu(
context: this,
+ constraints: BoxConstraints.loose(Size.infinite),
position: RelativeRect.fromLTRB(
globalPosition.dx,
globalPosition.dy,
diff --git a/lib/helpers/extensions/show_user_popover.dart b/lib/helpers/extensions/show_user_popover.dart
new file mode 100644
index 00000000..16988796
--- /dev/null
+++ b/lib/helpers/extensions/show_user_popover.dart
@@ -0,0 +1,18 @@
+import "package:flutter/material.dart";
+import "package:nexus/helpers/extensions/show_context_menu.dart";
+import "package:nexus/models/membership.dart";
+import "package:nexus/widgets/chat_page/user_popover.dart";
+
+extension ShowUserPopover on BuildContext {
+ void showUserPopover(Membership member, {required Offset globalPosition}) =>
+ showContextMenu(
+ globalPosition: globalPosition,
+ children: [
+ PopupMenuItem(
+ enabled: false,
+ padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+ child: IconTheme(data: IconThemeData(), child: UserPopover(member)),
+ ),
+ ],
+ );
+}
diff --git a/lib/main.dart b/lib/main.dart
index 8cf43654..846f0758 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,19 +1,22 @@
+import "dart:io";
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/foundation.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/header_controller.dart";
+import "package:nexus/controllers/multi_provider_controller.dart";
import "package:nexus/controllers/shared_prefs_controller.dart";
import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/helpers/extensions/scheme_to_theme.dart";
import "package:nexus/pages/chat_page.dart";
import "package:nexus/pages/login_page.dart";
-import "package:nexus/pages/settings_page.dart";
-import "package:nexus/widgets/appbar.dart";
+import "package:nexus/pages/verify_page.dart";
import "package:nexus/widgets/error_dialog.dart";
import "package:nexus/widgets/loading.dart";
import "package:window_manager/window_manager.dart";
import "package:flutter/material.dart";
import "package:dynamic_system_colors/dynamic_system_colors.dart";
-import "package:window_size/window_size.dart";
final GlobalKey navigatorKey = GlobalKey();
@@ -33,7 +36,9 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue}
void showError(Object error, [StackTrace? stackTrace]) {
if (error.toString().contains("DioException")) return;
+ if (error.toString().contains("Invalid source")) return;
if (error.toString().contains("UTF-16")) return;
+ if (error.toString().contains("HTTP request failed")) return;
if (error.toString().contains("Invalid image data")) return;
debugPrintStack(stackTrace: stackTrace, label: error.toString());
@@ -52,16 +57,17 @@ void showError(Object error, [StackTrace? stackTrace]) {
void main() async {
WidgetsFlutterBinding.ensureInitialized();
- await windowManager.ensureInitialized();
- await windowManager.waitUntilReadyToShow(
- WindowOptions(titleBarStyle: TitleBarStyle.hidden),
- );
+ if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
+ await windowManager.ensureInitialized();
+ await windowManager.waitUntilReadyToShow(
+ WindowOptions(titleBarStyle: TitleBarStyle.hidden),
+ );
+ await windowManager.setMinimumSize(Size.square(500));
+ }
FlutterError.onError = (FlutterErrorDetails details) =>
showError(details.exception.toString(), details.stack);
- setWindowMinSize(const Size.square(500));
-
runApp(
ProviderScope(
observers: [
@@ -74,11 +80,11 @@ void main() async {
);
}
-class App extends ConsumerWidget {
+class App extends StatelessWidget {
const App({super.key});
@override
- Widget build(BuildContext context, WidgetRef ref) => DynamicColorBuilder(
+ Widget build(BuildContext context) => DynamicColorBuilder(
builder: (lightDynamic, darkDynamic) => MaterialApp(
navigatorKey: navigatorKey,
debugShowCheckedModeBanner: false,
@@ -92,42 +98,40 @@ class App extends ConsumerWidget {
brightness: Brightness.dark,
))
.theme,
- home: Builder(
- builder: (context) => ref
- .watch(SharedPrefsController.provider)
- .betterWhen(
- data: (_) => ref
- .watch(ClientController.provider)
- .betterWhen(
- data: (client) =>
- client.accessToken == null ? LoginPage() : ChatPage(),
- loading: () => Scaffold(
- body: Center(
- child: Column(
- mainAxisSize: MainAxisSize.min,
- spacing: 16,
- children: [
- Text(
- "Syncing...",
- style: Theme.of(context).textTheme.headlineMedium,
- ),
- Loading(),
- ],
- ),
- ),
- appBar: Appbar(
- actions: [
- IconButton(
- onPressed: () => Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => SettingsPage()),
- ),
- icon: Icon(Icons.settings),
- ),
- ],
- ),
- ),
- ),
- ),
+ home: Scaffold(
+ body: Consumer(
+ builder: (_, ref, _) => ref
+ .watch(
+ MultiProviderController.provider(
+ IListConst([
+ SharedPrefsController.provider,
+ ClientController.provider,
+ HeaderController.provider,
+ ]),
+ ),
+ )
+ .betterWhen(
+ data: (_) => Consumer(
+ builder: (_, ref, _) {
+ final clientState = ref.watch(
+ ClientStateController.provider,
+ );
+
+ if (clientState == null || !clientState.isInitialized) {
+ return Loading();
+ }
+
+ if (!clientState.isLoggedIn) {
+ return LoginPage();
+ } else if (!clientState.isVerified) {
+ return VerifyPage();
+ } else {
+ return ChatPage();
+ }
+ },
+ ),
+ ),
+ ),
),
),
);
diff --git a/lib/models/account_data.dart b/lib/models/account_data.dart
new file mode 100644
index 00000000..a325ffe9
--- /dev/null
+++ b/lib/models/account_data.dart
@@ -0,0 +1,16 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "account_data.freezed.dart";
+part "account_data.g.dart";
+
+@freezed
+abstract class AccountData with _$AccountData {
+ const factory AccountData({
+ required String userId,
+ required String? roomId,
+ required String type,
+ required dynamic content,
+ }) = _AccountData;
+
+ factory AccountData.fromJson(Map json) =>
+ _$AccountDataFromJson(json);
+}
diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart
new file mode 100644
index 00000000..1e15136e
--- /dev/null
+++ b/lib/models/client_state.dart
@@ -0,0 +1,17 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "client_state.freezed.dart";
+part "client_state.g.dart";
+
+@freezed
+abstract class ClientState with _$ClientState {
+ const factory ClientState({
+ required bool isInitialized,
+ required bool isLoggedIn,
+ required bool isVerified,
+ required String? userId,
+ required String? homeserverUrl,
+ }) = _ClientState;
+
+ factory ClientState.fromJson(Map json) =>
+ _$ClientStateFromJson(json);
+}
diff --git a/lib/models/configs/message_config.dart b/lib/models/configs/message_config.dart
new file mode 100644
index 00000000..66a437cd
--- /dev/null
+++ b/lib/models/configs/message_config.dart
@@ -0,0 +1,28 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/models/room.dart";
+part "message_config.freezed.dart";
+part "message_config.g.dart";
+
+@freezed
+abstract class MessageConfig with _$MessageConfig {
+ const MessageConfig._();
+ const factory MessageConfig({
+ @Default(false) bool alwaysReturn,
+ @Default(false) bool includeEdits,
+ required Room room,
+ required Event event,
+ }) = _MessageConfig;
+
+ @override
+ bool operator ==(Object other) =>
+ other.runtimeType == runtimeType &&
+ other is MessageConfig &&
+ other.event == event;
+
+ @override
+ int get hashCode => Object.hash(runtimeType, event);
+
+ factory MessageConfig.fromJson(Map json) =>
+ _$MessageConfigFromJson(json);
+}
diff --git a/lib/models/configs/messages_config.dart b/lib/models/configs/messages_config.dart
new file mode 100644
index 00000000..b33a71ce
--- /dev/null
+++ b/lib/models/configs/messages_config.dart
@@ -0,0 +1,17 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/models/room.dart";
+part "messages_config.freezed.dart";
+part "messages_config.g.dart";
+
+@freezed
+abstract class MessagesConfig with _$MessagesConfig {
+ const factory MessagesConfig({
+ required Room room,
+ required IList events,
+ }) = _MessagesConfig;
+
+ factory MessagesConfig.fromJson(Map json) =>
+ _$MessagesConfigFromJson(json);
+}
diff --git a/lib/models/configs/power_level_config.dart b/lib/models/configs/power_level_config.dart
new file mode 100644
index 00000000..31cc08cb
--- /dev/null
+++ b/lib/models/configs/power_level_config.dart
@@ -0,0 +1,17 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/requests/membership_action.dart";
+part "power_level_config.freezed.dart";
+part "power_level_config.g.dart";
+
+@freezed
+abstract class PowerLevelConfig with _$PowerLevelConfig {
+ const factory PowerLevelConfig({
+ @Default(false) bool isStateEvent,
+ required String eventType,
+ MembershipAction? action,
+ String? targetUser,
+ }) = _PowerLevelConfig;
+
+ factory PowerLevelConfig.fromJson(Map json) =>
+ _$PowerLevelConfigFromJson(json);
+}
diff --git a/lib/models/epoch_date_time_converter.dart b/lib/models/epoch_date_time_converter.dart
new file mode 100644
index 00000000..c26d020d
--- /dev/null
+++ b/lib/models/epoch_date_time_converter.dart
@@ -0,0 +1,11 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+
+class EpochDateTimeConverter implements JsonConverter {
+ const EpochDateTimeConverter();
+
+ @override
+ DateTime fromJson(int json) => DateTime.fromMillisecondsSinceEpoch(json);
+
+ @override
+ int toJson(DateTime object) => object.millisecondsSinceEpoch;
+}
diff --git a/lib/models/event.dart b/lib/models/event.dart
new file mode 100644
index 00000000..734f6674
--- /dev/null
+++ b/lib/models/event.dart
@@ -0,0 +1,80 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/epoch_date_time_converter.dart";
+part "event.freezed.dart";
+part "event.g.dart";
+
+@freezed
+abstract class Event with _$Event {
+ const factory Event({
+ @JsonKey(name: "rowid") required int rowId,
+ @JsonKey(name: "timeline_rowid") required int timelineRowId,
+ required String roomId,
+ required String eventId,
+ @JsonKey(name: "sender") required String authorId,
+ required String type,
+ String? stateKey,
+ @EpochDateTimeConverter() required DateTime timestamp,
+ required IMap content,
+ IMap? decrypted,
+ String? decryptedType,
+ @Default(IMap.empty()) IMap unsigned,
+ LocalContent? localContent,
+ String? transactionId,
+ String? redactedBy,
+ String? relatesTo,
+ String? relationType,
+ String? decryptionError,
+ String? sendError,
+ @Default(IMap.empty()) IMap reactions,
+ @JsonKey(name: "last_edit_rowid") int? lastEditRowId,
+ @UnreadTypeConverter() UnreadType? unreadType,
+ }) = _Event;
+
+ factory Event.fromJson(Map json) => _$EventFromJson(json);
+}
+
+@freezed
+abstract class LocalContent with _$LocalContent {
+ const factory LocalContent({
+ String? sanitizedHtml,
+ String? editSource,
+ bool? wasPlaintext,
+ bool? bigEmoji,
+ bool? hasMath,
+ bool? replyFallbackRemoved,
+ }) = _LocalContent;
+
+ factory LocalContent.fromJson(Map json) =>
+ _$LocalContentFromJson(json);
+}
+
+class UnreadTypeConverter implements JsonConverter {
+ const UnreadTypeConverter();
+
+ @override
+ UnreadType? fromJson(int? json) => json == null ? null : UnreadType(json);
+
+ @override
+ int? toJson(UnreadType? object) => object?.value;
+}
+
+// I think this is correct but I'm not sure, its some type of bitmask.
+@immutable
+class UnreadType {
+ final int value;
+
+ const UnreadType(this.value);
+
+ static const none = UnreadType(0);
+ static const normal = UnreadType(1);
+ static const notify = UnreadType(2);
+ static const highlight = UnreadType(4);
+ static const sound = UnreadType(8);
+
+ bool get isNone => value == 0;
+ bool get isNormal => (value & 1) != 0;
+ bool get shouldNotify => (value & 2) != 0;
+ bool get isHighlighted => (value & 4) != 0;
+ bool get playsSound => (value & 8) != 0;
+}
diff --git a/lib/models/full_room.dart b/lib/models/full_room.dart
deleted file mode 100644
index ee61da6f..00000000
--- a/lib/models/full_room.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import "package:freezed_annotation/freezed_annotation.dart";
-import "package:matrix/matrix.dart";
-part "full_room.freezed.dart";
-
-@freezed
-abstract class FullRoom with _$FullRoom {
- const FullRoom._();
- const factory FullRoom({
- required Room roomData,
- required String title,
- required Uri? avatar,
- }) = _FullRoom;
-}
diff --git a/lib/models/image_data.dart b/lib/models/image_data.dart
deleted file mode 100644
index e5bc57e5..00000000
--- a/lib/models/image_data.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import "package:freezed_annotation/freezed_annotation.dart";
-part "image_data.freezed.dart";
-
-@freezed
-abstract class ImageData with _$ImageData {
- const factory ImageData({
- required String uri,
- required int? height,
- required int? width,
- }) = _ImageData;
-}
diff --git a/lib/models/lazy_load_summary.dart b/lib/models/lazy_load_summary.dart
new file mode 100644
index 00000000..0cd250f5
--- /dev/null
+++ b/lib/models/lazy_load_summary.dart
@@ -0,0 +1,16 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+part "lazy_load_summary.freezed.dart";
+part "lazy_load_summary.g.dart";
+
+@freezed
+abstract class LazyLoadSummary with _$LazyLoadSummary {
+ const factory LazyLoadSummary({
+ required IList? heroes,
+ required int? joinedMemberCount,
+ required int? invitedMemberCount,
+ }) = _LazyLoadSummary;
+
+ factory LazyLoadSummary.fromJson(Map json) =>
+ _$LazyLoadSummaryFromJson(json);
+}
diff --git a/lib/models/membership.dart b/lib/models/membership.dart
new file mode 100644
index 00000000..ce0cc42c
--- /dev/null
+++ b/lib/models/membership.dart
@@ -0,0 +1,32 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/helpers/extensions/mxc_to_https.dart";
+import "package:nexus/models/membership_status.dart";
+part "membership.freezed.dart";
+
+@freezed
+abstract class Membership with _$Membership {
+ const Membership._();
+ const factory Membership({
+ required MembershipStatus status,
+ required Uri? avatarUrl,
+ required String displayName,
+ required String userId,
+ }) = _Membership;
+
+ factory Membership.fromContent(
+ IMap content,
+ String userId,
+ String homeserver,
+ ) => Membership(
+ status: MembershipStatus.values.firstWhere(
+ (status) => status.name == content["membership"],
+ orElse: () => MembershipStatus.leave,
+ ),
+ avatarUrl: Uri.tryParse(
+ content["avatar_url"] ?? "",
+ )?.mxcToHttps(homeserver),
+ userId: userId,
+ displayName: content["displayname"] ?? userId.substring(1).split(":").first,
+ );
+}
diff --git a/lib/models/membership_status.dart b/lib/models/membership_status.dart
new file mode 100644
index 00000000..bc85e226
--- /dev/null
+++ b/lib/models/membership_status.dart
@@ -0,0 +1,4 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+
+@JsonEnum()
+enum MembershipStatus { leave, invite, ban, join }
diff --git a/lib/models/paginate.dart b/lib/models/paginate.dart
new file mode 100644
index 00000000..df0a0f67
--- /dev/null
+++ b/lib/models/paginate.dart
@@ -0,0 +1,17 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/event.dart";
+part "paginate.freezed.dart";
+part "paginate.g.dart";
+
+@freezed
+abstract class Paginate with _$Paginate {
+ const factory Paginate({
+ required IList events,
+ required IList relatedEvents,
+ required bool hasMore,
+ }) = _Paginate;
+
+ factory Paginate.fromJson(Map json) =>
+ _$PaginateFromJson(json);
+}
diff --git a/lib/models/profile.dart b/lib/models/profile.dart
new file mode 100644
index 00000000..584f27b7
--- /dev/null
+++ b/lib/models/profile.dart
@@ -0,0 +1,36 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+part "profile.freezed.dart";
+part "profile.g.dart";
+
+Object? readPronouns(Map map, _) =>
+ map["m.pronouns"] ?? map["io.fsky.nyx.pronouns"];
+
+Object? readTimezone(Map map, _) =>
+ map["m.tz"] ?? map["us.cloke.msc4175.tz"];
+
+@freezed
+abstract class Profile with _$Profile {
+ const factory Profile({
+ String? avatarUrl,
+ @JsonKey(name: "displayname") String? displayName,
+
+ @JsonKey(readValue: readTimezone) String? timezone,
+
+ @Default(IList.empty())
+ @JsonKey(readValue: readPronouns)
+ IList pronouns,
+ }) = _Profile;
+
+ factory Profile.fromJson(Map json) =>
+ _$ProfileFromJson(json);
+}
+
+@freezed
+abstract class Pronoun with _$Pronoun {
+ const factory Pronoun({required String language, required String summary}) =
+ _Pronoun;
+
+ factory Pronoun.fromJson(Map json) =>
+ _$PronounFromJson(json);
+}
diff --git a/lib/models/read_receipt.dart b/lib/models/read_receipt.dart
new file mode 100644
index 00000000..d533e2de
--- /dev/null
+++ b/lib/models/read_receipt.dart
@@ -0,0 +1,18 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/epoch_date_time_converter.dart";
+part "read_receipt.freezed.dart";
+part "read_receipt.g.dart";
+
+@freezed
+abstract class ReadReceipt with _$ReadReceipt {
+ const factory ReadReceipt({
+ String? roomId,
+ required String userId,
+ String? threadId,
+ required String eventId,
+ @EpochDateTimeConverter() required DateTime timestamp,
+ }) = _ReadReceipt;
+
+ factory ReadReceipt.fromJson(Map json) =>
+ _$ReadReceiptFromJson(json);
+}
diff --git a/lib/models/requests/get_event_request.dart b/lib/models/requests/get_event_request.dart
new file mode 100644
index 00000000..9374f3a2
--- /dev/null
+++ b/lib/models/requests/get_event_request.dart
@@ -0,0 +1,32 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/room.dart";
+part "get_event_request.freezed.dart";
+part "get_event_request.g.dart";
+
+@Freezed(toJson: false)
+abstract class GetEventRequest with _$GetEventRequest {
+ const GetEventRequest._();
+ const factory GetEventRequest({
+ required Room room,
+ required String eventId,
+ @Default(false) bool unredact,
+ }) = _GetEventRequest;
+
+ Map toJson() => {
+ "room_id": room.metadata?.id,
+ "event_id": eventId,
+ "unredact": unredact,
+ };
+
+ @override
+ bool operator ==(Object other) =>
+ other.runtimeType == runtimeType &&
+ other is GetEventRequest &&
+ other.eventId == eventId;
+
+ @override
+ int get hashCode => Object.hash(runtimeType, eventId);
+
+ factory GetEventRequest.fromJson(Map json) =>
+ _$GetEventRequestFromJson(json);
+}
diff --git a/lib/models/requests/get_related_events_request.dart b/lib/models/requests/get_related_events_request.dart
new file mode 100644
index 00000000..7e2244f4
--- /dev/null
+++ b/lib/models/requests/get_related_events_request.dart
@@ -0,0 +1,15 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "get_related_events_request.freezed.dart";
+part "get_related_events_request.g.dart";
+
+@freezed
+abstract class GetRelatedEventsRequest with _$GetRelatedEventsRequest {
+ const factory GetRelatedEventsRequest({
+ required String roomId,
+ required String eventId,
+ required String relationType,
+ }) = _GetRelatedEventsRequest;
+
+ factory GetRelatedEventsRequest.fromJson(Map json) =>
+ _$GetRelatedEventsRequestFromJson(json);
+}
diff --git a/lib/models/requests/get_room_state_request.dart b/lib/models/requests/get_room_state_request.dart
new file mode 100644
index 00000000..8ee05f05
--- /dev/null
+++ b/lib/models/requests/get_room_state_request.dart
@@ -0,0 +1,16 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "get_room_state_request.freezed.dart";
+part "get_room_state_request.g.dart";
+
+@freezed
+abstract class GetRoomStateRequest with _$GetRoomStateRequest {
+ const factory GetRoomStateRequest({
+ required String roomId,
+ @Default(false) bool refetch,
+ @Default(false) bool fetchMembers,
+ @Default(false) bool includeMembers,
+ }) = _GetRoomStateRequest;
+
+ factory GetRoomStateRequest.fromJson(Map json) =>
+ _$GetRoomStateRequestFromJson(json);
+}
diff --git a/lib/models/requests/join_room_request.dart b/lib/models/requests/join_room_request.dart
new file mode 100644
index 00000000..d6b411e4
--- /dev/null
+++ b/lib/models/requests/join_room_request.dart
@@ -0,0 +1,15 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+part "join_room_request.freezed.dart";
+part "join_room_request.g.dart";
+
+@freezed
+abstract class JoinRoomRequest with _$JoinRoomRequest {
+ const factory JoinRoomRequest({
+ required String roomIdOrAlias,
+ required IList via,
+ }) = _JoinRoomRequest;
+
+ factory JoinRoomRequest.fromJson(Map json) =>
+ _$JoinRoomRequestFromJson(json);
+}
diff --git a/lib/models/requests/login_request.dart b/lib/models/requests/login_request.dart
new file mode 100644
index 00000000..b3704fac
--- /dev/null
+++ b/lib/models/requests/login_request.dart
@@ -0,0 +1,15 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "login_request.freezed.dart";
+part "login_request.g.dart";
+
+@freezed
+abstract class LoginRequest with _$LoginRequest {
+ const factory LoginRequest({
+ required String username,
+ required String password,
+ required String homeserverUrl,
+ }) = _LoginRequest;
+
+ factory LoginRequest.fromJson(Map json) =>
+ _$LoginRequestFromJson(json);
+}
diff --git a/lib/models/requests/membership_action.dart b/lib/models/requests/membership_action.dart
new file mode 100644
index 00000000..d8521647
--- /dev/null
+++ b/lib/models/requests/membership_action.dart
@@ -0,0 +1,4 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+
+@JsonEnum()
+enum MembershipAction { ban, kick, unban, invite }
diff --git a/lib/models/requests/paginate_request.dart b/lib/models/requests/paginate_request.dart
new file mode 100644
index 00000000..44cf8ecd
--- /dev/null
+++ b/lib/models/requests/paginate_request.dart
@@ -0,0 +1,15 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "paginate_request.freezed.dart";
+part "paginate_request.g.dart";
+
+@freezed
+abstract class PaginateRequest with _$PaginateRequest {
+ const factory PaginateRequest({
+ required String roomId,
+ required int? maxTimelineId,
+ @Default(20) int limit,
+ }) = _PaginateRequest;
+
+ factory PaginateRequest.fromJson(Map json) =>
+ _$PaginateRequestFromJson(json);
+}
diff --git a/lib/models/requests/redact_event_request.dart b/lib/models/requests/redact_event_request.dart
new file mode 100644
index 00000000..fed22554
--- /dev/null
+++ b/lib/models/requests/redact_event_request.dart
@@ -0,0 +1,3 @@
+import "package:nexus/models/requests/report_request.dart";
+
+typedef RedactEventRequest = ReportRequest;
diff --git a/lib/models/requests/report_request.dart b/lib/models/requests/report_request.dart
new file mode 100644
index 00000000..749ad600
--- /dev/null
+++ b/lib/models/requests/report_request.dart
@@ -0,0 +1,15 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "report_request.freezed.dart";
+part "report_request.g.dart";
+
+@freezed
+abstract class ReportRequest with _$ReportRequest {
+ const factory ReportRequest({
+ required String roomId,
+ required String eventId,
+ String? reason,
+ }) = _ReportRequest;
+
+ factory ReportRequest.fromJson(Map json) =>
+ _$ReportRequestFromJson(json);
+}
diff --git a/lib/models/requests/send_event_request.dart b/lib/models/requests/send_event_request.dart
new file mode 100644
index 00000000..da5de323
--- /dev/null
+++ b/lib/models/requests/send_event_request.dart
@@ -0,0 +1,17 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "send_event_request.freezed.dart";
+part "send_event_request.g.dart";
+
+@freezed
+abstract class SendEventRequest with _$SendEventRequest {
+ const factory SendEventRequest({
+ required String roomId,
+ required String type,
+ required Map content,
+ @Default(false) bool synchronous,
+ @Default(false) bool disableEncryption,
+ }) = _SendEventRequest;
+
+ factory SendEventRequest.fromJson(Map json) =>
+ _$SendEventRequestFromJson(json);
+}
diff --git a/lib/models/requests/send_message_request.dart b/lib/models/requests/send_message_request.dart
new file mode 100644
index 00000000..883c5859
--- /dev/null
+++ b/lib/models/requests/send_message_request.dart
@@ -0,0 +1,54 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/relation_type.dart";
+part "send_message_request.freezed.dart";
+part "send_message_request.g.dart";
+
+@freezed
+abstract class SendMessageRequest with _$SendMessageRequest {
+ const factory SendMessageRequest({
+ required String roomId,
+ required String text,
+ @Default(Mentions()) @JsonKey(name: "mentions") Mentions mentions,
+ @JsonKey(name: "relates_to") Relation? relation,
+ }) = _SendMessageRequest;
+
+ factory SendMessageRequest.fromJson(Map json) =>
+ _$SendMessageRequestFromJson(json);
+}
+
+@freezed
+abstract class Mentions with _$Mentions {
+ const factory Mentions({
+ @Default(false) bool room,
+ @Default(IList.empty()) IList userIds,
+ }) = _Mentions;
+
+ factory Mentions.fromJson(Map json) =>
+ _$MentionsFromJson(json);
+}
+
+@Freezed(toJson: false)
+abstract class Relation with _$Relation {
+ const Relation._();
+
+ const factory Relation({
+ required String eventId,
+ required RelationType relationType,
+ }) = _Relation;
+
+ Map toJson() {
+ switch (relationType) {
+ case RelationType.reply:
+ return {
+ "m.in_reply_to": {"event_id": eventId},
+ };
+
+ case RelationType.edit:
+ return {"rel_type": "m.replace", "event_id": eventId};
+ }
+ }
+
+ factory Relation.fromJson(Map json) =>
+ _$RelationFromJson(json);
+}
diff --git a/lib/models/requests/set_membership_request.dart b/lib/models/requests/set_membership_request.dart
new file mode 100644
index 00000000..dd0e1f2d
--- /dev/null
+++ b/lib/models/requests/set_membership_request.dart
@@ -0,0 +1,19 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/requests/membership_action.dart";
+part "set_membership_request.freezed.dart";
+part "set_membership_request.g.dart";
+
+@freezed
+abstract class SetMembershipRequest with _$SetMembershipRequest {
+ const factory SetMembershipRequest({
+ required String userId,
+ required String roomId,
+
+ String? reason,
+ @JsonKey(name: "action") required MembershipAction action,
+ @Default(false) @JsonKey(name: "msc4293_redact_events") bool redact,
+ }) = _SetMembershipRequest;
+
+ factory SetMembershipRequest.fromJson(Map json) =>
+ _$SetMembershipRequestFromJson(json);
+}
diff --git a/lib/models/room.dart b/lib/models/room.dart
new file mode 100644
index 00000000..3c3eec04
--- /dev/null
+++ b/lib/models/room.dart
@@ -0,0 +1,36 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/models/read_receipt.dart";
+import "package:nexus/models/room_metadata.dart";
+part "room.freezed.dart";
+part "room.g.dart";
+
+@freezed
+abstract class Room with _$Room {
+ const factory Room({
+ @JsonKey(name: "meta") RoomMetadata? metadata,
+ @Default(IList.empty()) IList timeline,
+ @Default(false) bool reset,
+ @Default(IMap.empty()) IMap> state,
+ // required IMap accountData,
+ @Default(IList.empty()) IList events,
+ @Default(IMap.empty()) IMap