forked from Henry-Hiles/nexus
Compare commits
43 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0df1a198b | ||
|
|
cc050f62fc | ||
|
|
f72c59f79d | ||
|
|
32393f12c0 | ||
| db2a169f34 | |||
|
82b6f2c647 |
|||
|
cafdf43fd3 |
|||
|
d62626858d |
|||
|
985b6d52e0 |
|||
|
2372ecd141 |
|||
|
34f45c929a |
|||
|
4f66bdc817 |
|||
|
6cc5971919 |
|||
|
75be47554f |
|||
|
2878412573 |
|||
|
07b492d0f4 |
|||
|
132efbdfd1 |
|||
|
bfd0b1ec47 |
|||
|
0df327d125 |
|||
|
3d341ac4d8 |
|||
|
15ccddfad5 |
|||
|
e59632bb07 |
|||
|
5f96c8e57f |
|||
|
7b0fea3a07 |
|||
|
f51d773885 |
|||
|
6afa169af9 |
|||
|
27fba2cdb5 |
|||
|
5424dda62a |
|||
|
e447540062 |
|||
|
7c6ddab6a3 |
|||
|
5e0ba1029d |
|||
|
96ca282d5a |
|||
|
8be9a4f2f6 |
|||
|
d1c4a69b40 |
|||
|
5c6440894b |
|||
|
e8f4ff072d |
|||
|
b2da534a32 |
|||
|
ede26c9a27 |
|||
|
66d4ef18b4 |
|||
|
362819b464 |
|||
|
2a86bdafeb |
|||
|
77d9f9bdc1 |
|||
| 32d5f30e03 |
9 changed files with 243 additions and 79 deletions
11
README.md
11
README.md
|
|
@ -15,7 +15,7 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
|
||||||
|
|
||||||
## Progress
|
## Progress
|
||||||
|
|
||||||
- [ ] Move from the Dart SDK to the Gomuks SDK with bindings: WIP
|
- [x] Move from the Dart SDK to the Gomuks SDK with Dart bindings: https://git.federated.nexus/Henry-Hiles/nexus/pulls/2
|
||||||
- [ ] Platform Support
|
- [ ] Platform Support
|
||||||
- [x] Linux
|
- [x] Linux
|
||||||
- [x] Windows
|
- [x] Windows
|
||||||
|
|
@ -33,14 +33,17 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
|
||||||
- [ ] Searching
|
- [ ] Searching
|
||||||
- [ ] Creating (Rooms, Spaces, and DMs)
|
- [ ] Creating (Rooms, Spaces, and DMs)
|
||||||
- [x] Joining
|
- [x] Joining
|
||||||
- [x] Using alias/id/link
|
- [x] Using a text/uri/link
|
||||||
|
- [x] Plain text
|
||||||
|
- [x] `matrix:` Uri
|
||||||
|
- [ ] Matrix.to link: I just need to fix my regex
|
||||||
- [ ] From space
|
- [ ] From space
|
||||||
- [ ] Exploring
|
- [ ] Exploring
|
||||||
- [x] Leaving
|
- [x] Leaving
|
||||||
- [x] Subspaces
|
- [x] Subspaces
|
||||||
- [x] Messages
|
- [x] Messages
|
||||||
- [x] Encryption
|
- [x] Encryption
|
||||||
- [ ] Restoring crypto identity from passphrase/key or verification
|
- [x] Restoring crypto identity from passphrase/key or verification
|
||||||
- [x] Sending
|
- [x] Sending
|
||||||
- [x] Plain text
|
- [x] Plain text
|
||||||
- [x] HTML/Markdown
|
- [x] HTML/Markdown
|
||||||
|
|
@ -147,4 +150,4 @@ flutter run
|
||||||
|
|
||||||
## Community
|
## 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.
|
||||||
|
|
|
||||||
43
flake.nix
43
flake.nix
|
|
@ -29,6 +29,22 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
src = ./.;
|
||||||
|
|
||||||
|
# from https://discourse.nixos.org/t/is-there-a-way-to-read-a-yaml-file-and-get-back-a-set/18385/5
|
||||||
|
importYAML =
|
||||||
|
file:
|
||||||
|
lib.importJSON (
|
||||||
|
pkgs.runCommand "converted-yaml.json" { } ''${pkgs.yj}/bin/yj < "${file}" > "$out"''
|
||||||
|
);
|
||||||
|
|
||||||
|
package = importYAML "${src}/pubspec.yaml";
|
||||||
|
|
||||||
|
usedFlutter = (pkgs.flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; });
|
||||||
|
|
||||||
|
buildInputs = [ pkgs.sqlite ];
|
||||||
|
in
|
||||||
{
|
{
|
||||||
_module.args.pkgs = import nixpkgs {
|
_module.args.pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
@ -45,20 +61,35 @@
|
||||||
olm
|
olm
|
||||||
git
|
git
|
||||||
clang
|
clang
|
||||||
(flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
|
usedFlutter
|
||||||
|
|
||||||
(pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
|
(pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
|
||||||
];
|
];
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
LD_LIBRARY_PATH = "${
|
LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}:./build/native_assets/linux";
|
||||||
pkgs.lib.makeLibraryPath ([
|
|
||||||
pkgs.sqlite
|
|
||||||
])
|
|
||||||
}:./build/native_assets/linux";
|
|
||||||
CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
|
CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
packages.default = usedFlutter.buildFlutterApplication {
|
||||||
|
inherit src buildInputs;
|
||||||
|
pname = package.name;
|
||||||
|
version = package.version;
|
||||||
|
|
||||||
|
pubspecLock = importYAML "${src}/pubspec.lock";
|
||||||
|
gitHashes = {
|
||||||
|
flutter_chat_ui = "sha256-4fuag7lRH5cMBFD3fUzj2K541JwXLoz8HF/4OMr3uhk=";
|
||||||
|
flutter_link_previewer = "sha256-4fuag7lRH5cMBFD3fUzj2K541JwXLoz8HF/4OMr3uhk=";
|
||||||
|
flyer_chat_text_message = "sha256-4fuag7lRH5cMBFD3fUzj2K541JwXLoz8HF/4OMr3uhk=";
|
||||||
|
window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patchPhase = /* sh */ ''
|
||||||
|
patchShebangs ./scripts/generate.sh
|
||||||
|
./scripts/generate.sh # note: this doesn't quit the build on fail
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ import "package:nexus/models/paginate.dart";
|
||||||
import "package:nexus/models/requests/get_event_request.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_related_events_request.dart";
|
||||||
import "package:nexus/models/requests/get_room_state_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/requests/login_request.dart";
|
||||||
import "package:nexus/models/profile.dart";
|
import "package:nexus/models/profile.dart";
|
||||||
import "package:nexus/models/requests/paginate_request.dart";
|
import "package:nexus/models/requests/paginate_request.dart";
|
||||||
|
|
@ -138,6 +139,11 @@ class ClientController extends AsyncNotifier<int> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<String> joinRoom(JoinRoomRequest request) async {
|
||||||
|
final response = await _sendCommand("join_room", request.toJson());
|
||||||
|
return response["room_id"];
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> leaveRoom(Room room) async {
|
Future<void> leaveRoom(Room room) async {
|
||||||
if (room.metadata == null) return;
|
if (room.metadata == null) return;
|
||||||
await _sendCommand("leave_room", {"room_id": room.metadata!.id});
|
await _sendCommand("leave_room", {"room_id": room.metadata!.id});
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
import "package:collection/collection.dart";
|
import "package:collection/collection.dart";
|
||||||
|
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||||
import "package:flutter/material.dart";
|
import "package:flutter/material.dart";
|
||||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||||
import "package:nexus/controllers/client_controller.dart";
|
import "package:nexus/controllers/client_controller.dart";
|
||||||
import "package:nexus/controllers/key_controller.dart";
|
import "package:nexus/controllers/key_controller.dart";
|
||||||
import "package:nexus/controllers/spaces_controller.dart";
|
import "package:nexus/controllers/spaces_controller.dart";
|
||||||
|
import "package:nexus/helpers/extensions/link_to_mention.dart";
|
||||||
|
import "package:nexus/models/requests/join_room_request.dart";
|
||||||
|
|
||||||
extension JoinRoomWithSnackbars on ClientController {
|
extension JoinRoomWithSnackbars on ClientController {
|
||||||
Future<void> joinRoomWithSnackBars(
|
Future<void> joinRoomWithSnackBars(
|
||||||
|
|
@ -11,77 +14,77 @@ extension JoinRoomWithSnackbars on ClientController {
|
||||||
String roomAlias,
|
String roomAlias,
|
||||||
WidgetRef ref,
|
WidgetRef ref,
|
||||||
) async {
|
) async {
|
||||||
// final parsed = roomAlias.parseIdentifierIntoParts();
|
final roomIdOrAlias = roomAlias.mention ?? roomAlias;
|
||||||
// final alias = parsed?.primaryIdentifier ?? roomAlias;
|
|
||||||
|
|
||||||
// final scaffoldMessenger = ScaffoldMessenger.of(context);
|
final scaffoldMessenger = ScaffoldMessenger.of(context);
|
||||||
|
|
||||||
// final snackbar = scaffoldMessenger.showSnackBar(
|
final snackbar = scaffoldMessenger.showSnackBar(
|
||||||
// SnackBar(
|
SnackBar(
|
||||||
// content: Text("Joining room $alias."),
|
content: Text("Joining room $roomIdOrAlias."),
|
||||||
// duration: Duration(days: 999),
|
duration: Duration(days: 999),
|
||||||
// ),
|
),
|
||||||
// );
|
);
|
||||||
|
|
||||||
// try {
|
try {
|
||||||
// final id = await joinRoom(alias, via: parsed?.via.toList());
|
final id = await joinRoom(
|
||||||
|
JoinRoomRequest(
|
||||||
|
roomIdOrAlias: roomIdOrAlias,
|
||||||
|
via: IList(Uri.tryParse(roomAlias)?.queryParametersAll["via"] ?? []),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
// snackbar.close();
|
snackbar.close();
|
||||||
|
|
||||||
// scaffoldMessenger.showSnackBar(
|
scaffoldMessenger.showSnackBar(
|
||||||
// SnackBar(
|
SnackBar(
|
||||||
// content: Text("Room $alias successfully joined."),
|
content: Text("Room $roomIdOrAlias successfully joined."),
|
||||||
// action: SnackBarAction(
|
action: SnackBarAction(
|
||||||
// label: "Open",
|
label: "Open",
|
||||||
// onPressed: () async {
|
onPressed: () async {
|
||||||
// final spaces = await ref.refresh(
|
final spaces = ref.watch(SpacesController.provider);
|
||||||
// SpacesController.provider.future,
|
final space = spaces.firstWhereOrNull((space) => space.id == id);
|
||||||
// );
|
|
||||||
// final space = spaces.firstWhereOrNull((space) => space.id == id);
|
|
||||||
|
|
||||||
// await ref
|
await ref
|
||||||
// .watch(
|
.watch(
|
||||||
// KeyController.provider(KeyController.spaceKey).notifier,
|
KeyController.provider(KeyController.spaceKey).notifier,
|
||||||
// )
|
)
|
||||||
// .set(
|
.set(
|
||||||
// space?.id ??
|
space?.id ??
|
||||||
// spaces
|
spaces
|
||||||
// .firstWhere(
|
.firstWhere(
|
||||||
// (space) =>
|
(space) => space.children.any(
|
||||||
// space.children.firstWhereOrNull(
|
(child) => child.metadata?.id == id,
|
||||||
// (child) => child.roomData.id == id,
|
),
|
||||||
// ) !=
|
)
|
||||||
// null,
|
.id,
|
||||||
// )
|
);
|
||||||
// .id,
|
|
||||||
// );
|
|
||||||
|
|
||||||
// if (space == null) {
|
if (space == null) {
|
||||||
// await ref
|
await ref
|
||||||
// .watch(
|
.watch(
|
||||||
// KeyController.provider(KeyController.roomKey).notifier,
|
KeyController.provider(KeyController.roomKey).notifier,
|
||||||
// )
|
)
|
||||||
// .set(id);
|
.set(id);
|
||||||
// }
|
}
|
||||||
// },
|
},
|
||||||
// ),
|
),
|
||||||
// ),
|
),
|
||||||
// );
|
);
|
||||||
// } catch (error) {
|
} catch (error) {
|
||||||
// snackbar.close();
|
snackbar.close();
|
||||||
// if (context.mounted) {
|
if (context.mounted) {
|
||||||
// scaffoldMessenger.showSnackBar(
|
scaffoldMessenger.showSnackBar(
|
||||||
// SnackBar(
|
SnackBar(
|
||||||
// backgroundColor: Theme.of(context).colorScheme.errorContainer,
|
backgroundColor: Theme.of(context).colorScheme.errorContainer,
|
||||||
// content: Text(
|
content: Text(
|
||||||
// error.toString(),
|
error.toString(),
|
||||||
// style: TextStyle(
|
style: TextStyle(
|
||||||
// color: Theme.of(context).colorScheme.onErrorContainer,
|
color: Theme.of(context).colorScheme.onErrorContainer,
|
||||||
// ),
|
),
|
||||||
// ),
|
),
|
||||||
// ),
|
),
|
||||||
// );
|
);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,11 @@ extension LinkToMention on String {
|
||||||
if (uri.pathSegments.isNotEmpty) {
|
if (uri.pathSegments.isNotEmpty) {
|
||||||
final identifier = uri.pathSegments.last;
|
final identifier = uri.pathSegments.last;
|
||||||
if (identifier.isNotEmpty) {
|
if (identifier.isNotEmpty) {
|
||||||
return Uri.decodeComponent(identifier);
|
return "${switch (uri.pathSegments.firstOrNull) {
|
||||||
|
"r" || "roomid" => "#",
|
||||||
|
"u" => "@",
|
||||||
|
_ => "",
|
||||||
|
}}${Uri.decodeComponent(identifier)}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (_) {}
|
} catch (_) {}
|
||||||
|
|
|
||||||
15
lib/models/requests/join_room_request.dart
Normal file
15
lib/models/requests/join_room_request.dart
Normal file
|
|
@ -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<String> via,
|
||||||
|
}) = _JoinRoomRequest;
|
||||||
|
|
||||||
|
factory JoinRoomRequest.fromJson(Map<String, Object?> json) =>
|
||||||
|
_$JoinRoomRequestFromJson(json);
|
||||||
|
}
|
||||||
|
|
@ -1,11 +1,8 @@
|
||||||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||||
import "package:flutter/material.dart";
|
import "package:flutter/material.dart";
|
||||||
import "package:flutter/services.dart";
|
|
||||||
import "package:flutter_hooks/flutter_hooks.dart";
|
|
||||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||||
import "package:nexus/controllers/client_controller.dart";
|
import "package:nexus/controllers/client_controller.dart";
|
||||||
import "package:nexus/models/room.dart";
|
import "package:nexus/models/room.dart";
|
||||||
import "package:nexus/widgets/form_text_input.dart";
|
|
||||||
|
|
||||||
class RoomMenu extends ConsumerWidget {
|
class RoomMenu extends ConsumerWidget {
|
||||||
final Room room;
|
final Room room;
|
||||||
|
|
|
||||||
105
src/gomuks/libgomuks.h
Normal file
105
src/gomuks/libgomuks.h
Normal file
|
|
@ -0,0 +1,105 @@
|
||||||
|
/* Code generated by cmd/cgo; DO NOT EDIT. */
|
||||||
|
|
||||||
|
/* package go.mau.fi/gomuks/pkg/ffi */
|
||||||
|
|
||||||
|
|
||||||
|
#line 1 "cgo-builtin-export-prolog"
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#ifndef GO_CGO_EXPORT_PROLOGUE_H
|
||||||
|
#define GO_CGO_EXPORT_PROLOGUE_H
|
||||||
|
|
||||||
|
#ifndef GO_CGO_GOSTRING_TYPEDEF
|
||||||
|
typedef struct { const char *p; ptrdiff_t n; } _GoString_;
|
||||||
|
extern size_t _GoStringLen(_GoString_ s);
|
||||||
|
extern const char *_GoStringPtr(_GoString_ s);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Start of preamble from import "C" comments. */
|
||||||
|
|
||||||
|
|
||||||
|
#line 9 "ffi.go"
|
||||||
|
|
||||||
|
#include "gomuksffi.h"
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
static inline void _gomuks_callEventCallback(EventCallback cb, const char *command, int64_t request_id, GomuksOwnedBuffer data) {
|
||||||
|
cb(command, request_id, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
#line 1 "cgo-generated-wrapper"
|
||||||
|
|
||||||
|
|
||||||
|
/* End of preamble from import "C" comments. */
|
||||||
|
|
||||||
|
|
||||||
|
/* Start of boilerplate cgo prologue. */
|
||||||
|
#line 1 "cgo-gcc-export-header-prolog"
|
||||||
|
|
||||||
|
#ifndef GO_CGO_PROLOGUE_H
|
||||||
|
#define GO_CGO_PROLOGUE_H
|
||||||
|
|
||||||
|
typedef signed char GoInt8;
|
||||||
|
typedef unsigned char GoUint8;
|
||||||
|
typedef short GoInt16;
|
||||||
|
typedef unsigned short GoUint16;
|
||||||
|
typedef int GoInt32;
|
||||||
|
typedef unsigned int GoUint32;
|
||||||
|
typedef long long GoInt64;
|
||||||
|
typedef unsigned long long GoUint64;
|
||||||
|
typedef GoInt64 GoInt;
|
||||||
|
typedef GoUint64 GoUint;
|
||||||
|
typedef size_t GoUintptr;
|
||||||
|
typedef float GoFloat32;
|
||||||
|
typedef double GoFloat64;
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#if !defined(__cplusplus) || _MSVC_LANG <= 201402L
|
||||||
|
#include <complex.h>
|
||||||
|
typedef _Fcomplex GoComplex64;
|
||||||
|
typedef _Dcomplex GoComplex128;
|
||||||
|
#else
|
||||||
|
#include <complex>
|
||||||
|
typedef std::complex<float> GoComplex64;
|
||||||
|
typedef std::complex<double> GoComplex128;
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
typedef float _Complex GoComplex64;
|
||||||
|
typedef double _Complex GoComplex128;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
static assertion to make sure the file is being used on architecture
|
||||||
|
at least with matching size of GoInt.
|
||||||
|
*/
|
||||||
|
typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
|
||||||
|
|
||||||
|
#ifndef GO_CGO_GOSTRING_TYPEDEF
|
||||||
|
typedef _GoString_ GoString;
|
||||||
|
#endif
|
||||||
|
typedef void *GoMap;
|
||||||
|
typedef void *GoChan;
|
||||||
|
typedef struct { void *t; void *v; } GoInterface;
|
||||||
|
typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* End of boilerplate cgo prologue. */
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern GomuksHandle GomuksInit(void);
|
||||||
|
extern int GomuksStart(GomuksHandle handle, EventCallback callback);
|
||||||
|
extern void GomuksDestroy(GomuksHandle handle);
|
||||||
|
extern GomuksResponse GomuksSubmitCommand(GomuksHandle handle, char* command, GomuksBorrowedBuffer data);
|
||||||
|
extern GomuksAccountInfo GomuksGetAccountInfo(GomuksHandle handle);
|
||||||
|
extern void GomuksFreeAccountInfo(GomuksAccountInfo info);
|
||||||
|
extern void GomuksFreeBuffer(GomuksOwnedBuffer buf);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
BIN
src/gomuks/libgomuks.so
Normal file
BIN
src/gomuks/libgomuks.so
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue