michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Bug fix

Browse source
This commit is contained in:
Ajay Bura 2022-07-31 16:21:10 +05:30
parent 3f7ba56106
commit f99e79236e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/app/organisms/emoji-board/custom-emoji.js
View file

@ -143,10 +143,10 @@ class ImagePack {
function getGlobalImagePacks(mx) { function getGlobalImagePacks(mx) {
const globalContent = mx.getAccountData('im.ponies.emote_rooms')?.getContent(); const globalContent = mx.getAccountData('im.ponies.emote_rooms')?.getContent();
if (typeof globalContent !== 'object') return null; if (typeof globalContent !== 'object') return [];
const { rooms } = globalContent; const { rooms } = globalContent;
if (typeof rooms !== 'object') return null; if (typeof rooms !== 'object') return [];
const roomIds = Object.keys(rooms); const roomIds = Object.keys(rooms);
@ -206,7 +206,11 @@ function getRelevantPacks(mx, rooms) {
const globalPackIds = new Set(globalPacks.map((pack) => pack.id)); const globalPackIds = new Set(globalPacks.map((pack) => pack.id));
const roomsPack = rooms?.flatMap(getRoomImagePacks) ?? []; const roomsPack = rooms?.flatMap(getRoomImagePacks) ?? [];
return [].concat(userPack, globalPacks, roomsPack.filter((pack) => !globalPackIds.has(pack.id))); return [].concat(
userPack ?? [],
globalPacks,
roomsPack.filter((pack) => !globalPackIds.has(pack.id)),
);
} }
function getShortcodeToEmoji(room) { function getShortcodeToEmoji(room) {