From 2a919593337428cd44cd77255c53d060cdd6a056 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 21 Jul 2026 21:34:49 -0400
Subject: [PATCH] fix encrypted uploads

---
 lib/controllers/attachment.dart       |  3 +--
 lib/models/content/message.dart       | 10 ++++++----
 lib/models/requests/upload_media.dart |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/controllers/attachment.dart b/lib/controllers/attachment.dart
index 13d096b..e33493e 100644
--- a/lib/controllers/attachment.dart
+++ b/lib/controllers/attachment.dart
@@ -26,8 +26,7 @@ class AttachmentController extends Notifier<(String, MessageContent?)?> {
         .uploadMedia(
           .new(
             path: file.path,
-            encrypted:
-                room?.state[EventType.encryption.name]?.isNotEmpty == true,
+            encrypt: room?.state[EventType.encryption.type]?.isNotEmpty == true,
           ),
         );
 
diff --git a/lib/models/content/message.dart b/lib/models/content/message.dart
index 6314161..acbe70e 100644
--- a/lib/models/content/message.dart
+++ b/lib/models/content/message.dart
@@ -7,6 +7,8 @@ import "package:nexus/models/info/video.dart";
 part "message.freezed.dart";
 part "message.g.dart";
 
+typedef EncryptedFile = Map<String, dynamic>;
+
 @Freezed(unionKey: "msgtype", fallbackUnion: "default")
 abstract class MessageContent extends Content with _$MessageContent {
   MessageContent._();
@@ -38,7 +40,7 @@ abstract class MessageContent extends Content with _$MessageContent {
     required String body,
     MessageFormat? format,
     String? formattedBody,
-    // EncryptedFile? file
+    EncryptedFile? file,
     String? filename,
     ImageInfo? info,
     Uri? url,
@@ -49,7 +51,7 @@ abstract class MessageContent extends Content with _$MessageContent {
     required String body,
     MessageFormat? format,
     String? formattedBody,
-    // EncryptedFile? file
+    EncryptedFile? file,
     String? filename,
     FileInfo? info,
     Uri? url,
@@ -60,7 +62,7 @@ abstract class MessageContent extends Content with _$MessageContent {
     required String body,
     MessageFormat? format,
     String? formattedBody,
-    // EncryptedFile? file
+    EncryptedFile? file,
     String? filename,
     AudioInfo? info,
     Uri? url,
@@ -71,7 +73,7 @@ abstract class MessageContent extends Content with _$MessageContent {
     required String body,
     MessageFormat? format,
     String? formattedBody,
-    // EncryptedFile? file
+    EncryptedFile? file,
     String? filename,
     VideoInfo? info,
     Uri? url,
diff --git a/lib/models/requests/upload_media.dart b/lib/models/requests/upload_media.dart
index 6704974..a640bea 100644
--- a/lib/models/requests/upload_media.dart
+++ b/lib/models/requests/upload_media.dart
@@ -6,7 +6,7 @@ part "upload_media.g.dart";
 abstract class UploadMediaRequest with _$UploadMediaRequest {
   const factory UploadMediaRequest({
     required String path,
-    required bool encrypted,
+    required bool encrypt,
     String? filename,
     @Default(false) @JsonKey(name: "voice_message") bool isVoiceMessage,
     @Default(false) bool forceFile,