diff options
| author | 1Step621 <86859447+1STEP621@users.noreply.github.com> | 2024-02-24 10:22:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-24 10:22:23 +0900 |
| commit | e3dd3f6b63efffde6dd125e8ecef66aa7069c1a0 (patch) | |
| tree | 2f90c46c89d786d33808e1335ab11e4f812183ef /packages/frontend/src/scripts | |
| parent | enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeD... (diff) | |
| download | sharkey-e3dd3f6b63efffde6dd125e8ecef66aa7069c1a0.tar.gz sharkey-e3dd3f6b63efffde6dd125e8ecef66aa7069c1a0.tar.bz2 sharkey-e3dd3f6b63efffde6dd125e8ecef66aa7069c1a0.zip | |
Enhance(frontend): リアクションピッカーを調整 (#13354)
* 打てない絵文字を表示しないのではなくグレーアウトするように など
* fix: 今度は検索とピン留めに効いてなかった
* lint fix
* use Map
* 斜めに線を引いてわかりやすく
* 斜め線は右上からのほうが良かったかも
* デザイン調整
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/check-reaction-permissions.ts | 6 | ||||
| -rw-r--r-- | packages/frontend/src/scripts/emojilist.ts | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/packages/frontend/src/scripts/check-reaction-permissions.ts b/packages/frontend/src/scripts/check-reaction-permissions.ts index c9d2a5bfc6..da704717c1 100644 --- a/packages/frontend/src/scripts/check-reaction-permissions.ts +++ b/packages/frontend/src/scripts/check-reaction-permissions.ts @@ -1,6 +1,10 @@ import * as Misskey from 'misskey-js'; +import { UnicodeEmojiDef } from './emojilist.js'; -export function checkReactionPermissions(me: Misskey.entities.MeDetailed, note: Misskey.entities.Note, emoji: Misskey.entities.EmojiSimple): boolean { +export function checkReactionPermissions(me: Misskey.entities.MeDetailed, note: Misskey.entities.Note, emoji: Misskey.entities.EmojiSimple | UnicodeEmojiDef): boolean { + if ('char' in emoji) return true; // UnicodeEmojiDefなら常にリアクション可能 + + emoji = emoji as Misskey.entities.EmojiSimple; const roleIdsThatCanBeUsedThisEmojiAsReaction = emoji.roleIdsThatCanBeUsedThisEmojiAsReaction ?? []; return !(emoji.localOnly && note.user.host !== me.host) && !(emoji.isSensitive && (note.reactionAcceptance === 'nonSensitiveOnly' || note.reactionAcceptance === 'nonSensitiveOnlyForLocalLikeOnlyForRemote')) diff --git a/packages/frontend/src/scripts/emojilist.ts b/packages/frontend/src/scripts/emojilist.ts index 54d45e025f..2a6120f3ba 100644 --- a/packages/frontend/src/scripts/emojilist.ts +++ b/packages/frontend/src/scripts/emojilist.ts @@ -20,6 +20,10 @@ export const emojilist: UnicodeEmojiDef[] = _emojilist.map(x => ({ category: unicodeEmojiCategories[x[2]], })); +export const unicodeEmojisMap = new Map<string, UnicodeEmojiDef>( + emojilist.map(x => [x.char, x]) +); + const _indexByChar = new Map<string, number>(); const _charGroupByCategory = new Map<string, string[]>(); for (let i = 0; i < emojilist.length; i++) { |