From 72d2de0c2efdf238205c860de265ceefe8610ba2 Mon Sep 17 00:00:00 2001
From: Ryan Nystrom <rnystrom@instagram.com>
Date: Sun, 27 Aug 2017 22:51:34 -0700
Subject: [PATCH] tweak close behavior

---
 Classes/Issues/GithubClient+Issues.swift  |  6 +++---
 Classes/Issues/IssuesViewController.swift | 13 +++++++++----
 Resources/Info.plist                      |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Classes/Issues/GithubClient+Issues.swift b/Classes/Issues/GithubClient+Issues.swift
index 20366633..164a5015 100644
--- a/Classes/Issues/GithubClient+Issues.swift
+++ b/Classes/Issues/GithubClient+Issues.swift
@@ -163,9 +163,9 @@ extension GithubClient {
         completion: @escaping (Result<CloseStatus>) -> ()
         ) {
         request(Request(
-            path: "repos/\(owner)/\(repo)/issue/\(number)",
-            method: .post,
-            parameters: [ "status": status.rawValue ],
+            path: "repos/\(owner)/\(repo)/issues/\(number)",
+            method: .patch,
+            parameters: [ "state": status.rawValue ],
             completion: { (response, _) in
                 if response.value != nil {
                     completion(.success(status))
diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift
index a2cc6249..8828b2c3 100644
--- a/Classes/Issues/IssuesViewController.swift
+++ b/Classes/Issues/IssuesViewController.swift
@@ -202,7 +202,7 @@ IssueTextActionsViewDelegate {
     }
 
     func shareAction(sender: UIBarButtonItem) -> UIAlertAction {
-        return UIAlertAction(title: NSLocalizedString("Share...", comment: ""), style: .default) { [weak self] _ in
+        return UIAlertAction(title: NSLocalizedString("Send To", comment: ""), style: .default) { [weak self] _ in
             guard let strongSelf = self else { return }
             let safariActivity = TUSafariActivity()
             let controller = UIActivityViewController(activityItems: [strongSelf.externalURL], applicationActivities: [safariActivity])
@@ -221,11 +221,11 @@ IssueTextActionsViewDelegate {
 
     func closeAction() -> UIAlertAction? {
         guard current?.viewerCanUpdate == true,
-            let status = current?.status.status,
+            let status = localStatusChange?.model.status ?? current?.status.status,
             status != .merged
             else { return nil }
 
-        let close = status == .closed
+        let close = status == .open
         let title = close ? NSLocalizedString("Close", comment: "") : NSLocalizedString("Reopen", comment: "")
         return UIAlertAction(title: title, style: .default, handler: { [weak self] _ in
             self?.setStatus(close: close)
@@ -234,6 +234,11 @@ IssueTextActionsViewDelegate {
 
     func onMore(sender: UIBarButtonItem) {
         let alert = UIAlertController()
+
+        if let close = closeAction() {
+            alert.addAction(close)
+        }
+
         alert.addAction(shareAction(sender: sender))
         alert.addAction(safariAction())
         alert.addAction(UIAlertAction(title: Strings.cancel, style: .cancel, handler: nil))
@@ -291,7 +296,7 @@ IssueTextActionsViewDelegate {
         )
         let localEvent = IssueStatusEventModel(
             id: UUID().uuidString,
-            actor: "TODO",
+            actor: client.sessionManager.focusedUserSession?.username ?? Strings.unknown,
             commitHash: nil,
             date: Date(),
             status: close ? .closed : .reopened,
diff --git a/Resources/Info.plist b/Resources/Info.plist
index c8ad5e30..5ecc8d2d 100644
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1536</string>
+	<string>1542</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>