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

trying to get this merged #205

Merged
merged 4 commits into from
Mar 31, 2024
Merged

trying to get this merged #205

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
741b53e
trying to get this merged
cameronaaron Mar 30, 2024
9f7883c
removed field
cameronaaron Mar 30, 2024
9ac5031
like this?
cameronaaron Mar 31, 2024
bfea7d6
like this?
cameronaaron Mar 31, 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
16 changes: 2 additions & 14 deletions portal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ func (br *IMBridge) NewPortal(dbPortal *database.Portal) *Portal {
MessageStatuses: make(chan *imessage.SendMessageStatus, 100),
MatrixMessages: make(chan *event.Event, 100),
backfillStart: make(chan struct{}),
ReadAt: time.Now(),
}
portal.log = maulogadapt.ZeroAsMau(&portal.zlog)
if !br.IM.Capabilities().MessageSendResponses {
Expand Down Expand Up @@ -254,7 +253,6 @@ type Portal struct {
messageDedup map[string]SentMessage
messageDedupLock sync.Mutex
Identifier imessage.Identifier
ReadAt time.Time

userIsTyping bool
typingLock sync.Mutex
Expand Down Expand Up @@ -453,12 +451,6 @@ func (portal *Portal) markRead(intent *appservice.IntentAPI, eventID id.EventID,
return nil
}

// Only send the read update if it is more recent than the last read time
if portal.ReadAt.After(readAt) {
return nil
} else {
portal.ReadAt = readAt
}

var extra CustomReadReceipt
if intent == portal.bridge.user.DoublePuppetIntent {
Expand Down Expand Up @@ -2142,12 +2134,8 @@ func (portal *Portal) HandleiMessage(msg *imessage.Message) id.EventID {

// If the message exists in the database, handle edits or retractions
if dbMessage != nil && dbMessage.MXID != "" {
// DEVNOTE: It seems sometimes the message is just edited to remove data instead of actually retracting it

// Clean up the text so the length is accurate
msg.Text = strings.ReplaceAll(msg.Text, "\ufffc", "")
msg.Subject = strings.ReplaceAll(msg.Subject, "\ufffc", "")

// DEVNOTE: It seems sometimes the message is just edited to remove data instead of actually retracting it
trek-boldly-go marked this conversation as resolved.
Show resolved Hide resolved
if msg.IsRetracted ||
(len(msg.Attachments) == 0 && len(msg.Text) == 0 && len(msg.Subject) == 0) {

Expand All @@ -2159,7 +2147,7 @@ func (portal *Portal) HandleiMessage(msg *imessage.Message) id.EventID {
}

overrideSuccess = true
} else if msg.IsEdited {
} else if msg.IsEdited && dbMessage.Part > 0 {

// Edit existing message
intent := portal.getIntentForMessage(msg, nil)
Expand Down
Loading