From e40e065d33644a414e8063bfddda890f2e6dff2c Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Wed, 28 Oct 2020 10:58:04 +1100
Subject: [PATCH] Giphy improvement with trending load on opening Giphy search
 page

---
 .../GifPicker/GifPickerViewController.swift   | 21 +++++++++++
 Signal/src/network/GiphyAPI.swift             | 35 +++++++++++++++++--
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
index c36f2931f..5254f096e 100644
--- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
+++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
@@ -134,6 +134,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
                                                selector: #selector(didBecomeActive),
                                                name: NSNotification.Name.OWSApplicationDidBecomeActive,
                                                object: nil)
+        loadTrending()
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -484,6 +485,26 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
 
         search(query: query)
     }
+    
+    private func loadTrending() {
+        assert(progressiveSearchTimer == nil)
+        assert(searchBar.text == nil || searchBar.text?.count == 0)
+
+        GiphyAPI.sharedInstance.trending().done { [weak self] imageInfos in
+            guard let self = self else { return }
+
+            Logger.info("showing trending")
+            if imageInfos.count > 0 {
+                self.imageInfos = imageInfos
+                self.viewMode = .results
+            } else {
+                owsFailDebug("trending results was unexpectedly empty")
+            }
+        }.catch { error in
+            // Don't both showing error UI feedback for default "trending" results.
+            Logger.error("error: \(error)")
+        }
+    }
 
     private func search(query: String) {
         Logger.info("searching: \(query)")
diff --git a/Signal/src/network/GiphyAPI.swift b/Signal/src/network/GiphyAPI.swift
index 462fc59e1..64304fca9 100644
--- a/Signal/src/network/GiphyAPI.swift
+++ b/Signal/src/network/GiphyAPI.swift
@@ -3,6 +3,7 @@
 //
 
 import Foundation
+import PromiseKit
 
 // There's no UTI type for webp!
 enum GiphyFormat {
@@ -286,6 +287,37 @@ extension GiphyError: LocalizedError {
     }
 
     // MARK: Search
+    // This is the Signal iOS API key.
+    let kGiphyApiKey = "ZsUpUm2L6cVbvei347EQNp7HrROjbOdc"
+    let kGiphyPageSize = 100
+    
+    public func trending() -> Promise<[GiphyImageInfo]> {
+        guard let sessionManager = giphyAPISessionManager() else {
+            Logger.error("Couldn't create session manager.")
+            return Promise.value([])
+        }
+        let urlString = "/v1/gifs/trending?api_key=\(kGiphyApiKey)&limit=\(kGiphyPageSize)"
+        let (promise, resolver) = Promise<[GiphyImageInfo]>.pending()
+        sessionManager.get(urlString,
+                           parameters: [String: AnyObject](),
+                           progress: nil,
+                           success: { _, value in
+                            Logger.error("search request succeeded")
+                            if let imageInfos = self.parseGiphyImages(responseJson: value) {
+                                resolver.fulfill(imageInfos)
+                            } else {
+                                Logger.error("unable to parse trending images")
+                                resolver.fulfill([])
+                            }
+                            
+        },
+                           failure: { _, error in
+                            Logger.error("search request failed: \(error)")
+                            resolver.reject(error)
+        })
+
+        return promise
+    }
 
     public func search(query: String, success: @escaping (([GiphyImageInfo]) -> Void), failure: @escaping ((NSError?) -> Void)) {
         guard let sessionManager = giphyAPISessionManager() else {
@@ -299,9 +331,6 @@ extension GiphyError: LocalizedError {
             return
         }
 
-        // This is the Signal iOS API key.
-        let kGiphyApiKey = "ZsUpUm2L6cVbvei347EQNp7HrROjbOdc"
-        let kGiphyPageSize = 100
         let kGiphyPageOffset = 0
         guard let queryEncoded = query.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
             Logger.error("Could not URL encode query: \(query).")