From 4631aebdce0b7fcab393d162e802b56df0921432 Mon Sep 17 00:00:00 2001 From: Philippe Weidmann Date: Wed, 31 Jan 2024 14:10:43 +0100 Subject: [PATCH] fix: Add back missing isReplying --- Mail/Views/AI Writer/AIModel.swift | 11 ++++------- Mail/Views/AI Writer/Prompt/AIPromptView.swift | 3 ++- .../AI Writer/Proposition/AIPropositionMenu.swift | 3 ++- .../AI Writer/Proposition/AIPropositionView.swift | 3 ++- Mail/Views/New Message/ComposeMessageView.swift | 3 ++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Mail/Views/AI Writer/AIModel.swift b/Mail/Views/AI Writer/AIModel.swift index 6606d2b72..257ee34c1 100644 --- a/Mail/Views/AI Writer/AIModel.swift +++ b/Mail/Views/AI Writer/AIModel.swift @@ -49,7 +49,6 @@ final class AIModel: ObservableObject { private let mailboxManager: MailboxManager private let draftContentManager: DraftContentManager private let draft: Draft - private var messageReply: MessageReply? private var contextId: String? private var recipientsList: String? @@ -72,15 +71,13 @@ final class AIModel: ObservableObject { } } - var isReplying: Bool { - messageReply?.isReplying == true - } + var isReplying: Bool - init(mailboxManager: MailboxManager, draftContentManager: DraftContentManager, draft: Draft) { + init(mailboxManager: MailboxManager, draftContentManager: DraftContentManager, draft: Draft, isReplying: Bool) { self.mailboxManager = mailboxManager self.draftContentManager = draftContentManager self.draft = draft - messageReply = nil // editedDraft.messageReply + self.isReplying = isReplying } } @@ -194,7 +191,7 @@ extension AIModel { // If the context is too long, we must remove it so that the user can use // the AI assistant without context for future trials if self.error == .contextMaxSyntaxTokensReached { - messageReply = nil + isReplying = false } } diff --git a/Mail/Views/AI Writer/Prompt/AIPromptView.swift b/Mail/Views/AI Writer/Prompt/AIPromptView.swift index f1d9e12bb..8a9efeea1 100644 --- a/Mail/Views/AI Writer/Prompt/AIPromptView.swift +++ b/Mail/Views/AI Writer/Prompt/AIPromptView.swift @@ -127,6 +127,7 @@ struct AIPromptView: View { AIPromptView(aiModel: AIModel( mailboxManager: PreviewHelper.sampleMailboxManager, draftContentManager: PreviewHelper.sampleDraftContentManager, - draft: Draft() + draft: Draft(), + isReplying: false )) } diff --git a/Mail/Views/AI Writer/Proposition/AIPropositionMenu.swift b/Mail/Views/AI Writer/Proposition/AIPropositionMenu.swift index 22166d698..dcf8d6cef 100644 --- a/Mail/Views/AI Writer/Proposition/AIPropositionMenu.swift +++ b/Mail/Views/AI Writer/Proposition/AIPropositionMenu.swift @@ -88,6 +88,7 @@ struct FixedMenuOrderModifier: ViewModifier { AIPropositionMenu(aiModel: AIModel( mailboxManager: PreviewHelper.sampleMailboxManager, draftContentManager: PreviewHelper.sampleDraftContentManager, - draft: Draft() + draft: Draft(), + isReplying: false )) } diff --git a/Mail/Views/AI Writer/Proposition/AIPropositionView.swift b/Mail/Views/AI Writer/Proposition/AIPropositionView.swift index 905e53948..551b65ea0 100644 --- a/Mail/Views/AI Writer/Proposition/AIPropositionView.swift +++ b/Mail/Views/AI Writer/Proposition/AIPropositionView.swift @@ -153,6 +153,7 @@ struct AIPropositionView: View { AIPropositionView(aiModel: AIModel( mailboxManager: PreviewHelper.sampleMailboxManager, draftContentManager: PreviewHelper.sampleDraftContentManager, - draft: Draft() + draft: Draft(), + isReplying: false )) } diff --git a/Mail/Views/New Message/ComposeMessageView.swift b/Mail/Views/New Message/ComposeMessageView.swift index dc0ea4cf8..3d4e4ecdc 100644 --- a/Mail/Views/New Message/ComposeMessageView.swift +++ b/Mail/Views/New Message/ComposeMessageView.swift @@ -131,7 +131,8 @@ struct ComposeMessageView: View { _aiModel = StateObject(wrappedValue: AIModel( mailboxManager: mailboxManager, draftContentManager: currentDraftContentManager, - draft: draft + draft: draft, + isReplying: messageReply?.isReplying == true )) }