Compare commits

..

4 Commits

Author SHA1 Message Date
c883efcf41 Prefix api path with api/ 2018-09-29 21:40:18 +03:00
f2665335b3 Remove preceding equals 2018-09-29 21:35:50 +03:00
e6cf2bc659 Ignore all the nix results 2018-09-29 21:30:33 +03:00
cdaf3339c8 Add cabal-install to shell dependencies 2018-09-29 21:29:44 +03:00
4 changed files with 14 additions and 15 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
result
result*
dist/

View File

@ -16,6 +16,7 @@ let
_pkgs.binutils-unwrapped
haskellPackages.ghcid
haskellPackages.hasktags
haskellPackages.cabal-install
(haskellPackages.ghcWithHoogle (_: pkg.buildInputs ++ pkg.propagatedBuildInputs))
];
};

View File

@ -10,11 +10,11 @@ import ClassyPrelude
import qualified API.IPFS as IPFS
import Network.HTTP.Media ((//), (/:))
import Text.Pandoc.Class (runPure)
import Text.Pandoc.Options (def)
import Text.Pandoc.Readers.Markdown (readMarkdown)
import Text.Pandoc.Writers.HTML (writeHtml5String)
import Text.Pandoc.Class (runPure, PandocMonad)
import Text.Pandoc.Options (def)
import Network.HTTP.Media ((//), (/:))
data HTML
@ -31,5 +31,5 @@ instance Accept HTML where
type API = "ipfs" :> IPFS.API
type DocumentedAPI = API
type DocumentedAPI = "api" :> API
:<|> "help" :> Get '[PlainText, HTML] Docs

View File

@ -5,12 +5,10 @@
module Server.IPFS where
import API.IPFS
import Servant
import ClassyPrelude
import Network.DNS
import ClassyPrelude hiding (hash)
import Control.Lens (over, _Left)
import Network.DNS
import Servant
handler :: Server API
handler = liftIO getHash >>= either (const (throwError err500)) return
@ -23,6 +21,6 @@ handler = liftIO getHash >>= either (const (throwError err500)) return
-- This is terrible
return (eTxt >>= maybe (Left "Could not find dnslink") Right . hash)
hash [x] = case x of
(stripPrefix "dnslink" -> Just h) -> Just . VersionHash . decodeUtf8 $ h
(stripPrefix "dnslink=" -> Just h) -> Just . VersionHash . decodeUtf8 $ h
_ -> Nothing
hash _ = Nothing