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: Continue importing from file if single emoji import fails #14461

Merged
merged 4 commits into from
Sep 24, 2024

Conversation

winrg
Copy link
Contributor

@winrg winrg commented Aug 25, 2024

What

Add a try/catch block to the DriveService.addFile call to allow other emojis to be processed in the case of a missing one.

Why

There are potentially still good emojis in a file after one bad one, so interrupting the import process is bad behavior.

Additional info (optional)

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Update CHANGELOG.md

Fixes #14460

@github-actions github-actions bot added the packages/backend Server side specific issue/PR label Aug 25, 2024
Copy link
Contributor

github-actions bot commented Aug 25, 2024

このPRによるapi.jsonの差分

差分はこちら

Get diff files from Workflow Page

Copy link

codecov bot commented Aug 25, 2024

Codecov Report

Attention: Patch coverage is 0% with 24 lines in your changes missing coverage. Please review.

Project coverage is 39.56%. Comparing base (a37df2c) to head (d6f1bc3).
Report is 2 commits behind head on develop.

Files with missing lines Patch % Lines
...e/processors/ImportCustomEmojisProcessorService.ts 0.00% 24 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #14461      +/-   ##
===========================================
- Coverage    39.63%   39.56%   -0.08%     
===========================================
  Files         1542     1542              
  Lines       192690   192697       +7     
  Branches      3562     3533      -29     
===========================================
- Hits         76376    76234     -142     
- Misses      115717   115866     +149     
  Partials       597      597              

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

@KisaragiEffective

This comment was marked as resolved.

@winrg
Copy link
Contributor Author

winrg commented Aug 28, 2024

i have done so

Copy link
Collaborator

@KisaragiEffective KisaragiEffective left a comment

Choose a reason for hiding this comment

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

LGTM, thank you

@kakkokari-gtyih kakkokari-gtyih added this to the v2024.9.0 milestone Sep 9, 2024
@kakkokari-gtyih
Copy link
Contributor

conflict resolved

@syuilo syuilo merged commit 6898489 into misskey-dev:develop Sep 24, 2024
10 of 13 checks passed
@syuilo
Copy link
Member

syuilo commented Sep 24, 2024

🙏🏻

HotoRas pushed a commit to HotoRas/misskey-neko that referenced this pull request Sep 27, 2024
…ey-dev#14461)

* Fix: Continue importing from file if single emoji import fails

* Fix indentation

---------

Co-authored-by: かっこかり <[email protected]>
Co-authored-by: syuilo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages/backend Server side specific issue/PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fix: missing emojis in meta.json interrupts emoji import
4 participants