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

Group delete pushes #1429

Merged
merged 7 commits into from
Jan 31, 2023
Merged

Group delete pushes #1429

merged 7 commits into from
Jan 31, 2023

Conversation

nickvergessen
Copy link
Member

Rebased/Redo of #939

@nickvergessen nickvergessen added this to the Nextcloud 26 milestone Jan 25, 2023
@nickvergessen nickvergessen self-assigned this Jan 25, 2023
@nickvergessen nickvergessen marked this pull request as draft January 25, 2023 16:47
@nickvergessen nickvergessen mentioned this pull request Jan 25, 2023
Closed
2 tasks
@nickvergessen
Copy over the remaining and multi handling of the encrypt and sign me…
d26c4fc 
…thod

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Use null to be explicit about delete-all
f47d063 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Reorganize how deletes are deferred so we can properly group them
f188ccc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add psalm types and actually find a bug with it
efad0c6 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Enforce userId being a string
a0b76d7 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Copy link
Member Author

Rebased to get #1433 and the other generic CI fixes in

@nickvergessen nickvergessen marked this pull request as ready for review January 27, 2023 09:37
@nickvergessen nickvergessen changed the title Redo/939/group delete pushes Group delete pushes Jan 27, 2023
@nickvergessen
Only send grouped pushes to talk
aa3aabd 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@github-actions
Copy link
Contributor

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 10344 was 9500 (+8.88%)
Please check your code again. If you added a new test this can be expected and the base value in tests/Integration/base-query-count.txt can be increased.

SystemKeeper
SystemKeeper requested changes Jan 30, 2023
View reviewed changes
Copy link

@SystemKeeper SystemKeeper left a comment

Choose a reason for hiding this comment

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

In general working fine, but need to be adjusted for multiple devices (see comment).

lib/Push.php Outdated Show resolved Hide resolved
@nickvergessen
Start with the same notificationIds for each device
b6fd592 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@github-actions
Copy link
Contributor

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 10350 was 9500 (+8.94%)
Please check your code again. If you added a new test this can be expected and the base value in tests/Integration/base-query-count.txt can be increased.

SystemKeeper
SystemKeeper approved these changes Jan 30, 2023
View reviewed changes
Copy link

@SystemKeeper SystemKeeper left a comment

Choose a reason for hiding this comment

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

Works now correctly for me in talk-ios:

Printing description of pushNotification->_notificationIds:
<__NSArrayI 0x281972e00>(
50,
51,
52,
53,
54
)

@nickvergessen nickvergessen merged commit 4067a44 into master Jan 31, 2023
@nickvergessen nickvergessen deleted the redo/939/group-delete-pushes branch January 31, 2023 12:59
@blizzz blizzz mentioned this pull request Feb 1, 2023
Merged
@SystemKeeper SystemKeeper mentioned this pull request Mar 22, 2023
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SystemKeeper SystemKeeper SystemKeeper approved these changes

Assignees

@nickvergessen nickvergessen

Labels
3. to review enhancement feature: push 📲
Projects
None yet
Milestone
Nextcloud 26
Development

Successfully merging this pull request may close these issues.
2 participants
@nickvergessen @SystemKeeper