Update delete-all-portals and remove commented code

commands.go

@@ -668,6 +668,25 @@ func (handler *CommandHandler) CommandHelp(ce *CommandEvent) {
 	}, "\n* "))
 }
 
+func canDeletePortal(portal *Portal, userID id.UserID) bool {
+	members, err := portal.MainIntent().JoinedMembers(portal.MXID)
+	if err != nil {
+		portal.log.Errorfln("Failed to get joined members to check if portal can be deleted by %s: %v", userID, err)
+		return false
+	}
+	for otherUser := range members.Joined {
+		_, isPuppet := portal.bridge.ParsePuppetMXID(otherUser)
+		if isPuppet || otherUser == portal.bridge.Bot.UserID || otherUser == userID {
+			continue
+		}
+		user := portal.bridge.GetUserByMXID(otherUser)
+		if user != nil && user.Session != nil {
+			return false
+		}
+	}
+	return true
+}
+
 const cmdDeletePortalHelp = `delete-portal - Delete the current portal. If the portal is used by other people, this is limited to bridge admins.`
 
 func (handler *CommandHandler) CommandDeletePortal(ce *CommandEvent) {
@@ -676,13 +695,8 @@ func (handler *CommandHandler) CommandDeletePortal(ce *CommandEvent) {
 		return
 	}
 
-	if !ce.User.Admin {
+	if !ce.User.Admin && !canDeletePortal(ce.Portal, ce.User.MXID) {
-		// TODO reimplement
+		ce.Reply("Only bridge admins can delete portals with other Matrix users")
-		//users := ce.Portal.GetUserIDs()
-		//if len(users) > 1 || (len(users) == 1 && users[0] != ce.User.MXID) {
-		//	ce.Reply("Only bridge admins can delete portals with other Matrix users")
-		//	return
-		//}
 		return
 	}
 
@@ -691,22 +705,22 @@ func (handler *CommandHandler) CommandDeletePortal(ce *CommandEvent) {
 	ce.Portal.Cleanup(false)
 }
 
-const cmdDeleteAllPortalsHelp = `delete-all-portals - Delete all your portals that aren't used by any other user.`
+const cmdDeleteAllPortalsHelp = `delete-all-portals - Delete all portals.`
 
 func (handler *CommandHandler) CommandDeleteAllPortals(ce *CommandEvent) {
-	// TODO reimplement
+	portals := handler.bridge.GetAllPortals()
-	//portals := ce.User.GetPortals()
+	var portalsToDelete []*Portal
-	//portalsToDelete := make([]*Portal, 0, len(portals))
+
-	//for _, portal := range portals {
+	if ce.User.Admin {
-	//	users := portal.GetUserIDs()
+		portals = portalsToDelete
-	//	if len(users) == 1 && users[0] == ce.User.MXID {
+	} else {
-	//		portalsToDelete = append(portalsToDelete, portal)
+		portalsToDelete = portals[:0]
-	//	}
+		for _, portal := range portals {
-	//}
+			if canDeletePortal(portal, ce.User.MXID) {
-	if !ce.User.Admin {
+				portalsToDelete = append(portalsToDelete, portal)
-		return
+			}
+		}
 	}
-	portalsToDelete := handler.bridge.GetAllPortals()
 
 	leave := func(portal *Portal) {
 		if len(portal.MXID) > 0 {
@@ -726,13 +740,12 @@ func (handler *CommandHandler) CommandDeleteAllPortals(ce *CommandEvent) {
 			}
 		}
 	}
-	ce.Reply("Found %d portals with no other users, deleting...", len(portalsToDelete))
+	ce.Reply("Found %d portals, deleting...", len(portalsToDelete))
 	for _, portal := range portalsToDelete {
 		portal.Delete()
 		leave(portal)
 	}
-	ce.Reply("Finished deleting portal info. Now cleaning up rooms in background. " +
+	ce.Reply("Finished deleting portal info. Now cleaning up rooms in background.")
-		"You may already continue using the bridge. Use `sync` to recreate portals.")
 
 	go func() {
 		for _, portal := range portalsToDelete {

database/portal.go

@@ -178,26 +178,3 @@ func (portal *Portal) Delete() {
 		portal.log.Warnfln("Failed to delete %s: %v", portal.Key, err)
 	}
 }
-
-//func (portal *Portal) GetUserIDs() []id.UserID {
-//	rows, err := portal.db.Query(`SELECT "user".mxid FROM "user", user_portal
-//		WHERE "user".jid=user_portal.user_jid
-//			AND user_portal.portal_jid=$1
-//			AND user_portal.portal_receiver=$2`,
-//		portal.Key.JID, portal.Key.Receiver)
-//	if err != nil {
-//		portal.log.Debugln("Failed to get portal user ids:", err)
-//		return nil
-//	}
-//	var userIDs []id.UserID
-//	for rows.Next() {
-//		var userID id.UserID
-//		err = rows.Scan(&userID)
-//		if err != nil {
-//			portal.log.Warnln("Failed to scan row:", err)
-//			continue
-//		}
-//		userIDs = append(userIDs, userID)
-//	}
-//	return userIDs
-//}

user.go

@@ -152,24 +152,6 @@ func (bridge *Bridge) loadDBUser(dbUser *database.User, mxid *id.UserID) *User {
 	return user
 }
 
-func (user *User) GetPortals() []*Portal {
-	// FIXME
-	//keys := user.User.GetPortalKeys()
-	//portals := make([]*Portal, len(keys))
-	//
-	//user.bridge.portalsLock.Lock()
-	//for i, key := range keys {
-	//	portal, ok := user.bridge.portalsByJID[key]
-	//	if !ok {
-	//		portal = user.bridge.loadDBPortal(user.bridge.DB.Portal.GetByJID(key), &key)
-	//	}
-	//	portals[i] = portal
-	//}
-	//user.bridge.portalsLock.Unlock()
-	//return portals
-	return nil
-}
-
 func (bridge *Bridge) NewUser(dbUser *database.User) *User {
 	user := &User{
 		User:   dbUser,