1 files changed, 19 insertions(+), 10 deletions(-)

M gateway.hs

@@ 46,16 46,25 @@ handlePresence config presence@XMPP.Presence {
 }
 	| typ == XMPP.PresenceAvailable,
 	  hasMucCode 110 presence, -- done joining room
-	  Just source <- (XMPP.parseJID . unescapeJid . XMPP.strNode) =<< XMPP.jidNode to = do
-		when (bareTxt to == bareTxt (Config.bridgeJid config)) $ Session.cleanOld config from
-		liftIO $ DB.execute (Config.db config)
-			(s"UPDATE sessions SET target_nick=? WHERE source_muc=? AND source_nick=? AND target_muc=?")
-			(
-				XMPP.strResource <$> XMPP.jidResource from,
-				bareTxt source,
-				XMPP.strResource <$> XMPP.jidResource source,
-				bareTxt from
-			)
+	  bareTxt to == bareTxt (Config.bridgeJid config) = do
+		liftIO $ DB.withTransaction (Config.db config) $ do
+			DB.execute (Config.db config)
+				(s"DELETE FROM sessions WHERE source_muc=? AND target_muc=?")
+				(Nothing :: Maybe Text, bareTxt from)
+			Session.mkSession config XMPP.PresenceAvailable Nothing from
+		Session.cleanOld config from
+	| typ == XMPP.PresenceAvailable,
+	  hasMucCode 110 presence, -- done joining room
+	  Just source <- (XMPP.parseJID . unescapeJid . XMPP.strNode) =<< XMPP.jidNode to =
+		liftIO $ DB.withTransaction (Config.db config) $ do
+			DB.execute (Config.db config)
+				(s"DELETE FROM sessions WHERE source_muc=? AND source_nick=? AND target_muc=?")
+				(
+					bareTxt source,
+					XMPP.strResource <$> XMPP.jidResource source,
+					bareTxt from
+				)
+			Session.mkSession config XMPP.PresenceAvailable (Just source) from
 	| typ == XMPP.PresenceUnavailable,
 	  hasMucCode 110 presence, -- done leaving room
 	  Just source <- (XMPP.parseJID . unescapeJid . XMPP.strNode) =<< XMPP.jidNode to =