Add portal rooms to user-specific community for filtering

database/upgrades/2019-08-10-portal-in-community-field.go

@@ -0,0 +1,12 @@
+package upgrades
+
+import (
+	"database/sql"
+)
+
+func init() {
+	upgrades[8] = upgrade{"Add columns to store portal in filtering community meta", func(dialect Dialect, tx *sql.Tx, db *sql.DB) error {
+		_, err := tx.Exec(`ALTER TABLE user_portal ADD COLUMN in_community BOOLEAN NOT NULL DEFAULT FALSE`)
+		return err
+	}}
+}

database/upgrades/upgrades.go

@@ -22,7 +22,7 @@ type upgrade struct {
 	fn upgradeFunc
 }
 
-const NumberOfUpgrades = 8
+const NumberOfUpgrades = 9
 
 var upgrades [NumberOfUpgrades]upgrade
 

database/user.go

@@ -166,7 +166,12 @@ func (user *User) Update() {
 	}
 }
 
-func (user *User) SetPortalKeys(newKeys []PortalKey) error {
+type PortalKeyWithMeta struct {
+	PortalKey
+	InCommunity bool
+}
+
+func (user *User) SetPortalKeys(newKeys []PortalKeyWithMeta) error {
 	tx, err := user.db.Begin()
 	if err != nil {
 		return err
@@ -177,14 +182,16 @@ func (user *User) SetPortalKeys(newKeys []PortalKey) error {
 		return err
 	}
 	valueStrings := make([]string, len(newKeys))
-	values := make([]interface{}, len(newKeys)*3)
+	values := make([]interface{}, len(newKeys)*4)
 	for i, key := range newKeys {
-		valueStrings[i] = fmt.Sprintf("($%d, $%d, $%d)", i*3+1, i*3+2, i*3+3)
-		values[i*3] = user.jidPtr()
-		values[i*3+1] = key.JID
-		values[i*3+2] = key.Receiver
+		pos := i * 4
+		valueStrings[i] = fmt.Sprintf("($%d, $%d, $%d, $%d)", pos+1, pos+2, pos+3, pos+4)
+		values[pos] = user.jidPtr()
+		values[pos+1] = key.JID
+		values[pos+2] = key.Receiver
+		values[pos+3] = key.InCommunity
 	}
-	query := fmt.Sprintf("INSERT INTO user_portal (user_jid, portal_jid, portal_receiver) VALUES %s",
+	query := fmt.Sprintf("INSERT INTO user_portal (user_jid, portal_jid, portal_receiver, in_community) VALUES %s",
 		strings.Join(valueStrings, ", "))
 	_, err = tx.Exec(query, values...)
 	if err != nil {
@@ -212,3 +219,23 @@ func (user *User) GetPortalKeys() []PortalKey {
 	}
 	return keys
 }
+
+func (user *User) GetInCommunityMap() map[PortalKey]bool {
+	rows, err := user.db.Query(`SELECT portal_jid, portal_receiver, in_community FROM user_portal WHERE user_jid=$1`, user.jidPtr())
+	if err != nil {
+		user.log.Warnln("Failed to get user portal keys:", err)
+		return nil
+	}
+	keys := make(map[PortalKey]bool)
+	for rows.Next() {
+		var key PortalKey
+		var inCommunity bool
+		err = rows.Scan(&key.JID, &key.Receiver, &inCommunity)
+		if err != nil {
+			user.log.Warnln("Failed to scan row:", err)
+			continue
+		}
+		keys[key] = inCommunity
+	}
+	return keys
+}