lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Fix rate-overlimit issue when there are more than 5 whatsapp channels in a single account.

Browse Source 
resolves #1844
This commit is contained in:
Yousef Mansy
2023-03-01 22:43:16 -08:00
parent 24f6747516
commit 655297a63a
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bridge/whatsappmulti/whatsapp.go
View File

@@ -35,11 +35,12 @@ const (
type Bwhatsapp struct { type Bwhatsapp struct {
*bridge.Config *bridge.Config
startedAt time.Time startedAt time.Time
wc *whatsmeow.Client wc *whatsmeow.Client
contacts map[types.JID]types.ContactInfo contacts map[types.JID]types.ContactInfo
users map[string]types.ContactInfo users map[string]types.ContactInfo
userAvatars map[string]string userAvatars map[string]string
joinedGroups []*types.GroupInfo
} }
// New Create a new WhatsApp bridge. This will be called for each [whatsapp.<server>] entry you have in the config file // New Create a new WhatsApp bridge. This will be called for each [whatsapp.<server>] entry you have in the config file
@@ -121,6 +122,11 @@ func (b *Bwhatsapp) Connect() error {
return errors.New("failed to get contacts: " + err.Error()) return errors.New("failed to get contacts: " + err.Error())
} }
b.joinedGroups, err = b.wc.GetJoinedGroups()
if err != nil {
return errors.New("failed to get list of joined groups: " + err.Error())
}
b.startedAt = time.Now() b.startedAt = time.Now()
// map all the users // map all the users
@@ -166,11 +172,6 @@ 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)
@@ -178,7 +179,7 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
return err return err
} }
for _, group := range groups { for _, group := range b.joinedGroups {
if group.JID == gJID { if group.JID == gJID {
return nil return nil
} }
@@ -187,7 +188,7 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
foundGroups := []string{} foundGroups := []string{}
for _, group := range groups { for _, group := range b.joinedGroups {
if group.Name == channel.Name { if group.Name == channel.Name {
foundGroups = append(foundGroups, group.Name) foundGroups = append(foundGroups, group.Name)
} }
@@ -196,7 +197,7 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
switch len(foundGroups) { switch len(foundGroups) {
case 0: case 0:
// didn't match any group - print out possibilites // didn't match any group - print out possibilites
for _, group := range groups { for _, group := range b.joinedGroups {
b.Log.Infof("%s %s", group.JID, group.Name) b.Log.Infof("%s %s", group.JID, group.Name)
} }
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)