Skip to content

Commit

Permalink
fix(frontend): 타임라인 노트의 리액션 뷰어에 리모트 서버의 커스텀 이모지가 표시되지 않음
Browse files Browse the repository at this point in the history
*Update CHANGELOG_CHERRYPICK.md

*test
  • Loading branch information
noridev committed May 29, 2024
1 parent 9bfc9bc commit feb83e6
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG_CHERRYPICK.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
# 릴리즈 노트
이 문서는 CherryPick의 변경 사항만 포함합니다.

## 4.x.x
출시일: unreleased<br>
기반 Misskey 버전: 2024.x.x<br>
Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오.

## NOTE
-

### General
-

### Client
- Fix: 타임라인 노트의 리액션 뷰어에 리모트 서버의 커스텀 이모지가 표시되지 않음

### Server
-

---

## 4.8.0
출시일: 2024/5/20<br>
기반 Misskey 버전: 2024.3.1<br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import * as sound from '@/scripts/sound.js';
import { checkReactionPermissions } from '@/scripts/check-reaction-permissions.js';
import { customEmojisMap } from '@/custom-emojis.js';
import { customEmojis, customEmojisMap } from '@/custom-emojis.js';
import { getUnicodeEmoji } from '@/scripts/emojilist.js';
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
Expand Down Expand Up @@ -66,7 +66,7 @@ const reactionName = computed(() => {
return r.slice(0, r.indexOf('@'));
});
const alternative: ComputedRef<string | null> = computed(() => defaultStore.state.reactableRemoteReactionEnabled ? (customEmojisMap.value.find(it => it.name === reactionName.value)?.name ?? null) : null);
const alternative: ComputedRef<string | null> = computed(() => defaultStore.state.reactableRemoteReactionEnabled ? (customEmojis.value.find(it => it.name === reactionName.value)?.name ?? null) : null);
async function toggleReaction(ev: MouseEvent) {
if (!canToggle.value) {
Expand Down Expand Up @@ -167,7 +167,7 @@ async function menu(ev) {
}),
});
},
}, customEmojisMap.value.find(it => it.name === reactionName.value)?.name ? {
}, customEmojis.value.find(it => it.name === reactionName.value)?.name ? {
text: i18n.ts.copy,
icon: 'ti ti-copy',
action: () => {
Expand Down

0 comments on commit feb83e6

Please sign in to comment.