chore: bump version

closes #10

.github/workflows/build.yml

@@ -1,5 +1,7 @@
 name: build
-on: push
+on:
+  push:
+    branches: ["main"]
 jobs:
   android:
     runs-on: ubuntu-latest
@@ -12,7 +14,19 @@ jobs:
           channel: stable
       - run: flutter pub get
       - run: flutter build appbundle
+        env:
+          KEYSTORE: ${{ secrets.KEYSTORE }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEYSTORE_SHA256: ${{ secrets.KEYSTORE_SHA256 }}
       - run: flutter build apk --split-per-abi
+        env:
+          KEYSTORE: ${{ secrets.KEYSTORE }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEYSTORE_SHA256: ${{ secrets.KEYSTORE_SHA256 }}
       - uses: actions/upload-artifact@v4
         with:
           name: "release.aab"

devtools_options.yaml

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

lib/login.dart

@@ -6,47 +6,60 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:ndk/domain_layer/entities/account.dart';
 import 'package:ndk/shared/nips/nip01/bip340.dart';
 import 'package:ndk/shared/nips/nip19/nip19.dart';
+import 'package:zap_stream_flutter/utils.dart';
 
-class Account {
+class LoginAccount {
   final AccountType type;
   final String pubkey;
   final String? privateKey;
 
-  Account._({required this.type, required this.pubkey, this.privateKey});
+  LoginAccount._({required this.type, required this.pubkey, this.privateKey});
 
-  static Account nip19(String key) {
-    final keyData = Nip19.decode(key);
+  static LoginAccount nip19(String key) {
+    final keyData = bech32ToHex(key);
     final pubkey =
         Nip19.isKey("nsec", key) ? Bip340.getPublicKey(keyData) : keyData;
     final privateKey = Nip19.isKey("npub", key) ? null : keyData;
-    return Account._(
-      type: AccountType.privateKey,
+    return LoginAccount._(
+      type:
+          Nip19.isKey("npub", key)
+              ? AccountType.publicKey
+              : AccountType.privateKey,
       pubkey: pubkey,
       privateKey: privateKey,
     );
   }
 
-  static Account privateKeyHex(String key) {
-    return Account._(
+  static LoginAccount privateKeyHex(String key) {
+    return LoginAccount._(
       type: AccountType.privateKey,
       privateKey: key,
       pubkey: Bip340.getPublicKey(key),
     );
   }
 
-  static Account externalPublicKeyHex(String key) {
-    return Account._(type: AccountType.externalSigner, pubkey: key);
+  static LoginAccount externalPublicKeyHex(String key) {
+    return LoginAccount._(type: AccountType.externalSigner, pubkey: key);
   }
 
-  static Map<String, dynamic> toJson(Account? acc) => {
+  static Map<String, dynamic> toJson(LoginAccount? acc) => {
     "type": acc?.type.name,
     "pubKey": acc?.pubkey,
     "privateKey": acc?.privateKey,
   };
 
-  static Account? fromJson(Map<String, dynamic> json) {
+  static LoginAccount? fromJson(Map<String, dynamic> json) {
     if (json.length > 2 && json.containsKey("pubKey")) {
-      return Account._(
+      if ((json["pubKey"] as String).length != 64) {
+        throw "Invalid pubkey, length != 64";
+      }
+      if (json.containsKey("privateKey")) {
+        final privKey = json["privateKey"] as String?;
+        if (privKey != null && privKey.length != 64) {
+          throw "Invalid privateKey, length != 64";
+        }
+      }
+      return LoginAccount._(
         type: AccountType.values.firstWhere(
           (v) => v.toString().endsWith(json["type"] as String),
         ),
@@ -58,27 +71,30 @@ class Account {
   }
 }
 
-class LoginData extends ValueNotifier<Account?> {
+class LoginData extends ValueNotifier<LoginAccount?> {
   final _storage = FlutterSecureStorage();
   static const String _storageKey = "accounts";
 
   LoginData() : super(null) {
     super.addListener(() async {
-      final data = json.encode(Account.toJson(value));
-      await _storage.write(key: _storageKey, value: data);
+      if (value != null) {
+        final data = json.encode(LoginAccount.toJson(value));
+        await _storage.write(key: _storageKey, value: data);
+      } else {
+        await _storage.delete(key: _storageKey);
+      }
     });
   }
 
-  Future<void> logout() async {
+  void logout() {
     super.value = null;
-    await _storage.delete(key: _storageKey);
   }
 
   Future<void> load() async {
     final acc = await _storage.read(key: _storageKey);
     if (acc?.isNotEmpty ?? false) {
       try {
-        super.value = Account.fromJson(json.decode(acc!));
+        super.value = LoginAccount.fromJson(json.decode(acc!));
       } catch (e) {
         developer.log(e.toString());
       }

lib/main.dart

@@ -7,6 +7,8 @@ import 'package:ndk_amber/ndk_amber.dart';
 import 'package:ndk_objectbox/ndk_objectbox.dart';
 import 'package:ndk_rust_verifier/ndk_rust_verifier.dart';
 import 'package:zap_stream_flutter/pages/login.dart';
+import 'package:zap_stream_flutter/pages/login_input.dart';
+import 'package:zap_stream_flutter/pages/new_account.dart';
 import 'package:zap_stream_flutter/pages/profile.dart';
 import 'package:zap_stream_flutter/pages/stream.dart';
 import 'package:zap_stream_flutter/theme.dart';
@@ -25,13 +27,21 @@ class NoVerify extends EventVerifier {
 
 final ndkCache = DbObjectBox();
 final eventVerifier = kDebugMode ? NoVerify() : RustEventVerifier();
-var ndk = Ndk(NdkConfig(eventVerifier: eventVerifier, cache: ndkCache));
+var ndk = Ndk(
+  NdkConfig(
+    eventVerifier: eventVerifier,
+    cache: ndkCache,
+    bootstrapRelays: defaultRelays,
+    //engine: NdkEngine.JIT,
+  ),
+);
 
 const userAgent = "zap.stream/1.0";
 const defaultRelays = [
   "wss://nos.lol",
   "wss://relay.damus.io",
   "wss://relay.primal.net",
+  "wss://relay.snort.social",
 ];
 const searchRelays = ["wss://relay.nostr.band", "wss://search.nos.today"];
 
@@ -87,7 +97,43 @@ Future<void> main() async {
               StatefulShellBranch(
                 routes: [
                   GoRoute(path: "/", builder: (ctx, state) => HomePage()),
-                  GoRoute(path: "/login", builder: (ctx, state) => LoginPage()),
+                  ShellRoute(
+                    builder: (context, state, child) {
+                      return Container(
+                        margin: EdgeInsets.only(top: 50),
+                        padding: EdgeInsets.symmetric(horizontal: 5),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          spacing: 20,
+                          children: [
+                            Center(
+                              child: Image.asset(
+                                "assets/logo.png",
+                                height: 150,
+                              ),
+                            ),
+                            child,
+                          ],
+                        ),
+                      );
+                    },
+                    routes: [
+                      GoRoute(
+                        path: "/login",
+                        builder: (ctx, state) => LoginPage(),
+                        routes: [
+                          GoRoute(
+                            path: "key",
+                            builder: (ctx, state) => LoginInputPage(),
+                          ),
+                          GoRoute(
+                            path: "new",
+                            builder: (context, state) => NewAccountPage(),
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
                   GoRoute(
                     path: "/e/:id",
                     builder: (ctx, state) {

lib/pages/home.dart

@@ -16,6 +16,7 @@ class HomePage extends StatelessWidget {
           children: [
             HeaderWidget(),
             RxFilter<Nip01Event>(
+              Key("home-page"),
               filters: [
                 Filter(kinds: [30_311], limit: 50),
               ],

lib/pages/login.dart

@@ -1,59 +1,58 @@
 import 'package:amberflutter/amberflutter.dart';
 import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ndk/shared/nips/nip19/nip19.dart';
 import 'package:zap_stream_flutter/login.dart';
 import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/button.dart';
 
-class LoginPage extends StatefulWidget {
+class LoginPage extends StatelessWidget {
   const LoginPage({super.key});
-
-  @override
-  State<StatefulWidget> createState() => _LoginPage();
-}
-
-class _LoginPage extends State<LoginPage> {
   @override
   Widget build(BuildContext context) {
-    return Container(
-      margin: EdgeInsets.only(top: 50),
-      child: Column(
-        spacing: 10,
-        children: [
-          Image.asset("assets/logo.png", height: 150),
-          FutureBuilder(
-            future: Amberflutter().isAppInstalled(),
-            builder: (ctx, state) {
-              if (state.data ?? false) {
-                return BasicButton.text(
-                  "Login with Amber",
-                  onTap: () async {
-                    final amber = Amberflutter();
-                    final result = await amber.getPublicKey();
-                    if (result['signature'] != null) {
-                      final key = Nip19.decode(result['signature']);
-                      loginData.value = Account.externalPublicKeyHex(key);
+    return Column(
+      spacing: 20,
+      children: [
+        FutureBuilder(
+          future: Amberflutter().isAppInstalled(),
+          builder: (ctx, state) {
+            if (state.data ?? false) {
+              return BasicButton.text(
+                "Login with Amber",
+                onTap: () async {
+                  final amber = Amberflutter();
+                  final result = await amber.getPublicKey();
+                  if (result['signature'] != null) {
+                    final key = bech32ToHex(result['signature']);
+                    loginData.value = LoginAccount.externalPublicKeyHex(key);
+                    if (ctx.mounted) {
                       ctx.go("/");
                     }
-                  },
-                );
-              } else {
-                return SizedBox.shrink();
-              }
-            },
+                  }
+                },
+              );
+            } else {
+              return SizedBox.shrink();
+            }
+          },
+        ),
+        BasicButton.text(
+          "Login with Key",
+          onTap: () => context.push("/login/key"),
+        ),
+        Container(
+          margin: EdgeInsets.symmetric(vertical: 20),
+          height: 1,
+          decoration: BoxDecoration(
+            border: Border(bottom: BorderSide(color: LAYER_2)),
           ),
-          /*BasicButton.text("Login with Key"),
-          Container(
-            margin: EdgeInsets.symmetric(vertical: 20),
-            height: 1,
-            decoration: BoxDecoration(
-              border: Border(bottom: BorderSide(color: LAYER_1)),
-            ),
-          ),
-          Text("Create Account"),*/
-        ],
-      ),
+        ),
+        BasicButton.text(
+          "Create Account",
+          onTap: () => context.push("/login/new"),
+        ),
+      ],
     );
   }
 }

lib/pages/login_input.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:zap_stream_flutter/login.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
+import 'package:zap_stream_flutter/widgets/button.dart';
+
+class LoginInputPage extends StatefulWidget {
+  const LoginInputPage({super.key});
+
+  @override
+  State<StatefulWidget> createState() => _LoginInputPage();
+}
+
+class _LoginInputPage extends State<LoginInputPage> {
+  final TextEditingController _controller = TextEditingController();
+  String? _error;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      spacing: 20,
+      children: [
+        TextFormField(
+          controller: _controller,
+          decoration: InputDecoration(labelText: "npub/nsec"),
+        ),
+        BasicButton.text(
+          "Login",
+          onTap: () async {
+            try {
+              final keyData = bech32ToHex(_controller.text);
+              if (keyData.isNotEmpty) {
+                loginData.value = LoginAccount.nip19(_controller.text);
+                context.go("/");
+              } else {
+                throw "Invalid key";
+              }
+            } catch (e) {
+              setState(() {
+                _error = e.toString();
+              });
+            }
+          },
+        ),
+
+        if (_error != null)
+          Text(
+            _error!,
+            style: TextStyle(color: WARNING, fontWeight: FontWeight.bold),
+          ),
+      ],
+    );
+  }
+}

lib/pages/new_account.dart

@@ -0,0 +1,123 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:ndk/ndk.dart';
+import 'package:ndk/shared/nips/nip01/bip340.dart';
+import 'package:ndk/shared/nips/nip01/key_pair.dart';
+import 'package:zap_stream_flutter/login.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/widgets/button.dart';
+
+class NewAccountPage extends StatefulWidget {
+  const NewAccountPage({super.key});
+
+  @override
+  State<StatefulWidget> createState() => _NewAccountPage();
+}
+
+class _NewAccountPage extends State<NewAccountPage> {
+  final TextEditingController _name = TextEditingController();
+  String? _avatar;
+  String? _error;
+  final KeyPair _privateKey = Bip340.generatePrivateKey();
+
+  Future<void> _uploadAvatar() async {
+    ndk.accounts.loginPrivateKey(
+      pubkey: _privateKey.publicKey,
+      privkey: _privateKey.privateKey!,
+    );
+
+    final file = await ImagePicker().pickImage(source: ImageSource.gallery);
+    if (file != null) {
+      final upload = await ndk.blossom.uploadBlob(
+        serverUrls: ["https://nostr.download"],
+        data: await file.readAsBytes(),
+      );
+      setState(() {
+        _avatar = upload.first.descriptor!.url;
+      });
+    }
+  }
+
+  Future<void> _login() async {
+    if (ndk.accounts.isNotLoggedIn) {
+      ndk.accounts.loginPrivateKey(
+        pubkey: _privateKey.publicKey,
+        privkey: _privateKey.privateKey!,
+      );
+    }
+
+    await ndk.metadata.broadcastMetadata(
+      Metadata(
+        pubKey: _privateKey.publicKey,
+        name: _name.text,
+        picture: _avatar,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      spacing: 20,
+      children: [
+        GestureDetector(
+          onTap: () {
+            _uploadAvatar().catchError((e) {
+              setState(() {
+                if (e is String) {
+                  _error = e;
+                }
+              });
+            });
+          },
+          child: Container(
+            width: 200,
+            height: 200,
+            clipBehavior: Clip.antiAlias,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.all(Radius.circular(200)),
+              color: Color.fromARGB(100, 50, 50, 50),
+            ),
+            child:
+                _avatar == null
+                    ? Center(child: Text("Upload Avatar"))
+                    : CachedNetworkImage(imageUrl: _avatar!),
+          ),
+        ),
+        TextField(
+          controller: _name,
+          decoration: InputDecoration(labelText: "Username"),
+        ),
+        BasicButton.text(
+          "Login",
+          onTap: () {
+            _login()
+                .then((_) {
+                  loginData.value = LoginAccount.privateKeyHex(
+                    _privateKey.privateKey!,
+                  );
+                  if (context.mounted) {
+                    context.go("/");
+                  }
+                })
+                .catchError((e) {
+                  setState(() {
+                    if (e is String) {
+                      _error = e;
+                    }
+                  });
+                });
+          },
+        ),
+        if (_error != null)
+          Text(
+            _error!,
+            style: TextStyle(color: WARNING, fontWeight: FontWeight.bold),
+          ),
+      ],
+    );
+  }
+}

lib/pages/profile.dart

@@ -2,11 +2,11 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
 import 'package:ndk/ndk.dart';
-import 'package:ndk/shared/nips/nip19/nip19.dart';
 import 'package:zap_stream_flutter/imgproxy.dart';
 import 'package:zap_stream_flutter/main.dart';
 import 'package:zap_stream_flutter/rx_filter.dart';
 import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/avatar.dart';
 import 'package:zap_stream_flutter/widgets/button.dart';
 import 'package:zap_stream_flutter/widgets/header.dart';
@@ -20,7 +20,7 @@ class ProfilePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final hexPubkey = Nip19.decode(pubkey);
+    final hexPubkey = bech32ToHex(pubkey);
     return ProfileLoaderWidget(hexPubkey, (ctx, state) {
       final profile = state.data ?? Metadata(pubKey: hexPubkey);
       return SingleChildScrollView(
@@ -81,7 +81,7 @@ class ProfilePage extends StatelessWidget {
             ),
 
             RxFilter<Nip01Event>(
-              key: Key("profile-streams:$hexPubkey"),
+              Key("profile-streams:$hexPubkey"),
               relays: defaultRelays,
               filters: [
                 Filter(kinds: [30_311], limit: 200, pTags: [hexPubkey]),

lib/pages/stream.dart

@@ -1,8 +1,12 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:chewie/chewie.dart';
 import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
 import 'package:video_player/video_player.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
+import 'package:zap_stream_flutter/imgproxy.dart';
 import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/rx_filter.dart';
 import 'package:zap_stream_flutter/theme.dart';
 import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/button.dart';
@@ -38,17 +42,21 @@ class _StreamPage extends State<StreamPage> {
       _controller = VideoPlayerController.networkUrl(
         Uri.parse(url),
         httpHeaders: Map.from({"user-agent": userAgent}),
-        videoPlayerOptions: VideoPlayerOptions(allowBackgroundPlayback: true),
       );
       () async {
         await _controller!.initialize();
-
-        _chewieController = ChewieController(
-          videoPlayerController: _controller!,
-          autoPlay: true,
-        );
         setState(() {
-          // nothing
+          _chewieController = ChewieController(
+            videoPlayerController: _controller!,
+            aspectRatio: 16 / 9,
+            autoPlay: true,
+            placeholder:
+                (widget.stream.info.image?.isNotEmpty ?? false)
+                    ? CachedNetworkImage(
+                      imageUrl: proxyImg(context, widget.stream.info.image!),
+                    )
+                    : null,
+          );
         });
       }();
     }
@@ -66,6 +74,24 @@ class _StreamPage extends State<StreamPage> {
 
   @override
   Widget build(BuildContext context) {
+    return RxFilter<Nip01Event>(
+      Key("stream:event:${widget.stream.aTag}"),
+      relays: widget.stream.info.relays,
+      filters: [
+        Filter(
+          kinds: [widget.stream.event.kind],
+          authors: [widget.stream.event.pubKey],
+          dTags: [widget.stream.event.getDtag()!],
+        ),
+      ],
+      builder: (ctx, state) {
+        final stream = StreamEvent(state?.firstOrNull ?? widget.stream.event);
+        return _buildStream(context, stream);
+      },
+    );
+  }
+
+  Widget _buildStream(BuildContext context, StreamEvent stream) {
     return Column(
       spacing: 4,
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -75,16 +101,24 @@ class _StreamPage extends State<StreamPage> {
           child:
               _chewieController != null
                   ? Chewie(controller: _chewieController!)
-                  : Container(color: LAYER_1),
+                  : Container(
+                    color: LAYER_1,
+                    child:
+                        (stream.info.image?.isNotEmpty ?? false)
+                            ? CachedNetworkImage(
+                              imageUrl: proxyImg(context, stream.info.image!),
+                            )
+                            : null,
+                  ),
         ),
         Text(
-          widget.stream.info.title ?? "",
+          stream.info.title ?? "",
           style: TextStyle(fontWeight: FontWeight.w600, fontSize: 18),
         ),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            ProfileWidget.pubkey(widget.stream.info.host),
+            ProfileWidget.pubkey(stream.info.host),
             Row(
               spacing: 8,
               children: [
@@ -101,18 +135,25 @@ class _StreamPage extends State<StreamPage> {
                       constraints: BoxConstraints.expand(),
                       builder: (ctx) {
                         return ZapWidget(
-                          pubkey: widget.stream.info.host,
-                          target: widget.stream.event,
+                          pubkey: stream.info.host,
+                          target: stream.event,
+                          zapTags:
+                              // tag goal onto zap request
+                              stream.info.goal != null
+                                  ? [
+                                    ["e", stream.info.goal!],
+                                  ]
+                                  : null,
                         );
                       },
                     );
                   },
                 ),
-                if (widget.stream.info.participants != null)
+                if (stream.info.participants != null)
                   PillWidget(
                     color: LAYER_1,
                     child: Text(
-                      "${widget.stream.info.participants} viewers",
+                      "${stream.info.participants} viewers",
                       style: TextStyle(
                         fontSize: 12,
                         fontWeight: FontWeight.w500,
@@ -123,8 +164,7 @@ class _StreamPage extends State<StreamPage> {
             ),
           ],
         ),
-        SizedBox(height: 10),
-        Expanded(child: ChatWidget(stream: widget.stream)),
+        Expanded(child: ChatWidget(stream: stream)),
       ],
     );
   }

lib/rx_filter.dart

@@ -14,14 +14,14 @@ class RxFilter<T> extends StatefulWidget {
   final T Function(Nip01Event)? mapper;
   final List<String>? relays;
 
-  const RxFilter({
-    super.key,
+  const RxFilter(
+    Key key, {
     required this.filters,
     required this.builder,
     this.mapper,
     this.leaveOpen = true,
     this.relays,
-  });
+  }) : super(key: key);
 
   @override
   State<StatefulWidget> createState() => _RxFilter<T>();
@@ -37,8 +37,6 @@ class _RxFilter<T> extends State<RxFilter<T>> {
     developer.log("RX:SEDNING ${widget.filters}");
     _response = ndk.requests.subscription(
       filters: widget.filters,
-      cacheRead: true,
-      cacheWrite: true,
       explicitRelays: widget.relays,
     );
     if (!widget.leaveOpen) {
@@ -54,20 +52,24 @@ class _RxFilter<T> extends State<RxFilter<T>> {
           developer.log("RX:ERROR $e");
         })
         .listen((events) {
-      setState(() {
-        _events ??= HashMap();
-        developer.log("RX:GOT ${events.length} events for ${widget.filters}");
-        events.forEach(_replaceInto);
-      });
-    });
+          setState(() {
+            developer.log(
+              "RX:GOT ${events.length} events for ${widget.filters}",
+            );
+            events.forEach(_replaceInto);
+          });
+        });
   }
 
   void _replaceInto(Nip01Event ev) {
     final evKey = _eventKey(ev);
-    final existing = _events?[evKey];
+    _events ??= HashMap();
+    final existing = _events![evKey];
     if (existing == null || existing.$1 < ev.createdAt) {
-      _events?[evKey] =
-          (ev.createdAt, widget.mapper != null ? widget.mapper!(ev) : ev as T);
+      _events![evKey] = (
+        ev.createdAt,
+        widget.mapper != null ? widget.mapper!(ev) : ev as T,
+      );
     }
   }
 
@@ -91,8 +93,7 @@ class _RxFilter<T> extends State<RxFilter<T>> {
 
   @override
   Widget build(BuildContext context) {
-    return widget.builder(context,
-        _events?.values.map((v) => v.$2).toList());
+    return widget.builder(context, _events?.values.map((v) => v.$2).toList());
   }
 }
 
@@ -104,14 +105,14 @@ class RxFutureFilter<T> extends StatelessWidget {
   final Widget? loadingWidget;
   final T Function(Nip01Event)? mapper;
 
-  const RxFutureFilter({
-    super.key,
+  const RxFutureFilter(
+    Key key, {
     required this.filterBuilder,
     required this.builder,
     this.mapper,
     this.leaveOpen = true,
     this.loadingWidget,
-  });
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -120,7 +121,11 @@ class RxFutureFilter<T> extends StatelessWidget {
       builder: (ctx, data) {
         if (data.hasData) {
           return RxFilter<T>(
-              filters: data.data!, mapper: mapper, builder: builder);
+            super.key!,
+            filters: data.data!,
+            mapper: mapper,
+            builder: builder,
+          );
         } else {
           return loadingWidget ?? SizedBox.shrink();
         }

lib/theme.dart

@@ -15,3 +15,4 @@ Color LAYER_5 = Color.fromARGB(255, 173, 173, 173);
 Color PRIMARY_1 = Color.fromARGB(255, 248, 56, 217);
 Color SECONDARY_1 = Color.fromARGB(255, 52, 210, 254);
 Color ZAP_1 = Color.fromARGB(255, 255, 141, 43);
+Color WARNING = Color.fromARGB(255, 255, 86, 63);

lib/utils.dart

@@ -1,5 +1,9 @@
+import 'package:bech32/bech32.dart';
 import 'package:collection/collection.dart';
+import 'package:convert/convert.dart';
+import 'package:intl/intl.dart';
 import 'package:ndk/ndk.dart';
+import 'package:ndk/shared/nips/nip19/nip19.dart';
 
 /// Container class over event and stream info
 class StreamEvent {
@@ -39,6 +43,7 @@ class StreamInfo {
   String? gameId;
   GameInfo? gameInfo;
   List<String> streams;
+  List<String>? relays;
 
   StreamInfo({
     this.id,
@@ -123,6 +128,12 @@ StreamInfo extractStreamInfo(Nip01Event ev) {
     matchTag(t, 'starts', (v) => ret.starts = int.tryParse(v));
     matchTag(t, 'ends', (v) => ret.ends = int.tryParse(v));
     matchTag(t, 'service', (v) => ret.service = v);
+    if (t[0] == "relays") {
+      ret.relays = t.slice(1);
+      if (ret.relays!.isEmpty) {
+        ret.relays = null;
+      }
+    }
   }
 
   var sortedTags = sortStreamTags(ev.tags);
@@ -201,7 +212,7 @@ StreamInfo extractStreamInfo(Nip01Event ev) {
 
 String getHost(Nip01Event ev) {
   return ev.tags.firstWhere(
-    (t) => t[0] == "p" && t[3] == "host",
+    (t) => t[0] == "p" && t.length > 2 && t[3] == "host",
     orElse: () => ["p", ev.pubKey], // fake p tag with event pubkey
   )[1];
 }
@@ -223,12 +234,13 @@ class Category {
 List<Category> AllCategories = []; // Implement as needed
 
 String formatSats(int n) {
+  final fmt = NumberFormat();
   if (n >= 1000000) {
-    return "${(n / 1000000).toStringAsFixed(1)}M";
-  } else if (n >= 1000) {
-    return "${(n / 1000).toStringAsFixed(1)}k";
+    return "${fmt.format(n / 1000000)}M";
+  } else if (n >= 1500) {
+    return "${fmt.format(n / 1000)}K";
   } else {
-    return "$n";
+    return fmt.format(n);
   }
 }
 
@@ -238,3 +250,56 @@ String zapSum(List<Nip01Event> zaps) {
       .fold(0, (acc, v) => acc + (v.amountSats ?? 0));
   return formatSats(total);
 }
+
+String bech32ToHex(String bech32) {
+  final decoder = Bech32Decoder();
+  final data = decoder.convert(bech32, 10_000);
+  final data8bit = Nip19.convertBits(data.data, 5, 8, false);
+  if (data.hrp == "nevent" || data.hrp == "naddr" || data.hrp == "nprofile") {
+    final tlv = parseTLV(data8bit);
+    return hex.encode(tlv.firstWhere((v) => v.type == 0).value);
+  } else {
+    return hex.encode(data8bit);
+  }
+}
+
+class TLV {
+  final int type;
+  final int length;
+  final List<int> value;
+
+  TLV(this.type, this.length, this.value);
+}
+
+List<TLV> parseTLV(List<int> data) {
+  List<TLV> result = [];
+  int index = 0;
+
+  while (index < data.length) {
+    // Check if we have enough bytes for type and length
+    if (index + 2 > data.length) {
+      throw FormatException('Incomplete TLV data');
+    }
+
+    // Read type (1 byte)
+    int type = data[index];
+    index++;
+
+    // Read length (1 byte)
+    int length = data[index];
+    index++;
+
+    // Check if we have enough bytes for value
+    if (index + length > data.length) {
+      throw FormatException('TLV value length exceeds available data');
+    }
+
+    // Read value
+    List<int> value = data.sublist(index, index + length);
+    index += length;
+
+    result.add(TLV(type, length, value));
+  }
+
+  return result;
+}

lib/widgets/chat.dart

@@ -1,5 +1,3 @@
-import 'dart:developer' as developer;
-
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:ndk/ndk.dart';
@@ -8,77 +6,272 @@ import 'package:zap_stream_flutter/rx_filter.dart';
 import 'package:zap_stream_flutter/theme.dart';
 import 'package:zap_stream_flutter/utils.dart';
 import 'package:zap_stream_flutter/widgets/avatar.dart';
+import 'package:zap_stream_flutter/widgets/chat_message.dart';
+import 'package:zap_stream_flutter/widgets/chat_write.dart';
 import 'package:zap_stream_flutter/widgets/profile.dart';
 
 class ChatWidget extends StatelessWidget {
   final StreamEvent stream;
 
   const ChatWidget({super.key, required this.stream});
-
   @override
   Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          child: SingleChildScrollView(
-            reverse: true,
-            child: RxFilter<Nip01Event>(
-              filters: [
-                Filter(kinds: [1311, 9735], limit: 200, aTags: [stream.aTag]),
-              ],
-              builder: (ctx, state) {
-                return Column(
-                  spacing: 8,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children:
-                      (state ?? [])
-                          .sortedBy((c) => c.createdAt)
-                          .map(
-                            (c) => switch (c.kind) {
-                              1311 => ChatMessageWidget(stream: stream, msg: c),
-                              9735 => ChatZapWidget(stream: stream, zap: c),
-                              _ => SizedBox.shrink(),
-                            },
-                          )
-                          .toList(),
-                );
-              },
+    var muteLists = [stream.info.host];
+    if (ndk.accounts.getPublicKey() != null) {
+      muteLists.add(ndk.accounts.getPublicKey()!);
+    }
+
+    var filters = [
+      Filter(kinds: [1311, 9735], limit: 200, aTags: [stream.aTag]),
+      Filter(kinds: [Nip51List.kMute], authors: muteLists),
+    ];
+    return RxFilter<Nip01Event>(
+      Key("stream:chat:${stream.aTag}"),
+      relays: stream.info.relays,
+      filters: filters,
+      builder: (ctx, state) {
+        final mutedPubkeys =
+            (state ?? [])
+                .where((e) => e.kind == Nip51List.kMute)
+                .map((e) => e.tags)
+                .expand((e) => e)
+                .where(
+                  (e) => e[0] == "p" && e[1] != stream.info.host,
+                ) // cant mute host
+                .map((e) => e[1])
+                .toSet();
+
+        final filteredChat =
+            (state ?? [])
+                .where(
+                  (e) =>
+                      !mutedPubkeys.contains(switch (e.kind) {
+                        9735 => ZapReceipt.fromEvent(e).sender ?? e.pubKey,
+                        _ => e.pubKey,
+                      }),
+                )
+                .sortedBy((e) => e.createdAt)
+                .reversed
+                .toList();
+
+        final zaps =
+            filteredChat
+                .where((e) => e.kind == 9735)
+                .map((e) => ZapReceipt.fromEvent(e))
+                .toList();
+        return Column(
+          spacing: 8,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (zaps.isNotEmpty) _TopZappersWidget(events: zaps),
+            if (stream.info.goal != null)
+              _StreamGoalWidget.id(stream.info.goal!),
+            Expanded(
+              child: ListView.builder(
+                reverse: true,
+                primary: true,
+                itemCount: filteredChat.length,
+                itemBuilder:
+                    (ctx, idx) => switch (filteredChat[idx].kind) {
+                      1311 => ChatMessageWidget(
+                        key: Key("chat:${filteredChat[idx].id}"),
+                        stream: stream,
+                        msg: filteredChat[idx],
+                      ),
+                      9735 => _ChatZapWidget(
+                        key: Key("chat:${filteredChat[idx].id}"),
+                        stream: stream,
+                        zap: filteredChat[idx],
+                      ),
+                      _ => SizedBox.shrink(),
+                    },
+              ),
             ),
-          ),
-        ),
-        if (stream.info.status == StreamStatus.live)
-          WriteMessageWidget(stream: stream),
-        if (stream.info.status == StreamStatus.ended)
-          Container(
-            padding: EdgeInsets.all(8),
-            margin: EdgeInsets.symmetric(vertical: 8),
-            width: double.maxFinite,
-            alignment: Alignment.center,
-            decoration: BoxDecoration(
-              color: PRIMARY_1,
-              borderRadius: DEFAULT_BR,
-            ),
-            child: Text(
-              "STREAM ENDED",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-          ),
-      ],
+            if (stream.info.status == StreamStatus.live)
+              WriteMessageWidget(stream: stream),
+            if (stream.info.status == StreamStatus.ended)
+              Container(
+                padding: EdgeInsets.all(8),
+                margin: EdgeInsets.symmetric(vertical: 8),
+                width: double.maxFinite,
+                alignment: Alignment.center,
+                decoration: BoxDecoration(borderRadius: DEFAULT_BR),
+                child: Text(
+                  "STREAM ENDED",
+                  style: TextStyle(fontWeight: FontWeight.bold),
+                ),
+              ),
+          ],
+        );
+      },
     );
   }
 }
 
-class ChatZapWidget extends StatelessWidget {
+class _StreamGoalWidget extends StatelessWidget {
+  final Nip01Event goal;
+
+  const _StreamGoalWidget({required this.goal});
+
+  static Widget id(String id) {
+    return RxFilter<Nip01Event>(
+      Key("stream:goal:$id"),
+      leaveOpen: false,
+      filters: [
+        Filter(kinds: [9041], ids: [id]),
+      ],
+      builder: (ctx, state) {
+        final goal = state?.firstOrNull;
+        return goal != null ? _StreamGoalWidget(goal: goal) : SizedBox.shrink();
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final max = int.parse(goal.getFirstTag("amount") ?? "1");
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 4, vertical: 4),
+      child: RxFilter<Nip01Event>(
+        Key("stream:goal:$id:zaps"),
+        filters: [
+          Filter(kinds: [9735], eTags: [goal.id]),
+        ],
+        builder: (ctx, state) {
+          final zaps = (state ?? []).map((e) => ZapReceipt.fromEvent(e));
+          final totalZaps =
+              zaps.fold(0, (acc, v) => acc + (v.amountSats ?? 0)) * 1000;
+          final progress = totalZaps / max;
+          final remaining = ((max - totalZaps).clamp(0, max) / 1000).toInt();
+
+          final q = MediaQuery.of(ctx);
+          return Column(
+            spacing: 4,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Expanded(child: Text(goal.content)),
+                  if (remaining > 0)
+                    Text(
+                      "Remaining: ${formatSats(remaining)}",
+                      style: TextStyle(fontSize: 10, color: LAYER_5),
+                    ),
+                ],
+              ),
+              Stack(
+                children: [
+                  Container(
+                    height: 10,
+                    decoration: BoxDecoration(
+                      color: LAYER_2,
+                      borderRadius: DEFAULT_BR,
+                    ),
+                  ),
+                  Container(
+                    height: 10,
+                    width: (q.size.width * progress).clamp(1, q.size.width),
+                    decoration: BoxDecoration(
+                      color: ZAP_1,
+                      borderRadius: DEFAULT_BR,
+                    ),
+                  ),
+                  if (remaining > 0)
+                    Positioned(
+                      right: 2,
+                      child: Text(
+                        "Goal: ${formatSats((max / 1000).toInt())}",
+                        style: TextStyle(
+                          fontSize: 8,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ),
+                  if (remaining == 0)
+                    Center(
+                      child: Text(
+                        "COMPLETE",
+                        style: TextStyle(
+                          color: LAYER_0,
+                          fontSize: 8,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
+
+class _TopZappersWidget extends StatelessWidget {
+  final List<ZapReceipt> events;
+
+  const _TopZappersWidget({required this.events});
+
+  @override
+  Widget build(BuildContext context) {
+    final topZaps =
+        events
+            .fold(<String, int>{}, (acc, e) {
+              if (e.sender != null) {
+                acc[e.sender!] = (acc[e.sender!] ?? 0) + e.amountSats!;
+              }
+              return acc;
+            })
+            .entries
+            .sortedBy((e) => e.value)
+            .reversed
+            .take(10)
+            .toList();
+
+    return SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      primary: false,
+      child: Row(
+        spacing: 10,
+        children:
+            topZaps
+                .map(
+                  (v) => Container(
+                    padding: EdgeInsets.only(left: 4, right: 8),
+                    decoration: BoxDecoration(
+                      borderRadius: DEFAULT_BR,
+                      border: Border.all(color: LAYER_3),
+                    ),
+                    child: ProfileWidget.pubkey(
+                      v.key,
+                      showName: false,
+                      size: 20,
+                      spacing: 0,
+                      children: [
+                        Icon(Icons.bolt, color: ZAP_1),
+                        Text(formatSats(v.value)),
+                      ],
+                    ),
+                  ),
+                )
+                .toList(),
+      ),
+    );
+  }
+}
+
+class _ChatZapWidget extends StatelessWidget {
   final StreamEvent stream;
   final Nip01Event zap;
 
-  const ChatZapWidget({super.key, required this.stream, required this.zap});
+  const _ChatZapWidget({required this.stream, required this.zap, super.key});
 
   @override
   Widget build(BuildContext context) {
     final parsed = ZapReceipt.fromEvent(zap);
     return Container(
+      margin: EdgeInsets.symmetric(vertical: 4),
       padding: EdgeInsets.all(8),
       decoration: BoxDecoration(
         border: Border.all(color: ZAP_1),
@@ -125,6 +318,7 @@ class ChatZapWidget extends StatelessWidget {
                     padding: EdgeInsets.only(right: 8),
                     child: AvatarWidget(profile: profile, size: 20),
                   ),
+                  alignment: PlaceholderAlignment.middle,
                 ),
               TextSpan(text: name),
               TextSpan(text: " zapped ", style: TextStyle(color: FONT_COLOR)),
@@ -137,111 +331,3 @@ class ChatZapWidget extends StatelessWidget {
     );
   }
 }
-
-class ChatMessageWidget extends StatelessWidget {
-  final StreamEvent stream;
-  final Nip01Event msg;
-
-  const ChatMessageWidget({super.key, required this.stream, required this.msg});
-
-  @override
-  Widget build(BuildContext context) {
-    return ProfileLoaderWidget(msg.pubKey, (ctx, state) {
-      final profile = state.data ?? Metadata(pubKey: msg.pubKey);
-      return RichText(
-        text: TextSpan(
-          children: [
-            WidgetSpan(
-              child: AvatarWidget(profile: profile, size: 24),
-              alignment: PlaceholderAlignment.middle,
-            ),
-            TextSpan(text: " "),
-            WidgetSpan(
-              alignment: PlaceholderAlignment.middle,
-              child: ProfileNameWidget(
-                profile: profile,
-                style: TextStyle(
-                  color:
-                      msg.pubKey == stream.info.host ? PRIMARY_1 : SECONDARY_1,
-                ),
-              ),
-            ),
-            TextSpan(text: " "),
-            TextSpan(text: msg.content, style: TextStyle(color: FONT_COLOR)),
-          ],
-        ),
-      );
-    });
-  }
-}
-
-class WriteMessageWidget extends StatefulWidget {
-  final StreamEvent stream;
-
-  const WriteMessageWidget({super.key, required this.stream});
-
-  @override
-  State<StatefulWidget> createState() => _WriteMessageWidget();
-}
-
-class _WriteMessageWidget extends State<WriteMessageWidget> {
-  final TextEditingController _controller = TextEditingController();
-
-  Future<void> _sendMessage() async {
-    final login = ndk.accounts.getLoggedAccount();
-    if (login == null) return;
-
-    final chatMsg = Nip01Event(
-      pubKey: login.pubkey,
-      kind: 1311,
-      content: _controller.text,
-      tags: [
-        ["a", widget.stream.aTag],
-      ],
-    );
-    developer.log(chatMsg.toString());
-    final res = ndk.broadcast.broadcast(nostrEvent: chatMsg);
-    await res.broadcastDoneFuture;
-    _controller.text = "";
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isLogin = ndk.accounts.isLoggedIn;
-
-    return Container(
-      margin: EdgeInsets.fromLTRB(4, 8, 4, 0),
-      padding: EdgeInsets.symmetric(horizontal: 8),
-      decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
-      child:
-          isLogin
-              ? Row(
-                children: [
-                  Expanded(
-                    child: TextField(
-                      controller: _controller,
-                      onSubmitted: (_) => _sendMessage(),
-                      decoration: InputDecoration(
-                        labelText: "Write message",
-                        contentPadding: EdgeInsets.symmetric(vertical: 4),
-                        labelStyle: TextStyle(color: LAYER_4, fontSize: 14),
-                        border: InputBorder.none,
-                      ),
-                    ),
-                  ),
-                  //IconButton(onPressed: () {}, icon: Icon(Icons.mood)),
-                  IconButton(
-                    onPressed: () {
-                      _sendMessage();
-                    },
-                    icon: Icon(Icons.send),
-                  ),
-                ],
-              )
-              : Container(
-                padding: EdgeInsets.symmetric(vertical: 12),
-                child: Row(children: [Text("Please login to send messages")]),
-              ),
-    );
-  }
-}

lib/widgets/chat_message.dart

@@ -0,0 +1,136 @@
+import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/rx_filter.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
+import 'package:zap_stream_flutter/widgets/avatar.dart';
+import 'package:zap_stream_flutter/widgets/chat_modal.dart';
+import 'package:zap_stream_flutter/widgets/nostr_text.dart';
+import 'package:zap_stream_flutter/widgets/profile.dart';
+
+class ChatMessageWidget extends StatelessWidget {
+  final StreamEvent stream;
+  final Nip01Event msg;
+
+  const ChatMessageWidget({super.key, required this.stream, required this.msg});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProfileLoaderWidget(msg.pubKey, (ctx, state) {
+      final profile = state.data ?? Metadata(pubKey: msg.pubKey);
+      return GestureDetector(
+        onLongPress: () {
+          if (ndk.accounts.canSign) {
+            showModalBottomSheet(
+              context: context,
+              constraints: BoxConstraints.expand(),
+              builder: (ctx) => ChatModalWidget(profile: profile, event: msg),
+            );
+          }
+        },
+        child: Padding(
+          padding: EdgeInsets.symmetric(horizontal: 2, vertical: 4),
+          child: Column(
+            spacing: 2,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [_chatText(profile), ChatReactions(msg: msg)],
+          ),
+        ),
+      );
+    }, key: Key("chat:${msg.id}:profile"));
+  }
+
+  Widget _chatText(Metadata profile) {
+    return RichText(
+      text: TextSpan(
+        children: [
+          WidgetSpan(
+            child: AvatarWidget(profile: profile, size: 24),
+            alignment: PlaceholderAlignment.middle,
+          ),
+          TextSpan(text: " "),
+          WidgetSpan(
+            alignment: PlaceholderAlignment.middle,
+            child: ProfileNameWidget(
+              profile: profile,
+              style: TextStyle(
+                color: msg.pubKey == stream.info.host ? PRIMARY_1 : SECONDARY_1,
+              ),
+            ),
+          ),
+          TextSpan(text: " "),
+          ...textToSpans(msg.content, msg.tags, msg.pubKey),
+        ],
+      ),
+    );
+  }
+}
+
+class ChatReactions extends StatelessWidget {
+  final Nip01Event msg;
+
+  const ChatReactions({super.key, required this.msg});
+
+  @override
+  Widget build(BuildContext context) {
+    return RxFilter<Nip01Event>(
+      Key("chat:${msg.id}:reactions"),
+      filters: [
+        Filter(kinds: [9735, 7], eTags: [msg.id]),
+      ],
+      builder: (ctx, data) => _chatReactions(data),
+    );
+  }
+
+  Widget _chatReactions(List<Nip01Event>? events) {
+    if ((events?.length ?? 0) == 0) return SizedBox.shrink();
+
+    // reactions must have e tag pointing to msg
+    final filteredEvents = events!.where((e) => e.getEId() == msg.id);
+    final zaps = filteredEvents
+        .where((e) => e.kind == 9735)
+        .map((e) => ZapReceipt.fromEvent(e));
+    final reactions = filteredEvents.where((e) => e.kind == 7);
+
+    return Row(
+      spacing: 8,
+      children: [
+        if (zaps.isNotEmpty)
+          Container(
+            padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2),
+            decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
+            child: Row(
+              children: [
+                Icon(Icons.bolt, color: ZAP_1, size: 16),
+                Text(
+                  formatSats(
+                    zaps.fold(0, (acc, v) => acc + (v.amountSats ?? 0)),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        if (reactions.isNotEmpty)
+          ...reactions
+              .fold(<String, Set<String>>{}, (acc, v) {
+                // ignore: prefer_collection_literals
+                acc[v.content] ??= Set();
+                acc[v.content]!.add(v.pubKey);
+                return acc;
+              })
+              .entries
+              .map(
+                (v) => Container(
+                  padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2),
+                  decoration: BoxDecoration(
+                    color: LAYER_2,
+                    borderRadius: DEFAULT_BR,
+                  ),
+                  child: Center(child: Text(v.key)),
+                ),
+              ),
+      ],
+    );
+  }
+}

lib/widgets/chat_modal.dart

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/widgets/mute_button.dart';
+import 'package:zap_stream_flutter/widgets/nostr_text.dart';
+import 'package:zap_stream_flutter/widgets/profile.dart';
+import 'package:zap_stream_flutter/widgets/reaction.dart';
+import 'package:zap_stream_flutter/widgets/zap.dart';
+
+class ChatModalWidget extends StatefulWidget {
+  final Metadata profile;
+  final Nip01Event event;
+
+  const ChatModalWidget({
+    super.key,
+    required this.profile,
+    required this.event,
+  });
+
+  @override
+  State<StatefulWidget> createState() => _ChatModalWidget();
+}
+
+class _ChatModalWidget extends State<ChatModalWidget> {
+  bool _showEmojiPicker = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.fromLTRB(5, 10, 5, 0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        spacing: 10,
+        children: [
+          ProfileWidget(profile: widget.profile),
+          Container(
+            width: double.maxFinite,
+            decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
+            padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+            child: NoteText(event: widget.event),
+          ),
+          Row(
+            spacing: 8,
+            children: [
+              IconButton.filled(
+                color: LAYER_5,
+                style: ButtonStyle(
+                  backgroundColor: WidgetStateColor.resolveWith((_) => LAYER_3),
+                ),
+                onPressed:
+                    () => setState(() {
+                      _showEmojiPicker = !_showEmojiPicker;
+                    }),
+                icon: Icon(Icons.mood),
+              ),
+              IconButton.filled(
+                color: ZAP_1,
+                style: ButtonStyle(
+                  backgroundColor: WidgetStateColor.resolveWith((_) => LAYER_3),
+                ),
+                onPressed: () {
+                  Navigator.pop(context);
+                  showModalBottomSheet(
+                    context: context,
+                    builder: (ctx) {
+                      return ZapWidget(
+                        pubkey: widget.event.pubKey,
+                        target: widget.event,
+                      );
+                    },
+                  );
+                },
+                icon: Icon(Icons.bolt),
+              ),
+            ],
+          ),
+          if (_showEmojiPicker) ReactionWidget(event: widget.event),
+          MuteButton(
+            pubkey: widget.event.pubKey,
+            onTap: () {
+              Navigator.pop(context);
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/chat_write.dart

@@ -0,0 +1,90 @@
+import 'package:flutter/material.dart';
+import 'package:ndk/ndk.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
+
+class WriteMessageWidget extends StatefulWidget {
+  final StreamEvent stream;
+
+  const WriteMessageWidget({super.key, required this.stream});
+
+  @override
+  State<StatefulWidget> createState() => __WriteMessageWidget();
+}
+
+class __WriteMessageWidget extends State<WriteMessageWidget> {
+  late final TextEditingController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController();
+  }
+
+  Future<void> _sendMessage() async {
+    final login = ndk.accounts.getLoggedAccount();
+    if (login == null) return;
+
+    final chatMsg = Nip01Event(
+      pubKey: login.pubkey,
+      kind: 1311,
+      content: _controller.text,
+      tags: [
+        ["a", widget.stream.aTag],
+      ],
+    );
+    _controller.text = "";
+    final res = ndk.broadcast.broadcast(nostrEvent: chatMsg);
+    await res.broadcastDoneFuture;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final canSign = ndk.accounts.canSign;
+    final isLogin = ndk.accounts.isLoggedIn;
+
+    return Container(
+      margin: EdgeInsets.fromLTRB(4, 8, 4, 0),
+      padding: EdgeInsets.symmetric(horizontal: 8),
+      decoration: BoxDecoration(color: LAYER_2, borderRadius: DEFAULT_BR),
+      child:
+          canSign
+              ? Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      controller: _controller,
+                      onSubmitted: (_) => _sendMessage(),
+                      decoration: InputDecoration(
+                        labelText: "Write message",
+                        contentPadding: EdgeInsets.symmetric(vertical: 4),
+                        labelStyle: TextStyle(color: LAYER_4, fontSize: 14),
+                        border: InputBorder.none,
+                      ),
+                    ),
+                  ),
+                  //IconButton(onPressed: () {}, icon: Icon(Icons.mood)),
+                  IconButton(
+                    onPressed: () {
+                      _sendMessage();
+                    },
+                    icon: Icon(Icons.send),
+                  ),
+                ],
+              )
+              : Container(
+                padding: EdgeInsets.symmetric(vertical: 12),
+                child: Row(
+                  children: [
+                    Text(
+                      isLogin
+                          ? "Can't write messages with npub login"
+                          : "Please login to send messages",
+                    ),
+                  ],
+                ),
+              ),
+    );
+  }
+}

lib/widgets/mute_button.dart

@@ -0,0 +1,74 @@
+import 'package:flutter/widgets.dart';
+import 'package:ndk/domain_layer/entities/nip_51_list.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/widgets/button.dart';
+
+class MuteButton extends StatelessWidget {
+  final String pubkey;
+  final void Function()? onTap;
+  final void Function()? onMute;
+  final void Function()? onUnmute;
+
+  const MuteButton({
+    super.key,
+    required this.pubkey,
+    this.onTap,
+    this.onMute,
+    this.onUnmute,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final signer = ndk.accounts.getLoggedAccount()?.signer;
+    if (signer == null || signer.getPublicKey() == pubkey) {
+      return SizedBox.shrink();
+    }
+
+    return FutureBuilder(
+      future: ndk.lists.getSingleNip51List(Nip51List.kMute, signer),
+      builder: (ctx, state) {
+        final mutes = (state.data?.pubKeys ?? []).map((e) => e.value).toSet();
+        final isMuted = mutes.contains(pubkey);
+        return BasicButton(
+          Text(
+            isMuted ? "Unmute" : "Mute",
+            style: TextStyle(
+              color: Color.fromARGB(255, 0, 0, 0),
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          padding: EdgeInsets.symmetric(vertical: 4, horizontal: 12),
+          decoration: BoxDecoration(color: WARNING, borderRadius: DEFAULT_BR),
+          onTap: () async {
+            if (onTap != null) {
+              onTap!();
+            }
+            if (isMuted) {
+              await ndk.lists.broadcastRemoveNip51ListElement(
+                Nip51List.kMute,
+                Nip51List.kPubkey,
+                pubkey,
+                null,
+              );
+              if (onUnmute != null) {
+                onUnmute!();
+              }
+            } else {
+              await ndk.lists.broadcastAddNip51ListElement(
+                Nip51List.kMute,
+                Nip51List.kPubkey,
+                pubkey,
+                null,
+              );
+
+              if (onMute != null) {
+                onMute!();
+              }
+            }
+          },
+        );
+      },
+    );
+  }
+}

lib/widgets/nostr_text.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ndk/ndk.dart';
+import 'package:ndk/shared/nips/nip19/nip19.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:zap_stream_flutter/theme.dart';
+import 'package:zap_stream_flutter/utils.dart';
+import 'package:zap_stream_flutter/widgets/profile.dart';
+
+class NoteText extends StatelessWidget {
+  final Nip01Event event;
+
+  const NoteText({super.key, required this.event});
+
+  @override
+  Widget build(BuildContext context) {
+    return RichText(
+      text: TextSpan(
+        children: textToSpans(event.content, event.tags, event.pubKey),
+      ),
+    );
+  }
+}
+
+/// Converts a nostr note text containing links
+/// and mentions into multiple spans for rendering
+List<InlineSpan> textToSpans(
+  String content,
+  List<List<String>> tags,
+  String pubkey,
+) {
+  return _buildContentSpans(content);
+}
+
+/// Content parser from camelus
+/// https://github.com/leo-lox/camelus/blob/f58455a0ac07fcc780bdc69b8f4544fd5ea4a46d/lib/presentation_layer/components/note_card/note_card_build_split_content.dart#L262
+List<InlineSpan> _buildContentSpans(String content) {
+  List<InlineSpan> spans = [];
+  RegExp exp = RegExp(
+    r'nostr:(nprofile|npub)[a-zA-Z0-9]+|'
+    r'nostr:(note|nevent)[a-zA-Z0-9]+|'
+    r'(#\$\$\s*[0-9]+\s*\$\$)|'
+    r'(#\w+)|' // Hashtags
+    r'(https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*))', // URLs
+    caseSensitive: false,
+  );
+
+  content.splitMapJoin(
+    exp,
+    onMatch: (Match match) {
+      String? matched = match.group(0);
+      if (matched != null) {
+        if (matched.startsWith('nostr:')) {
+          spans.add(_buildProfileOrNoteSpan(matched));
+        } else if (matched.startsWith('#')) {
+          spans.add(_buildHashtagSpan(matched));
+        } else if (matched.startsWith('http')) {
+          spans.add(_buildUrlSpan(matched));
+        }
+      }
+      return '';
+    },
+    onNonMatch: (String text) {
+      spans.add(TextSpan(text: text));
+      return '';
+    },
+  );
+
+  return spans;
+}
+
+InlineSpan _buildProfileOrNoteSpan(String word) {
+  final cleanedWord = word.replaceAll('nostr:', '');
+  final isProfile =
+      cleanedWord.startsWith('nprofile') || cleanedWord.startsWith('npub');
+  final isNote =
+      cleanedWord.startsWith('note') || cleanedWord.startsWith('nevent');
+
+  if (isProfile) {
+    final hexKey = bech32ToHex(cleanedWord);
+    if (hexKey.isNotEmpty) {
+      return _inlineMention(hexKey);
+    } else {
+      return TextSpan(text: "@$cleanedWord");
+    }
+  }
+  if (isNote) {
+    final eventId = bech32ToHex(cleanedWord);
+    return TextSpan(text: eventId, style: TextStyle(color: PRIMARY_1));
+  } else {
+    return TextSpan(text: word);
+  }
+}
+
+InlineSpan _buildHashtagSpan(String word) {
+  return TextSpan(text: word, style: TextStyle(color: PRIMARY_1));
+}
+
+InlineSpan _buildUrlSpan(String url) {
+  return TextSpan(
+    text: url,
+    style: TextStyle(color: PRIMARY_1),
+    recognizer:
+        TapGestureRecognizer()
+          ..onTap = () {
+            launchUrl(Uri.parse(url));
+          },
+  );
+}
+
+InlineSpan _inlineMention(String pubkey) {
+  return WidgetSpan(
+    alignment: PlaceholderAlignment.middle,
+    child: ProfileLoaderWidget(pubkey, (ctx, profile) {
+      return GestureDetector(
+        onTap:
+            () => ctx.push(
+              "/p/${Nip19.encodePubKey(pubkey)}",
+              extra: profile.data,
+            ),
+        child: Text(
+          "@${ProfileNameWidget.nameFromProfile(profile.data ?? Metadata(pubKey: pubkey))}",
+          style: TextStyle(color: PRIMARY_1),
+        ),
+      );
+    }),
+  );
+}

lib/widgets/profile.dart

@@ -14,6 +14,7 @@ class ProfileLoaderWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
+      key: super.key ?? Key("profile-loader:$pubkey"),
       future: ndk.metadata.loadMetadata(pubkey),
       builder: builder,
     );
@@ -26,14 +27,14 @@ class ProfileNameWidget extends StatelessWidget {
 
   const ProfileNameWidget({super.key, required this.profile, this.style});
 
-  static Widget pubkey(String pubkey, {TextStyle? style}) {
-    return FutureBuilder(
-      future: ndk.metadata.loadMetadata(pubkey),
-      builder:
-          (ctx, data) => ProfileNameWidget(
-            profile: data.data ?? Metadata(pubKey: pubkey),
-            style: style,
-          ),
+  static Widget pubkey(String pubkey, {Key? key, TextStyle? style}) {
+    return ProfileLoaderWidget(
+      pubkey,
+      (ctx, data) => ProfileNameWidget(
+        profile: data.data ?? Metadata(pubKey: pubkey),
+        style: style,
+      ),
+      key: key,
     );
   }
 
@@ -64,19 +65,36 @@ class ProfileWidget extends StatelessWidget {
   final Metadata profile;
   final TextStyle? style;
   final double? size;
+  final List<Widget>? children;
+  final bool? showName;
+  final double? spacing;
 
   const ProfileWidget({
     super.key,
     required this.profile,
     this.style,
     this.size,
+    this.children,
+    this.showName,
+    this.spacing,
   });
 
-  static Widget pubkey(String pubkey, {double? size}) {
+  static Widget pubkey(
+    String pubkey, {
+    double? size,
+    List<Widget>? children,
+    bool? showName,
+    double? spacing,
+    Key? key,
+  }) {
     return ProfileLoaderWidget(pubkey, (ctx, state) {
       return ProfileWidget(
         profile: state.data ?? Metadata(pubKey: pubkey),
         size: size,
+        showName: showName,
+        spacing: spacing,
+        key: key,
+        children: children,
       );
     });
   }
@@ -84,10 +102,11 @@ class ProfileWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
-      spacing: 8,
+      spacing: spacing ?? 8,
       children: [
         AvatarWidget(profile: profile, size: size),
-        ProfileNameWidget(profile: profile),
+        if (showName ?? true) ProfileNameWidget(profile: profile, key: key),
+        ...(children ?? []),
       ],
     );
   }

lib/widgets/reaction.dart

@@ -0,0 +1,51 @@
+import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
+import 'package:flutter/foundation.dart' as foundation;
+import 'package:flutter/widgets.dart';
+import 'package:ndk/entities.dart';
+import 'package:zap_stream_flutter/main.dart';
+import 'package:zap_stream_flutter/theme.dart';
+
+class ReactionWidget extends StatelessWidget {
+  final Nip01Event event;
+
+  const ReactionWidget({super.key, required this.event});
+
+  @override
+  Widget build(BuildContext context) {
+    return EmojiPicker(
+      onEmojiSelected: (category, emoji) {
+        ndk.broadcast.broadcastReaction(
+          eventId: event.id,
+          reaction: emoji.emoji,
+        );
+        Navigator.pop(context);
+      },
+      config: Config(
+        height: 256,
+        checkPlatformCompatibility: true,
+        emojiViewConfig: EmojiViewConfig(
+          emojiSizeMax:
+              28 *
+              (foundation.defaultTargetPlatform == TargetPlatform.iOS
+                  ? 1.20
+                  : 1.0),
+          backgroundColor: LAYER_1,
+        ),
+        viewOrderConfig: const ViewOrderConfig(
+          top: EmojiPickerItem.categoryBar,
+          middle: EmojiPickerItem.emojiView,
+          bottom: EmojiPickerItem.searchBar,
+        ),
+        bottomActionBarConfig: BottomActionBarConfig(
+          backgroundColor: LAYER_2,
+          buttonColor: PRIMARY_1,
+        ),
+        categoryViewConfig: CategoryViewConfig(backgroundColor: LAYER_2),
+        searchViewConfig: SearchViewConfig(
+          backgroundColor: LAYER_2,
+          buttonIconColor: PRIMARY_1,
+        ),
+      ),
+    );
+  }
+}

lib/widgets/stream_grid.dart

@@ -21,45 +21,71 @@ class StreamGrid extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final streams = events
-        .map((e) => StreamEvent(e))
-        .where((e) => e.info.stream?.isNotEmpty ?? false)
-        .sortedBy((a) => a.info.starts ?? a.event.createdAt);
+    final streams =
+        events
+            .map((e) => StreamEvent(e))
+            .sortedBy((a) => a.info.starts ?? a.event.createdAt)
+            .reversed;
     final live = streams.where((s) => s.info.status == StreamStatus.live);
     final ended = streams.where((s) => s.info.status == StreamStatus.ended);
     final planned = streams.where((s) => s.info.status == StreamStatus.planned);
     return Column(
       spacing: 16,
       children: [
-        if (showLive && live.isNotEmpty) _streamGroup("Live", live),
-        if (showPlanned && planned.isNotEmpty) _streamGroup("Planned", planned),
-        if (showEnded && ended.isNotEmpty) _streamGroup("Ended", ended),
+        if (showLive && live.isNotEmpty) _streamGroup(context, "Live", live),
+        if (showPlanned && planned.isNotEmpty)
+          _streamGroup(context, "Planned", planned),
+        if (showEnded && ended.isNotEmpty)
+          _streamGroup(context, "Ended", ended),
       ],
     );
   }
 
-  Widget _streamGroup(String title, Iterable<StreamEvent> events) {
+  Widget _streamTitle(String title) {
+    return Row(
+      spacing: 16,
+      children: [
+        Text(
+          title,
+          style: TextStyle(fontSize: 21, fontWeight: FontWeight.w500),
+        ),
+        Expanded(
+          child: Container(
+            height: 1,
+            decoration: BoxDecoration(
+              border: Border(bottom: BorderSide(color: LAYER_2)),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _streamGroup(
+    BuildContext context,
+    String title,
+    Iterable<StreamEvent> events,
+  ) {
+    final eventList = events.toList();
+
+    // profide fixed item size for performance
+    final q = MediaQuery.of(context);
     return Column(
       spacing: 16,
       children: [
-        Row(
-          spacing: 16,
-          children: [
-            Text(
-              title,
-              style: TextStyle(fontSize: 21, fontWeight: FontWeight.w500),
-            ),
-            Expanded(
-              child: Container(
-                height: 1,
-                decoration: BoxDecoration(
-                  border: Border(bottom: BorderSide(color: LAYER_2)),
-                ),
-              ),
-            ),
-          ],
+        _streamTitle(title),
+        ListView.builder(
+          itemCount: eventList.length,
+          primary: false,
+          shrinkWrap: true,
+          itemBuilder: (ctx, idx) {
+            final stream = eventList[idx];
+            return Padding(
+              padding: EdgeInsets.symmetric(vertical: 8),
+              child: StreamTileWidget(stream),
+            );
+          },
         ),
-        ...events.map((e) => StreamTileWidget(e)),
       ],
     );
   }

lib/widgets/zap.dart

@@ -1,4 +1,5 @@
 import 'package:clipboard/clipboard.dart';
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:ndk/domain_layer/usecases/lnurl/lnurl.dart';
 import 'package:ndk/ndk.dart';
@@ -13,8 +14,16 @@ import 'package:zap_stream_flutter/widgets/profile.dart';
 class ZapWidget extends StatefulWidget {
   final String pubkey;
   final Nip01Event? target;
+  final List<Nip01Event>? otherTargets;
+  final List<List<String>>? zapTags;
 
-  const ZapWidget({super.key, required this.pubkey, this.target});
+  const ZapWidget({
+    super.key,
+    required this.pubkey,
+    this.target,
+    this.zapTags,
+    this.otherTargets,
+  });
 
   @override
   State<StatefulWidget> createState() => _ZapWidget();
@@ -84,6 +93,7 @@ class _ZapWidget extends State<ZapWidget> {
       ),
       BasicButton.text(
         "Zap",
+        decoration: BoxDecoration(color: LAYER_3, borderRadius: DEFAULT_BR),
         onTap: () {
           try {
             _loadZap();
@@ -132,29 +142,53 @@ class _ZapWidget extends State<ZapWidget> {
     ];
   }
 
+  Future<ZapRequest?> _makeZap() async {
+    final signer = ndk.accounts.getLoggedAccount()?.signer;
+    if (signer == null) return null;
+
+    var relays = defaultRelays;
+    // if target event has relays tag, use that for zap
+    if (widget.target?.tags.any((t) => t[0] == "relays") ?? false) {
+      relays = widget.target!.tags.firstWhere((t) => t[0] == "relays").slice(1);
+    }
+    final amount = _amount! * 1000;
+
+    var tags = [
+      ["relays", ...relays],
+      ["amount", amount.toString()],
+      ["p", widget.pubkey],
+    ];
+
+    // tag targets for zap request
+    for (final t in [
+      ...(widget.target != null ? [widget.target!] : []),
+      ...(widget.otherTargets != null ? widget.otherTargets! : []),
+    ]) {
+      if (t.kind >= 30_000 && t.kind < 40_000) {
+        tags.add(["a", "${t.kind}:${t.pubKey}:${t.getDtag()!}"]);
+      } else {
+        tags.add(["e", t.id]);
+      }
+    }
+    if (widget.zapTags != null) {
+      tags.addAll(widget.zapTags!);
+    }
+    var event = ZapRequest(
+      pubKey: signer.getPublicKey(),
+      tags: tags,
+      content: _comment.text,
+    );
+    await signer.sign(event);
+    return event;
+  }
+
   Future<void> _loadZap() async {
     final profile = await ndk.metadata.loadMetadata(widget.pubkey);
     if (profile?.lud16 == null) {
       throw "No lightning address found";
     }
-    final signer = ndk.accounts.getLoggedAccount()?.signer;
-
-    final zapRequest =
-        signer != null
-            ? await ndk.zaps.createZapRequest(
-              amountSats: _amount!,
-              signer: signer,
-              pubKey: widget.pubkey,
-              eventId: widget.target?.id,
-              addressableId:
-                  widget.target != null
-                      ? "${widget.target!.kind}:${widget.target!.pubKey}:${widget.target!.getDtag()!}"
-                      : null,
-              relays: defaultRelays,
-              comment: _comment.text.isNotEmpty ? _comment.text : null,
-            )
-            : null;
 
+    final zapRequest = await _makeZap();
     final invoice = await ndk.zaps.fetchInvoice(
       lud16Link: Lnurl.getLud16LinkFromLud16(profile!.lud16!)!,
       amountSats: _amount!,
@@ -174,7 +208,7 @@ class _ZapWidget extends State<ZapWidget> {
           }),
       child: Container(
         decoration: BoxDecoration(
-          color: n == _amount ? LAYER_2 : LAYER_1,
+          color: n == _amount ? LAYER_4 : LAYER_3,
           borderRadius: DEFAULT_BR,
         ),
         alignment: AlignmentDirectional.center,

linux/flutter/generated_plugin_registrant.cc

@@ -6,11 +6,19 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <emoji_picker_flutter/emoji_picker_flutter_plugin.h>
+#include <file_selector_linux/file_selector_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <objectbox_flutter_libs/objectbox_flutter_libs_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) emoji_picker_flutter_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "EmojiPickerFlutterPlugin");
+  emoji_picker_flutter_plugin_register_with_registrar(emoji_picker_flutter_registrar);
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
   g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
   flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  emoji_picker_flutter
+  file_selector_linux
   flutter_secure_storage_linux
   objectbox_flutter_libs
   url_launcher_linux

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,20 +5,26 @@
 import FlutterMacOS
 import Foundation
 
+import emoji_picker_flutter
+import file_selector_macos
 import flutter_secure_storage_macos
 import objectbox_flutter_libs
 import package_info_plus
 import path_provider_foundation
+import shared_preferences_foundation
 import sqflite_darwin
 import url_launcher_macos
 import video_player_avfoundation
 import wakelock_plus
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin"))
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   ObjectboxFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "ObjectboxFlutterLibsPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))

nap.yaml

@@ -0,0 +1,13 @@
+id: "io.nostrlabs.zap_stream_flutter"
+name: "zap.stream"
+description: "Live streaming on nostr"
+icon: "https://zap.stream/logo.png"
+images:
+  - "https://nostr.download/baf24ad818fae082cbca3ac9dc1dc132bb9d733fb6660f2128a564e3acfa7d58.webp"
+  - "https://nostr.download/5a5528627022126e54b7501f23fbd3c7bc8437faaac841ad1a98afc2268f8e6f.webp"
+repository: "https://github.com/nostrlabs-io/zap-stream-flutter"
+url: "https://zap.stream"
+license: "MIT"
+tags:
+  - "livestream"
+  - "video"

pubspec.lock

@@ -26,7 +26,7 @@ packages:
     source: hosted
     version: "2.12.0"
   bech32:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: bech32
       sha256: "156cbace936f7720c79a79d16a03efad343b1ef17106716e04b8b8e39f99f7f7"
@@ -129,6 +129,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.4+2"
   crypto:
     dependency: "direct main"
     description:
@@ -177,6 +185,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.11"
+  emoji_picker_flutter:
+    dependency: "direct main"
+    description:
+      name: emoji_picker_flutter
+      sha256: "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
   equatable:
     dependency: transitive
     description:
@@ -209,6 +225,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
+  file_selector_linux:
+    dependency: transitive
+    description:
+      name: file_selector_linux
+      sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3+2"
+  file_selector_macos:
+    dependency: transitive
+    description:
+      name: file_selector_macos
+      sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4+2"
+  file_selector_platform_interface:
+    dependency: transitive
+    description:
+      name: file_selector_platform_interface
+      sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.2"
+  file_selector_windows:
+    dependency: transitive
+    description:
+      name: file_selector_windows
+      sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3+4"
   fixnum:
     dependency: transitive
     description:
@@ -246,6 +294,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.28"
   flutter_rust_bridge:
     dependency: transitive
     description:
@@ -360,6 +416,78 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image_picker:
+    dependency: "direct main"
+    description:
+      name: image_picker
+      sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  image_picker_android:
+    dependency: transitive
+    description:
+      name: image_picker_android
+      sha256: "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.12+23"
+  image_picker_for_web:
+    dependency: transitive
+    description:
+      name: image_picker_for_web
+      sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.6"
+  image_picker_ios:
+    dependency: transitive
+    description:
+      name: image_picker_ios
+      sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.12+2"
+  image_picker_linux:
+    dependency: transitive
+    description:
+      name: image_picker_linux
+      sha256: "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1+2"
+  image_picker_macos:
+    dependency: transitive
+    description:
+      name: image_picker_macos
+      sha256: "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1+2"
+  image_picker_platform_interface:
+    dependency: transitive
+    description:
+      name: image_picker_platform_interface
+      sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.10.1"
+  image_picker_windows:
+    dependency: transitive
+    description:
+      name: image_picker_windows
+      sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1+1"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.20.2"
   js:
     dependency: transitive
     description:
@@ -440,30 +568,40 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.16.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   ndk:
     dependency: "direct main"
     description:
       path: "packages/ndk"
-      ref: bbf2aa9c2468b2301de65734199649d56bb0fd74
-      resolved-ref: bbf2aa9c2468b2301de65734199649d56bb0fd74
+      ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      resolved-ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
       url: "https://github.com/relaystr/ndk"
     source: git
     version: "0.3.2"
   ndk_amber:
     dependency: "direct main"
     description:
-      name: ndk_amber
-      sha256: "6f525e2bcdea08ecdd1815e2fdfc6e53c4bb86335927d8c333c1f4513dc1c099"
-      url: "https://pub.dev"
-    source: hosted
+      path: "packages/amber"
+      ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      resolved-ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      url: "https://github.com/relaystr/ndk"
+    source: git
     version: "0.3.0"
   ndk_objectbox:
     dependency: "direct main"
     description:
-      name: ndk_objectbox
-      sha256: f2bd04299ed34b99a01957c46eb6ff495c0bdcde068d382cbb8b8a222f67e132
-      url: "https://pub.dev"
-    source: hosted
+      path: "packages/objectbox"
+      ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      resolved-ref: "919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a"
+      url: "https://github.com/relaystr/ndk"
+    source: git
     version: "0.2.3"
   ndk_rust_verifier:
     dependency: "direct main"
@@ -657,6 +795,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  shared_preferences:
+    dependency: transitive
+    description:
+      name: shared_preferences
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.3"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.10"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -774,6 +968,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
   url_launcher:
     dependency: "direct main"
     description:
@@ -998,6 +1200,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.5.0"
+  xxh3:
+    dependency: transitive
+    description:
+      name: xxh3
+      sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
 sdks:
   dart: ">=3.7.2 <4.0.0"
   flutter: ">=3.27.0"

pubspec.yaml

@@ -1,7 +1,7 @@
 name: zap_stream_flutter
 description: "zap.stream"
 publish_to: 'none'
-version: 0.1.0+1
+version: 0.3.0+5
 
 environment:
   sdk: ^3.7.2
@@ -28,13 +28,27 @@ dependencies:
   qr_flutter: ^4.1.0
   url_launcher: ^6.3.1
   chewie: ^1.11.3
+  image_picker: ^1.1.2
+  emoji_picker_flutter: ^4.3.0
+  bech32: ^0.2.2
+  intl: ^0.20.2
 
 dependency_overrides:
   ndk:
     git:
       url: https://github.com/relaystr/ndk
       path: packages/ndk
-      ref: bbf2aa9c2468b2301de65734199649d56bb0fd74
+      ref: 919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a
+  ndk_objectbox:
+    git:
+      url: https://github.com/relaystr/ndk
+      path: packages/objectbox
+      ref: 919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a
+  ndk_amber:
+    git:
+      url: https://github.com/relaystr/ndk
+      path: packages/amber
+      ref: 919f35866f4b9d84565f7f08ebbbcd5fd0ef0b6a
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -6,11 +6,17 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <emoji_picker_flutter/emoji_picker_flutter_plugin_c_api.h>
+#include <file_selector_windows/file_selector_windows.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <objectbox_flutter_libs/objectbox_flutter_libs_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  EmojiPickerFlutterPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("EmojiPickerFlutterPluginCApi"));
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   ObjectboxFlutterLibsPluginRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -3,6 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  emoji_picker_flutter
+  file_selector_windows
   flutter_secure_storage_windows
   objectbox_flutter_libs
   url_launcher_windows