bruig: show mediate ID requests in list of kx attempts

companyzero · Oct 11, 2024 · 711b0c0 · 711b0c0
1 parent 5778917
commit 711b0c0
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 14 deletions.
diff --git a/bruig/flutterui/bruig/lib/components/interactive_avatar.dart b/bruig/flutterui/bruig/lib/components/interactive_avatar.dart
@@ -253,7 +253,9 @@ class UserAvatarFromID extends StatelessWidget {
 class UserNickFromID extends StatelessWidget {
   final String uid;
   final TextSize? textSize;
-  const UserNickFromID(this.uid, {this.textSize, super.key});
+  final String nickAlternative;
+  const UserNickFromID(this.uid,
+      {this.textSize, this.nickAlternative = "", super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -264,6 +266,8 @@ class UserNickFromID extends StatelessWidget {
       nick = chat.nick;
     } else if (uid == client.publicID) {
       nick = "me (${client.nick})";
+    } else {
+      nick = nickAlternative;
     }
     return Txt(nick, size: textSize);
   }

diff --git a/bruig/flutterui/bruig/lib/screens/list_kxs.dart b/bruig/flutterui/bruig/lib/screens/list_kxs.dart
@@ -26,6 +26,22 @@ class _ListKXsScreenState extends State<ListKXsScreen> {
   void listKXs() async {
     try {
       var newKXs = await Golib.listKXs();
+      var newMIs = await Golib.listMediateIDRequests();
+
+      // Add the mediate ID requests as if they were KX attempts to simplify
+      // the report.
+      newKXs.addAll(newMIs.map((mi) => KXData(
+          PublicIdentity("", "", mi.target),
+          "",
+          "",
+          "",
+          "",
+          KXStage.mediateID,
+          mi.date,
+          null,
+          false,
+          mi.mediator)));
+
       newKXs.sortBy((v) => v.timestamp);
       newKXs.reverseRange(0, newKXs.length);
       setState(() => kxs = newKXs);
@@ -34,6 +50,10 @@ class _ListKXsScreenState extends State<ListKXsScreen> {
     }
   }
 
+  String kxTargetID(KXData kx) =>
+      kx.invitee?.identity ?? kx.public?.identity ?? "";
+  String kxTargetNick(KXData kx) => kx.invitee?.nick ?? kx.public?.nick ?? "";
+
   @override
   void initState() {
     super.initState();
@@ -56,8 +76,8 @@ class _ListKXsScreenState extends State<ListKXsScreen> {
             ["Stage", "${kx.stage}"],
             ["Updated", "${kx.timestamp}"],
             ["Initial RV", Copyable(kx.initialRV)],
-            ["Target Nick", kx.invitee?.nick ?? ""],
-            ["Target ID", Copyable(kx.invitee?.identity ?? "")],
+            ["Target ID", Copyable(kxTargetID(kx))],
+            ["Target Nick", kxTargetNick(kx)],
             ["Mediator ID", Copyable(kx.mediatorID ?? "")],
             [
               "Mediator",

diff --git a/bruig/flutterui/plugin/lib/definitions.dart b/bruig/flutterui/plugin/lib/definitions.dart
@@ -2224,6 +2224,7 @@ enum KXStage {
   step2IdKX,
   @JsonValue(2)
   step3IDKX,
+  mediateID,
 }
 
 @JsonSerializable()
@@ -2261,6 +2262,17 @@ class KXData {
   factory KXData.fromJson(Map<String, dynamic> json) => _$KXDataFromJson(json);
 }
 
+@JsonSerializable()
+class MediateIDRequest {
+  final String mediator;
+  final String target;
+  final DateTime date;
+
+  MediateIDRequest(this.mediator, this.target, this.date);
+  factory MediateIDRequest.fromJson(Map<String, dynamic> json) =>
+      _$MediateIDRequestFromJson(json);
+}
+
 mixin NtfStreams {
   StreamController<RemoteUser> ntfAcceptedInvites =
       StreamController<RemoteUser>();
@@ -3295,17 +3307,11 @@ abstract class PluginPlatform {
     return (res as List).map<String>((v) => v as String).toList();
   }
 
-  Future<List<KXData>> listKXs() async {
-      // jsonToList(await asyncCall(CTListKXs, null), KXData.fromJson);
-      var res = await asyncCall(
-        CTListKXs, null);
-    if (res == null) {
-      return List.empty();
-    }
-    return (res as List)
-        .map<KXData>((v) => KXData.fromJson(v))
-        .toList();
-  }
+  Future<List<KXData>> listKXs() async =>
+      jsonToList(await asyncCall(CTListKXs, null), KXData.fromJson);
+
+  Future<List<MediateIDRequest>> listMediateIDRequests() async => jsonToList(
+      await asyncCall(CTListMIRequests, null), MediateIDRequest.fromJson);
 }
 
 const int CTUnknown = 0x00;
@@ -3441,6 +3447,7 @@ const int CTSubAllPosts = 0x8d;
 const int CTUpdateUINotificationsCfg = 0x8e;
 const int CTGCListUnkxdMembers = 0x8f;
 const int CTListKXs = 0x90;
+const int CTListMIRequests = 0x91;
 
 const int notificationsStartID = 0x1000;
 

diff --git a/bruig/flutterui/plugin/lib/definitions.g.dart b/bruig/flutterui/plugin/lib/definitions.g.dart
diff --git a/bruig/golib/command_handlers.go b/bruig/golib/command_handlers.go
@@ -2155,6 +2155,9 @@ func handleClientCmd(cc *clientCtx, cmd *cmd) (interface{}, error) {
 
 	case CTListKXs:
 		return c.ListKXs()
+
+	case CTListMIRequests:
+		return c.ListMediateIDs()
 	}
 	return nil, nil
 

diff --git a/bruig/golib/commands.go b/bruig/golib/commands.go
@@ -151,6 +151,7 @@ const (
 	CTUpdateUINotificationsCfg            = 0x8e
 	CTGCListUnkxdMembers                  = 0x8f
 	CTListKXs                             = 0x90
+	CTListMIRequests                      = 0x91
 
 	NTInviteReceived         = 0x1001
 	NTInviteAccepted         = 0x1002