commands: remove unnecessary sync types

pkg/connector/commands.go

@@ -18,72 +18,40 @@ package connector
 
 import (
 	"slices"
-	"sync"
 
+	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/commands"
-
+	"maunium.net/go/mautrix/format"
-	"go.mau.fi/mautrix-telegram/pkg/gotd/tg"
 )
 
-var cmdSync = &commands.FullHandler{
+var cmdSyncChats = &commands.FullHandler{
-	Func: fnSync,
+	Func: fnSyncChats,
-	Name: "sync",
+	Name: "sync-chats",
 	Help: commands.HelpMeta{
 		Section:     commands.HelpSectionChats,
-		Description: "Synchronize your chat portals, contacts and/or own info.",
+		Description: "Synchronize your chats",
-		Args:        "[`chats`|`contacts`|`me`]",
+		Args:        "[_login ID_]",
 	},
 	RequiresLogin: true,
 }
 
-func fnSync(ce *commands.Event) {
+func fnSyncChats(ce *commands.Event) {
-	var only string
+	logins := ce.User.GetUserLogins()
 	if len(ce.Args) > 0 {
-		if !slices.Contains([]string{"chats", "contacts", "me"}, ce.Args[0]) {
+		logins = slices.DeleteFunc(logins, func(login *bridgev2.UserLogin) bool {
-			ce.Reply("Invalid argument. Use `chats`, `contacts` or `me`.")
+			return !slices.Contains(ce.Args, string(login.ID))
+		})
+		if len(logins) == 0 {
+			ce.Reply("No matching logins found with provided ID(s)")
 			return
 		}
-		only = ce.Args[0]
 	}
-
+	for _, login := range logins {
-	var wg sync.WaitGroup
-	for _, login := range ce.User.GetUserLogins() {
 		client := login.Client.(*TelegramClient)
-		if only == "" || only == "chats" {
+		if err := client.syncChats(ce.Ctx, 0, false, true); err != nil {
-			ce.Reply("Synchronizing chats for %s...", login.ID)
+			ce.Reply("Failed to synchronize chats for %s: %v", format.SafeMarkdownCode(login.ID), err)
-			wg.Add(1)
+		} else {
-			go func() {
+			ce.Reply("Successfully synchronized chats for %s", format.SafeMarkdownCode(login.ID))
-				defer wg.Done()
-				if err := client.syncChats(ce.Ctx, 0, false, true); err != nil {
-					ce.Reply("Failed to synchronize chats for %s: %v", login.ID, err)
-				}
-			}()
-		}
-		if only == "" || only == "contacts" {
-			ce.Reply("Synchronizing contacts...")
-			wg.Add(1)
-			go func() {
-				// TODO
-				ce.Reply("Contact sync is not yet implemented!")
-				defer wg.Done()
-			}()
-		}
-		if only == "" || only == "me" {
-			ce.Reply("Synchronizing your info...")
-			wg.Add(1)
-			go func() {
-				wg.Done()
-				if users, err := client.client.API().UsersGetUsers(ce.Ctx, []tg.InputUserClass{&tg.InputUserSelf{}}); err != nil {
-					ce.Reply("Failed to get your info for %s: %v", login.ID, err)
-				} else if len(users) == 0 {
-					ce.Reply("Failed to get your info for %s: no users returned", login.ID)
-				} else if users[0].TypeID() != tg.UserTypeID {
-					ce.Reply("Unexpected user type %s", users[0].TypeName())
-				} else if _, err = client.updateGhost(ce.Ctx, client.telegramUserID, users[0].(*tg.User)); err != nil {
-					ce.Reply("Failed to update your info for %s: %v", login.ID, err)
-				}
-			}()
 		}
 	}
-	wg.Wait()
 }

pkg/connector/connector.go

@@ -41,7 +41,7 @@ var _ bridgev2.MaxFileSizeingNetwork = (*TelegramConnector)(nil)
 func (tg *TelegramConnector) Init(bridge *bridgev2.Bridge) {
 	tg.Store = store.NewStore(bridge.DB.Database, dbutil.ZeroLogger(bridge.Log.With().Str("db_section", "telegram").Logger()))
 	tg.Bridge = bridge
-	tg.Bridge.Commands.(*commands.Processor).AddHandlers(cmdSync)
+	tg.Bridge.Commands.(*commands.Processor).AddHandlers(cmdSyncChats)
 }
 
 func (tg *TelegramConnector) Start(ctx context.Context) error {