diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 98f69c701..94e7f9f6b 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -39,401 +39,403 @@ import { reactionPicker } from '@/scripts/reaction-picker';
import { getUrlWithoutLoginId } from '@/scripts/login-id';
import { getAccountFromId } from '@/scripts/get-account-from-id';
-console.info(`Misskey v${version}`);
+(async () => {
+ console.info(`Misskey v${version}`);
-if (_DEV_) {
- console.warn('Development mode!!!');
+ if (_DEV_) {
+ console.warn('Development mode!!!');
- console.info(`vue ${vueVersion}`);
+ console.info(`vue ${vueVersion}`);
- (window as any).$i = $i;
- (window as any).$store = defaultStore;
+ (window as any).$i = $i;
+ (window as any).$store = defaultStore;
- window.addEventListener('error', event => {
- console.error(event);
- /*
- alert({
- type: 'error',
- title: 'DEV: Unhandled error',
- text: event.message
+ window.addEventListener('error', event => {
+ console.error(event);
+ /*
+ alert({
+ type: 'error',
+ title: 'DEV: Unhandled error',
+ text: event.message
+ });
+ */
});
- */
+
+ window.addEventListener('unhandledrejection', event => {
+ console.error(event);
+ /*
+ alert({
+ type: 'error',
+ title: 'DEV: Unhandled promise rejection',
+ text: event.reason
+ });
+ */
+ });
+ }
+
+ // タッチデバイスでCSSの:hoverを機能させる
+ document.addEventListener('touchend', () => {}, { passive: true });
+
+ // 一斉リロード
+ reloadChannel.addEventListener('message', path => {
+ if (path !== null) location.href = path;
+ else location.reload();
});
- window.addEventListener('unhandledrejection', event => {
- console.error(event);
- /*
- alert({
- type: 'error',
- title: 'DEV: Unhandled promise rejection',
- text: event.reason
- });
- */
- });
-}
-
-// タッチデバイスでCSSの:hoverを機能させる
-document.addEventListener('touchend', () => {}, { passive: true });
-
-// 一斉リロード
-reloadChannel.addEventListener('message', path => {
- if (path !== null) location.href = path;
- else location.reload();
-});
-
-//#region SEE: https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
-// TODO: いつの日にか消したい
-const vh = window.innerHeight * 0.01;
-document.documentElement.style.setProperty('--vh', `${vh}px`);
-window.addEventListener('resize', () => {
+ //#region SEE: https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
+ // TODO: いつの日にか消したい
const vh = window.innerHeight * 0.01;
document.documentElement.style.setProperty('--vh', `${vh}px`);
-});
-//#endregion
+ window.addEventListener('resize', () => {
+ const vh = window.innerHeight * 0.01;
+ document.documentElement.style.setProperty('--vh', `${vh}px`);
+ });
+ //#endregion
-// If mobile, insert the viewport meta tag
-if (['smartphone', 'tablet'].includes(deviceKind)) {
- const viewport = document.getElementsByName('viewport').item(0);
- viewport.setAttribute('content',
- `${viewport.getAttribute('content')}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`);
-}
-
-//#region Set lang attr
-const html = document.documentElement;
-html.setAttribute('lang', lang);
-//#endregion
-
-//#region loginId
-const params = new URLSearchParams(location.search);
-const loginId = params.get('loginId');
-
-if (loginId) {
- const target = getUrlWithoutLoginId(location.href);
-
- if (!$i || $i.id !== loginId) {
- const account = await getAccountFromId(loginId);
- if (account) {
- await login(account.token, target);
- }
+ // If mobile, insert the viewport meta tag
+ if (['smartphone', 'tablet'].includes(deviceKind)) {
+ const viewport = document.getElementsByName('viewport').item(0);
+ viewport.setAttribute('content',
+ `${viewport.getAttribute('content')}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`);
}
- history.replaceState({ misskey: 'loginId' }, '', target);
-}
+ //#region Set lang attr
+ const html = document.documentElement;
+ html.setAttribute('lang', lang);
+ //#endregion
-//#endregion
+ //#region loginId
+ const params = new URLSearchParams(location.search);
+ const loginId = params.get('loginId');
-//#region Fetch user
-if ($i && $i.token) {
- if (_DEV_) {
- console.log('account cache found. refreshing...');
- }
+ if (loginId) {
+ const target = getUrlWithoutLoginId(location.href);
- refreshAccount();
-} else {
- if (_DEV_) {
- console.log('no account cache found.');
- }
-
- // 連携ログインの場合用にCookieを参照する
- const i = (document.cookie.match(/igi=(\w+)/) || [null, null])[1];
-
- if (i != null && i !== 'null') {
- if (_DEV_) {
- console.log('signing...');
- }
-
- try {
- document.body.innerHTML = 'Please wait...
';
- await login(i);
- } catch (err) {
- // Render the error screen
- // TODO: ちゃんとしたコンポーネントをレンダリングする(v10とかのトラブルシューティングゲーム付きのやつみたいな)
- document.body.innerHTML = 'Oops!
';
- }
- } else {
- if (_DEV_) {
- console.log('not signed in');
- }
- }
-}
-//#endregion
-
-const fetchInstanceMetaPromise = fetchInstance();
-
-fetchInstanceMetaPromise.then(() => {
- localStorage.setItem('v', instance.version);
-
- // Init service worker
- initializeSw();
-});
-
-const app = createApp(
- window.location.search === '?zen' ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
- !$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :
- ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) :
- ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) :
- defineAsyncComponent(() => import('@/ui/universal.vue')),
-);
-
-if (_DEV_) {
- app.config.performance = true;
-}
-
-app.config.globalProperties = {
- $i,
- $store: defaultStore,
- $instance: instance,
- $t: i18n.t,
- $ts: i18n.ts,
-};
-
-widgets(app);
-directives(app);
-components(app);
-
-const splash = document.getElementById('splash');
-// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
-if (splash) splash.addEventListener('transitionend', () => {
- splash.remove();
-});
-
-// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
-// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
-const rootEl = (() => {
- const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
-
- const currentEl = document.getElementById(MISSKEY_MOUNT_DIV_ID);
-
- if (currentEl) {
- console.warn('multiple import detected');
- return currentEl;
- }
-
- const rootEl = document.createElement('div');
- rootEl.id = MISSKEY_MOUNT_DIV_ID;
- document.body.appendChild(rootEl);
- return rootEl;
-})();
-
-app.mount(rootEl);
-
-// boot.jsのやつを解除
-window.onerror = null;
-window.onunhandledrejection = null;
-
-reactionPicker.init();
-
-if (splash) {
- splash.style.opacity = '0';
- splash.style.pointerEvents = 'none';
-}
-
-// クライアントが更新されたか？
-const lastVersion = localStorage.getItem('lastVersion');
-if (lastVersion !== version) {
- localStorage.setItem('lastVersion', version);
-
- // テーマリビルドするため
- localStorage.removeItem('theme');
-
- try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
- if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
- // ログインしてる場合だけ
- if ($i) {
- popup(defineAsyncComponent(() => import('@/components/updated.vue')), {}, {}, 'closed');
+ if (!$i || $i.id !== loginId) {
+ const account = await getAccountFromId(loginId);
+ if (account) {
+ await login(account.token, target);
}
}
- } catch (err) {
+
+ history.replaceState({ misskey: 'loginId' }, '', target);
}
-}
-// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
-watch(defaultStore.reactiveState.darkMode, (darkMode) => {
- applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
-}, { immediate: localStorage.theme == null });
+ //#endregion
-const darkTheme = computed(ColdDeviceStorage.makeGetterSetter('darkTheme'));
-const lightTheme = computed(ColdDeviceStorage.makeGetterSetter('lightTheme'));
+ //#region Fetch user
+ if ($i && $i.token) {
+ if (_DEV_) {
+ console.log('account cache found. refreshing...');
+ }
-watch(darkTheme, (theme) => {
- if (defaultStore.state.darkMode) {
- applyTheme(theme);
- }
-});
-
-watch(lightTheme, (theme) => {
- if (!defaultStore.state.darkMode) {
- applyTheme(theme);
- }
-});
-
-//#region Sync dark mode
-if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
- defaultStore.set('darkMode', isDeviceDarkmode());
-}
-
-window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => {
- if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
- defaultStore.set('darkMode', mql.matches);
- }
-});
-//#endregion
-
-fetchInstanceMetaPromise.then(() => {
- if (defaultStore.state.themeInitial) {
- if (instance.defaultLightTheme != null) ColdDeviceStorage.set('lightTheme', JSON5.parse(instance.defaultLightTheme));
- if (instance.defaultDarkTheme != null) ColdDeviceStorage.set('darkTheme', JSON5.parse(instance.defaultDarkTheme));
- defaultStore.set('themeInitial', false);
- }
-});
-
-watch(defaultStore.reactiveState.useBlurEffectForModal, v => {
- document.documentElement.style.setProperty('--modalBgFilter', v ? 'blur(4px)' : 'none');
-}, { immediate: true });
-
-watch(defaultStore.reactiveState.useBlurEffect, v => {
- if (v) {
- document.documentElement.style.removeProperty('--blur');
+ refreshAccount();
} else {
- document.documentElement.style.setProperty('--blur', 'none');
- }
-}, { immediate: true });
+ if (_DEV_) {
+ console.log('no account cache found.');
+ }
-let reloadDialogShowing = false;
-stream.on('_disconnected_', async () => {
- if (defaultStore.state.serverDisconnectedBehavior === 'reload') {
- location.reload();
- } else if (defaultStore.state.serverDisconnectedBehavior === 'dialog') {
- if (reloadDialogShowing) return;
- reloadDialogShowing = true;
- const { canceled } = await confirm({
- type: 'warning',
- title: i18n.ts.disconnectedFromServer,
- text: i18n.ts.reloadConfirm,
- });
- reloadDialogShowing = false;
- if (!canceled) {
+ // 連携ログインの場合用にCookieを参照する
+ const i = (document.cookie.match(/igi=(\w+)/) || [null, null])[1];
+
+ if (i != null && i !== 'null') {
+ if (_DEV_) {
+ console.log('signing...');
+ }
+
+ try {
+ document.body.innerHTML = 'Please wait...
';
+ await login(i);
+ } catch (err) {
+ // Render the error screen
+ // TODO: ちゃんとしたコンポーネントをレンダリングする(v10とかのトラブルシューティングゲーム付きのやつみたいな)
+ document.body.innerHTML = 'Oops!
';
+ }
+ } else {
+ if (_DEV_) {
+ console.log('not signed in');
+ }
+ }
+ }
+ //#endregion
+
+ const fetchInstanceMetaPromise = fetchInstance();
+
+ fetchInstanceMetaPromise.then(() => {
+ localStorage.setItem('v', instance.version);
+
+ // Init service worker
+ initializeSw();
+ });
+
+ const app = createApp(
+ window.location.search === '?zen' ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
+ !$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :
+ ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) :
+ ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) :
+ defineAsyncComponent(() => import('@/ui/universal.vue')),
+ );
+
+ if (_DEV_) {
+ app.config.performance = true;
+ }
+
+ app.config.globalProperties = {
+ $i,
+ $store: defaultStore,
+ $instance: instance,
+ $t: i18n.t,
+ $ts: i18n.ts,
+ };
+
+ widgets(app);
+ directives(app);
+ components(app);
+
+ const splash = document.getElementById('splash');
+ // 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
+ if (splash) splash.addEventListener('transitionend', () => {
+ splash.remove();
+ });
+
+ // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
+ // なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
+ const rootEl = (() => {
+ const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
+
+ const currentEl = document.getElementById(MISSKEY_MOUNT_DIV_ID);
+
+ if (currentEl) {
+ console.warn('multiple import detected');
+ return currentEl;
+ }
+
+ const rootEl = document.createElement('div');
+ rootEl.id = MISSKEY_MOUNT_DIV_ID;
+ document.body.appendChild(rootEl);
+ return rootEl;
+ })();
+
+ app.mount(rootEl);
+
+ // boot.jsのやつを解除
+ window.onerror = null;
+ window.onunhandledrejection = null;
+
+ reactionPicker.init();
+
+ if (splash) {
+ splash.style.opacity = '0';
+ splash.style.pointerEvents = 'none';
+ }
+
+ // クライアントが更新されたか？
+ const lastVersion = localStorage.getItem('lastVersion');
+ if (lastVersion !== version) {
+ localStorage.setItem('lastVersion', version);
+
+ // テーマリビルドするため
+ localStorage.removeItem('theme');
+
+ try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
+ if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
+ // ログインしてる場合だけ
+ if ($i) {
+ popup(defineAsyncComponent(() => import('@/components/updated.vue')), {}, {}, 'closed');
+ }
+ }
+ } catch (err) {
+ }
+ }
+
+ // NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
+ watch(defaultStore.reactiveState.darkMode, (darkMode) => {
+ applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
+ }, { immediate: localStorage.theme == null });
+
+ const darkTheme = computed(ColdDeviceStorage.makeGetterSetter('darkTheme'));
+ const lightTheme = computed(ColdDeviceStorage.makeGetterSetter('lightTheme'));
+
+ watch(darkTheme, (theme) => {
+ if (defaultStore.state.darkMode) {
+ applyTheme(theme);
+ }
+ });
+
+ watch(lightTheme, (theme) => {
+ if (!defaultStore.state.darkMode) {
+ applyTheme(theme);
+ }
+ });
+
+ //#region Sync dark mode
+ if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
+ defaultStore.set('darkMode', isDeviceDarkmode());
+ }
+
+ window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => {
+ if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
+ defaultStore.set('darkMode', mql.matches);
+ }
+ });
+ //#endregion
+
+ fetchInstanceMetaPromise.then(() => {
+ if (defaultStore.state.themeInitial) {
+ if (instance.defaultLightTheme != null) ColdDeviceStorage.set('lightTheme', JSON5.parse(instance.defaultLightTheme));
+ if (instance.defaultDarkTheme != null) ColdDeviceStorage.set('darkTheme', JSON5.parse(instance.defaultDarkTheme));
+ defaultStore.set('themeInitial', false);
+ }
+ });
+
+ watch(defaultStore.reactiveState.useBlurEffectForModal, v => {
+ document.documentElement.style.setProperty('--modalBgFilter', v ? 'blur(4px)' : 'none');
+ }, { immediate: true });
+
+ watch(defaultStore.reactiveState.useBlurEffect, v => {
+ if (v) {
+ document.documentElement.style.removeProperty('--blur');
+ } else {
+ document.documentElement.style.setProperty('--blur', 'none');
+ }
+ }, { immediate: true });
+
+ let reloadDialogShowing = false;
+ stream.on('_disconnected_', async () => {
+ if (defaultStore.state.serverDisconnectedBehavior === 'reload') {
location.reload();
+ } else if (defaultStore.state.serverDisconnectedBehavior === 'dialog') {
+ if (reloadDialogShowing) return;
+ reloadDialogShowing = true;
+ const { canceled } = await confirm({
+ type: 'warning',
+ title: i18n.ts.disconnectedFromServer,
+ text: i18n.ts.reloadConfirm,
+ });
+ reloadDialogShowing = false;
+ if (!canceled) {
+ location.reload();
+ }
}
- }
-});
-
-stream.on('emojiAdded', emojiData => {
- // TODO
- //store.commit('instance/set', );
-});
-
-for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
- import('./plugin').then(({ install }) => {
- install(plugin);
});
-}
-const hotkeys = {
- 'd': (): void => {
- defaultStore.set('darkMode', !defaultStore.state.darkMode);
- },
- 's': search,
-};
+ stream.on('emojiAdded', emojiData => {
+ // TODO
+ //store.commit('instance/set', );
+ });
-if ($i) {
- // only add post shortcuts if logged in
- hotkeys['p|n'] = post;
-
- if ($i.isDeleted) {
- alert({
- type: 'warning',
- text: i18n.ts.accountDeletionInProgress,
+ for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
+ import('./plugin').then(({ install }) => {
+ install(plugin);
});
}
- const lastUsed = localStorage.getItem('lastUsed');
- if (lastUsed) {
- const lastUsedDate = parseInt(lastUsed, 10);
- // 二時間以上前なら
- if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
- toast(i18n.t('welcomeBackWithName', {
- name: $i.name || $i.username,
- }));
- }
- }
- localStorage.setItem('lastUsed', Date.now().toString());
+ const hotkeys = {
+ 'd': (): void => {
+ defaultStore.set('darkMode', !defaultStore.state.darkMode);
+ },
+ 's': search,
+ };
- if ('Notification' in window) {
- // 許可を得ていなかったらリクエスト
- if (Notification.permission === 'default') {
- Notification.requestPermission();
+ if ($i) {
+ // only add post shortcuts if logged in
+ hotkeys['p|n'] = post;
+
+ if ($i.isDeleted) {
+ alert({
+ type: 'warning',
+ text: i18n.ts.accountDeletionInProgress,
+ });
}
+
+ const lastUsed = localStorage.getItem('lastUsed');
+ if (lastUsed) {
+ const lastUsedDate = parseInt(lastUsed, 10);
+ // 二時間以上前なら
+ if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
+ toast(i18n.t('welcomeBackWithName', {
+ name: $i.name || $i.username,
+ }));
+ }
+ }
+ localStorage.setItem('lastUsed', Date.now().toString());
+
+ if ('Notification' in window) {
+ // 許可を得ていなかったらリクエスト
+ if (Notification.permission === 'default') {
+ Notification.requestPermission();
+ }
+ }
+
+ const main = markRaw(stream.useChannel('main', null, 'System'));
+
+ // 自分の情報が更新されたとき
+ main.on('meUpdated', i => {
+ updateAccount(i);
+ });
+
+ main.on('readAllNotifications', () => {
+ updateAccount({ hasUnreadNotification: false });
+ });
+
+ main.on('unreadNotification', () => {
+ updateAccount({ hasUnreadNotification: true });
+ });
+
+ main.on('unreadMention', () => {
+ updateAccount({ hasUnreadMentions: true });
+ });
+
+ main.on('readAllUnreadMentions', () => {
+ updateAccount({ hasUnreadMentions: false });
+ });
+
+ main.on('unreadSpecifiedNote', () => {
+ updateAccount({ hasUnreadSpecifiedNotes: true });
+ });
+
+ main.on('readAllUnreadSpecifiedNotes', () => {
+ updateAccount({ hasUnreadSpecifiedNotes: false });
+ });
+
+ main.on('readAllMessagingMessages', () => {
+ updateAccount({ hasUnreadMessagingMessage: false });
+ });
+
+ main.on('unreadMessagingMessage', () => {
+ updateAccount({ hasUnreadMessagingMessage: true });
+ sound.play('chatBg');
+ });
+
+ main.on('readAllAntennas', () => {
+ updateAccount({ hasUnreadAntenna: false });
+ });
+
+ main.on('unreadAntenna', () => {
+ updateAccount({ hasUnreadAntenna: true });
+ sound.play('antenna');
+ });
+
+ main.on('readAllAnnouncements', () => {
+ updateAccount({ hasUnreadAnnouncement: false });
+ });
+
+ main.on('readAllChannels', () => {
+ updateAccount({ hasUnreadChannel: false });
+ });
+
+ main.on('unreadChannel', () => {
+ updateAccount({ hasUnreadChannel: true });
+ sound.play('channel');
+ });
+
+ // トークンが再生成されたとき
+ // このままではMisskeyが利用できないので強制的にサインアウトさせる
+ main.on('myTokenRegenerated', () => {
+ signout();
+ });
}
- const main = markRaw(stream.useChannel('main', null, 'System'));
-
- // 自分の情報が更新されたとき
- main.on('meUpdated', i => {
- updateAccount(i);
- });
-
- main.on('readAllNotifications', () => {
- updateAccount({ hasUnreadNotification: false });
- });
-
- main.on('unreadNotification', () => {
- updateAccount({ hasUnreadNotification: true });
- });
-
- main.on('unreadMention', () => {
- updateAccount({ hasUnreadMentions: true });
- });
-
- main.on('readAllUnreadMentions', () => {
- updateAccount({ hasUnreadMentions: false });
- });
-
- main.on('unreadSpecifiedNote', () => {
- updateAccount({ hasUnreadSpecifiedNotes: true });
- });
-
- main.on('readAllUnreadSpecifiedNotes', () => {
- updateAccount({ hasUnreadSpecifiedNotes: false });
- });
-
- main.on('readAllMessagingMessages', () => {
- updateAccount({ hasUnreadMessagingMessage: false });
- });
-
- main.on('unreadMessagingMessage', () => {
- updateAccount({ hasUnreadMessagingMessage: true });
- sound.play('chatBg');
- });
-
- main.on('readAllAntennas', () => {
- updateAccount({ hasUnreadAntenna: false });
- });
-
- main.on('unreadAntenna', () => {
- updateAccount({ hasUnreadAntenna: true });
- sound.play('antenna');
- });
-
- main.on('readAllAnnouncements', () => {
- updateAccount({ hasUnreadAnnouncement: false });
- });
-
- main.on('readAllChannels', () => {
- updateAccount({ hasUnreadChannel: false });
- });
-
- main.on('unreadChannel', () => {
- updateAccount({ hasUnreadChannel: true });
- sound.play('channel');
- });
-
- // トークンが再生成されたとき
- // このままではMisskeyが利用できないので強制的にサインアウトさせる
- main.on('myTokenRegenerated', () => {
- signout();
- });
-}
-
-// shortcut
-document.addEventListener('keydown', makeHotkey(hotkeys));
+ // shortcut
+ document.addEventListener('keydown', makeHotkey(hotkeys));
+})();
diff --git a/packages/client/src/scripts/emojilist.ts b/packages/client/src/scripts/emojilist.ts
index 4196170d2..f9afcda12 100644
--- a/packages/client/src/scripts/emojilist.ts
+++ b/packages/client/src/scripts/emojilist.ts
@@ -8,4 +8,6 @@ export type UnicodeEmojiDef = {
}
// initial converted from https://github.com/muan/emojilib/commit/242fe68be86ed6536843b83f7e32f376468b38fb
-export const emojilist = (await import('../emojilist.json')).default as UnicodeEmojiDef[];
+import _emojilist from '../emojilist.json';
+
+export const emojilist = _emojilist as UnicodeEmojiDef[];
diff --git a/packages/client/src/scripts/idb-proxy.ts b/packages/client/src/scripts/idb-proxy.ts
index d462a0d7c..77bb84463 100644
--- a/packages/client/src/scripts/idb-proxy.ts
+++ b/packages/client/src/scripts/idb-proxy.ts
@@ -11,16 +11,15 @@ const fallbackName = (key: string) => `idbfallback::${key}`;
let idbAvailable = typeof window !== 'undefined' ? !!window.indexedDB : true;
if (idbAvailable) {
- try {
- await iset('idb-test', 'test');
- } catch (err) {
+ iset('idb-test', 'test').catch(err => {
console.error('idb error', err);
+ console.error('indexedDB is unavailable. It will use localStorage.');
idbAvailable = false;
- }
+ });
+} else {
+ console.error('indexedDB is unavailable. It will use localStorage.');
}
-if (!idbAvailable) console.error('indexedDB is unavailable. It will use localStorage.');
-
export async function get(key: string) {
if (idbAvailable) return iget(key);
return JSON.parse(localStorage.getItem(fallbackName(key)));