forked from Nexus/nexus
Compare commits
3 commits
b727d0342d
...
148bc8f95c
| Author | SHA1 | Date | |
|---|---|---|---|
|
148bc8f95c |
|||
|
b037dc06c8 |
|||
|
3c7c74f745 |
5 changed files with 39 additions and 27 deletions
|
|
@ -58,6 +58,7 @@
|
||||||
permissions = {
|
permissions = {
|
||||||
share = [ "network" ];
|
share = [ "network" ];
|
||||||
sockets = [
|
sockets = [
|
||||||
|
"pulseaudio"
|
||||||
"fallback-x11"
|
"fallback-x11"
|
||||||
"wayland"
|
"wayland"
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,10 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
|
||||||
|
|
||||||
return editedEvent == null
|
return editedEvent == null
|
||||||
? foundEvent
|
? foundEvent
|
||||||
: foundEvent?.copyWith(content: editedEvent.content);
|
: foundEvent?.copyWith(
|
||||||
|
content: editedEvent.content,
|
||||||
|
localContent: editedEvent.localContent,
|
||||||
|
);
|
||||||
})
|
})
|
||||||
.nonNulls
|
.nonNulls
|
||||||
.toIList();
|
.toIList();
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ class UrlPreviewController extends AsyncNotifier<OpenGraphData?> {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<OpenGraphData?> build() async {
|
Future<OpenGraphData?> build() async {
|
||||||
|
try {
|
||||||
final homeserver = ref.watch(
|
final homeserver = ref.watch(
|
||||||
ClientStateController.provider.select((value) => value?.homeserverUrl),
|
ClientStateController.provider.select((value) => value?.homeserverUrl),
|
||||||
);
|
);
|
||||||
|
|
@ -38,7 +39,9 @@ class UrlPreviewController extends AsyncNotifier<OpenGraphData?> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} catch (_) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import "package:flutter_hooks/flutter_hooks.dart";
|
||||||
import "package:fluttertagger/fluttertagger.dart";
|
import "package:fluttertagger/fluttertagger.dart";
|
||||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||||
import "package:nexus/controllers/power_level_controller.dart";
|
import "package:nexus/controllers/power_level_controller.dart";
|
||||||
|
import "package:nexus/models/content/message.dart";
|
||||||
import "package:nexus/models/event.dart";
|
import "package:nexus/models/event.dart";
|
||||||
import "package:nexus/models/relation_type.dart";
|
import "package:nexus/models/relation_type.dart";
|
||||||
import "package:nexus/widgets/composer/mention_overlay.dart";
|
import "package:nexus/widgets/composer/mention_overlay.dart";
|
||||||
|
|
@ -42,7 +43,12 @@ class Composer extends HookConsumerWidget {
|
||||||
final query = useState("");
|
final query = useState("");
|
||||||
|
|
||||||
if (relationType == .edit && controller.value.text.isEmpty) {
|
if (relationType == .edit && controller.value.text.isEmpty) {
|
||||||
controller.value.text = relatedEvent?.localContent?.editSource ?? "";
|
controller.value.text =
|
||||||
|
relatedEvent?.localContent?.editSource ??
|
||||||
|
switch (relatedEvent?.content) {
|
||||||
|
TextMessageContent(:final body) => body,
|
||||||
|
_ => "",
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
void send() {
|
void send() {
|
||||||
|
|
|
||||||
|
|
@ -508,7 +508,6 @@ class RoomChat extends HookConsumerWidget {
|
||||||
MemberList(roomId),
|
MemberList(roomId),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|
||||||
endDrawer: showMembersByDefault ? null : MemberList(roomId),
|
endDrawer: showMembersByDefault ? null : MemberList(roomId),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue