diff --git a/docker-compose.yml b/docker-compose.yml index c7e367d..77485c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ services: - "3000:3000" volumes: - '$APPDATA:/app/data' + network_mode: host environment: - IP_FROM_HEADER=true - SQLITE_DATABASE=/app/data/espial.sqlite3 diff --git a/src/Handler/Archive.hs b/src/Handler/Archive.hs index fa633df..e1593ad 100644 --- a/src/Handler/Archive.hs +++ b/src/Handler/Archive.hs @@ -22,6 +22,7 @@ shouldArchiveBookmark :: User -> Key Bookmark -> Handler Bool shouldArchiveBookmark user kbid = do runDB (get kbid) >>= \case Nothing -> pure False + Just bm -> do pure $ (isNothing $ bookmarkArchiveHref bm) && @@ -32,10 +33,12 @@ shouldArchiveBookmark user kbid = do getArchiveManager :: Handler Manager getArchiveManager = do appSettings <- pure . appSettings =<< getYesod - NH.newTlsManagerWith $ NH.mkManagerSettings def $ - NC.SockSettingsSimple - <$> fmap unpack (appArchiveSocksProxyHost appSettings) - <*> fmap toEnum (appArchiveSocksProxyPort appSettings) + let mSocks = + NC.SockSettingsSimple <$> + fmap unpack (appArchiveSocksProxyHost appSettings) <*> + fmap toEnum (appArchiveSocksProxyPort appSettings) + NH.newTlsManagerWith (NH.mkManagerSettings def mSocks) + archiveBookmarkUrl :: Key Bookmark -> String -> Handler () archiveBookmarkUrl kbid url =