Merge pull request wikimedia#3769 from wikimedia/T267849

AaaLD - Navigate to particular talk page topic if possible
codemagic-ci-cd · Nov 19, 2020 · f3ec62f · f3ec62f
2 parents 93a38c4 + 6cbd044
commit f3ec62f
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 18 deletions.
diff --git a/WMF Framework/Significant Events Endpoint/ArticleAsLivingDocViewModels.swift b/WMF Framework/Significant Events Endpoint/ArticleAsLivingDocViewModels.swift
@@ -571,7 +571,7 @@ public extension ArticleAsLivingDocViewModel {
 
             public enum ButtonsToDisplay {
                 case thankAndViewChanges(userId: UInt, revisionId: UInt)
-                case viewDiscussion(sectionName: String)
+                case viewDiscussion(sectionName: String?)
             }
 
             public let typedEvent: SignificantEvents.TypedEvent
@@ -599,7 +599,13 @@ public extension ArticleAsLivingDocViewModel {
                 case .newTalkPageTopic(let newTalkPageTopic):
                     self.userId = newTalkPageTopic.userId
                     userGroups = newTalkPageTopic.userGroups
-                    self.buttonsToDisplay = .viewDiscussion(sectionName: newTalkPageTopic.section)
+
+                    if let talkPageSection = newTalkPageTopic.section {
+                        self.buttonsToDisplay = .viewDiscussion(sectionName: Self.sectionTitleWithWikitextStripped(originalTitle: talkPageSection))
+                    } else {
+                        self.buttonsToDisplay = .viewDiscussion(sectionName: nil)
+                    }
+
                 case .large(let largeChange):
                     self.userId = largeChange.userId
                     userGroups = largeChange.userGroups
@@ -637,7 +643,6 @@ public extension ArticleAsLivingDocViewModel {
                     revId = 0
                     parentId = 0
                 }
-
             }
 
             public static func == (lhs: ArticleAsLivingDocViewModel.Event.Large, rhs: ArticleAsLivingDocViewModel.Event.Large) -> Bool {
@@ -905,17 +910,25 @@ public extension ArticleAsLivingDocViewModel.Event.Large {
         }
 
         //strip == signs from all section titles
-        let finalSet = set.map { (section) -> String in
-            if let match = section.range(of: "(?<==)[^=]+", options: .regularExpression) {
-                return String(section[match])
-            }
-
-            return section
-        }
+        let finalSet = set.map { Self.sectionTitleWithWikitextStripped(originalTitle: $0) }
 
         return Set(finalSet)
     }
 
+    //remove one or more equal signs and zero or more spaces on either side of the title text
+    private static func sectionTitleWithWikitextStripped(originalTitle: String) -> String {
+        var loopTitle = originalTitle
+
+        let regex = "^=+\\s*|\\s*=+$"
+        var maybeMatch = loopTitle.range(of: regex, options: .regularExpression)
+        while let match = maybeMatch {
+            loopTitle.removeSubrange(match)
+            maybeMatch = loopTitle.range(of: regex, options: .regularExpression)
+        }
+
+        return loopTitle
+    }
+
     private func localizedStringFromSections(sections: [String]) -> String? {
         var localizedString: String
         switch sections.count {

diff --git a/WMF Framework/Significant Events Endpoint/SignificantEventsModels.swift b/WMF Framework/Significant Events Endpoint/SignificantEventsModels.swift
@@ -231,7 +231,7 @@ public extension SignificantEvents {
             public let timestampString: String
             public let user: String
             public let userId: UInt
-            public let section: String
+            public let section: String?
             public let snippet: String
             public let userGroups: [String]?
             public let userEditCount: UInt?
@@ -242,7 +242,6 @@ public extension SignificantEvents {
                       let timestampString = untypedEvent.timestampString,
                       let user = untypedEvent.user,
                       let userId = untypedEvent.userId,
-                      let section = untypedEvent.section,
                       let snippet = untypedEvent.snippet else {
                     return nil
                 }
@@ -253,7 +252,7 @@ public extension SignificantEvents {
                 self.timestampString = timestampString
                 self.user = user
                 self.userId = userId
-                self.section = section
+                self.section = untypedEvent.section
                 self.snippet = snippet
                 self.userGroups = untypedEvent.userGroups
                 self.userEditCount = untypedEvent.userEditCount

diff --git a/WMF Framework/String+LinkParsing.swift b/WMF Framework/String+LinkParsing.swift
@@ -50,6 +50,12 @@ public extension String {
         return replacingOccurrences(of: " ", with: "_").precomposedStringWithCanonicalMapping
      }
 
+    var asTalkPageFragment: String? {
+        let denormalizedName = replacingOccurrences(of: " ", with: "_")
+        let unlinkedName = denormalizedName.replacingOccurrences(of: "[[", with: "").replacingOccurrences(of: "]]", with: "")
+        return unlinkedName.addingPercentEncoding(withAllowedCharacters: NSCharacterSet.wmf_encodeURIComponentAllowed())
+    }
+
     //assumes string is already normalized
     var googleFormPercentEncodedPageTitle: String? {
         return googleFormPageTitle?.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)

diff --git a/...ia/Code/Article as a Living Document/ArticleAsLivingDocLargeEventCollectionViewCell.swift b/...ia/Code/Article as a Living Document/ArticleAsLivingDocLargeEventCollectionViewCell.swift
@@ -345,7 +345,17 @@ class ArticleAsLivingDocLargeEventCollectionViewCell: CollectionViewCell {
             ArticleAsLivingDocFunnel.shared.logModalViewDiscussionButtonTapped(position: loggingPosition)
         }
 
-        articleDelegate?.showTalkPage()
+        guard let largeEvent = largeEvent else {
+            return
+        }
+
+        switch largeEvent.buttonsToDisplay {
+        case .viewDiscussion(let sectionName):
+            articleDelegate?.showTalkPageWithSectionName(sectionName)
+        default:
+            assertionFailure("Unexpected button type")
+            articleDelegate?.showTalkPageWithSectionName(nil)
+        }
     }
 }
 

diff --git a/Wikipedia/Code/Article as a Living Document/ArticleAsLivingDocViewController.swift b/Wikipedia/Code/Article as a Living Document/ArticleAsLivingDocViewController.swift
@@ -10,15 +10,14 @@ protocol ArticleAsLivingDocViewControllerDelegate: class {
     func fetchNextPage(nextRvStartId: UInt, theme: Theme)
     func showEditHistory()
     func handleLink(with href: String)
-    func showTalkPage()
     func livingDocViewWillAppear()
     func livingDocViewWillPush()
 }
 
 protocol ArticleDetailsShowing: class {
     func goToHistory()
     func goToDiff(revisionId: UInt, parentId: UInt, diffType: DiffContainerViewModel.DiffType)
-    func showTalkPage()
+    func showTalkPageWithSectionName(_ sectionName: String?)
     func thankButtonTapped(for revisionID: Int, isUserAnonymous: Bool, livingDocLoggingValues: ArticleAsLivingDocLoggingValues)
 }
 
@@ -442,11 +441,19 @@ extension ArticleAsLivingDocViewController: ArticleAsLivingDocHorizontallyScroll
 
 @available(iOS 13.0, *)
 extension ArticleAsLivingDocViewController: ArticleDetailsShowing {
-    func showTalkPage() {
-        guard let talkPageURL = delegate?.articleURL.articleTalkPage else {
+    func showTalkPageWithSectionName(_ sectionName: String?) {
+
+        var maybeTalkPageURL = delegate?.articleURL.articleTalkPage
+        if let convertedSectionName = sectionName?.asTalkPageFragment,
+           let talkPageURL = maybeTalkPageURL {
+            maybeTalkPageURL = URL(string: talkPageURL.absoluteString + "#" + convertedSectionName)
+        }
+
+        guard let talkPageURL = maybeTalkPageURL else {
             showGenericError()
             return
         }
+
         navigate(to: talkPageURL)
     }