Apply code style

Author: fanyu

Mixin/Mixin-Bridging-Header.h

@@ -2,7 +2,6 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "MXSFastURLDetector.h"
 #import "MXMProvisionCryptor.h"
 #import "opusfile.h"
 #import "opusenc.h"

Mixin/UserInterface/Controllers/Chat/SharedMediaLinkTableViewController.swift

@@ -2,7 +2,7 @@ import UIKit
 import MixinServices
 
 class SharedMediaLinkTableViewController: SharedMediaTableViewController {
-        
+    
     private var dates = [String]()
     private var items = [String: [HyperlinkItem]]()
 
@@ -19,7 +19,7 @@ class SharedMediaLinkTableViewController: SharedMediaTableViewController {
 extension SharedMediaLinkTableViewController: UITableViewDataSource {
 
     func numberOfSections(in tableView: UITableView) -> Int {
-        items.count
+        dates.count
     }
 
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -28,27 +28,23 @@ extension SharedMediaLinkTableViewController: UITableViewDataSource {
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.shared_media_link, for: indexPath)!
-        if let item = item(at: indexPath) {
-            cell.linkLabel.text = item.link
-        }
+        cell.linkLabel.text = items[dates[indexPath.section]]?[indexPath.row].link
         return cell
     }
 
 }
 
 extension SharedMediaLinkTableViewController: UITableViewDelegate {
-        
+    
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let view = tableView.dequeueReusableHeaderFooterView(withIdentifier: headerReuseId) as! SharedMediaTableHeaderView
-        if section < dates.count {
-            view.label.text = dates[section]
-        }
+        view.label.text = dates[section]
         return view
     }
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
-        if let item = item(at: indexPath), let url = URL(string: item.link), let container = parent?.parent {
+        if let item = items[dates[indexPath.section]]?[indexPath.row], let url = URL(string: item.link), let container = parent?.parent {
             let context = MixinWebViewController.Context(conversationId: conversationId, initialUrl: url)
             MixinWebViewController.presentInstance(with: context, asChildOf: container)
         }
@@ -58,36 +54,32 @@ extension SharedMediaLinkTableViewController: UITableViewDelegate {
 
 extension SharedMediaLinkTableViewController {
 
-    private func item(at indexPath: IndexPath) -> HyperlinkItem? {
-        guard indexPath.section < dates.count else {
-            return nil
-        }
-        let date = dates[indexPath.section]
-        guard let items = self.items[date], indexPath.row >= 0, indexPath.row < items.count else {
-            return nil
-        }
-        return items[indexPath.row]
-    }
-    
     private func reloadData() {
+        guard let conversationId = self.conversationId else {
+            return
+        }
         DispatchQueue.global().async { [weak self] in
-            guard let self = self else {
-                return
+            var dates = [String]()
+            var items = [String: [HyperlinkItem]]()
+            let linkItems = HyperlinkDAO.shared.hyperlinks(conversationId: conversationId)
+            for item in linkItems {
+                let date = item.createdAt.toUTCDate()
+                let title = DateFormatter.dateSimple.string(from: date)
+                if items[title] != nil {
+                    items[title]!.append(item)
+                } else {
+                    dates.append(title)
+                    items[title] = [item]
+                }
             }
-            let linkItems = HyperlinkDAO.shared.hyperlinks(conversationId: self.conversationId)
             DispatchQueue.main.async {
-                for item in linkItems {
-                    let date = item.createdAt.toUTCDate()
-                    let title = DateFormatter.dateSimple.string(from: date)
-                    if self.items[title] != nil {
-                        self.items[title]!.append(item)
-                    } else {
-                        self.dates.append(title)
-                        self.items[title] = [item]
-                    }
+                guard let self = self else {
+                    return
                 }
+                self.dates = dates
+                self.items = items
                 self.tableView.reloadData()
-                self.tableView.checkEmpty(dataCount: self.items.count,
+                self.tableView.checkEmpty(dataCount: items.count,
                                           text: R.string.localizable.no_links(),
                                           photo: R.image.emptyIndicator.ic_shared_link()!)
             }

MixinServices/MixinServices/Database/User/DAO/MessageDAO.swift

@@ -583,7 +583,7 @@ public final class MessageDAO: UserDatabaseDAO {
             quotedMessage = nil
         }
 
-        if message.category.hasSuffix("_TEXT"), let content = message.content, let link = Link.detector.lastMatche(in: content)?.url?.absoluteString {
+        if message.category.hasSuffix("_TEXT"), let content = message.content, let link = Link.detector.lastMatch(in: content)?.url?.absoluteString {
             message.hyperlink = link
         }
         db.write { (db) in

MixinServices/MixinServices/Foundation/URLDetector/MXSFastURLDetector.h

@@ -6,8 +6,7 @@ NS_SWIFT_NAME(FastURLDetector)
 @interface MXSFastURLDetector : NSObject
 
 - (void)enumerateMatchesInString:(NSString *)string options:(NSMatchingOptions)options usingBlock:(void (NS_NOESCAPE ^)(NSTextCheckingResult * _Nullable result, NSMatchingFlags flags, BOOL *stop))block;
-
-- (nullable NSTextCheckingResult *)lastMatcheInString:(NSString *)string options:(NSMatchingOptions)options;
+- (nullable NSTextCheckingResult *)lastMatchInString:(NSString *)string options:(NSMatchingOptions)options;
 
 @end
 

MixinServices/MixinServices/Foundation/URLDetector/MXSFastURLDetector.m

@@ -2,6 +2,8 @@
 
 @implementation MXSFastURLDetector
 
+NS_INLINE BOOL MaybeContainsURL(NSString *string);
+
 + (NSDataDetector *)detector {
     static NSDataDetector *detector;
     static dispatch_once_t onceToken;
@@ -12,22 +14,22 @@ + (NSDataDetector *)detector {
 }
 
 - (void)enumerateMatchesInString:(NSString *)string options:(NSMatchingOptions)options usingBlock:(void (NS_NOESCAPE ^)(NSTextCheckingResult * _Nullable result, NSMatchingFlags flags, BOOL *stop))block {
-    if ([self maybeContainsURL:string]) {
+    if (MaybeContainsURL(string)) {
         NSRange range = NSMakeRange(0, string.length);
         [[MXSFastURLDetector detector] enumerateMatchesInString:string options:options range:range usingBlock:block];
     }
 }
 
-- (nullable NSTextCheckingResult *)lastMatcheInString:(NSString *)string options:(NSMatchingOptions)options {
-    if ([self maybeContainsURL:string]) {
+- (nullable NSTextCheckingResult *)lastMatchInString:(NSString *)string options:(NSMatchingOptions)options {
+    if (MaybeContainsURL(string)) {
         NSRange range = NSMakeRange(0, string.length);
         return [[MXSFastURLDetector detector] matchesInString:string options:options range:range].lastObject;
     } else {
         return nil;
     }
 }
 
-- (BOOL)maybeContainsURL:(NSString *)string {
+NS_INLINE BOOL MaybeContainsURL(NSString *string) {
     if (string.length < 3) {
         return NO;
     }