fix: make create_send_msg_jobs actually return row IDs - #8585
Open
link2xt wants to merge 2 commits into
Open
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
link2xt
force-pushed
the
link2xt/create_send_msg_jobs-row_id
branch
from
August 14, 2026 11:40
20ae3c5 to
889578d
Compare
link2xt
force-pushed
the
link2xt/create_send_msg_jobs-row_id
branch
2 times, most recently
from
August 23, 2026 02:37
42ebbff to
1ca89ff
Compare
.execute() was returning the number of rows, so usually 1. .insert() is returning the row ID. In most cases it does not matter because the result is checked with .is_empty(), but send_msg_sync() actually uses the row IDs.
link2xt
force-pushed
the
link2xt/create_send_msg_jobs-row_id
branch
from
August 25, 2026 14:08
1ca89ff to
e657a72
Compare
link2xt
marked this pull request as ready for review
August 25, 2026 14:08
link2xt
commented
Aug 25, 2026
| chat1.send_msg_sync(msg1) | ||
|
|
||
| lp.sec("ac2: receive message") | ||
| msg_in = ac2._evtracker.wait_next_incoming_message() |
Collaborator
Author
There was a problem hiding this comment.
The test gets stuck without the fix, likely here because the message is never sent out as it tries to send rowid 1 from smtp table.
Collaborator
Author
|
Ended up writing a python test for dc_send_msg_sync() because it is the only API that is affected and only exists as CFFI. IIRC it is used by iOS for share extension. |
link2xt
commented
Aug 25, 2026
| sent_id = lib.dc_send_msg_sync(self.account._dc_context, self.id, msg._dc_msg) | ||
| if sent_id == 0: | ||
| raise ValueError("message could not be sent") | ||
| # modify message in place to avoid bad state for the caller |
Collaborator
Author
There was a problem hiding this comment.
This code is copy-pasted from a function above.
hpk42
approved these changes
Aug 26, 2026
hpk42
left a comment
hpk42
left a comment
Contributor
There was a problem hiding this comment.
looks good enough (see review comments). Also i think it'd be good to have an offline Rust test queuing two messages and testing the row-id behaviour.
| ac1.stop_io() | ||
| msg1 = Message.new_empty(ac1, "text") | ||
| msg1.set_text("message1") | ||
| chat1.send_msg_sync(msg1) |
Contributor
There was a problem hiding this comment.
i'd assert that msg1.is_out_delivered() to not land in receive-timeout if something goes wrong.
Comment on lines
262
to
+305
| def send_msg(self, msg: Message) -> Message: | ||
| """send a message by using a ready Message object. | ||
|
|
||
| :param msg: a :class:`deltachat.message.Message` instance | ||
| previously returned by | ||
| e.g. :meth:`deltachat.message.Message.new_empty`. | ||
| :raises ValueError: if message can not be sent. | ||
|
|
||
| :returns: a :class:`deltachat.message.Message` instance as | ||
| sent out. This is the same object as was passed in, which | ||
| has been modified with the new state of the core. | ||
| """ | ||
| sent_id = lib.dc_send_msg(self.account._dc_context, self.id, msg._dc_msg) | ||
| if sent_id == 0: | ||
| raise ValueError("message could not be sent") | ||
| # modify message in place to avoid bad state for the caller | ||
| sent_msg = Message.from_db(self.account, sent_id) | ||
| if sent_msg is None: | ||
| raise ValueError("cannot load just sent message from the database") | ||
| msg._dc_msg = sent_msg._dc_msg | ||
| return msg | ||
|
|
||
| def send_msg_sync(self, msg: Message) -> Message: | ||
| """Send a message synchronously. | ||
| This bypasses the IO scheduler and creates its own SMTP connection. | ||
|
|
||
| :param msg: a :class:`deltachat.message.Message` instance | ||
| previously returned by | ||
| e.g. :meth:`deltachat.message.Message.new_empty`. | ||
| :raises ValueError: if message can not be sent. | ||
|
|
||
| :returns: a :class:`deltachat.message.Message` instance as | ||
| sent out. This is the same object as was passed in, which | ||
| has been modified with the new state of the core. | ||
| """ | ||
| sent_id = lib.dc_send_msg_sync(self.account._dc_context, self.id, msg._dc_msg) | ||
| if sent_id == 0: | ||
| raise ValueError("message could not be sent") | ||
| # modify message in place to avoid bad state for the caller | ||
| sent_msg = Message.from_db(self.account, sent_id) | ||
| if sent_msg is None: | ||
| raise ValueError("cannot load just sent message from the database") | ||
| msg._dc_msg = sent_msg._dc_msg | ||
| return msg |
Contributor
There was a problem hiding this comment.
this is almost complete duplication. except for one different lib call. Please consider avoiding it.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
.execute() was returning the number of rows, so usually 1.
.insert() is returning the row ID.
In most cases it does not matter because the result is checked with .is_empty(), but send_msg_sync() actually uses the row IDs.