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

Test migration of avatars #31866

Merged
merged 4 commits into from
Apr 11, 2022
Merged

Test migration of avatars #31866

merged 4 commits into from
Apr 11, 2022

Conversation

Pytal
Copy link
Member

@Pytal Pytal commented Apr 7, 2022 •
edited
Loading

Test avatar migration introduced in #31382

Avatar images can only be jpg or png files, see

server/core/Controller/AvatarController.php

Lines 170 to 175 in 9644b7e

if ($node->getMimeType() !== 'image/jpeg' && $node->getMimeType() !== 'image/png') {
return new JSONResponse(
['data' => ['message' => $this->l->t('The selected file is not an image.')]],
Http::STATUS_BAD_REQUEST
);
}
and

server/apps/settings/templates/settings/personal/personal.info.php

Line 68 in 9644b7e

<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>

@Pytal
Improve strictness of account file regex
3fb4201 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal
Test avatar migration
32fc848 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal Pytal added 3. to review Waiting for reviews feature: user migration Related to User migration labels Apr 7, 2022
@Pytal Pytal added this to the Nextcloud 24 milestone Apr 7, 2022
@Pytal Pytal requested review from come-nc and a team April 7, 2022 00:50
@Pytal Pytal self-assigned this Apr 7, 2022
@Pytal Pytal requested review from ArtificialOwl and vanpertsch and removed request for a team April 7, 2022 00:50
@Pytal Pytal mentioned this pull request Apr 7, 2022
Merged
@Pytal Pytal requested review from artonge and CarlSchwan April 7, 2022 00:52
come-nc
come-nc reviewed Apr 7, 2022
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

👍

apps/settings/tests/UserMigration/AccountMigratorTest.php Outdated Show resolved Hide resolved
apps/settings/tests/UserMigration/AccountMigratorTest.php Show resolved Hide resolved
@blizzz blizzz mentioned this pull request Apr 7, 2022
Merged
@Pytal
Remove unnecessary array_diff
6e62c3d 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal
Add comment explaining avatar basename
8e7372d 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
artonge
artonge approved these changes Apr 11, 2022
View reviewed changes
Copy link
Contributor

@artonge artonge left a comment

Choose a reason for hiding this comment

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

Nice avatars

@Pytal Pytal added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 11, 2022
@Pytal Pytal merged commit 209a2a6 into master Apr 11, 2022
@Pytal Pytal deleted the test-avatar-migration branch April 11, 2022 17:45
@blizzz blizzz mentioned this pull request Apr 13, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artonge artonge artonge approved these changes

@come-nc come-nc come-nc approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl

@vanpertsch vanpertsch Awaiting requested review from vanpertsch

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

Assignees

@Pytal Pytal

Labels
4. to release Ready to be released and/or waiting for tests to finish feature: user migration Related to User migration
Projects
None yet
Milestone
Nextcloud 24
Development

Successfully merging this pull request may close these issues.
3 participants
@Pytal @artonge @come-nc