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.

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

bug_: fix resend type for private group messages #5258

Merged
merged 2 commits into from
May 30, 2024

Conversation

cammellos
Copy link
Contributor

The resend type was wrong for private group chats, leading for those messages not being retried anymore after coming back online.

@status-im-auto
Copy link
Member

status-im-auto commented May 29, 2024

Jenkins Builds

Click to see older builds (32)
Commit #️⃣ Finished (UTC) Duration Platform Result
✖️ 7191223 #1 2024-05-29 16:51:18 ~1 min tests 📄log
✔️ 7191223 #1 2024-05-29 16:53:41 ~4 min linux 📦zip
✔️ 7191223 #1 2024-05-29 16:54:43 ~5 min ios 📦zip
✔️ 7191223 #1 2024-05-29 16:56:00 ~6 min android 📦aar
✔️ a7a8879 #2 2024-05-29 16:56:15 ~2 min linux 📦zip
✔️ a7a8879 #2 2024-05-29 16:57:58 ~2 min ios 📦zip
✔️ a7a8879 #2 2024-05-29 16:58:22 ~1 min android 📦aar
✖️ a7a8879 #2 2024-05-29 16:56:37 ~2 min tests 📄log
✖️ c6326cb #3 2024-05-29 17:01:25 ~2 min tests 📄log
✔️ c6326cb #3 2024-05-29 17:01:57 ~3 min ios 📦zip
✔️ c6326cb #3 2024-05-29 17:03:50 ~5 min linux 📦zip
✔️ c6326cb #3 2024-05-29 17:04:40 ~6 min android 📦aar
✖️ 1d4aca3 #4 2024-05-29 17:06:14 ~2 min tests 📄log
✔️ 1d4aca3 #4 2024-05-29 17:06:19 ~2 min linux 📦zip
✔️ 1d4aca3 #4 2024-05-29 17:06:46 ~1 min android 📦aar
✔️ 1d4aca3 #4 2024-05-29 17:07:08 ~3 min ios 📦zip
✖️ 0ea97e6 #5 2024-05-29 17:28:11 ~1 min tests 📄log
✔️ 0ea97e6 #5 2024-05-29 17:29:11 ~2 min android 📦aar
✔️ 0ea97e6 #5 2024-05-29 17:29:17 ~2 min linux 📦zip
✔️ 0ea97e6 #5 2024-05-29 17:30:13 ~3 min ios 📦zip
✖️ 3bafbbe #6 2024-05-29 17:46:46 ~1 min tests 📄log
✔️ 3bafbbe #6 2024-05-29 17:48:17 ~2 min android 📦aar
✔️ 3bafbbe #6 2024-05-29 17:48:21 ~2 min linux 📦zip
✔️ 3bafbbe #6 2024-05-29 17:49:02 ~3 min ios 📦zip
✖️ 6021959 #7 2024-05-29 19:21:58 ~57 sec tests 📄log
✔️ 6021959 #7 2024-05-29 19:23:40 ~2 min linux 📦zip
✔️ 6021959 #7 2024-05-29 19:23:57 ~3 min android 📦aar
✔️ 6021959 #7 2024-05-29 19:24:32 ~3 min ios 📦zip
✖️ a332809 #8 2024-05-29 19:24:05 ~1 min tests 📄log
✔️ a332809 #8 2024-05-29 19:26:04 ~2 min linux 📦zip
✔️ a332809 #8 2024-05-29 19:26:10 ~1 min android 📦aar
✔️ a332809 #8 2024-05-29 19:27:43 ~2 min ios 📦zip
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 5b17234 #9 2024-05-30 10:06:58 ~4 min linux 📦zip
✔️ 5b17234 #9 2024-05-30 10:07:41 ~5 min ios 📦zip
✔️ 5b17234 #9 2024-05-30 10:08:41 ~6 min android 📦aar
✔️ 5b17234 #9 2024-05-30 10:44:00 ~41 min tests 📄log

@cammellos cammellos force-pushed the bug/send-private-group-chat-messages-as-datasync branch 2 times, most recently from a7a8879 to c6326cb Compare May 29, 2024 16:58
@cammellos cammellos force-pushed the bug/send-private-group-chat-messages-as-datasync branch from c6326cb to 1d4aca3 Compare May 29, 2024 17:03
@@ -288,6 +288,14 @@ func (c *Chat) IsActivePersonalChat() bool {
return c.Active && (c.OneToOne() || c.PrivateGroupChat() || c.Public()) && c.CommunityID == ""
}

func (c *Chat) DefaultResendType() common.ResendType {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cammellos, the function protocol#GetResendTypeForChat seems to be a duplicate of this new function you just defined. Shouldn't the places GetResendTypeForChat is called also use the new implementation you defined that caters for private group chats? If so, probably better would be to remove/replace GetResendTypeForChat with your DefaultResendType?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yes, I didn't notice it was already there, I assumed it wasn't, I'll use mine since it's tested :)

@cammellos cammellos force-pushed the bug/send-private-group-chat-messages-as-datasync branch from 1d4aca3 to 0ea97e6 Compare May 29, 2024 17:26
Copy link
Member

@jrainville jrainville left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cammellos cammellos force-pushed the bug/send-private-group-chat-messages-as-datasync branch 2 times, most recently from 6021959 to a332809 Compare May 29, 2024 19:22
Copy link
Contributor

@qfrank qfrank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for the fix!

@cammellos cammellos force-pushed the bug/send-private-group-chat-messages-as-datasync branch from a332809 to 5b17234 Compare May 30, 2024 10:02
@jo-mut jo-mut merged commit 0061c56 into develop May 30, 2024
11 of 12 checks passed
@jo-mut jo-mut deleted the bug/send-private-group-chat-messages-as-datasync branch May 30, 2024 12:18
jo-mut pushed a commit that referenced this pull request May 30, 2024
* chore_: bump go-waku

* fix_: fix resend type for private group messages

---------

Co-authored-by: Richard Ramos <[email protected]>
cammellos added a commit that referenced this pull request May 30, 2024
cammellos added a commit that referenced this pull request May 30, 2024
jo-mut added a commit that referenced this pull request May 30, 2024
---------

Co-authored-by: Andrea Maria Piana <[email protected]>
Co-authored-by: Richard Ramos <[email protected]>
@kaichaosun kaichaosun mentioned this pull request May 31, 2024
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants