1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-25 06:14:14 +02:00

Merge branch 'develop' into room

This commit is contained in:
syuilo
2026-03-22 18:14:44 +09:00
71 changed files with 2732 additions and 2471 deletions

View File

@@ -150,6 +150,7 @@ import { definePage } from '@/page.js';
import { claimAchievement, claimedAchievements } from '@/utility/achievements.js';
import { $i } from '@/i.js';
import { prefer } from '@/preferences.js';
import { DEFAULT_EMOJIS } from '@@/js/const.js';
const patronsWithIcon = [{
name: 'カイヤン',
@@ -429,7 +430,12 @@ const containerEl = useTemplateRef('containerEl');
function iconLoaded() {
if (containerEl.value == null) return;
const emojis = prefer.s.emojiPalettes[0].emojis;
const emojis = prefer.s.emojiPalettes[0]?.emojis ?? [];
if (emojis.length < DEFAULT_EMOJIS.length) {
emojis.push(...DEFAULT_EMOJIS.slice(0, DEFAULT_EMOJIS.length - emojis.length));
}
const containerWidth = containerEl.value.offsetWidth;
for (let i = 0; i < 32; i++) {
easterEggEmojis.value.push({