Skip to content

respect privacy options of event/task in activity for shared calendar #13331

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
Closed
fdellwing wants to merge 4 commits into from
Closed

respect privacy options of event/task in activity for shared calendar #13331

fdellwing wants to merge 4 commits into from

Conversation

@fdellwing
Copy link

@fdellwing fdellwing commented Jan 3, 2019

do not show calendar events in activity log if event is not public

respect privacy options of event
bdb5201 
do not show calendar events in activity log if event is not public

Signed-off-by: Fabian Dellwing <f.dellwing@netfutura.de>
fix regression
d124d72 
make sure to only hide calendar events, not todos
show all events in owner activity log

Signed-off-by: Fabian Dellwing <f.dellwing@netfutura.de>
tcitworld
tcitworld reviewed Jan 3, 2019
View reviewed changes
Copy link
Member

@tcitworld tcitworld left a comment

Choose a reason for hiding this comment

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

Looks good to me, a test inside https://github.com/nextcloud/server/blob/master/apps/dav/tests/unit/CalDAV/Activity/BackendTest.php would be nice.

@fdellwing
Copy link
Author

fdellwing commented Jan 3, 2019

I'm really not good with tests in PHP, will look into it.

@tcitworld
Copy link
Member

tcitworld commented Jan 3, 2019

I'll be happy to try to provide some if you don't feel like it. :)

@rullzer
Copy link
Member

rullzer commented Jan 4, 2019

@fdellwing first of all thanks :)

So this is to hide activities for private events in shared calendars right?

@fdellwing
Copy link
Author

fdellwing commented Jan 4, 2019

Yes, that is correct.

also hide private tasks
7fd4bef 
fix indentation

Signed-off-by: Fabian Dellwing <f.dellwing@netfutura.de>
@fdellwing fdellwing changed the title respect privacy options of event respect privacy options of event/task in activity for shared calendar Jan 4, 2019
@fdellwing
Copy link
Author

fdellwing commented Jan 4, 2019

I have no clue why the test is failing, maybe unrelated?

@rullzer rullzer added this to the Nextcloud 16 milestone Jan 4, 2019
@rullzer rullzer added the 3. to review Waiting for reviews label Jan 4, 2019
georgehrke
georgehrke reviewed Jan 4, 2019
View reviewed changes
skip loop earlier, use const instead of hardcoded number
24eae49 
Signed-off-by: Fabian Dellwing <f.dellwing@netfutura.de>
@fdellwing
Copy link
Author

fdellwing commented Jan 4, 2019 •
edited
Loading

I did add an use statement for the CalDavBackend to not have the classification hardcoded. I hope this is fine for you. It probably also makes the code more readable, as you do not have to guess what 0 stands for.

@nickvergessen
Copy link
Member

nickvergessen commented Jan 8, 2019

I think I would still trigger an activity and just leave out the details/name.

@georgehrke
Copy link
Member

georgehrke commented Jan 8, 2019

I think I would still trigger an activity and just leave out the details/name.

Maybe for events that are set to "share as show busy only", but not for events set to "hide when sharing". :)

@nickvergessen
Copy link
Member

nickvergessen commented Jan 8, 2019

Maybe for events that are set to "share as show busy only", but not for events set to "hide when sharing". :)

Yes, exactly.

@fdellwing thanks for the PR. Do you want to integrate this change? Or shall I take it over?

@fdellwing
Copy link
Author

fdellwing commented Jan 8, 2019

I can change it so, that "show busy" generates an activity without details and "private" does not generate an activity at all.

It will have to wait until tomorrow though, I'll knock of work in 10 minutes. If you wanna change it yourself, feel free to take the PR over.

nickvergessen
nickvergessen reviewed Jan 8, 2019
View reviewed changes
apps/dav/lib/CalDAV/Activity/Backend.php
$users[] = $owner;

foreach ($users as $user) {
if ($classification !== CalDavBackend::CLASSIFICATION_PUBLIC && $user !== $owner) {
Copy link
Member

@nickvergessen nickvergessen Jan 8, 2019

Choose a reason for hiding this comment

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

if ($classification === CalDavBackend::CLASSIFICATION_PRIVATE && $user !== $owner) {

@nickvergessen
Copy link
Member

nickvergessen commented Jan 8, 2019

Actually let me take this over and add a step to clean it up.

@nickvergessen nickvergessen mentioned this pull request Jan 8, 2019
Merged
@fdellwing fdellwing deleted the patch-1 branch January 8, 2019 18:22
@nickvergessen
Copy link
Member

nickvergessen commented Jan 9, 2019

@fdellwing can you send me an email to <my github name>@nextcloud.com please? Thanks 😎

@fdellwing
Copy link
Author

fdellwing commented Jan 9, 2019

Sure thing.

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

Reviewers

@nickvergessen nickvergessen nickvergessen left review comments

@georgehrke georgehrke georgehrke left review comments

@tcitworld tcitworld tcitworld left review comments

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

@rullzer rullzer Awaiting requested review from rullzer

Assignees

No one assigned

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

5 participants

@fdellwing @tcitworld @rullzer @nickvergessen @georgehrke