|
@@ -19,8 +19,8 @@ package config
|
|
import (
|
|
import (
|
|
"strings"
|
|
"strings"
|
|
|
|
|
|
- "maunium.net/go/mautrix/appservice"
|
|
|
|
"maunium.net/go/mautrix/bridge/bridgeconfig"
|
|
"maunium.net/go/mautrix/bridge/bridgeconfig"
|
|
|
|
+ "maunium.net/go/mautrix/util"
|
|
up "maunium.net/go/mautrix/util/configupgrade"
|
|
up "maunium.net/go/mautrix/util/configupgrade"
|
|
)
|
|
)
|
|
|
|
|
|
@@ -128,7 +128,7 @@ func DoUpgrade(helper *up.Helper) {
|
|
if secret, ok := helper.Get(up.Str, "appservice", "provisioning", "shared_secret"); ok && secret != "generate" {
|
|
if secret, ok := helper.Get(up.Str, "appservice", "provisioning", "shared_secret"); ok && secret != "generate" {
|
|
helper.Set(up.Str, secret, "bridge", "provisioning", "shared_secret")
|
|
helper.Set(up.Str, secret, "bridge", "provisioning", "shared_secret")
|
|
} else if secret, ok = helper.Get(up.Str, "bridge", "provisioning", "shared_secret"); !ok || secret == "generate" {
|
|
} else if secret, ok = helper.Get(up.Str, "bridge", "provisioning", "shared_secret"); !ok || secret == "generate" {
|
|
- sharedSecret := appservice.RandomString(64)
|
|
|
|
|
|
+ sharedSecret := util.RandomString(64)
|
|
helper.Set(up.Str, sharedSecret, "bridge", "provisioning", "shared_secret")
|
|
helper.Set(up.Str, sharedSecret, "bridge", "provisioning", "shared_secret")
|
|
} else {
|
|
} else {
|
|
helper.Copy(up.Str, "bridge", "provisioning", "shared_secret")
|
|
helper.Copy(up.Str, "bridge", "provisioning", "shared_secret")
|