Merge pull request #49 from SubvertDev/feature/topic-poll

SubvertDev · web-flow · commit dcfed918ca1d · 2025-11-21T21:59:33.000+03:00
Topic Polls
diff --git a/Modules/Sources/APIClient/APIClient.swift b/Modules/Sources/APIClient/APIClient.swift
@@ -63,6 +63,7 @@ public struct APIClient: Sendable {
     public var editPost: @Sendable (_ request: PostEditRequest) async throws -> PostSendResponse
     public var deletePosts: @Sendable (_ postIds: [Int]) async throws -> Bool
     public var postKarma: @Sendable (_ postId: Int, _ isUp: Bool) async throws -> Bool
+    public var voteInTopicPoll: @Sendable (_ topicId: Int, _ selections: [[Int]]) async throws -> Bool
     
     // Favorites
     public var getFavorites: @Sendable (_ request: FavoritesRequest, _ policy: CachePolicy) async throws -> AsyncThrowingStream<Favorite, any Error>
@@ -357,6 +358,13 @@ extension APIClient: DependencyKey {
                 return status == 0
             },
             
+            voteInTopicPoll: { topicId, selections in
+                let command = ForumCommand.Topic.Poll.vote(topicId: topicId, selections: selections)
+                let response = try await api.send(command)
+                let status = Int(response.getResponseStatus())!
+                return status == 0
+            },
+            
             // MARK: - Favorites
             
             getFavorites: { request, policy in
@@ -570,6 +578,9 @@ extension APIClient: DependencyKey {
             postKarma: { _, _ in
                 return true
             },
+            voteInTopicPoll: { _, _ in
+                return true
+            },
             getFavorites: { _, _ in
                 let (stream, continuation) = AsyncThrowingStream.makeStream(of: Favorite.self)
                 continuation.yield(with: .success(.mock))
diff --git a/Modules/Sources/AnalyticsClient/Events/TopicEvent.swift b/Modules/Sources/AnalyticsClient/Events/TopicEvent.swift
@@ -10,6 +10,7 @@ import Foundation
 public enum TopicEvent: Event {
     case onRefresh
     case topicHatOpenButtonTapped
+    case topicPollOpenButtonTapped
     case userTapped(Int)
     case urlTapped(URL)
     case imageTapped(URL)
diff --git a/Modules/Sources/Models/Forum/Topic.swift b/Modules/Sources/Models/Forum/Topic.swift
@@ -41,7 +41,7 @@ public struct Topic: Codable, Sendable, Identifiable, Hashable {
             self.options = options
         }
         
-        public struct Choice: Sendable, Codable, Hashable {
+        public struct Choice: Sendable, Codable, Hashable, Identifiable {
             public let id: Int
             public let votes: Int
             public let name: String
@@ -53,12 +53,14 @@ public struct Topic: Codable, Sendable, Identifiable, Hashable {
             }
         }
         
-        public struct Option: Sendable, Codable, Hashable {
+        public struct Option: Sendable, Codable, Hashable, Identifiable {
+            public let id: Int
             public let name: String
             public let several: Bool
             public let choices: [Choice]
             
-            public init(name: String, several: Bool, choices: [Choice]) {
+            public init(id: Int, name: String, several: Bool, choices: [Choice]) {
+                self.id = id
                 self.name = name
                 self.several = several
                 self.choices = choices
@@ -110,20 +112,7 @@ public extension Topic {
         authorName: "4spander",
         curatorId: 6176341,
         curatorName: "AirFlare",
-        poll: Poll(
-            name: "Some simple poll...",
-            voted: false,
-            totalVotes: 2134,
-            options: [
-                Poll.Option(
-                    name: "Select this choise...",
-                    several: false,
-                    choices: [
-                        Poll.Choice(id: 2, name: "First choice", votes: 2)
-                    ]
-                )
-            ]
-        ),
+        poll: .mock,
         postsCount: 5005,
         posts: [
             .mock(id: 0), .mock(id: 1), .mock(id: 2)
@@ -133,3 +122,31 @@ public extension Topic {
         ]
     )
 }
+
+public extension Topic.Poll {
+    static let mock = Topic.Poll(
+        name: "Some simple poll...",
+        voted: false,
+        totalVotes: 12,
+        options: [
+            .init(
+                id: 0,
+                name: "Select not several...",
+                several: false,
+                choices: [
+                    .init(id: 2, name: "First choice", votes: 2),
+                    .init(id: 3, name: "Second choice", votes: 4)
+                ]
+            ),
+            .init(
+                id: 1,
+                name: "Select several...",
+                several: true,
+                choices: [
+                    .init(id: 4, name: "First choice", votes: 4),
+                    .init(id: 5, name: "Second choice", votes: 2)
+                ]
+            ),
+        ]
+    )
+}
diff --git a/Modules/Sources/ParsingClient/Parsers/TopicParser.swift b/Modules/Sources/ParsingClient/Parsers/TopicParser.swift
@@ -131,7 +131,7 @@ public struct TopicParser {
     
     private static func parsePollOptions(_ optionsRaw: [[Any]]) throws(ParsingError) -> [Topic.Poll.Option] {
         var options: [Topic.Poll.Option] = []
-        for option in optionsRaw {
+        for (optionId, option) in optionsRaw.enumerated() {
             guard let name = option[safe: 0] as? String,
                   let several = option[safe: 1] as? Int,
                   let names = option[safe: 2] as? [String],
@@ -151,6 +151,7 @@ public struct TopicParser {
             }
             
             let option = Topic.Poll.Option(
+                id: optionId,
                 name: name,
                 several: several == 1 ? true : false,
                 choices: choices
diff --git a/Modules/Sources/TopicFeature/Analytics/TopicFeature+Analytics.swift b/Modules/Sources/TopicFeature/Analytics/TopicFeature+Analytics.swift
@@ -23,10 +23,12 @@ extension TopicFeature {
                         .view(.onNextAppear),
                         .view(.finishedPostAnimation),
                         .view(.changeKarmaTapped),
+                        .view(.topicPollVoteButtonTapped),
                         .internal(.loadTypes),
                         .internal(.goToPost),
                         .internal(.jumpRequestFailed),
                         .internal(.changeKarma),
+                        .internal(.voteInPoll),
                         .internal(.load),
                         .internal(.refresh),
                         .pageNavigation,
@@ -41,6 +43,9 @@ extension TopicFeature {
                 case .view(.topicHatOpenButtonTapped):
                     analytics.log(TopicEvent.topicHatOpenButtonTapped)
                     
+                case .view(.topicPollOpenButtonTapped):
+                    analytics.log(TopicEvent.topicPollOpenButtonTapped)
+                    
                 case let .view(.userTapped(userId: userId)):
                     analytics.log(TopicEvent.userTapped(userId))
                     
diff --git a/Modules/Sources/TopicFeature/Resources/Localizable.xcstrings b/Modules/Sources/TopicFeature/Resources/Localizable.xcstrings
@@ -1,6 +1,16 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "%lld people voted" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Проголосовало %lld чел."
+          }
+        }
+      }
+    },
     "Add to favorites" : {
       "localizations" : {
         "ru" : {
@@ -137,6 +147,16 @@
         }
       }
     },
+    "Poll" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Опрос"
+          }
+        }
+      }
+    },
     "Post deleted" : {
       "localizations" : {
         "ru" : {
@@ -227,6 +247,16 @@
         }
       }
     },
+    "Show results" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Результаты"
+          }
+        }
+      }
+    },
     "Today, %@" : {
       "localizations" : {
         "ru" : {
@@ -267,6 +297,26 @@
         }
       }
     },
+    "Vote" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Голосовать"
+          }
+        }
+      }
+    },
+    "Vote approved" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Голос засчитан"
+          }
+        }
+      }
+    },
     "Write Post" : {
       "localizations" : {
         "ru" : {
diff --git a/Modules/Sources/TopicFeature/TopicFeature.swift b/Modules/Sources/TopicFeature/TopicFeature.swift
@@ -34,6 +34,7 @@ public struct TopicFeature: Reducer, Sendable {
         static let favoriteRemoved = LocalizedStringResource("Removed from favorites", bundle: .module)
         static let postDeleted = LocalizedStringResource("Post deleted", bundle: .module)
         static let postKarmaChanged = LocalizedStringResource("Post karma changed", bundle: .module)
+        static let topicVoteApproved = LocalizedStringResource("Vote approved", bundle: .module)
     }
     
     // MARK: - Destinations
@@ -81,6 +82,7 @@ public struct TopicFeature: Reducer, Sendable {
         }
         
         var shouldShowTopicHatButton = false
+        var shouldShowTopicPollButton = true
         
         public init(
             topicId: Int,
@@ -117,6 +119,8 @@ public struct TopicFeature: Reducer, Sendable {
             case onRefresh
             case finishedPostAnimation
             case topicHatOpenButtonTapped
+            case topicPollOpenButtonTapped
+            case topicPollVoteButtonTapped([Int: Set<Int>])
             case changeKarmaTapped(Int, Bool)
             case userTapped(Int)
             case urlTapped(URL)
@@ -132,6 +136,7 @@ public struct TopicFeature: Reducer, Sendable {
             case refresh
             case goToPost(postId: Int, offset: Int, forceRefresh: Bool)
             case changeKarma(postId: Int, isUp: Bool)
+            case voteInPoll(selections: [[Int]])
             case loadTopic(Int)
             case loadTypes([[TopicTypeUI]])
             case topicResponse(Result<Topic, any Error>)
@@ -228,6 +233,16 @@ public struct TopicFeature: Reducer, Sendable {
                 state.shouldShowTopicHatButton = false
                 return .none
                 
+            case .view(.topicPollOpenButtonTapped):
+                state.shouldShowTopicPollButton = false
+                return .none
+                
+            case let .view(.topicPollVoteButtonTapped(selections)):
+                let values = selections.sorted(by: { $0.key < $1.key }).map {
+                    Array($0.value)
+                }
+                return .send(.internal(.voteInPoll(selections: values)))
+                
             case let .view(.userTapped(id)):
                 return .send(.delegate(.openUser(id: id)))
                 
@@ -397,6 +412,20 @@ public struct TopicFeature: Reducer, Sendable {
                     jumpTo(.post(id: postId), true, &state)
                 )
                 
+            case let .internal(.voteInPoll(selections)):
+                return .concatenate(
+                    .run { [topicId = state.topicId] _ in
+                        let status = try await apiClient.voteInTopicPoll(
+                            topicId: topicId,
+                            selections: selections
+                        )
+                        let voteApproved = ToastMessage(text: Localization.topicVoteApproved, haptic: .success)
+                        await toastClient.showToast(status ? voteApproved : .whoopsSomethingWentWrong)
+                    }.cancellable(id: CancelID.loading),
+                    
+                    .send(.internal(.refresh))
+                )
+                
             case let .internal(.loadTopic(offset)):
                 if !state.isRefreshing {
                     state.isLoadingTopic = true
@@ -465,6 +494,7 @@ public struct TopicFeature: Reducer, Sendable {
                 
                 state.isLoadingTopic = false
                 state.isRefreshing = false
+                state.shouldShowTopicPollButton = true
                 state.shouldShowTopicHatButton = !state.pageNavigation.isFirstPage
                 
                 reportFullyDisplayed(&state)
diff --git a/Modules/Sources/TopicFeature/TopicScreen.swift b/Modules/Sources/TopicFeature/TopicScreen.swift
diff --git a/Modules/Sources/TopicFeature/Views/PollView.swift b/Modules/Sources/TopicFeature/Views/PollView.swift
