adyxax/hsbot
Archived
1
0
Fork 0
Code Issues Activity

Improved last active quote handling.

Browse source
This commit is contained in:
Julien Dessaux 2011-09-19 00:35:41 +02:00
parent 2d97af231e
commit 9bbb6228a0
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Hsbot/Plugin/Quote.hs
View file

@ -86,8 +86,9 @@ isQuoteLockedFor quoteId requestor now = do
Nothing -> return $ Just True Nothing -> return $ Just True
Nothing -> return Nothing Nothing -> return Nothing
lockQuoteIdFor :: QuoteID -> IRC.UserName -> UTCTime -> Update QuoteDB () lockQuoteIdFor :: QuoteID -> IRC.UserName -> IRC.Channel -> UTCTime -> Update QuoteDB ()
lockQuoteIdFor quoteId requestor now = get >>= \db -> put db { lockedQuotes = M.insert quoteId (requestor, now) (lockedQuotes db) } lockQuoteIdFor quoteId requestor channel now = get >>= \db -> put db { lockedQuotes = M.insert quoteId (requestor, now) (lockedQuotes db)
, lastActive = M.insert channel quoteId (lastActive db) }
setQuote :: QuoteID -> Quote -> Update QuoteDB () setQuote :: QuoteID -> Quote -> Update QuoteDB ()
setQuote quoteId theQuote = get >>= \db -> put db { quoteBotDB = M.insert quoteId theQuote (quoteBotDB db) } setQuote quoteId theQuote = get >>= \db -> put db { quoteBotDB = M.insert quoteId theQuote (quoteBotDB db) }
@ -95,11 +96,8 @@ setQuote quoteId theQuote = get >>= \db -> put db { quoteBotDB = M.insert quoteI
getLastActiveQuote :: IRC.Channel -> Query QuoteDB (Maybe QuoteID) getLastActiveQuote :: IRC.Channel -> Query QuoteDB (Maybe QuoteID)
getLastActiveQuote channel = asks lastActive >>= return . M.lookup channel getLastActiveQuote channel = asks lastActive >>= return . M.lookup channel
setLastActiveQuote :: QuoteID -> IRC.Channel -> Update QuoteDB ()
setLastActiveQuote quoteId channel = get >>= \db -> put db { lastActive = M.insert channel quoteId (lastActive db)}
$(makeAcidic ''QuoteDB [ 'getQuote, 'getQuoteDB, 'isQuoteLockedFor, 'lockQuoteIdFor, 'setQuote $(makeAcidic ''QuoteDB [ 'getQuote, 'getQuoteDB, 'isQuoteLockedFor, 'lockQuoteIdFor, 'setQuote
, 'getLastActiveQuote, 'setLastActiveQuote ]) , 'getLastActiveQuote ])
-- | gets a random quote from the database -- | gets a random quote from the database
getRandomQuote :: AcidState QuoteDB -> IO (Maybe Quote) getRandomQuote :: AcidState QuoteDB -> IO (Maybe Quote)
@ -173,12 +171,11 @@ quoteAppend quoteDB msg quoteID quotee text = do
activeLock <- query' quoteDB (IsQuoteLockedFor quoteID sender now) activeLock <- query' quoteDB (IsQuoteLockedFor quoteID sender now)
case activeLock of case activeLock of
Just True -> do Just True -> do
_ <- update' quoteDB (LockQuoteIdFor quoteID sender now) _ <- update' quoteDB (LockQuoteIdFor quoteID sender channel now)
mQuote <- query' quoteDB (GetQuote quoteID) mQuote <- query' quoteDB (GetQuote quoteID)
let newQuote = fromMaybe emptyQuote mQuote let newQuote = fromMaybe emptyQuote mQuote
newQuote' = newQuote { quotE = quotE newQuote ++ [ QuoteElt { eltQuotee = quotee, eltQuote = text } ] } newQuote' = newQuote { quotE = quotE newQuote ++ [ QuoteElt { eltQuotee = quotee, eltQuote = text } ] }
_ <- update' quoteDB (SetQuote quoteID newQuote') _ <- update' quoteDB (SetQuote quoteID newQuote')
_ <- update' quoteDB (SetLastActiveQuote quoteID (getChannel msg))
answerMsg msg $ sender ++ ": Appended to quote " ++ show quoteID answerMsg msg $ sender ++ ": Appended to quote " ++ show quoteID
Just False -> answerMsg msg $ sender ++ ": Someone else is editing this quote right now." Just False -> answerMsg msg $ sender ++ ": Someone else is editing this quote right now."
Nothing -> answerMsg msg $ sender ++ ":quoteId not found." Nothing -> answerMsg msg $ sender ++ ":quoteId not found."