make liftAnnex and liftAssistant polymorphic, like liftIO

Assistant/WebApp/Configurators/AWS.hs

@@ -143,7 +143,7 @@ getAddGlacierR = glacierConfigurator $ do
 				]
 		_ -> $(widgetFile "configurators/addglacier")
   where
-	setgroup r = liftAnnex $
+	setgroup r = liftAnnex $ 
 		setStandardGroup (Remote.uuid r) SmallArchiveGroup
 
 getEnableS3R :: UUID -> Handler RepHtml
@@ -167,7 +167,7 @@ enableAWSRemote remotetype uuid = do
 				fromJust $ M.lookup uuid m
 			makeAWSRemote remotetype creds name (const noop) M.empty
 		_ -> do
-			description <- lift $ liftAnnex $
+			description <- liftAnnex $
 				T.pack . concat <$> Remote.prettyListUUIDs [uuid]
 			$(widgetFile "configurators/enableaws")
 

Assistant/WebApp/Configurators/Edit.hs

@@ -119,8 +119,8 @@ getEditNewCloudRepositoryR uuid = xmppNeeded >> editForm True uuid
 
 editForm :: Bool -> UUID -> Handler RepHtml
 editForm new uuid = page "Configure repository" (Just Configuration) $ do
-	mremote <- lift $ liftAnnex $ Remote.remoteFromUUID uuid
-	curr <- lift $ liftAnnex $ getRepoConfig uuid mremote
+	mremote <- liftAnnex $ Remote.remoteFromUUID uuid
+	curr <- liftAnnex $ getRepoConfig uuid mremote
 	lift $ checkarchivedirectory curr
 	((result, form), enctype) <- lift $
 		runFormGet $ renderBootstrap $ editRepositoryAForm curr

Assistant/WebApp/Configurators/Local.hs

@@ -227,7 +227,7 @@ combineRepos dir name = liftAnnex $ do
 
 getEnableDirectoryR :: UUID -> Handler RepHtml
 getEnableDirectoryR uuid = page "Enable a repository" (Just Configuration) $ do
-	description <- lift $ liftAnnex $
+	description <- liftAnnex $
 		T.pack . concat <$> prettyListUUIDs [uuid]
 	$(widgetFile "configurators/enabledirectory")
 

Assistant/WebApp/Configurators/Pairing.hs

@@ -214,10 +214,10 @@ startLocalPairing stage oncancel alert muuid displaysecret secret = do
 	urlrender <- lift getUrlRender
 	reldir <- fromJust . relDir <$> lift getYesod
 
-	sendrequests <- lift $ liftAssistant $ asIO2 $ mksendrequests urlrender
+	sendrequests <- liftAssistant $ asIO2 $ mksendrequests urlrender
 	{- Generating a ssh key pair can take a while, so do it in the
 	 - background. -}
-	thread <- lift $ liftAssistant $ asIO $ do
+	thread <- liftAssistant $ asIO $ do
 		keypair <- liftIO $ genSshKeyPair
 		pairdata <- liftIO $ PairData
 			<$> getHostname

Assistant/WebApp/Configurators/Ssh.hs

@@ -133,7 +133,7 @@ getEnableRsyncR u = do
 		_ -> redirect AddSshR
   where
 	showform form enctype status = do
-		description <- lift $ liftAnnex $
+		description <- liftAnnex $
 			T.pack . concat <$> prettyListUUIDs [u]
 		$(widgetFile "configurators/ssh/enable")
 	enable sshdata = lift $ redirect $ ConfirmSshR $

Assistant/WebApp/Configurators/WebDAV.hs

@@ -108,7 +108,7 @@ getEnableWebDAVR uuid = do
 			FormSuccess input -> lift $
 				makeWebDavRemote name (toCredPair input) (const noop) M.empty
 			_ -> do
-				description <- lift $ liftAnnex $
+				description <- liftAnnex $
 					T.pack . concat <$> Remote.prettyListUUIDs [uuid]
 				$(widgetFile "configurators/enablewebdav")
 #else

Assistant/WebApp/Configurators/XMPP.hs

@@ -85,7 +85,7 @@ getBuddyName u = go =<< getclientjid
 getNeedCloudRepoR :: UUID -> Handler RepHtml
 #ifdef WITH_XMPP
 getNeedCloudRepoR for = page "Cloud repository needed" (Just Configuration) $ do
-	buddyname <- lift $ liftAssistant $ getBuddyName for
+	buddyname <- liftAssistant $ getBuddyName for
 	$(widgetFile "configurators/xmpp/needcloudrepo")
 #else
 needCloudRepoR = xmppPage $
@@ -129,9 +129,9 @@ buddyListDisplay :: Widget
 buddyListDisplay = do
 	autoUpdate ident NotifierBuddyListR (10 :: Int) (10 :: Int)
 #ifdef WITH_XMPP
-	myjid <- lift $ liftAssistant $ xmppClientID <$> getDaemonStatus
+	myjid <- liftAssistant $ xmppClientID <$> getDaemonStatus
 	let isself (BuddyKey b) = Just b == myjid
-	buddies <- lift $ liftAssistant $ do
+	buddies <- liftAssistant $ do
 		pairedwith <- map fst <$> getXMPPRemotes
 		catMaybes . map (buddySummary pairedwith)
 			<$> (getBuddyList <<~ buddyList)