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

Update holiday_calendars.json to be in sync with Thunderbird #6014

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

nclm
Copy link
Contributor

@nclm nclm commented May 16, 2024

From conversation in #6011:

Imported content from https://github.com/thunderbird/thunderbird-website/blob/master/media/caldata/autogen/calendars.json (version from Apr 1, 2024, 9:39 PM GMT+2) bringing the number of calendars from about 56 to about 86.

Adds 'locale', 'language', and 'updated' fields that are not used by Nextcloud at the moment but present in Thunderbird’s source file.

Content from https://github.com/thunderbird/thunderbird-website/blob/master/media/caldata/autogen/calendars.json (version from Apr 1, 2024, 9:39 PM GMT+2).

Adds 'locale', 'language', and 'updated' that are not used by Nextcloud at the moment but present in Thunderbird’s source file.

Signed-off-by: nicolas <[email protected]>
Copy link

codecov bot commented May 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 23.54%. Comparing base (e44de16) to head (c472a85).
Report is 379 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #6014   +/-   ##
=========================================
  Coverage     23.54%   23.54%           
  Complexity      455      455           
=========================================
  Files           246      246           
  Lines         11707    11707           
  Branches       2141     2141           
=========================================
  Hits           2756     2756           
  Misses         8637     8637           
  Partials        314      314           
Flag Coverage Δ
javascript 15.18% <ø> (ø)
php 58.46% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@miaulalala
Copy link
Contributor

The problem is see is that old subscriptions aren't updated to the new endpoint, which means even if I have a subscription, the button in the subscription calendar list isn't greyed out. Instead I can subscribe to the same holiday calendar twice - in my test case for Germany. That's a bit confusing for the users.

Looks like the subscription is found in \Sabre\CalDAV\Backend\SubscriptionSupport::getSubscriptionsForUser.

I think this will need a bit of a code change in the backend, maybe a migration step that updates the subscriptions to use the new autogen endpoint automatically.

@miaulalala miaulalala marked this pull request as draft May 16, 2024 13:01
@joshtrichards joshtrichards added 2. developing Work in progress enhancement New feature request labels May 16, 2024
Copy link

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

@p4p4j0hn
Copy link

p4p4j0hn commented Sep 3, 2024

maybe a migration step that updates the subscriptions to use the new autogen endpoint automatically.

A more immediate change that is necessary is the initial subscription url for the holiday calendars should have the autogen endpoint. The Canadian calendar being pulled in does not work for me, since Nextcloud Calendar is pointing to an outdated endpoint. If I subscribe to the updated calendar directly from Thunderbird all the holidays display correctly.

@cwerstuik
Copy link

@miaulalala If it's as easy as deleting the old calendar and adding it again, maybe a migration step can be added later...

I also was hoping to rely on the Canadian calendar, but the holidays are all wrong so as it is, no one in Canada is going to be using this calendar. Thanks for considering.

@miaulalala miaulalala marked this pull request as ready for review October 2, 2024 17:05
@miaulalala
Copy link
Contributor

Let's get this in, and add a migration or repair step for this separately as this has to be done on the server side anyway.

@miaulalala miaulalala added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 2, 2024
@miaulalala miaulalala merged commit fec6035 into nextcloud:main Oct 2, 2024
42 checks passed
@miaulalala
Copy link
Contributor

/backport to stable5.0

@backportbot backportbot bot added the backport-request A backport was requested for this pull request label Oct 2, 2024
@backportbot backportbot bot removed the backport-request A backport was requested for this pull request label Oct 2, 2024
@nclm
Copy link
Contributor Author

nclm commented Oct 3, 2024

Great thanks,

Would there be any way to quarterly/biyearly/yearly update the file with the latest from Thunderbird?
They seem to update it “quarterly”: https://github.com/thunderbird/thunderbird-website/commits/master/media/caldata/autogen/calendars.json

@miaulalala
Copy link
Contributor

Great thanks,

Would there be any way to quarterly/biyearly/yearly update the file with the latest from Thunderbird? They seem to update it “quarterly”: thunderbird/thunderbird-website@master/media/caldata/autogen/calendars.json (commits)

not automatically yet - maybe there's some script we could run but I'm not sure.

@nclm
Copy link
Contributor Author

nclm commented Oct 3, 2024

Or maybe some kind of yearly repeating task in Github or whichever project management tool, just to remember to do a manual PR regularly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement New feature request feedback-requested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants