From 92b88e46ac09c227956358d3a2050cf1aedad759 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sun, 26 Jul 2026 17:21:01 -0400
Subject: [PATCH 1/2] fix attachments disappearing when editing messages

---
 lib/controllers/room_chat.dart | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/controllers/room_chat.dart b/lib/controllers/room_chat.dart
index ac979e0..558817c 100644
--- a/lib/controllers/room_chat.dart
+++ b/lib/controllers/room_chat.dart
@@ -121,9 +121,16 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
     required RelationType relationType,
     Event? relation,
   }) async {
-    final attachment = ref.watch(AttachmentController.provider(roomId));
+    Content? baseContent;
+    if (relationType == .edit) {
+      baseContent = relation?.content;
+    } else {
+      final attachment = ref.watch(AttachmentController.provider(roomId));
+      if (attachment != null && attachment.$2 == null) return;
 
-    if (attachment != null && attachment.$2 == null) return;
+      baseContent = attachment?.$2;
+      ref.invalidate(AttachmentController.provider(roomId));
+    }
 
     var taggedMessage = text;
 
@@ -141,7 +148,7 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
     final event = await client.sendMessage(
       SendMessageRequest(
         roomId: roomId,
-        baseContent: attachment?.$2,
+        baseContent: baseContent,
         mentions: Mentions(
           userIds: [
             if (shouldMention == true &&
@@ -158,8 +165,6 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
       ),
     );
 
-    ref.invalidate(AttachmentController.provider(roomId));
-
     ref
         .watch(RoomsController.provider.notifier)
         .update(

From 90230651e6a5aae17f96bb4775ddb2d65edc8018 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sun, 26 Jul 2026 18:26:20 -0400
Subject: [PATCH 2/2] default auth method to none

Fixes auth on MAS
---
 lib/models/requests/oauth/register_client.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/models/requests/oauth/register_client.dart b/lib/models/requests/oauth/register_client.dart
index c4ef68f..cf4f9e0 100644
--- a/lib/models/requests/oauth/register_client.dart
+++ b/lib/models/requests/oauth/register_client.dart
@@ -16,6 +16,9 @@ abstract class OAuthRegisterClientRequest with _$OAuthRegisterClientRequest {
     IList<GrantType>? grantTypes,
     IList<Uri>? redirectUris,
     IList<ResponseType>? responseTypes,
+
+    @Default(AuthMethod.none)
+    @JsonKey(name: "token_endpoint_auth_method")
     AuthMethod? authMethod,
   }) = _OAuthRegisterClientRequest;