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

feat: 新カスタム絵文字管理画面(β)の追加 #13473

Open
wants to merge 190 commits into
base: develop
Choose a base branch
from

Conversation

samunohito
Copy link
Member

@samunohito samunohito commented Feb 28, 2024

What

カスタム絵文字の登録画面をリニューアルし、複数の絵文字に対して同時に登録・更新作業を行えるようにしました。

Why

resolve #10996

Additional info (optional)

既存のカスタム絵文字管理画面はそのままのこし、新画面はβ版の位置づけで追加しています(安定したら完全に置き換える考え)。

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests

# Conflicts:
#	packages/misskey-js/src/api.types.ts
#	packages/misskey-js/src/autogen/apiClientJSDoc.ts
#	packages/misskey-js/src/autogen/endpoint.ts
#	packages/misskey-js/src/autogen/entities.ts
#	packages/misskey-js/src/autogen/models.ts
#	packages/misskey-js/src/autogen/types.ts
# Conflicts:
#	packages/frontend/package.json
#	packages/misskey-js/src/autogen/apiClientJSDoc.ts
#	packages/misskey-js/src/autogen/endpoint.ts
#	packages/misskey-js/src/autogen/entities.ts
#	packages/misskey-js/src/autogen/models.ts
#	packages/misskey-js/src/autogen/types.ts
#	pnpm-lock.yaml
# Conflicts:
#	packages/misskey-js/src/autogen/apiClientJSDoc.ts
#	packages/misskey-js/src/autogen/endpoint.ts
#	packages/misskey-js/src/autogen/entities.ts
#	packages/misskey-js/src/autogen/models.ts
#	packages/misskey-js/src/autogen/types.ts
# Conflicts:
#	packages/backend/src/core/CustomEmojiService.ts
#	packages/backend/src/server/api/endpoints/admin/emoji/update.ts
#	packages/frontend/src/components/global/MkStickyContainer.vue
@samunohito samunohito removed this from the v2024.11.1? milestone Nov 23, 2024
fruitriin added a commit to mistems/mistems that referenced this pull request Dec 3, 2024
@Sayamame-beans
Copy link
Member

Check Misskey JS autogenのCIがコケているのは、空白が1行無くて差分が発生しているからという理由っぽいです…
https://github.com/misskey-dev/misskey/actions/runs/12522540171/job/34931019195?pr=13473#step:5:12

Comment on lines +598 to +600
const direction = sortKey.startsWith('-') ? 'DESC' : 'ASC';
const key = sortKey.replace(/^[+-]/, '');
builder.addOrderBy(`emoji.${key}`, direction);
Copy link
Member

Choose a reason for hiding this comment

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

copied from niri-la#239 (comment)

未知のsortKeyでSQL Injectionできないかが若干こわいのでfetchEmojisSortKeysにsortKeyがあるかどうかをここでも確認したい気がする

もちろん API の json validation で弾いてるっぽいけど、念のためにここで確認したくなる
(将来別のAPI等が使うようになった際に API 側の実装を忘れる可能性を気にしてる)

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 packages/frontend Client side specific issue/PR packages/misskey-js
Projects
7 participants