cwinfo/matterbridge
5
0
Fork 0
mirror of https://github.com/cwinfo/matterbridge.git synced 2024-11-22 09:20:27 +00:00
Code Releases Activity

Refactor JoinChannel (whatsapp)

Browse Source
This commit is contained in:
Wim 2022-02-03 21:48:55 +01:00
parent e3cafeaf92
commit 0205a67309
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bridge/whatsapp/whatsapp.go
View File

@ -147,51 +147,44 @@ func (b *Bwhatsapp) Disconnect() error {
func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error { func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
byJid := isGroupJid(channel.Name) byJid := isGroupJid(channel.Name)
groups, err := b.wc.GetJoinedGroups()
if err != nil {
return err
}
// verify if we are member of the given group // verify if we are member of the given group
if byJid { if byJid {
gJID, err := types.ParseJID(channel.Name) gJID, err := types.ParseJID(channel.Name)
if err != nil { if err != nil {
return err return err
} }
// channel.Name specifies static group jID, not the name
info, err := b.wc.Store.Contacts.GetContact(gJID)
if err != nil {
return err
}
if !info.Found {
return fmt.Errorf("account doesn't belong to group with jid %s", channel.Name)
}
for _, group := range groups {
if group.JID == gJID {
return nil return nil
} }
// channel.Name specifies group name that might change, warn about it
var jids []string
allContacts, err := b.wc.Store.Contacts.GetAllContacts()
if err != nil {
return err
}
for id := range allContacts {
if isGroupJid(id.String()) && id.String() == channel.Name {
jids = append(jids, id.String())
} }
} }
switch len(jids) { foundGroups := []string{}
for _, group := range groups {
if group.Name == channel.Name {
foundGroups = append(foundGroups, group.Name)
}
}
switch len(foundGroups) {
case 0: case 0:
// didn't match any group - print out possibilites // didn't match any group - print out possibilites
for id, contact := range allContacts { for _, group := range groups {
if isGroupJid(id.String()) { b.Log.Infof("%s %s", group.JID, group.Name)
b.Log.Infof("%s %s", id, contact.FullName)
} }
}
return fmt.Errorf("please specify group's JID from the list above instead of the name '%s'", channel.Name) return fmt.Errorf("please specify group's JID from the list above instead of the name '%s'", channel.Name)
case 1: case 1:
return fmt.Errorf("group name might change. Please configure gateway with channel=\"%v\" instead of channel=\"%v\"", jids[0], channel.Name) return fmt.Errorf("group name might change. Please configure gateway with channel=\"%v\" instead of channel=\"%v\"", foundGroups[0], channel.Name)
default: default:
return fmt.Errorf("there is more than one group with name '%s'. Please specify one of JIDs as channel name: %v", channel.Name, jids) return fmt.Errorf("there is more than one group with name '%s'. Please specify one of JIDs as channel name: %v", channel.Name, foundGroups)
} }
} }