-
-
Notifications
You must be signed in to change notification settings - Fork 110
fix: Order of messages if outgoing reply is received earlier (#7169) #7192
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.
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
Open
iequidoo
wants to merge
3
commits into
iequidoo/unbend-calc_sort_timestamp
Choose a base branch
from
iequidoo/test_sync_sentbox_then_inbox
base: iequidoo/unbend-calc_sort_timestamp
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
fix: Order of messages if outgoing reply is received earlier (#7169) #7192
iequidoo
wants to merge
3
commits into
iequidoo/unbend-calc_sort_timestamp
from
iequidoo/test_sync_sentbox_then_inbox
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
462985d to
7c44f7d
Compare
69afdb8 to
6ffe634
Compare
7c44f7d to
dce6e5d
Compare
6ffe634 to
33ffb04
Compare
dce6e5d to
adff64f
Compare
33ffb04 to
a20e01c
Compare
adff64f to
9b1782b
Compare
a20e01c to
d12267e
Compare
9b1782b to
ba25096
Compare
d12267e to
8f54b8f
Compare
ba25096 to
4443d59
Compare
8f54b8f to
3ce0588
Compare
4443d59 to
adff64f
Compare
…mp_sent This makes `calc_sort_timestamp()` a continuous function of the message timestamp, simplifies the SQL query and prepares for creation of a db index for it so that it's fast. Currently it doesn't uses indexes effectively; if a chat has many messages, it's slow, i.e. O(n).
Tested on some random chat, the SQL query took 1.411202ms (vs 6.692714ms before) in median. Still looks a bit slow, but already better.
adff64f to
21b1abb
Compare
This fixes a scenario when an outgoing reply is received earlier than an incoming message for some reason like device B having `MvboxMove` enabled, sending the reply and going offline immediately, so the reply is in Inbox and it's processed by device A earlier because e.g. `MvboxMove` is disabled on it. Also if we add multi-transport later, this scenario will be just normal. This allows received outgoing messages to mingle with fresh incoming ones, i.e. sorts them together purely by timestamp by assigning `InFresh` state to received outgoing messages, but still returning `OutDelivered` by all APIs for compatibility. NB: We already do such a trick for `OutMdnRcvd`. As for messages sent locally, there's no need to make them more noticeable even if they are newer, so received outgoing messages are always added after them.
3ce0588 to
62116ea
Compare
4ff32d0 to
247ec1e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #7312 . Replacement for #7177 . The third try %)
Fix #7169
This fixes a scenario when an outgoing reply is received earlier than an incoming message for some reason like device B having
MvboxMoveenabled, sending the reply and going offline immediately, so the reply is in Inbox and it's processed by device A earlier because e.g.MvboxMoveis disabled on it. Also if we add multi-transport later, this scenario will be just normal.This allows received outgoing messages to mingle with fresh incoming ones, i.e. sorts them together purely by timestamp by assigning
InFreshstate to received outgoing messages, but still returningOutDeliveredby all APIs for compatibility. NB: We already do such a trick forOutMdnRcvd.As for messages sent locally, there's no need to make them more noticeable even if they are newer, so received outgoing messages are always added after them.