some minor refactoring

jdisho · Dec 28, 2019 · f19c0fc · f19c0fc
1 parent 9f81d19
commit f19c0fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Papr/Custom UI/PaprNavigationController.swift b/Papr/Custom UI/PaprNavigationController.swift
@@ -76,11 +76,16 @@ class PaprNavigationController: UINavigationController {
         topViewController?.navigationItem.backBarButtonItem = UIBarButtonItem(title: "Back", style: .plain, target: nil, action: nil)
 
         service.getMe()
-            .flatMap { result -> Observable<User> in
-                guard case let .success(user) = result else { return .empty() }
-                profileImage.isHidden = false
-                return .just(user)
+            .map { result -> User? in
+                switch result {
+                case let .success(user):
+                    profileImage.isHidden = false
+                    return user
+                case .failure:
+                    return nil
+                }
             }
+            .unwrap()
             .map { $0.profileImage?.medium }
             .unwrap()
             .mapToURL()

diff --git a/Papr/Services/PhotoService/PhotoService.swift b/Papr/Services/PhotoService/PhotoService.swift
@@ -51,7 +51,7 @@ struct PhotoService: PhotoServiceType {
             .catchError { _ in
                 let accessToken = UserDefaults.standard.string(forKey: Papr.Unsplash.clientID)
                 guard accessToken == nil else {
-                    return .just(.failure(.other(message: "Failed to like")))
+                    return .just(.failure(.other(message: "Failed to unlike")))
                 }
                 return .just(.failure(.noAccessToken))
         }

diff --git a/Papr/Utils/Extentions/Rx/ObservableType+Extras.swift b/Papr/Utils/Extentions/Rx/ObservableType+Extras.swift
@@ -45,11 +45,8 @@ extension ObservableType {
 
 }
 extension Observable where Element == String {
-
     func mapToURL() -> Observable<URL> {
-        return map { URL(string: $0) }
-            .filter { $0 != nil }
-            .map { $0! }
+        return map { URL(string: $0) }.compactMap { $0 }
     }
 }
 extension Observable where Element == Data {