Add hashtags to search

Pachyderm/Model/Hashtag.swift

@@ -39,3 +39,13 @@ extension Hashtag {
         }
     }
 }
+
+extension Hashtag: Equatable, Hashable {
+    public static func ==(lhs: Hashtag, rhs: Hashtag) -> Bool {
+        return lhs.url == rhs.url
+    }
+    
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(url)
+    }
+}

Pachyderm/Model/SearchResults.swift

@@ -11,7 +11,7 @@ import Foundation
 public class SearchResults: Decodable {
     public let accounts: [Account]
     public let statuses: [Status]
-    public let hashtags: [String]
+    public let hashtags: [Hashtag]
     
     private enum CodingKeys: String, CodingKey {
         case accounts

Tusker.xcodeproj/project.pbxproj

@@ -69,6 +69,8 @@
 		D6109A0D214599E100432DC2 /* RequestRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0C214599E100432DC2 /* RequestRange.swift */; };
 		D6109A0F21459B6900432DC2 /* Pagination.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0E21459B6900432DC2 /* Pagination.swift */; };
 		D6109A11214607D500432DC2 /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A10214607D500432DC2 /* Timeline.swift */; };
+		D611C2CF232DC61100C86A49 /* HashtagTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */; };
+		D611C2D0232DC61100C86A49 /* HashtagTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */; };
 		D6163F2C21AA0AF1008DAC41 /* MyProfileTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6163F2B21AA0AF1008DAC41 /* MyProfileTableViewController.swift */; };
 		D627FF76217E923E00CC0648 /* DraftsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF75217E923E00CC0648 /* DraftsManager.swift */; };
 		D627FF79217E950100CC0648 /* DraftsTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627FF78217E950100CC0648 /* DraftsTableViewController.xib */; };
@@ -322,6 +324,8 @@
 		D6109A0C214599E100432DC2 /* RequestRange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestRange.swift; sourceTree = "<group>"; };
 		D6109A0E21459B6900432DC2 /* Pagination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pagination.swift; sourceTree = "<group>"; };
 		D6109A10214607D500432DC2 /* Timeline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timeline.swift; sourceTree = "<group>"; };
+		D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HashtagTableViewCell.swift; sourceTree = "<group>"; };
+		D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HashtagTableViewCell.xib; sourceTree = "<group>"; };
 		D6163F2B21AA0AF1008DAC41 /* MyProfileTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyProfileTableViewController.swift; sourceTree = "<group>"; };
 		D627FF75217E923E00CC0648 /* DraftsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsManager.swift; sourceTree = "<group>"; };
 		D627FF78217E950100CC0648 /* DraftsTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DraftsTableViewController.xib; sourceTree = "<group>"; };
@@ -661,6 +665,15 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+		D611C2CC232DC5FC00C86A49 /* Hashtag Cell */ = {
+			isa = PBXGroup;
+			children = (
+				D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */,
+				D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */,
+			);
+			path = "Hashtag Cell";
+			sourceTree = "<group>";
+		};
 		D627FF77217E94F200CC0648 /* Drafts */ = {
 			isa = PBXGroup;
 			children = (
@@ -1041,6 +1054,7 @@
 				D641C78B213DD92F004B4513 /* Profile Header */,
 				D641C78C213DD937004B4513 /* Notifications */,
 				D6A3BC872321F78000FD64D5 /* Account Cell */,
+				D611C2CC232DC5FC00C86A49 /* Hashtag Cell */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1403,6 +1417,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D611C2D0232DC61100C86A49 /* HashtagTableViewCell.xib in Resources */,
 				D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */,
 				D627FF7D217E958900CC0648 /* DraftTableViewCell.xib in Resources */,
 				D6A3BC7D232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib in Resources */,
@@ -1529,6 +1544,7 @@
 				D6C7D27D22B6EBF800071952 /* AttachmentsContainerView.swift in Sources */,
 				D6F953F021251A2900CF0F2B /* MastodonController.swift in Sources */,
 				0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */,
+				D611C2CF232DC61100C86A49 /* HashtagTableViewCell.swift in Sources */,
 				D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */,
 				D66362712136338600C9CBA2 /* ComposeViewController.swift in Sources */,
 				D6BC9DD7232D7811002CA326 /* TimelinesPageViewController.swift in Sources */,

Tusker/Screens/Search/SearchTableViewController.swift

@@ -12,6 +12,7 @@ import Pachyderm
 
 fileprivate let accountCell = "accountCell"
 fileprivate let statusCell = "statusCell"
+fileprivate let hashtagCell = "hashtagCell"
 
 class SearchTableViewController: EnhancedTableViewController {
 
@@ -39,6 +40,7 @@ class SearchTableViewController: EnhancedTableViewController {
 
         tableView.register(UINib(nibName: "AccountTableViewCell", bundle: .main), forCellReuseIdentifier: accountCell)
         tableView.register(UINib(nibName: "StatusTableViewCell", bundle: .main), forCellReuseIdentifier: statusCell)
+        tableView.register(UINib(nibName: "HashtagTableViewCell", bundle: .main), forCellReuseIdentifier: hashtagCell)
         
         dataSource = DataSource(tableView: tableView, cellProvider: { (tableView, indexPath, item) -> UITableViewCell? in
             switch item {
@@ -47,6 +49,11 @@ class SearchTableViewController: EnhancedTableViewController {
                 cell.updateUI(accountID: id)
                 cell.delegate = self
                 return cell
+            case let .hashtag(tag):
+                let cell = tableView.dequeueReusableCell(withIdentifier: hashtagCell, for: indexPath) as! HashtagTableViewCell
+                cell.updateUI(hashtag: tag)
+                cell.delegate = self
+                return cell
             case let .status(id):
                 let cell = tableView.dequeueReusableCell(withIdentifier: statusCell, for: indexPath) as! StatusTableViewCell
                 cell.updateUI(statusID: id)
@@ -107,6 +114,10 @@ class SearchTableViewController: EnhancedTableViewController {
                 snapshot.appendItems(results.accounts.map { Item.account($0.id) }, toSection: .accounts)
                 MastodonCache.addAll(accounts: results.accounts)
             }
+            if !results.hashtags.isEmpty {
+                snapshot.appendSections([.hashtags])
+                snapshot.appendItems(results.hashtags.map { Item.hashtag($0) }, toSection: .hashtags)
+            }
             if !results.statuses.isEmpty {
                 snapshot.appendSections([.statuses])
                 snapshot.appendItems(results.statuses.map { Item.status($0.id) }, toSection: .statuses)
@@ -122,12 +133,15 @@ class SearchTableViewController: EnhancedTableViewController {
 extension SearchTableViewController {
     enum Section: CaseIterable {
         case accounts
+        case hashtags
         case statuses
 
         var displayName: String {
             switch self {
             case .accounts:
                 return NSLocalizedString("People", comment: "accounts search results section")
+            case .hashtags:
+                return NSLocalizedString("Hashtags", comment: "hashtag search results section")
             case .statuses:
                 return NSLocalizedString("Posts", comment: "statuses search results section")
             }
@@ -135,6 +149,7 @@ extension SearchTableViewController {
     }
     enum Item: Hashable {
         case account(String)
+        case hashtag(Hashtag)
         case status(String)
     }
     

Tusker/Views/Hashtag Cell/HashtagTableViewCell.swift

@@ -0,0 +1,34 @@
+//
+//  HashtagTableViewCell.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/14/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+class HashtagTableViewCell: UITableViewCell {
+
+    var delegate: TuskerNavigationDelegate?
+    
+    @IBOutlet weak var hashtagLabel: UILabel!
+    
+    var hashtag: Hashtag!
+
+    func updateUI(hashtag: Hashtag) {
+        self.hashtag = hashtag
+        
+        hashtagLabel.text = "#\(hashtag.name)"
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        if selected {
+            delegate?.selected(tag: hashtag)
+        }
+    }
+    
+}

Tusker/Views/Hashtag Cell/HashtagTableViewCell.xib

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="HashtagTableViewCell" customModule="Tusker" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#hashtag" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vVg-1C-zJr">
+                        <rect key="frame" x="16" y="11" width="83" height="22"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="vVg-1C-zJr" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="Mnk-L3-dz9"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="vVg-1C-zJr" secondAttribute="bottom" id="qgx-dQ-SGs"/>
+                    <constraint firstItem="vVg-1C-zJr" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="ulh-dS-m0f"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="hashtagLabel" destination="vVg-1C-zJr" id="zJM-sN-cvL"/>
+            </connections>
+            <point key="canvasLocation" x="132" y="154"/>
+        </tableViewCell>
+    </objects>
+</document>