Skip to content

RefreshWebcalService: randomly generate calendar-object uri#19986

Merged
rullzer merged 1 commit intomasterfrom
bugfix/19980/fix_uid_as_uri
Mar 25, 2020
Merged

RefreshWebcalService: randomly generate calendar-object uri#19986
rullzer merged 1 commit intomasterfrom
bugfix/19980/fix_uid_as_uri

Conversation

@georgehrke
Copy link
Member

@georgehrke georgehrke commented Mar 16, 2020

fixes #19980

@georgehrke
RefreshWebcalService: randomly generate calendar-object uri
bd1f98c 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke georgehrke added the 3. to review Waiting for reviews label Mar 16, 2020
@georgehrke georgehrke requested a review from tcitworld March 16, 2020 14:37
@georgehrke
Copy link
Member Author

georgehrke commented Mar 16, 2020

/backport to stable18

@georgehrke
Copy link
Member Author

georgehrke commented Mar 16, 2020

/backport to stable17

@georgehrke georgehrke mentioned this pull request Mar 16, 2020
Closed
@georgehrke georgehrke requested a review from kesselb March 18, 2020 20:44
@kesselb
Copy link
Contributor

kesselb commented Mar 19, 2020

createCalendarObject uses calendar id, object uri, uid and calendar type to look for existing objects. Does that still work if we use a random uri?

@georgehrke
Copy link
Member Author

georgehrke commented Mar 19, 2020

@kesselb Yes, the current implementation is very simple. When refetching a webcal feed, it just deletes all cached events and stores the new ones.
https://github.com/nextcloud/server/pull/19986/files#diff-61d9e7310db26875b0eabc3a089d5cd9L112

kesselb
kesselb approved these changes Mar 19, 2020
View reviewed changes
apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
*
* @return string
*/
public function getRandomCalendarObjectUri():string {
Copy link
Contributor

@kesselb kesselb Mar 19, 2020

Choose a reason for hiding this comment

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

Could be protected.

@georgehrke georgehrke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 22, 2020
@rullzer rullzer merged commit 3427653 into master Mar 25, 2020
@rullzer rullzer deleted the bugfix/19980/fix_uid_as_uri branch March 25, 2020 07:11
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Mar 25, 2020
Merged
@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Mar 25, 2020

backport to stable18 in #20148

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Mar 25, 2020
Merged
@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Mar 25, 2020

backport to stable17 in #20149

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tcitworld tcitworld tcitworld approved these changes

@kesselb kesselb kesselb approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

External ICS calendars fail to display if the UID includes slash

4 participants

@georgehrke @kesselb @tcitworld @rullzer