Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mdtest: Clean up warnings and move on from deprecated waProto #597

Closed
wants to merge 3 commits into from
Closed

mdtest: Clean up warnings and move on from deprecated waProto #597

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e9c7e4
fix(main): Clean up warnings and move on from deprecated waProto
PurpShell May 25, 2024
4bea1dc
Merge branch 'tulir:main' into main
PurpShell Jun 5, 2024
842a788
Merge branch 'tulir:main' into main
PurpShell Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions mdtest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ import (
"go.mau.fi/whatsmeow"
"go.mau.fi/whatsmeow/appstate"
waBinary "go.mau.fi/whatsmeow/binary"
waProto "go.mau.fi/whatsmeow/binary/proto"
"go.mau.fi/whatsmeow/proto/waCommon"
"go.mau.fi/whatsmeow/proto/waCompanionReg"
"go.mau.fi/whatsmeow/proto/waE2E"
"go.mau.fi/whatsmeow/store"
"go.mau.fi/whatsmeow/store/sqlstore"
"go.mau.fi/whatsmeow/types"
Expand All @@ -58,7 +60,7 @@ func main() {
}
if *requestFullSync {
store.DeviceProps.RequireFullSync = proto.Bool(true)
store.DeviceProps.HistorySyncConfig = &waProto.DeviceProps_HistorySyncConfig{
store.DeviceProps.HistorySyncConfig = &waCompanionReg.DeviceProps_HistorySyncConfig{
FullSyncDaysLimit: proto.Uint32(3650),
FullSyncSizeMbLimit: proto.Uint32(102400),
StorageQuotaMb: proto.Uint32(102400),
Expand Down Expand Up @@ -265,7 +267,7 @@ func handleCmd(cmd string, args []string) {
}
resp, err := cli.IsOnWhatsApp(args)
if err != nil {
log.Errorf("Failed to check if users are on WhatsApp:", err)
log.Errorf("Failed to check if users are on WhatsApp: %s", err.Error())
} else {
for _, item := range resp {
if item.VerifiedName != nil {
Expand Down Expand Up @@ -346,6 +348,7 @@ func handleCmd(cmd string, args []string) {
}
case "mediaconn":
conn, err := cli.DangerousInternals().RefreshMediaConn(false)

if err != nil {
log.Errorf("Failed to get media connection: %v", err)
} else {
Expand Down Expand Up @@ -629,21 +632,26 @@ func handleCmd(cmd string, args []string) {
for _, item := range resp {
if action == whatsmeow.ParticipantChangeAdd && item.Error == 403 && item.AddRequest != nil {
log.Infof("Participant is private: %d %s %s %v", item.Error, item.JID, item.AddRequest.Code, item.AddRequest.Expiration)
cli.SendMessage(context.TODO(), item.JID, &waProto.Message{
GroupInviteMessage: &waProto.GroupInviteMessage{
resp, err := cli.SendMessage(context.TODO(), item.JID, &waE2E.Message{
GroupInviteMessage: &waE2E.GroupInviteMessage{
InviteCode: proto.String(item.AddRequest.Code),
InviteExpiration: proto.Int64(item.AddRequest.Expiration.Unix()),
GroupJID: proto.String(jid.String()),
GroupName: proto.String("Test group"),
Caption: proto.String("This is a test group"),
},
})
if err != nil {
log.Errorf("Error sending group invite: %v", err)
} else {
log.Infof("Group Invite sent (server timestamp: %s)", resp.Timestamp)
}
} else if item.Error == 409 {
log.Infof("Participant already in group: %d %s %+v", item.Error, item.JID)
log.Infof("Participant already in group: %d %s", item.Error, item.JID)
} else if item.Error == 0 {
log.Infof("Added participant: %d %s %+v", item.Error, item.JID)
log.Infof("Added participant: %d %s", item.Error, item.JID)
} else {
log.Infof("Unknown status: %d %s %+v", item.Error, item.JID)
log.Infof("Unknown status: %d %s", item.Error, item.JID)
}
}
case "getrequestparticipant":
Expand Down Expand Up @@ -707,7 +715,7 @@ func handleCmd(cmd string, args []string) {
if !ok {
return
}
msg := &waProto.Message{Conversation: proto.String(strings.Join(args[1:], " "))}
msg := &waE2E.Message{Conversation: proto.String(strings.Join(args[1:], " "))}
resp, err := cli.SendMessage(context.Background(), recipient, msg)
if err != nil {
log.Errorf("Error sending message: %v", err)
Expand Down Expand Up @@ -760,9 +768,9 @@ func handleCmd(cmd string, args []string) {
if reaction == "remove" {
reaction = ""
}
msg := &waProto.Message{
ReactionMessage: &waProto.ReactionMessage{
Key: &waProto.MessageKey{
msg := &waE2E.Message{
ReactionMessage: &waE2E.ReactionMessage{
Key: &waCommon.MessageKey{
RemoteJID: proto.String(recipient.String()),
FromMe: proto.Bool(fromMe),
ID: proto.String(messageID),
Expand Down Expand Up @@ -817,7 +825,7 @@ func handleCmd(cmd string, args []string) {
log.Errorf("Failed to upload file: %v", err)
return
}
msg := &waProto.Message{ImageMessage: &waProto.ImageMessage{
msg := &waE2E.Message{ImageMessage: &waE2E.ImageMessage{
Caption: proto.String(strings.Join(args[2:], " ")),
URL: proto.String(uploaded.URL),
DirectPath: proto.String(uploaded.DirectPath),
Expand Down