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

Fix carddav activities #33617

Merged
merged 1 commit into from
Aug 19, 2022

Conversation

nickvergessen
Copy link
Member

The settings where combined last minute but at the same time the activities
where not adjusted to map an existing setting so the filter was not possible
to even limit it to the types that the activities had.

Unluckily this is not retro-active

Fix nextcloud/activity#856

@tcitworld
Copy link
Member

Why does it work for activities of type calendars and calendar_events though?

@nickvergessen
Copy link
Member Author

Why does it work for activities of type calendars and calendar_events though?

Because they have different settings https://github.com/nextcloud/server/tree/814d9ac74a7d673746dc2a2760a2b8f773523a08/apps/dav/lib/CalDAV/Activity/Setting

But it was requested to not do that for contacts. The main of caldav being different is also to be able to ignore todo changes while being notified about events.

@nickvergessen nickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 19, 2022
@nickvergessen
Copy link
Member Author

/backport to stable24

@nickvergessen
Copy link
Member Author

/backport to stable23

@skjnldsv
Copy link
Member

There were 16 failures:
447 |  
448 | 1) OCA\DAV\Tests\unit\CardDAV\Activity\BackendTest::testTriggerAddressBookActivity with data set #1 ('addressbook_add', array('principal/user/admin', 42, 'this-uri', 'Name of addressbook'), array(), array(), '', 'admin', null, array('admin'))
449 | Expectation failed for method name is "setType" when invoked 1 time(s)
450 | Parameter 0 for invocation OCP\Activity\IEvent::setType('contacts'): OCP\Activity\IEvent does not match expected value.
451 | Failed asserting that two strings are equal.
452 | --- Expected
453 | +++ Actual
454 | @@ @@
455 | -'addressbook'
456 | +'contacts'

@skjnldsv skjnldsv added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Aug 19, 2022
The settings where combined last minute but at the same time the activities
where not adjusted to map an existing setting so the filter was not possible
to even limit it to the types that the activities had.

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/activity-856/fix-carddav-activities branch from 786fef6 to eab5189 Compare August 19, 2022 08:50
@nickvergessen nickvergessen added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Aug 19, 2022
@nickvergessen nickvergessen merged commit fdec866 into master Aug 19, 2022
@nickvergessen nickvergessen deleted the bugfix/activity-856/fix-carddav-activities branch August 19, 2022 09:38
@backportbot-nextcloud
Copy link

The backport to stable24 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

The backport to stable23 failed. Please do this backport manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: activity and notification
Projects
None yet
Development

Successfully merging this pull request may close these issues.

no activities are showing up with contacts filter
4 participants