14044 handle edit messages in bridge #4983
Conversation
Jenkins Builds
|
| editMessage := EditMessage{ | ||
| EditMessage: &protobuf.EditMessage{ | ||
| Clock: messageToEdit.Clock + 1, | ||
| Text: editedText, | ||
| MessageType: protobuf.MessageType_ONE_TO_ONE, | ||
| MessageId: messageToEdit.ID, | ||
| ChatId: theirChat.ID, | ||
| ContentType: protobuf.ChatMessage_BRIDGE_MESSAGE, | ||
| }, | ||
| From: common.PubkeyToHex(&theirMessenger.identity.PublicKey), | ||
| } | ||
| state := &ReceivedMessageState{ | ||
| Response: &MessengerResponse{}, | ||
| } | ||
|
|
||
| // Handle edit first | ||
| err = s.m.handleEditMessage(state, editMessage) | ||
| s.Require().NoError(err) | ||
|
|
||
| // It save the edit | ||
| s.Require().Len(state.Response.Messages(), 1) | ||
| s.Require().Len(state.Response.Chats(), 1) | ||
| s.Require().NotEmpty(state.Response.Chats()[0].LastMessage.EditedAt) | ||
| s.Require().Equal(state.Response.Messages()[0].GetBridgeMessage().Content, "edited text") |
There was a problem hiding this comment.
shouldn't you call WaitOnMessengerResponse instead of a direct call of s.m.handleEditMessage(state, editMessage) in order to check that s.m received the edited message?
| var hasMessage bool | ||
| hasMessage, err = db.bridgeMessageExists(tx, msg.GetBridgeMessage().MessageID) | ||
| if err != nil { | ||
| return |
There was a problem hiding this comment.
In case of err, maybe we should just ignore and save the message as before?
There was a problem hiding this comment.
Hmm, if it returned the error, it would mean that there is something wrong with db connection and another db operation would fail also. Am I right?
There was a problem hiding this comment.
I didn't mean return the error. I mean just not return. Because since you return, you will miss that message
| // Finds status messages id which are replies for bridgeMessageID | ||
| func (db sqlitePersistence) findStatusMessageIdsRepliedTo(tx *sql.Tx, parentMessageID string) (string, error) { | ||
| rows, err := tx.Query(`SELECT user_messages_id FROM bridge_messages WHERE message_id = ?`, parentMessageID) | ||
| func (db sqlitePersistence) FindStatusMessageIdForBridgeMessageId(messageID string) (string, error) { |
There was a problem hiding this comment.
Does this mean it could get slower over time? Excuse my ignorance, are the messages split per chats or something?
There was a problem hiding this comment.
Here, we query from bridge messages.
Bridge messages have a separated table. They are joined with messages via a messageId.
I did not investigate how much time does it take.
Issue #14044
endulab
force-pushed
the
14044-handle-edit-messages-in-bridge
branch
from
222089a to
1d8099e
Compare
|
Cherry-picked to master. |
Adjust EditMessage() to handle bridge messages (will be used by the bridge).
Adjust applyEditMessage() to handle bridge messages.
Closes #14044