~singpolyma/cheogram-muc-bridge

a6194876f15973d328ce46bae51d0dc3ceec59da — Stephen Paul Weber 2 years ago c368481
Warnings clean
3 files changed, 5 insertions(+), 6 deletions(-)

M Config.hs
M IQManager.hs
M Router.hs
M Config.hs => Config.hs +4 -4
@@ 28,17 28,17 @@ s = fromString
setup :: Text -> IO Config
setup expr = do
	configFile <- Dhall.input Dhall.auto expr
	Just bridgeJid <- return $ XMPP.parseJID $ s"bridge@" ++
	Just _bridgeJid <- return $ XMPP.parseJID $ s"bridge@" ++
		XMPP.formatJID (ConfigFile.componentJid configFile) ++ s"/bridge"
	db <- DB.open (textToString $ ConfigFile.db configFile)
	_db <- DB.open (textToString $ ConfigFile.db configFile)
	now <- getPOSIXTime
	return $ Config {
			componentJid = ConfigFile.componentJid configFile,
			server = ConfigFile.server configFile,
			secret = ConfigFile.secret configFile,
			nick = ConfigFile.nick configFile,
			bridgeJid = bridgeJid,
			db = db,
			bridgeJid = _bridgeJid,
			db = _db,
			dbVersion = ceiling now,
			mucs = ConfigFile.mucs configFile
		}

M IQManager.hs => IQManager.hs +1 -1
@@ 59,7 59,7 @@ iqReceiver responseMapVar receivedIQ
			return maybeIqResponseVar
		case maybeIqResponseVar of
			Just iqResponseVar -> do
				atomicUIO $ tryPutTMVar iqResponseVar receivedIQ
				void $ atomicUIO $ tryPutTMVar iqResponseVar receivedIQ
				return Nothing
			Nothing -> return (Just receivedIQ)
	| otherwise = return $ Just receivedIQ

M Router.hs => Router.hs +0 -1
@@ 5,7 5,6 @@ import BasicPrelude
import Control.Error                   (ExceptT (..))
import qualified Network.Protocol.XMPP as XMPP

import Util

runRoutedComponent ::
	   XMPP.Server