BBPanel & UploadBox && Form

Modules/Sources/APIClient/APIClient.swift

@@ -15,7 +15,9 @@ import ComposableArchitecture
 import PersistenceKeys
 
 public typealias ConnectionState = API.ConnectionState
+public typealias UploadRequest = PDAPI.UploadRequest
 public typealias UploadProgressStatus = PDAPI.UploadProgressStatus
+public typealias PDAPIDocument = PDAPI.Document
 public typealias PDAPIError = APIError
 
 // MARK: - Client
@@ -59,10 +61,12 @@ public struct APIClient: Sendable {
     public var markRead: @Sendable (_ id: Int, _ isTopic: Bool) async throws -> Bool
     public var getAnnouncement: @Sendable (_ id: Int) async throws -> Announcement
     public var getTopic: @Sendable (_ id: Int, _ page: Int, _ perPage: Int, _ postsFilter: TopicPostsFilter) async throws -> Topic
-    public var getTemplate: @Sendable (_ request: ForumTemplateRequest, _ isTopic: Bool) async throws -> [WriteFormFieldType]
+    public var getTemplate: @Sendable (_ request: ForumTemplateRequest, _ isTopic: Bool) async throws -> [FormFieldType]
+    public var sendTemplate: @Sendable (_ id: Int, _ content: PDAPIDocument, _ isTopic: Bool) async throws -> TemplateSend
     public var getHistory: @Sendable (_ offset: Int, _ perPage: Int) async throws -> History
     public var getMentions: @Sendable (_ showPosts: Bool, _ offset: Int, _ perPage: Int) async throws -> Mentions
-    public var previewPost: @Sendable (_ request: PostPreviewRequest) async throws -> PostPreview
+    public var previewPost: @Sendable (_ request: PostPreviewRequest) async throws -> PreviewResponse
+    public var previewTemplate: @Sendable (_ id: Int, _ content: PDAPIDocument, _ isTopic: Bool) async throws -> PreviewResponse
     public var sendPost: @Sendable (_ request: PostRequest) async throws -> PostSendResponse
     public var editPost: @Sendable (_ request: PostEditRequest) async throws -> PostSendResponse
     public var deletePosts: @Sendable (_ postIds: [Int]) async throws -> Bool
@@ -344,6 +348,14 @@ extension APIClient: DependencyKey {
                 let response = try await api.send(command)
                 return try await parser.parseWriteForm(response)
             },
+            sendTemplate: { id, content, isTopic in
+                let command = ForumCommand.template(
+                    type: isTopic ? .topic(forumId: id) : .post(topicId: id),
+                    action: .send(content)
+                )
+                let response = try await api.send(command)
+                return try await parser.parseTemplateSend(response: response)
+            },
 
 			getHistory: { offset, perPage in
                 let response = try await api.send(MemberCommand.history(page: offset, perPage: perPage))
@@ -365,6 +377,14 @@ extension APIClient: DependencyKey {
                 let response = try await api.send(command)
                 return try await parser.parsePostPreview(response)
             },
+            previewTemplate: { id, content, isTopic in
+                let command = ForumCommand.template(
+                    type: isTopic ? .topic(forumId: id) : .post(topicId: id),
+                    action: .preview(content)
+                )
+                let response = try await api.send(command)
+                return try await parser.parseTemplatePreview(response: response)
+            },
 
             sendPost: { request in
                 let command = ForumCommand.Post.send(data: PostSendRequest(
@@ -620,7 +640,10 @@ extension APIClient: DependencyKey {
                 return .mock
             },
             getTemplate: { _, _ in
-                return [.mockTitle, .mockText, .mockEditor]
+                return [.mockTitle, .mockRequiredText, .mockRequiredEditor, .mockEditor, .mockUploadBox]
+            },
+            sendTemplate: { _, _, isTopic in
+                return .success(isTopic ? .topic(id: 0) : .post(PostSend(id: 0, topicId: 1, offset: 2)))
             },
 			getHistory: { _, _ in
                 return .mock
@@ -629,10 +652,10 @@ extension APIClient: DependencyKey {
                 return .mock
             },
             previewPost: { request in
-                return PostPreview(
-                    content: request.post.content,
-                    attachmentIds: request.post.attachments
-                )
+                return PreviewResponse(content: request.post.content, attachments: [.mock])
+            },
+            previewTemplate: { _, _, _ in
+                return PreviewResponse(content: "content", attachments: [.mock])
             },
             sendPost: { _ in
                 return .success(PostSend(id: 0, topicId: 1, offset: 2))

Modules/Sources/APIClient/Requests/ForumTemplateRequest.swift

@@ -13,8 +13,8 @@ public struct ForumTemplateRequest {
 
     public enum TemplateAction {
         case get
-        case send([Any])
-        case preview([Any])
+        case send(PDAPIDocument)
+        case preview(PDAPIDocument)
     }
 
     public init(id: Int, action: TemplateAction) {
@@ -27,8 +27,8 @@ extension ForumTemplateRequest.TemplateAction {
     var transferType: ForumCommand.TemplateAction {
         switch self {
         case .get: return .get
-        case .preview: return .preview(Document())
-        case .send: return .send(Document())
+        case .preview(let data): return .preview(data)
+        case .send(let data): return .send(data)
         }
     }
 }

Modules/Sources/AnalyticsClient/Events/WriteFormEvent.swift → Modules/Sources/AnalyticsClient/Events/FormEvent.swift

@@ -1,19 +1,19 @@
 //
-//  WriteFormEvent.swift
+//  FormEvent.swift
 //  ForPDA
 //
 //  Created by Ilia Lubianoi on 13.12.2025.
 //
 
-public enum WriteFormEvent: Event {
+public enum FormEvent: Event {
 
-    case writeFormSent
+    case formSent
     case publishTapped
     case dismissTapped
     case previewTapped
 
     public var name: String {
-        return "Write Form " + eventName(for: self).inProperCase
+        return "Form " + eventName(for: self).inProperCase
     }
 
     public var properties: [String: String]? {

Modules/Sources/AnalyticsClient/Events/TopicEvent.swift

@@ -14,14 +14,14 @@ public enum TopicEvent: Event {
     case userTapped(Int)
     case urlTapped(URL)
     case imageTapped(URL)
-    case editWarningSheetClosed
     case textQuoted(Int)
 
     case menuCopyLink
     case menuOpenInBrowser
     case menuGoToEnd
     case menuSetFavorite
     case menuWritePost
+    case menuWritePostWithTemplate
 
     case menuPostReply(Int)
     case menuPostKarma(Int)

Modules/Sources/ArticleFeature/Comments/Analytics/CommentFeature+Analytics.swift

@@ -20,7 +20,7 @@ extension CommentFeature {
         var body: some Reducer<State, Action> {
             Reduce<State, Action> { state, action in
                 switch action {
-                case .onTask, ._timerTicked, ._likeResult, .alert, .delegate, .writeForm, .changeReputation:
+                case .onTask, ._timerTicked, ._likeResult, .alert, .delegate, .report, .changeReputation:
                     break
 
                 case .profileTapped:

Modules/Sources/ArticleFeature/Comments/CommentFeature.swift

@@ -12,8 +12,8 @@ import PersistenceKeys
 import APIClient
 import Models
 import ToastClient
-import WriteFormFeature
 import ReputationChangeFeature
+import FormFeature
 
 public enum CommentContextMenuOptions {
     case report
@@ -28,8 +28,6 @@ public struct CommentFeature: Reducer, Sendable {
     // MARK: - Localizations
 
     public enum Localization {
-        static let errorSendingReport = LocalizedStringResource("Error sending report", bundle: .module)
-        static let reportTooShort = LocalizedStringResource("Report too short", bundle: .module)
         static let reportSent = LocalizedStringResource("Report sent", bundle: .module)
     }
 
@@ -38,8 +36,8 @@ public struct CommentFeature: Reducer, Sendable {
     @ObservableState
     public struct State: Equatable, Identifiable {
         @Presents public var alert: AlertState<Never>?
-        @Presents var writeForm: WriteFormFeature.State?
         @Presents var changeReputation: ReputationChangeFeature.State?
+        @Presents var report: FormFeature.State?
         @Shared(.userSession) public var userSession: UserSession?
         public var id: Int { return comment.id }
         public var comment: Comment
@@ -88,8 +86,8 @@ public struct CommentFeature: Reducer, Sendable {
         case likeButtonTapped
         case changeReputationButtonTapped
 
-        case writeForm(PresentationAction<WriteFormFeature.Action>)
         case changeReputation(PresentationAction<ReputationChangeFeature.Action>)
+        case report(PresentationAction<FormFeature.Action>)
 
         case _likeResult(Bool)
         case _timerTicked
@@ -130,24 +128,12 @@ public struct CommentFeature: Reducer, Sendable {
             case let .profileTapped(id):
                 return .send(.delegate(.commentHeaderTapped(id)))
 
-            case .writeForm(.presented(.delegate(.writeFormSent(let response)))):
-                if case let .report(result) = response {
-                    let toast: ToastMessage
-                    switch result {
-                    case .error:
-                        toast = ToastMessage(text: Localization.errorSendingReport, isError: true, haptic: .error)
-                    case .tooShort:
-                        toast = ToastMessage(text: Localization.reportTooShort, isError: true, haptic: .error)
-                    case .success:
-                        toast = ToastMessage(text: Localization.reportSent, haptic: .success)
-                    }
-                    return .run { _ in
-                        await toastClient.showToast(toast)
-                    }
+            case .report(.presented(.delegate(.formSent(.report)))):
+                return .run { _ in
+                    await toastClient.showToast(ToastMessage(text: Localization.reportSent, haptic: .success))
                 }
-                return .none
 
-            case .writeForm, .changeReputation:
+            case .report, .changeReputation:
                 return .none
 
             case .hiddenLabelTapped:
@@ -158,10 +144,12 @@ public struct CommentFeature: Reducer, Sendable {
                 guard state.isAuthorized else {
                     return .send(.delegate(.unauthorizedAction))
                 }
-                state.writeForm = WriteFormFeature.State(formFor: .report(
-                    id: state.comment.id,
-                    type: .comment
-                ))
+                state.report = FormFeature.State(
+                    type: .report(
+                        id: state.comment.id,
+                        type: .comment
+                    )
+                )
                 return .none
 
             case .changeReputationButtonTapped:
@@ -216,8 +204,8 @@ public struct CommentFeature: Reducer, Sendable {
                 return .none
             }
         }
-        .ifLet(\.$writeForm, action: \.writeForm) {
-            WriteFormFeature()
+        .ifLet(\.$report, action: \.report) {
+            FormFeature()
         }
         .ifLet(\.$changeReputation, action: \.changeReputation) {
             ReputationChangeFeature()

Modules/Sources/ArticleFeature/Comments/CommentsView.swift

@@ -12,8 +12,8 @@ import NukeUI
 import SharedUI
 import SkeletonUI
 import SFSafeSymbols
-import WriteFormFeature
 import ReputationChangeFeature
+import FormFeature
 
 // MARK: - Comments View
 
@@ -118,9 +118,9 @@ struct CommentView: View {
                 }
                 .padding(.leading, 16 * CGFloat(store.comment.nestLevel))
             }
-            .fullScreenCover(item: $store.scope(state: \.writeForm, action: \.writeForm)) { store in
+            .fullScreenCover(item: $store.scope(state: \.report, action: \.report)) { store in
                 NavigationStack {
-                    WriteFormScreen(store: store)
+                    FormScreen(store: store)
                 }
             }
             .fittedSheet(

Modules/Sources/ArticleFeature/Resources/Localizable.xcstrings

@@ -92,6 +92,7 @@
       }
     },
     "Error sending report" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ru" : {
           "stringUnit" : {
@@ -171,16 +172,6 @@
         }
       }
     },
-    "Report too short" : {
-      "localizations" : {
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Слишком короткая жалоба"
-          }
-        }
-      }
-    },
     "Reputation" : {
       "localizations" : {
         "ru" : {

Modules/Sources/BBBuilder/Sources/Tokenizator/String/BBTokenizer.swift

@@ -55,7 +55,7 @@ public struct BBTokenizer {
 
                 if currentIndex < input.endIndex {
                     let string = String(input[tagStartIndex..<currentIndex])
-                    let tag = BBTag(rawValue: string)
+                    let tag = BBTag(rawValue: string.lowercased())
                     if let tag {
                         advanceIndex()
                         return .closingTag(tag)
@@ -78,7 +78,7 @@ public struct BBTokenizer {
                 }
 
                 let string = String(input[tagStartIndex..<currentIndex])
-                guard let tag = BBTag(rawValue: string) else {
+                guard let tag = BBTag(rawValue: string.lowercased()) else {
                     // Если мы встретили открывающий тег который не закрылся до конца сообщения, то advance делать не надо
                     if currentIndex < input.endIndex {
                         advanceIndex()