From 5706c0d307444471aee97d023db2a13f09b63ec1 Mon Sep 17 00:00:00 2001
From: Brian Litwin <brian.n.litwin@gmail.com>
Date: Sun, 21 Oct 2018 12:38:54 -0400
Subject: [PATCH] cleans up issue labels query

---
 Classes/Issues/IssuesViewController.swift                    | 5 ++++-
 Classes/Repository/RepositoryIssuesViewController.swift      | 2 +-
 .../View Controllers/UIViewController+PresentLabels.swift    | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift
index d33d34fc7..40049fbd7 100644
--- a/Classes/Issues/IssuesViewController.swift
+++ b/Classes/Issues/IssuesViewController.swift
@@ -54,6 +54,7 @@ final class IssuesViewController: MessageViewController,
     private var needsScrollToBottom = false
     private var lastTimelineElement: ListDiffable?
     private var actions: IssueTextActionsView?
+    private var issueType: RepositoryIssuesType?
 
     // must fetch collaborator info from API before showing editing controls
     private var viewerIsCollaborator = false
@@ -333,6 +334,7 @@ final class IssuesViewController: MessageViewController,
                 )
                 strongSelf.client.cache.add(listener: strongSelf, value: result)
                 strongSelf.resultID = result.id
+                strongSelf.issueType = result.pullRequest ? .pullRequests : .issues
             default: break
             }
 
@@ -636,7 +638,8 @@ final class IssuesViewController: MessageViewController,
     // MARK: IssueLabelsSectionControllerDelegate
     
     func didTapIssueLabel(owner: String, repo: String, label: String) {
-        presentLabels(client: client, owner: owner, repo: repo, label: label)
+        guard let issueType = self.issueType else { return }
+        presentLabels(client: client, owner: owner, repo: repo, label: label, type: issueType)
     }
 
 }
diff --git a/Classes/Repository/RepositoryIssuesViewController.swift b/Classes/Repository/RepositoryIssuesViewController.swift
index 3a34fe552..bfe6fa659 100644
--- a/Classes/Repository/RepositoryIssuesViewController.swift
+++ b/Classes/Repository/RepositoryIssuesViewController.swift
@@ -35,7 +35,7 @@ SearchBarSectionControllerDelegate {
         self.type = type
         self.label = label
         if let label = label {
-            previousSearchString += "label:\(label) "
+            previousSearchString += "label:\"\(label)\" "
         }
 
         super.init(
diff --git a/Classes/View Controllers/UIViewController+PresentLabels.swift b/Classes/View Controllers/UIViewController+PresentLabels.swift
index 41141fe65..434130778 100644
--- a/Classes/View Controllers/UIViewController+PresentLabels.swift	
+++ b/Classes/View Controllers/UIViewController+PresentLabels.swift	
@@ -10,13 +10,13 @@ import UIKit
 import GitHubAPI
 
 extension UIViewController {
-    func presentLabels(client: GithubClient, owner: String, repo: String, label: String) {
+    func presentLabels(client: GithubClient, owner: String, repo: String, label: String, type: RepositoryIssuesType) {
         let repositoryIssuesViewController =
             RepositoryIssuesViewController(
                 client: client,
                 owner: owner,
                 repo: repo,
-                type: .issues,
+                type: type,
                 label: label
         )