Map bridge types to cloud names

Author: tulir

cmd/bbctl/config.go

@@ -235,7 +235,7 @@ func doGenerateBridgeConfig(ctx *cli.Context, bridge string) (*generatedBridgeCo
 	existingBridge, ok := whoami.User.Bridges[bridge]
 	var bridgeType string
 	if ok && existingBridge.BridgeState.BridgeType != "" {
-		bridgeType = existingBridge.BridgeState.BridgeType
+		bridgeType = toInternalBridgeType(existingBridge.BridgeState.BridgeType)
 	} else {
 		bridgeType, err = guessOrAskBridgeType(bridge, ctx.String("type"))
 		if err != nil {

cmd/bbctl/register.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"cmp"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -69,6 +70,29 @@ type RegisterJSON struct {
 	YourUserID       id.UserID                `json:"your_user_id"`
 }
 
+var registerBridgeTypeMap = map[string]string{
+	"slack":     "slackgo",
+	"discord":   "discordgo",
+	"instagram": "instagramgo",
+	"facebook":  "facebookgo",
+}
+
+var reverseRegisterBridgeTypeMap = make(map[string]string, len(registerBridgeTypeMap))
+
+func init() {
+	for k, v := range registerBridgeTypeMap {
+		reverseRegisterBridgeTypeMap[v] = k
+	}
+}
+
+func toInternalBridgeType(typeName string) string {
+	return cmp.Or(reverseRegisterBridgeTypeMap[typeName], typeName)
+}
+
+func toCloudBridgeType(typeName string) string {
+	return cmp.Or(registerBridgeTypeMap[typeName], typeName)
+}
+
 func doRegisterBridge(ctx *cli.Context, bridge, bridgeType string, onlyGet bool) (*RegisterJSON, error) {
 	whoami, err := getCachedWhoami(ctx)
 	if err != nil {
@@ -107,6 +131,7 @@ func doRegisterBridge(ctx *cli.Context, bridge, bridgeType string, onlyGet bool)
 	// Remove the explicit bot user namespace (same as sender_localpart)
 	resp.Namespaces.UserIDs = resp.Namespaces.UserIDs[0:1]
 
+	bridgeType = toCloudBridgeType(bridgeType)
 	state := status.StateRunning
 	if (bridgeType != "" && bridgeType != "heisenbridge") || bridge == "androidsms" || bridge == "imessagecloud" || bridge == "imessage" {
 		state = status.StateStarting

cmd/bbctl/run.go

@@ -270,13 +270,13 @@ func runBridge(ctx *cli.Context) error {
 		if !ok || existingBridge.BridgeState.BridgeType == "" {
 			log.Printf("Existing bridge type not found, falling back to generating new config")
 			doWriteConfig = true
-		} else if reg, err := doRegisterBridge(ctx, bridgeName, existingBridge.BridgeState.BridgeType, true); err != nil {
+		} else if reg, err := doRegisterBridge(ctx, bridgeName, toInternalBridgeType(existingBridge.BridgeState.BridgeType), true); err != nil {
 			log.Printf("Failed to get existing bridge registration: %v", err)
 			log.Printf("Falling back to generating new config")
 			doWriteConfig = true
 		} else {
 			cfg = &generatedBridgeConfig{
-				BridgeType:   existingBridge.BridgeState.BridgeType,
+				BridgeType:   toInternalBridgeType(existingBridge.BridgeState.BridgeType),
 				RegisterJSON: reg,
 			}
 		}