From eb0df7f3558cbf96dcaf85a41443f64c8dac1e90 Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Tue, 19 Jan 2021 15:45:24 -0700
Subject: [PATCH] fix sorting and starting web sans ssl

---
 src/Application.hs  | 7 ++++---
 src/Lib/Registry.hs | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index 02ee5c5..56fde1d 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -202,9 +202,10 @@ startWeb foundation = do
             putStrLn @Text $ "Launching Tor Web Server on port " <> show torPort
             torAction <- async $ runSettings (warpSettings torPort foundation) app
             putStrLn @Text $ "Launching Web Server on port " <> show appPort
-            action <- async $ runTLS (tlsSettings sslCertLocation sslKeyLocation)
-                            (warpSettings appPort foundation)
-                            app
+            action <- if sslAuto
+                        then async $ runTLS (tlsSettings sslCertLocation sslKeyLocation)
+                            (warpSettings appPort foundation) app
+                        else async $ runSettings (warpSettings appPort foundation) app
             let actions = (action, torAction)
 
             setWebProcessThreadId (join (***) asyncThreadId actions) foundation
diff --git a/src/Lib/Registry.hs b/src/Lib/Registry.hs
index 9e7e87b..15694c5 100644
--- a/src/Lib/Registry.hs
+++ b/src/Lib/Registry.hs
@@ -40,7 +40,7 @@ getAvailableAppVersions rootDirectory ext@(Extension appId) = do
 getMostRecentAppVersion :: KnownSymbol a => FilePath -> Extension a -> IO (Maybe RegisteredAppVersion)
 getMostRecentAppVersion rootDirectory ext = do
     allVersions <- liftIO $ getAvailableAppVersions rootDirectory ext
-    pure $ head $ sortOn (fst . unRegisteredAppVersion) allVersions
+    pure $ head $ sortOn (Down . fst . unRegisteredAppVersion) allVersions
 
 -- /root/appId/version/appId.ext
 getVersionedFileFromDir :: KnownSymbol a => FilePath -> Extension a -> Version -> IO (Maybe FilePath)