watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Brandon Watson
2023-09-06 22:17:06 -05:00
parent 3db8e1da05
commit d6f94287d4
17 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/bridge.go
View File

@ -188,10 +188,13 @@ type UsernameTemplateArgs struct {
func (bc BridgeConfig) FormatDisplayname(gmid groupme.ID, member groupme.Member) string {
var buf strings.Builder
_ = bc.displaynameTemplate.Execute(&buf, map[string]string{
err := bc.displaynameTemplate.Execute(&buf, map[string]string{
"Name": member.Nickname,
"GMID": gmid.String(),
})
if err != nil {
fmt.Println(err)
}
return buf.String()
}

6
config/upgrade.go
View File

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