htalkat 0.1.2.2 → 0.1.2.3

raw patch · 7 files changed

+13/−16 lines, 7 filesdep ~bytestringdep ~memory

Dependency ranges changed: bytestring, memory

Files

• CursesClient.hs +2/−3
• HexString.hs +1/−1
• Incoming.hs +2/−3
• Petname.hs +2/−3
• Talkat.hs +2/−2
• Version.hs +1/−1
• htalkat.cabal +3/−3

@@ -378,9 +378,8 @@     let v = streamView ss         (len,n) = lenToSum (wh + v) $ allHeights ww ss         ls = reverse . take len $ allLines ss-        pls = take wh . drop (n - (wh + v)) . concat $-            reverse . zip (False:repeat True) . reverse .-            wrap ww <$> ls+        pls = take wh . drop (n - (wh + v)) $ concatMap+            (reverse . zip (False:repeat True) . reverse . wrap ww) ls         win = streamWin ss     liftIO $ do         werase win

@@ -49,7 +49,7 @@     parseHexString' _ = Nothing  showHexString :: ByteString -> String-showHexString = concat . (showHexWord8 <$>) . unpack+showHexString = concatMap showHexWord8 . unpack     where showHexWord8 w =             let (a,b) = quotRem w 16                 hex = ("0123456789abcdef" !!) . fromIntegral

@@ -12,7 +12,7 @@  import           Control.Monad    (filterM, forM, forM_) import           Data.List        ((\\))-import           Data.Maybe       (catMaybes)+import           Data.Maybe       (mapMaybe) import           Safe             (maximumMay, readMay) import           System.Directory import           System.FileLock  (SharedExclusive (..), withFileLock)@@ -63,8 +63,7 @@ incomingDir = (</> "incoming")  incomingNs :: FilePath -> IO [Int]-incomingNs ddir = catMaybes . (readMay <$>) <$>-    listDirectory (incomingDir ddir)+incomingNs ddir = mapMaybe readMay <$> listDirectory (incomingDir ddir)  incomingPath :: FilePath -> Incoming -> FilePath incomingPath ddir n = incomingDir ddir </> show n

@@ -16,7 +16,7 @@ import           Control.Monad.Trans.Maybe (MaybeT (..), runMaybeT) import           Data.Char                 (isAlphaNum) import           Data.List                 (elemIndices)-import           Data.Maybe                (catMaybes)+import           Data.Maybe                (mapMaybe) import           Safe                      (lastMay, readMay) import           System.Directory          (createDirectoryIfMissing,                                             listDirectory)@@ -100,5 +100,4 @@         writeFile path $ showUser user  loadNames :: FilePath -> IO [Petname]-loadNames ddir = catMaybes . (parsePetname <$>) <$>-    listDirectory (namesDir ddir)+loadNames ddir = mapMaybe parsePetname <$> listDirectory (namesDir ddir)

@@ -93,7 +93,7 @@ doCmd :: FilePath -> Config -> SocksProxy -> [O.Opt] -> [String] -> Command -> IO () doCmd ddir conf socksProxy opts args = \case     Help -> case args of-        [] -> putStr . O.globalHelp . init . concat $ (<>"\n") <$>+        [] -> putStr . O.globalHelp . init $ concatMap (<>"\n")             [ "Usage: htalkat [OPTION...] COMMAND [ARG...]"             , ""             , "Commands:"@@ -217,5 +217,5 @@         , "  Other users will be able to connect to you at talkat:FP@HOST[:PORT],"         , "  where FP is as given by i[dentity], HOST is your hostname or IP address,"         , "  and PORT is a non-standard port if you set one."-        , "  See " <> ddir </> "listen.conf" <> " for configuration options,"+        , "  See " <> ddir </> "htalkat.conf" <> " for configuration options,"         , "  and " <> ddir </> "notify.sh" <> " to set up notifications." ]

@@ -16,4 +16,4 @@ programName = "htalkat"  version :: String-version = "0.1.2.2"+version = "0.1.2.3"

@@ -1,6 +1,6 @@ cabal-version:      1.18 name:               htalkat-version:            0.1.2.2+version:            0.1.2.3 license:            GPL-3 license-file:       COPYING maintainer:         mbays@sdf.org@@ -60,7 +60,7 @@         array >=0.3 && <0.6,         asn1-encoding <0.10,         asn1-types >=0.3.4 && <0.4,-        bytestring >=0.10.8.0 && <0.12,+        bytestring >=0.10.8.0 && <0.13,         containers >=0.5.5.1 && <0.7,         cryptonite >=0.26 && <0.31,         data-default-class >=0.1.2.0 && <0.2,@@ -70,7 +70,7 @@         filelock <0.2,         filepath >=1.3.0.2 && <1.5,         hourglass >=0.2.12 && <0.3,-        memory >=0.14 && <0.18,+        memory >=0.14 && <0.19,         mtl >=2.0 && <2.4,         network >=2.4.2.3 && <3.2,         network-simple >=0.4.3 && <0.5,