Update mautrix-go (and update to new metadata system)

pkg/connector/client.go

@@ -14,6 +14,7 @@ import (
 	"go.mau.fi/zerozap"
 	"go.uber.org/zap"
 	"maunium.net/go/mautrix/bridgev2"
+	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
 
 	"go.mau.fi/mautrix-telegram/pkg/connector/ids"
@@ -187,10 +188,10 @@ func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta
 		return nil, err
 	}
 	var name string
+	roomType := database.RoomTypeDM
 	memberList := &bridgev2.ChatMemberList{
 		IsFull: true, // TODO not true for channels
 	}
-	var isSpace, isDM bool
 	var avatar *bridgev2.Avatar
 
 	switch peerType {
@@ -221,9 +222,9 @@ func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta
 					},
 				},
 			}
-			isDM = true
 		}
 	case ids.PeerTypeChat:
+		roomType = database.RoomTypeGroupDM
 		fullChat, err := t.client.API().MessagesGetFullChat(ctx, id)
 		if err != nil {
 			return nil, err
@@ -265,11 +266,10 @@ func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta
 	}
 
 	return &bridgev2.ChatInfo{
-		Name:         &name,
-		Avatar:       avatar,
-		Members:      memberList,
-		IsDirectChat: &isDM,
-		IsSpace:      &isSpace,
+		Name:    &name,
+		Avatar:  avatar,
+		Members: memberList,
+		Type:    &roomType,
 	}, nil
 }
 
@@ -315,11 +315,16 @@ func (t *TelegramClient) getUserInfoFromTelegramUser(user *tg.User) (*bridgev2.U
 
 	name := util.FormatFullName(user.FirstName, user.LastName)
 	return &bridgev2.UserInfo{
-		IsBot:        &user.Bot,
-		Name:         &name,
-		Avatar:       avatar,
-		Identifiers:  identifiers,
-		ExtraUpdates: bridgev2.SimpleMetadataUpdater[*bridgev2.Ghost]("fi.mau.telegram.is_premium", user.Premium),
+		IsBot:       &user.Bot,
+		Name:        &name,
+		Avatar:      avatar,
+		Identifiers: identifiers,
+		ExtraUpdates: func(ctx context.Context, ghost *bridgev2.Ghost) (changed bool) {
+			meta := ghost.Metadata.(*GhostMetadata)
+			changed = meta.IsPremium != user.Premium
+			meta.IsPremium = user.Premium
+			return changed
+		},
 	}, nil
 }
 

pkg/connector/config.go

@@ -7,6 +7,7 @@ import (
 
 	up "go.mau.fi/util/configupgrade"
 	"maunium.net/go/mautrix/bridgev2"
+	"maunium.net/go/mautrix/bridgev2/database"
 
 	"go.mau.fi/mautrix-telegram/pkg/connector/media"
 )
@@ -49,3 +50,25 @@ func (tg *TelegramConnector) ValidateConfig() error {
 	}
 	return nil
 }
+
+func (tg *TelegramConnector) GetDBMetaTypes() database.MetaTypes {
+	return database.MetaTypes{
+		Ghost: func() any {
+			return &GhostMetadata{}
+		},
+		Portal:   nil,
+		Message:  nil,
+		Reaction: nil,
+		UserLogin: func() any {
+			return &UserLoginMetadata{}
+		},
+	}
+}
+
+type GhostMetadata struct {
+	IsPremium bool `json:"is_premium"`
+}
+
+type UserLoginMetadata struct {
+	Phone string `json:"phone"`
+}

pkg/connector/login.go

@@ -193,10 +193,8 @@ func (p *PhoneLogin) handleAuthSuccess(ctx context.Context, authorization *tg.Au
 	userLoginID := ids.MakeUserLoginID(authorization.User.GetID())
 	ul, err := p.user.NewLogin(ctx, &database.UserLogin{
 		ID: userLoginID,
-		Metadata: database.UserLoginMetadata{
-			Extra: map[string]any{
-				"phone": p.phone,
-			},
+		Metadata: UserLoginMetadata{
+			Phone: p.phone,
 		},
 	}, nil)
 	if err != nil {

pkg/connector/telegram.go

@@ -352,7 +352,7 @@ func (t *TelegramClient) getReactionLimit(ctx context.Context, sender networkid.
 	if err != nil {
 		return 0, err
 	}
-	if isPremium, ok := ghost.Metadata.Extra["fi.mau.telegram.is_premium"].(bool); ok && isPremium {
+	if ghost.Metadata.(*GhostMetadata).IsPremium {
 		return int(config["reactions_user_max_premium"].(float64)), nil
 	} else {
 		return int(config["reactions_user_max_default"].(float64)), nil