tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Use default puppet when backfilling to avoid rate limits

Browse source
This commit is contained in:
Tulir Asokan 2019-05-30 17:22:03 +03:00
parent a9fd97932b
commit c4751f4953
2 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
portal.go
View file

@ -139,6 +139,7 @@ type Portal struct {
recentlyHandledIndex uint8 recentlyHandledIndex uint8
backfillLock sync.Mutex backfillLock sync.Mutex
backfilling bool
lastMessageTs uint64 lastMessageTs uint64
messages chan PortalMessage messages chan PortalMessage
@ -401,8 +402,20 @@ func (portal *Portal) UpdateMetadata(user *User) bool {
return update return update
} }
func (portal *Portal) ensureUserInvited(user *User) {
err := portal.MainIntent().EnsureInvited(portal.MXID, user.MXID)
if err != nil {
portal.log.Warnfln("Failed to ensure %s is invited to %s: %v", user.MXID, portal.MXID, err)
}
customPuppet := portal.bridge.GetPuppetByCustomMXID(user.MXID)
if customPuppet.CustomIntent() != nil {
_ = customPuppet.CustomIntent().EnsureJoined(portal.MXID)
}
}
func (portal *Portal) Sync(user *User, contact whatsapp.Contact) { func (portal *Portal) Sync(user *User, contact whatsapp.Contact) {
if portal.IsPrivateChat() { if portal.IsPrivateChat() {
portal.ensureUserInvited(user)
return return
} }
portal.log.Infoln("Syncing portal for", user.MXID) portal.log.Infoln("Syncing portal for", user.MXID)
@ -415,10 +428,7 @@ func (portal *Portal) Sync(user *User, contact whatsapp.Contact) {
return return
} }
} else { } else {
err := portal.MainIntent().EnsureInvited(portal.MXID, user.MXID) portal.ensureUserInvited(user)
if err != nil {
portal.log.Warnfln("Failed to ensure %s is invited to %s: %v", user.MXID, portal.MXID, err)
}
} }
update := false update := false
@ -521,7 +531,11 @@ func (portal *Portal) BackfillHistory(user *User, lastMessageTime uint64) error
return nil return nil
} }
portal.backfillLock.Lock() portal.backfillLock.Lock()
defer portal.backfillLock.Unlock() portal.backfilling = true
defer func() {
portal.backfilling = false
portal.backfillLock.Unlock()
}()
lastMessage := portal.bridge.DB.Message.GetLastInChat(portal.Key) lastMessage := portal.bridge.DB.Message.GetLastInChat(portal.Key)
if lastMessage == nil { if lastMessage == nil {
return nil return nil
@ -562,7 +576,17 @@ func (portal *Portal) FillInitialHistory(user *User) error {
return nil return nil
} }
portal.backfillLock.Lock() portal.backfillLock.Lock()
defer portal.backfillLock.Unlock() portal.backfilling = true
defer func() {
portal.backfilling = false
portal.backfillLock.Unlock()
}()
var privateChatPuppet *Puppet
if portal.IsPrivateChat() {
privateChatPuppet = portal.bridge.GetPuppetByJID(portal.Key.Receiver)
_, _ = portal.MainIntent().InviteUser(portal.MXID, &mautrix.ReqInviteUser{UserID: privateChatPuppet.MXID})
_ = privateChatPuppet.DefaultIntent().EnsureJoined(portal.MXID)
}
n := portal.bridge.Config.Bridge.InitialHistoryFill n := portal.bridge.Config.Bridge.InitialHistoryFill
portal.log.Infoln("Filling initial history, maximum", n, "messages") portal.log.Infoln("Filling initial history, maximum", n, "messages")
var messages []interface{} var messages []interface{}
@ -601,6 +625,9 @@ func (portal *Portal) FillInitialHistory(user *User) error {
} }
} }
portal.handleHistory(user, messages) portal.handleHistory(user, messages)
if privateChatPuppet != nil {
_, _ = privateChatPuppet.DefaultIntent().LeaveRoom(portal.MXID)
}
return nil return nil
} }
@ -681,6 +708,11 @@ func (portal *Portal) CreateMatrixRoom(user *User) error {
portal.Update() portal.Update()
if metadata != nil { if metadata != nil {
portal.SyncParticipants(metadata) portal.SyncParticipants(metadata)
} else {
customPuppet := portal.bridge.GetPuppetByCustomMXID(user.MXID)
if customPuppet.CustomIntent() != nil {
_ = customPuppet.CustomIntent().EnsureJoined(portal.MXID)
}
} }
err = portal.FillInitialHistory(user) err = portal.FillInitialHistory(user)
if err != nil { if err != nil {
@ -710,9 +742,6 @@ func (portal *Portal) MainIntent() *appservice.IntentAPI {
func (portal *Portal) GetMessageIntent(user *User, info whatsapp.MessageInfo) *appservice.IntentAPI { func (portal *Portal) GetMessageIntent(user *User, info whatsapp.MessageInfo) *appservice.IntentAPI {
if info.FromMe { if info.FromMe {
if portal.IsPrivateChat() {
return portal.bridge.GetPuppetByJID(user.JID).CustomIntent()
}
return portal.bridge.GetPuppetByJID(user.JID).IntentFor(portal) return portal.bridge.GetPuppetByJID(user.JID).IntentFor(portal)
} else if portal.IsPrivateChat() { } else if portal.IsPrivateChat() {
return portal.MainIntent() return portal.MainIntent()

2
puppet.go
View file

@ -156,7 +156,7 @@ func (puppet *Puppet) PhoneNumber() string {
} }
func (puppet *Puppet) IntentFor(portal *Portal) *appservice.IntentAPI { func (puppet *Puppet) IntentFor(portal *Portal) *appservice.IntentAPI {
if puppet.customIntent == nil || portal.Key.JID == puppet.JID{ if (!portal.IsPrivateChat() && puppet.customIntent == nil) || portal.backfilling || portal.Key.JID == puppet.JID {
return puppet.DefaultIntent() return puppet.DefaultIntent()
} }
return puppet.customIntent return puppet.customIntent