seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Ignore more tombstones, but only in DMs

Browse source
This commit is contained in:
Tulir Asokan 2023-08-15 11:28:59 +03:00
parent 18288b5ea5
commit 1fd9c70257
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
portal.go
View file

@ -775,7 +775,8 @@ func shouldIgnoreStatus(status gmproto.MessageStatusType) bool {
switch status { switch status {
case gmproto.MessageStatusType_TOMBSTONE_PROTOCOL_SWITCH_TO_TEXT, case gmproto.MessageStatusType_TOMBSTONE_PROTOCOL_SWITCH_TO_TEXT,
gmproto.MessageStatusType_TOMBSTONE_PROTOCOL_SWITCH_TO_RCS, gmproto.MessageStatusType_TOMBSTONE_PROTOCOL_SWITCH_TO_RCS,
gmproto.MessageStatusType_TOMBSTONE_PROTOCOL_SWITCH_TO_ENCRYPTED_RCS: gmproto.MessageStatusType_TOMBSTONE_PROTOCOL_SWITCH_TO_ENCRYPTED_RCS,
gmproto.MessageStatusType_TOMBSTONE_PROTOCOL_SWITCH_TO_ENCRYPTED_RCS_INFO:
return true return true
default: default:
return false return false
@ -791,7 +792,7 @@ func (portal *Portal) convertGoogleMessage(ctx context.Context, source *User, ev
cm.ID = evt.MessageID cm.ID = evt.MessageID
cm.PartCount = len(evt.GetMessageInfo()) cm.PartCount = len(evt.GetMessageInfo())
cm.Timestamp = time.UnixMicro(evt.Timestamp) cm.Timestamp = time.UnixMicro(evt.Timestamp)
cm.DontBridge = shouldIgnoreStatus(cm.Status) cm.DontBridge = portal.IsPrivateChat() && shouldIgnoreStatus(cm.Status)
if cm.Status >= 200 && cm.Status < 300 { if cm.Status >= 200 && cm.Status < 300 {
cm.Intent = portal.bridge.Bot cm.Intent = portal.bridge.Bot
if !portal.Encrypted && portal.IsPrivateChat() { if !portal.Encrypted && portal.IsPrivateChat() {