Merge pull request #57 from peterjosling/feature/url_loading_fix

Fix Messenger.com opening in browser on launch

Goofy/AppDelegate.swift

@@ -153,19 +153,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, WKNavigationDelegate, WKUIDe
 
     func webView(webView: WKWebView, decidePolicyForNavigationAction navigationAction: WKNavigationAction, decisionHandler: ((WKNavigationActionPolicy) -> Void)) {
 
-        var inAppURLs : Array = ["messenger.com/login","messenger.com/t"]
-
-        if let nav = navigationAction.request.URL!.absoluteString {
-            let inApp = inAppURLs.reduce(false, combine: { result, url in result || nav.rangeOfString(url) != nil })
+        if let url = navigationAction.request.URL {
+            var inApp = url.host!.hasSuffix("messenger.com") && !url.path!.hasPrefix("/l.php");
+            var isLogin = url.host!.hasSuffix("facebook.com") && (url.path!.hasPrefix("/login") || url.path!.hasPrefix("/checkpoint"));
 
-            if inApp  {
+            if inApp || isLogin {
                 decisionHandler(.Allow)
             } else {
                 NSWorkspace.sharedWorkspace().openURL(navigationAction.request.URL!)
                 decisionHandler(.Cancel)
             }
         }
-
     }
 
     func webView(webView: WKWebView, didFinishNavigation navigation: WKNavigation!) {