bridgev2/mxmain: handle GetConfig returning a nil upgrader

mautrix · Jul 1, 2024 · d86f710 · d86f710
1 parent c6e87a2
commit d86f710
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bridgev2/matrix/mxmain/main.go b/bridgev2/matrix/mxmain/main.go
@@ -306,6 +306,9 @@ func (br *BridgeMain) validateConfig() error {
 func (br *BridgeMain) getConfigUpgrader() (configupgrade.BaseUpgrader, any) {
 	networkExample, networkData, networkUpgrader := br.Connector.GetConfig()
 	baseConfig := br.makeFullExampleConfig(networkExample)
+	if networkUpgrader == nil {
+		networkUpgrader = configupgrade.NoopUpgrader
+	}
 	networkUpgraderProxied := &configupgrade.ProxyUpgrader{Target: networkUpgrader, Prefix: []string{"network"}}
 	upgrader := configupgrade.MergeUpgraders(baseConfig, networkUpgraderProxied, bridgeconfig.Upgrader)
 	return upgrader, networkData

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/tidwall/gjson v1.17.1
 	github.com/tidwall/sjson v1.2.5
 	github.com/yuin/goldmark v1.7.4
-	go.mau.fi/util v0.5.1-0.20240629220711-4fa40bf64652
+	go.mau.fi/util v0.5.1-0.20240701063757-6126777abba3
 	go.mau.fi/zeroconfig v0.1.2
 	golang.org/x/crypto v0.24.0
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8

diff --git a/go.sum b/go.sum
@@ -46,8 +46,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg=
 github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
-go.mau.fi/util v0.5.1-0.20240629220711-4fa40bf64652 h1:/wY7vpwOE6he5Qlf6lICHuOUs+nAQdsC7qwRsDbsh14=
-go.mau.fi/util v0.5.1-0.20240629220711-4fa40bf64652/go.mod h1:DsJzUrJAG53lCZnnYvq9/mOyLuPScWwYhvETiTrpdP4=
+go.mau.fi/util v0.5.1-0.20240701063757-6126777abba3 h1:EeFfeO2CheFO3HU6SCVQiP6dY8Wwv6dUyJ2SKtPyE70=
+go.mau.fi/util v0.5.1-0.20240701063757-6126777abba3/go.mod h1:DsJzUrJAG53lCZnnYvq9/mOyLuPScWwYhvETiTrpdP4=
 go.mau.fi/zeroconfig v0.1.2 h1:DKOydWnhPMn65GbXZOafgkPm11BvFashZWLct0dGFto=
 go.mau.fi/zeroconfig v0.1.2/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
 golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=