Some refactoring
parent
0d8e7ae973
commit
7a93179468
|
@ -58,6 +58,7 @@ pingPong state IdleMsg { .. } | even (convert msgTime :: Int) = do
|
||||||
if addUTCTime limit lastComm < msgTime
|
if addUTCTime limit lastComm < msgTime
|
||||||
then return . Just . PingCmd . pack . formatTime defaultTimeLocale "%s" $ msgTime
|
then return . Just . PingCmd . pack . formatTime defaultTimeLocale "%s" $ msgTime
|
||||||
else return Nothing
|
else return Nothing
|
||||||
|
|
||||||
pingPong _ _ = return Nothing
|
pingPong _ _ = return Nothing
|
||||||
|
|
||||||
greeter :: MonadMsgHandler m => Message -> m (Maybe Command)
|
greeter :: MonadMsgHandler m => Message -> m (Maybe Command)
|
||||||
|
|
|
@ -35,9 +35,6 @@ getByCanonicalNick canonicalNick = do
|
||||||
NickTracking { .. } <- ask
|
NickTracking { .. } <- ask
|
||||||
return . IS.toList $ nickTracking @= canonicalNick
|
return . IS.toList $ nickTracking @= canonicalNick
|
||||||
|
|
||||||
--getLastSeenOn :: CanonicalNick -> Query NickTracking LastSeenOn
|
|
||||||
--getLastSeenOn = liftM (minimumEx . map lastSeenOn) . getByCanonicalNick
|
|
||||||
|
|
||||||
saveNickTrack :: NickTrack -> Update NickTracking ()
|
saveNickTrack :: NickTrack -> Update NickTracking ()
|
||||||
saveNickTrack nt = do
|
saveNickTrack nt = do
|
||||||
NickTracking { .. } <- get
|
NickTracking { .. } <- get
|
||||||
|
@ -87,38 +84,37 @@ nickTrackerMsg state = go
|
||||||
|
|
||||||
commands = [ ("!nick", handleNickCommand)
|
commands = [ ("!nick", handleNickCommand)
|
||||||
, ("!seen", handleSeenCommand) ]
|
, ("!seen", handleSeenCommand) ]
|
||||||
|
|
||||||
handleCommands message = case find ((`isPrefixOf` message) . fst) commands of
|
handleCommands message = case find ((`isPrefixOf` message) . fst) commands of
|
||||||
Nothing -> return Nothing
|
Nothing -> return Nothing
|
||||||
Just (_, handler) -> handler state message
|
Just (_, handler) -> handler state message
|
||||||
|
|
||||||
withCanonicalNick :: MonadMsgHandler m => IORef (AcidState NickTracking)
|
withNickTracks :: MonadMsgHandler m
|
||||||
-> Text
|
=> IORef (AcidState NickTracking) -> Text -> (Text -> [NickTrack] -> IO Text)
|
||||||
-> (AcidState NickTracking -> Text -> CanonicalNick -> IO Text)
|
|
||||||
-> m (Maybe Command)
|
-> m (Maybe Command)
|
||||||
withCanonicalNick state msg f = liftIO $ do
|
withNickTracks state msg f = liftIO $ do
|
||||||
acid <- readIORef state
|
acid <- readIORef state
|
||||||
let nck = clean . unwords . drop 1 . words $ msg
|
let nick = clean . unwords . drop 1 . words $ msg
|
||||||
mcn <- liftM (map canonicalNick) . query acid . GetByNick $ Nick nck
|
mcn <- liftM (map canonicalNick) . query acid . GetByNick $ Nick nick
|
||||||
resp <- case mcn of
|
resp <- case mcn of
|
||||||
Nothing -> return $ "Unknown nick: " ++ nck
|
Nothing -> return $ "Unknown nick: " ++ nick
|
||||||
Just cn -> liftIO $ f acid nck cn
|
Just cn -> liftIO $ query acid (GetByCanonicalNick cn) >>= f nick
|
||||||
return . Just . ChannelMsgReply $ resp
|
return . Just . ChannelMsgReply $ resp
|
||||||
|
|
||||||
handleNickCommand :: MonadMsgHandler m => IORef(AcidState NickTracking) -> Text -> m (Maybe Command)
|
handleNickCommand :: MonadMsgHandler m => IORef(AcidState NickTracking) -> Text -> m (Maybe Command)
|
||||||
handleNickCommand state msg = withCanonicalNick state msg $ \acid nck canonicalNick -> do
|
handleNickCommand state msg = withNickTracks state msg $ \nck nickTracks -> do
|
||||||
nicks <- liftM (map ((\(Nick n) -> n) . nick)) . query acid . GetByCanonicalNick $ canonicalNick
|
let nicks = map ((\(Nick n) -> n) . nick) nickTracks
|
||||||
if length nicks == 1
|
if length nicks == 1
|
||||||
then return $ nck ++ " has only one nick"
|
then return $ nck ++ " has only one nick"
|
||||||
else return $ nck ++ "'s other nicks are: " ++ intercalate ", " (filter (/= nck) nicks)
|
else return $ nck ++ "'s other nicks are: " ++ intercalate ", " (filter (/= nck) nicks)
|
||||||
|
|
||||||
handleSeenCommand :: MonadMsgHandler m => IORef(AcidState NickTracking) -> Text -> m (Maybe Command)
|
handleSeenCommand :: MonadMsgHandler m => IORef(AcidState NickTracking) -> Text -> m (Maybe Command)
|
||||||
handleSeenCommand state msg = withCanonicalNick state msg $ \acid nick canonicalNick -> do
|
handleSeenCommand state msg = withNickTracks state msg $ \nick nickTracks -> do
|
||||||
nts <- query acid . GetByCanonicalNick $ canonicalNick
|
|
||||||
let NickTrack { lastSeenOn = LastSeenOn lastSeenOn'
|
let NickTrack { lastSeenOn = LastSeenOn lastSeenOn'
|
||||||
, nick = Nick lastSeenAs } = maximumByEx (comparing lastSeenOn) nts
|
, nick = Nick lastSeenAs } = maximumByEx (comparing lastSeenOn) nickTracks
|
||||||
let NickTrack { lastMessageOn = lastMessageOn'
|
let NickTrack { lastMessageOn = lastMessageOn'
|
||||||
, lastMessage = lastMessage'
|
, lastMessage = lastMessage'
|
||||||
, nick = Nick lastMessageAs } = maximumByEx (comparing lastMessageOn) nts
|
, nick = Nick lastMessageAs } = maximumByEx (comparing lastMessageOn) nickTracks
|
||||||
|
|
||||||
return $ nick ++ " was last seen on " ++ fmtTime lastSeenOn' ++
|
return $ nick ++ " was last seen on " ++ fmtTime lastSeenOn' ++
|
||||||
(if nick /= lastSeenAs then " as " ++ lastSeenAs else "") ++
|
(if nick /= lastSeenAs then " as " ++ lastSeenAs else "") ++
|
||||||
|
|
Loading…
Reference in New Issue