parent
a7ee4aabcb
commit
23f106a0c1
26 changed files with 628 additions and 573 deletions
|
@ -144,7 +144,7 @@ export function loadConfig() {
|
||||||
const clientManifestExists = fs.existsSync(_dirname + '/../../../built/_vite_/manifest.json');
|
const clientManifestExists = fs.existsSync(_dirname + '/../../../built/_vite_/manifest.json');
|
||||||
const clientManifest = clientManifestExists ?
|
const clientManifest = clientManifestExists ?
|
||||||
JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8'))
|
JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8'))
|
||||||
: { 'src/init.ts': { file: 'src/init.ts' } };
|
: { 'src/_boot_.ts': { file: 'src/_boot_.ts' } };
|
||||||
const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
|
const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
|
||||||
|
|
||||||
const mixin = {} as Mixin;
|
const mixin = {} as Mixin;
|
||||||
|
@ -165,7 +165,7 @@ export function loadConfig() {
|
||||||
mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;
|
mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;
|
||||||
mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;
|
mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;
|
||||||
mixin.userAgent = `Misskey/${meta.version} (${config.url})`;
|
mixin.userAgent = `Misskey/${meta.version} (${config.url})`;
|
||||||
mixin.clientEntry = clientManifest['src/init.ts'];
|
mixin.clientEntry = clientManifest['src/_boot_.ts'];
|
||||||
mixin.clientManifestExists = clientManifestExists;
|
mixin.clientManifestExists = clientManifestExists;
|
||||||
|
|
||||||
const externalMediaProxy = config.mediaProxy ?
|
const externalMediaProxy = config.mediaProxy ?
|
||||||
|
|
12
packages/frontend/src/_boot_.ts
Normal file
12
packages/frontend/src/_boot_.ts
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
// https://vitejs.dev/config/build-options.html#build-modulepreload
|
||||||
|
import 'vite/modulepreload-polyfill';
|
||||||
|
|
||||||
|
import '@/style.scss';
|
||||||
|
import { mainBoot } from './boot/main-boot';
|
||||||
|
import { subBoot } from './boot/sub-boot';
|
||||||
|
|
||||||
|
if (['/share', '/auth', '/miauth'].includes(location.pathname)) {
|
||||||
|
subBoot();
|
||||||
|
} else {
|
||||||
|
mainBoot();
|
||||||
|
}
|
263
packages/frontend/src/boot/common.ts
Normal file
263
packages/frontend/src/boot/common.ts
Normal file
|
@ -0,0 +1,263 @@
|
||||||
|
import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent, App } from 'vue';
|
||||||
|
import { compareVersions } from 'compare-versions';
|
||||||
|
import JSON5 from 'json5';
|
||||||
|
import widgets from '@/widgets';
|
||||||
|
import directives from '@/directives';
|
||||||
|
import components from '@/components';
|
||||||
|
import { version, ui, lang, updateLocale } from '@/config';
|
||||||
|
import { applyTheme } from '@/scripts/theme';
|
||||||
|
import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
|
||||||
|
import { i18n, updateI18n } from '@/i18n';
|
||||||
|
import { confirm, alert, post, popup, toast } from '@/os';
|
||||||
|
import { $i, refreshAccount, login, updateAccount, signout } from '@/account';
|
||||||
|
import { defaultStore, ColdDeviceStorage } from '@/store';
|
||||||
|
import { fetchInstance, instance } from '@/instance';
|
||||||
|
import { deviceKind } from '@/scripts/device-kind';
|
||||||
|
import { reloadChannel } from '@/scripts/unison-reload';
|
||||||
|
import { reactionPicker } from '@/scripts/reaction-picker';
|
||||||
|
import { getUrlWithoutLoginId } from '@/scripts/login-id';
|
||||||
|
import { getAccountFromId } from '@/scripts/get-account-from-id';
|
||||||
|
import { deckStore } from '@/ui/deck/deck-store';
|
||||||
|
import { miLocalStorage } from '@/local-storage';
|
||||||
|
import { fetchCustomEmojis } from '@/custom-emojis';
|
||||||
|
import { mainRouter } from '@/router';
|
||||||
|
|
||||||
|
export async function common(createVue: () => App<Element>) {
|
||||||
|
console.info(`Misskey v${version}`);
|
||||||
|
|
||||||
|
if (_DEV_) {
|
||||||
|
console.warn('Development mode!!!');
|
||||||
|
|
||||||
|
console.info(`vue ${vueVersion}`);
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
(window as any).$i = $i;
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
(window as any).$store = defaultStore;
|
||||||
|
|
||||||
|
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
|
||||||
|
});
|
||||||
|
*/
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const splash = document.getElementById('splash');
|
||||||
|
// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
|
||||||
|
if (splash) splash.addEventListener('transitionend', () => {
|
||||||
|
splash.remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
let isClientUpdated = false;
|
||||||
|
|
||||||
|
//#region クライアントが更新されたかチェック
|
||||||
|
const lastVersion = miLocalStorage.getItem('lastVersion');
|
||||||
|
if (lastVersion !== version) {
|
||||||
|
miLocalStorage.setItem('lastVersion', version);
|
||||||
|
|
||||||
|
// テーマリビルドするため
|
||||||
|
miLocalStorage.removeItem('theme');
|
||||||
|
|
||||||
|
try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
|
||||||
|
if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
|
||||||
|
isClientUpdated = true;
|
||||||
|
}
|
||||||
|
} catch (err) { /* empty */ }
|
||||||
|
}
|
||||||
|
//#endregion
|
||||||
|
|
||||||
|
//#region Detect language & fetch translations
|
||||||
|
const localeVersion = miLocalStorage.getItem('localeVersion');
|
||||||
|
const localeOutdated = (localeVersion == null || localeVersion !== version);
|
||||||
|
if (localeOutdated) {
|
||||||
|
const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
|
||||||
|
if (res.status === 200) {
|
||||||
|
const newLocale = await res.text();
|
||||||
|
const parsedNewLocale = JSON.parse(newLocale);
|
||||||
|
miLocalStorage.setItem('locale', newLocale);
|
||||||
|
miLocalStorage.setItem('localeVersion', version);
|
||||||
|
updateLocale(parsedNewLocale);
|
||||||
|
updateI18n(parsedNewLocale);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//#endregion
|
||||||
|
|
||||||
|
// タッチデバイスでCSSの:hoverを機能させる
|
||||||
|
document.addEventListener('touchend', () => {}, { passive: true });
|
||||||
|
|
||||||
|
// 一斉リロード
|
||||||
|
reloadChannel.addEventListener('message', path => {
|
||||||
|
if (path !== null) location.href = path;
|
||||||
|
else location.reload();
|
||||||
|
});
|
||||||
|
|
||||||
|
// 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
|
||||||
|
|
||||||
|
await defaultStore.ready;
|
||||||
|
await deckStore.ready;
|
||||||
|
|
||||||
|
const fetchInstanceMetaPromise = fetchInstance();
|
||||||
|
|
||||||
|
fetchInstanceMetaPromise.then(() => {
|
||||||
|
miLocalStorage.setItem('v', instance.version);
|
||||||
|
});
|
||||||
|
|
||||||
|
//#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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
history.replaceState({ misskey: 'loginId' }, '', target);
|
||||||
|
}
|
||||||
|
//#endregion
|
||||||
|
|
||||||
|
// NOTE: この処理は必ずクライアント更新チェック処理より後に来ること(テーマ再構築のため)
|
||||||
|
watch(defaultStore.reactiveState.darkMode, (darkMode) => {
|
||||||
|
applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
|
||||||
|
}, { immediate: miLocalStorage.getItem('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 });
|
||||||
|
|
||||||
|
//#region Fetch user
|
||||||
|
if ($i && $i.token) {
|
||||||
|
if (_DEV_) {
|
||||||
|
console.log('account cache found. refreshing...');
|
||||||
|
}
|
||||||
|
|
||||||
|
refreshAccount();
|
||||||
|
}
|
||||||
|
//#endregion
|
||||||
|
|
||||||
|
try {
|
||||||
|
await fetchCustomEmojis();
|
||||||
|
} catch (err) { /* empty */ }
|
||||||
|
|
||||||
|
const app = createVue();
|
||||||
|
|
||||||
|
if (_DEV_) {
|
||||||
|
app.config.performance = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
widgets(app);
|
||||||
|
directives(app);
|
||||||
|
components(app);
|
||||||
|
|
||||||
|
// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
|
||||||
|
// なぜか2回実行されることがあるため、mountするdivを1つに制限する
|
||||||
|
const rootEl = ((): HTMLElement => {
|
||||||
|
const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
|
||||||
|
|
||||||
|
const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID);
|
||||||
|
|
||||||
|
if (currentRoot) {
|
||||||
|
console.warn('multiple import detected');
|
||||||
|
return currentRoot;
|
||||||
|
}
|
||||||
|
|
||||||
|
const root = document.createElement('div');
|
||||||
|
root.id = MISSKEY_MOUNT_DIV_ID;
|
||||||
|
document.body.appendChild(root);
|
||||||
|
return root;
|
||||||
|
})();
|
||||||
|
|
||||||
|
app.mount(rootEl);
|
||||||
|
|
||||||
|
// boot.jsのやつを解除
|
||||||
|
window.onerror = null;
|
||||||
|
window.onunhandledrejection = null;
|
||||||
|
|
||||||
|
removeSplash();
|
||||||
|
|
||||||
|
return {
|
||||||
|
isClientUpdated,
|
||||||
|
app,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeSplash() {
|
||||||
|
const splash = document.getElementById('splash');
|
||||||
|
if (splash) {
|
||||||
|
splash.style.opacity = '0';
|
||||||
|
splash.style.pointerEvents = 'none';
|
||||||
|
}
|
||||||
|
}
|
254
packages/frontend/src/boot/main-boot.ts
Normal file
254
packages/frontend/src/boot/main-boot.ts
Normal file
|
@ -0,0 +1,254 @@
|
||||||
|
import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent } from 'vue';
|
||||||
|
import { common } from './common';
|
||||||
|
import { version, ui, lang, updateLocale } from '@/config';
|
||||||
|
import { i18n, updateI18n } from '@/i18n';
|
||||||
|
import { confirm, alert, post, popup, toast } from '@/os';
|
||||||
|
import { useStream } from '@/stream';
|
||||||
|
import * as sound from '@/scripts/sound';
|
||||||
|
import { $i, refreshAccount, login, updateAccount, signout } from '@/account';
|
||||||
|
import { defaultStore, ColdDeviceStorage } from '@/store';
|
||||||
|
import { makeHotkey } from '@/scripts/hotkey';
|
||||||
|
import { reactionPicker } from '@/scripts/reaction-picker';
|
||||||
|
import { miLocalStorage } from '@/local-storage';
|
||||||
|
import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
|
||||||
|
import { mainRouter } from '@/router';
|
||||||
|
import { initializeSw } from '@/scripts/initialize-sw';
|
||||||
|
|
||||||
|
export async function mainBoot() {
|
||||||
|
const { isClientUpdated } = await common(() => createApp(
|
||||||
|
new URLSearchParams(window.location.search).has('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')),
|
||||||
|
));
|
||||||
|
|
||||||
|
reactionPicker.init();
|
||||||
|
|
||||||
|
if (isClientUpdated && $i) {
|
||||||
|
popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
|
||||||
|
}
|
||||||
|
|
||||||
|
const stream = useStream();
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
|
||||||
|
import('../plugin').then(async ({ install }) => {
|
||||||
|
// Workaround for https://bugs.webkit.org/show_bug.cgi?id=242740
|
||||||
|
await new Promise(r => setTimeout(r, 0));
|
||||||
|
install(plugin);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const hotkeys = {
|
||||||
|
'd': (): void => {
|
||||||
|
defaultStore.set('darkMode', !defaultStore.state.darkMode);
|
||||||
|
},
|
||||||
|
's': (): void => {
|
||||||
|
mainRouter.push('/search');
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if ($i) {
|
||||||
|
// only add post shortcuts if logged in
|
||||||
|
hotkeys['p|n'] = post;
|
||||||
|
|
||||||
|
defaultStore.loaded.then(() => {
|
||||||
|
if (defaultStore.state.accountSetupWizard !== -1) {
|
||||||
|
popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {}, 'closed');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if ($i.isDeleted) {
|
||||||
|
alert({
|
||||||
|
type: 'warning',
|
||||||
|
text: i18n.ts.accountDeletionInProgress,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const m = now.getMonth() + 1;
|
||||||
|
const d = now.getDate();
|
||||||
|
|
||||||
|
if ($i.birthday) {
|
||||||
|
const bm = parseInt($i.birthday.split('-')[1]);
|
||||||
|
const bd = parseInt($i.birthday.split('-')[2]);
|
||||||
|
if (m === bm && d === bd) {
|
||||||
|
claimAchievement('loggedInOnBirthday');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m === 1 && d === 1) {
|
||||||
|
claimAchievement('loggedInOnNewYearsDay');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($i.loggedInDays >= 3) claimAchievement('login3');
|
||||||
|
if ($i.loggedInDays >= 7) claimAchievement('login7');
|
||||||
|
if ($i.loggedInDays >= 15) claimAchievement('login15');
|
||||||
|
if ($i.loggedInDays >= 30) claimAchievement('login30');
|
||||||
|
if ($i.loggedInDays >= 60) claimAchievement('login60');
|
||||||
|
if ($i.loggedInDays >= 100) claimAchievement('login100');
|
||||||
|
if ($i.loggedInDays >= 200) claimAchievement('login200');
|
||||||
|
if ($i.loggedInDays >= 300) claimAchievement('login300');
|
||||||
|
if ($i.loggedInDays >= 400) claimAchievement('login400');
|
||||||
|
if ($i.loggedInDays >= 500) claimAchievement('login500');
|
||||||
|
if ($i.loggedInDays >= 600) claimAchievement('login600');
|
||||||
|
if ($i.loggedInDays >= 700) claimAchievement('login700');
|
||||||
|
if ($i.loggedInDays >= 800) claimAchievement('login800');
|
||||||
|
if ($i.loggedInDays >= 900) claimAchievement('login900');
|
||||||
|
if ($i.loggedInDays >= 1000) claimAchievement('login1000');
|
||||||
|
|
||||||
|
if ($i.notesCount > 0) claimAchievement('notes1');
|
||||||
|
if ($i.notesCount >= 10) claimAchievement('notes10');
|
||||||
|
if ($i.notesCount >= 100) claimAchievement('notes100');
|
||||||
|
if ($i.notesCount >= 500) claimAchievement('notes500');
|
||||||
|
if ($i.notesCount >= 1000) claimAchievement('notes1000');
|
||||||
|
if ($i.notesCount >= 5000) claimAchievement('notes5000');
|
||||||
|
if ($i.notesCount >= 10000) claimAchievement('notes10000');
|
||||||
|
if ($i.notesCount >= 20000) claimAchievement('notes20000');
|
||||||
|
if ($i.notesCount >= 30000) claimAchievement('notes30000');
|
||||||
|
if ($i.notesCount >= 40000) claimAchievement('notes40000');
|
||||||
|
if ($i.notesCount >= 50000) claimAchievement('notes50000');
|
||||||
|
if ($i.notesCount >= 60000) claimAchievement('notes60000');
|
||||||
|
if ($i.notesCount >= 70000) claimAchievement('notes70000');
|
||||||
|
if ($i.notesCount >= 80000) claimAchievement('notes80000');
|
||||||
|
if ($i.notesCount >= 90000) claimAchievement('notes90000');
|
||||||
|
if ($i.notesCount >= 100000) claimAchievement('notes100000');
|
||||||
|
|
||||||
|
if ($i.followersCount > 0) claimAchievement('followers1');
|
||||||
|
if ($i.followersCount >= 10) claimAchievement('followers10');
|
||||||
|
if ($i.followersCount >= 50) claimAchievement('followers50');
|
||||||
|
if ($i.followersCount >= 100) claimAchievement('followers100');
|
||||||
|
if ($i.followersCount >= 300) claimAchievement('followers300');
|
||||||
|
if ($i.followersCount >= 500) claimAchievement('followers500');
|
||||||
|
if ($i.followersCount >= 1000) claimAchievement('followers1000');
|
||||||
|
|
||||||
|
if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365) {
|
||||||
|
claimAchievement('passedSinceAccountCreated1');
|
||||||
|
}
|
||||||
|
if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 2) {
|
||||||
|
claimAchievement('passedSinceAccountCreated2');
|
||||||
|
}
|
||||||
|
if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 3) {
|
||||||
|
claimAchievement('passedSinceAccountCreated3');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (claimedAchievements.length >= 30) {
|
||||||
|
claimAchievement('collectAchievements30');
|
||||||
|
}
|
||||||
|
|
||||||
|
window.setInterval(() => {
|
||||||
|
if (Math.floor(Math.random() * 20000) === 0) {
|
||||||
|
claimAchievement('justPlainLucky');
|
||||||
|
}
|
||||||
|
}, 1000 * 10);
|
||||||
|
|
||||||
|
window.setTimeout(() => {
|
||||||
|
claimAchievement('client30min');
|
||||||
|
}, 1000 * 60 * 30);
|
||||||
|
|
||||||
|
window.setTimeout(() => {
|
||||||
|
claimAchievement('client60min');
|
||||||
|
}, 1000 * 60 * 60);
|
||||||
|
|
||||||
|
const lastUsed = miLocalStorage.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,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
miLocalStorage.setItem('lastUsed', Date.now().toString());
|
||||||
|
|
||||||
|
const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt');
|
||||||
|
const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');
|
||||||
|
if (neverShowDonationInfo !== 'true' && (new Date($i.createdAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3))) && !location.pathname.startsWith('/miauth')) {
|
||||||
|
if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) {
|
||||||
|
popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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('readAllAntennas', () => {
|
||||||
|
updateAccount({ hasUnreadAntenna: false });
|
||||||
|
});
|
||||||
|
|
||||||
|
main.on('unreadAntenna', () => {
|
||||||
|
updateAccount({ hasUnreadAntenna: true });
|
||||||
|
sound.play('antenna');
|
||||||
|
});
|
||||||
|
|
||||||
|
main.on('readAllAnnouncements', () => {
|
||||||
|
updateAccount({ hasUnreadAnnouncement: false });
|
||||||
|
});
|
||||||
|
|
||||||
|
// トークンが再生成されたとき
|
||||||
|
// このままではMisskeyが利用できないので強制的にサインアウトさせる
|
||||||
|
main.on('myTokenRegenerated', () => {
|
||||||
|
signout();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// shortcut
|
||||||
|
document.addEventListener('keydown', makeHotkey(hotkeys));
|
||||||
|
|
||||||
|
initializeSw();
|
||||||
|
}
|
8
packages/frontend/src/boot/sub-boot.ts
Normal file
8
packages/frontend/src/boot/sub-boot.ts
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent } from 'vue';
|
||||||
|
import { common } from './common';
|
||||||
|
|
||||||
|
export async function subBoot() {
|
||||||
|
const { isClientUpdated } = await common(() => createApp(
|
||||||
|
defineAsyncComponent(() => import('@/ui/minimum.vue')),
|
||||||
|
));
|
||||||
|
}
|
|
@ -95,7 +95,7 @@ import XNavFolder from '@/components/MkDrive.navFolder.vue';
|
||||||
import XFolder from '@/components/MkDrive.folder.vue';
|
import XFolder from '@/components/MkDrive.folder.vue';
|
||||||
import XFile from '@/components/MkDrive.file.vue';
|
import XFile from '@/components/MkDrive.file.vue';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { defaultStore } from '@/store';
|
import { defaultStore } from '@/store';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { uploadFile, uploads } from '@/scripts/upload';
|
import { uploadFile, uploads } from '@/scripts/upload';
|
||||||
|
@ -131,7 +131,7 @@ const hierarchyFolders = ref<Misskey.entities.DriveFolder[]>([]);
|
||||||
const selectedFiles = ref<Misskey.entities.DriveFile[]>([]);
|
const selectedFiles = ref<Misskey.entities.DriveFile[]>([]);
|
||||||
const selectedFolders = ref<Misskey.entities.DriveFolder[]>([]);
|
const selectedFolders = ref<Misskey.entities.DriveFolder[]>([]);
|
||||||
const uploadings = uploads;
|
const uploadings = uploads;
|
||||||
const connection = stream.useChannel('drive');
|
const connection = useStream().useChannel('drive');
|
||||||
const keepOriginal = ref<boolean>(defaultStore.state.keepOriginalUploading); // 外部渡しが多いので$refは使わないほうがよい
|
const keepOriginal = ref<boolean>(defaultStore.state.keepOriginalUploading); // 外部渡しが多いので$refは使わないほうがよい
|
||||||
|
|
||||||
// ドロップされようとしているか
|
// ドロップされようとしているか
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
import { onBeforeUnmount, onMounted } from 'vue';
|
import { onBeforeUnmount, onMounted } from 'vue';
|
||||||
import * as Misskey from 'misskey-js';
|
import * as Misskey from 'misskey-js';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { claimAchievement } from '@/scripts/achievements';
|
import { claimAchievement } from '@/scripts/achievements';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
|
@ -50,7 +50,7 @@ const props = withDefaults(defineProps<{
|
||||||
let isFollowing = $ref(props.user.isFollowing);
|
let isFollowing = $ref(props.user.isFollowing);
|
||||||
let hasPendingFollowRequestFromYou = $ref(props.user.hasPendingFollowRequestFromYou);
|
let hasPendingFollowRequestFromYou = $ref(props.user.hasPendingFollowRequestFromYou);
|
||||||
let wait = $ref(false);
|
let wait = $ref(false);
|
||||||
const connection = stream.useChannel('main');
|
const connection = useStream().useChannel('main');
|
||||||
|
|
||||||
if (props.user.isFollowing == null) {
|
if (props.user.isFollowing == null) {
|
||||||
os.api('users/show', {
|
os.api('users/show', {
|
||||||
|
|
|
@ -22,7 +22,7 @@ import MkPagination, { Paging } from '@/components/MkPagination.vue';
|
||||||
import XNotification from '@/components/MkNotification.vue';
|
import XNotification from '@/components/MkNotification.vue';
|
||||||
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
|
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
|
||||||
import MkNote from '@/components/MkNote.vue';
|
import MkNote from '@/components/MkNote.vue';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { notificationTypes } from '@/const';
|
import { notificationTypes } from '@/const';
|
||||||
|
@ -45,7 +45,7 @@ const pagination: Paging = {
|
||||||
const onNotification = (notification) => {
|
const onNotification = (notification) => {
|
||||||
const isMuted = props.includeTypes ? !props.includeTypes.includes(notification.type) : $i.mutingNotificationTypes.includes(notification.type);
|
const isMuted = props.includeTypes ? !props.includeTypes.includes(notification.type) : $i.mutingNotificationTypes.includes(notification.type);
|
||||||
if (isMuted || document.visibilityState === 'visible') {
|
if (isMuted || document.visibilityState === 'visible') {
|
||||||
stream.send('readNotification');
|
useStream().send('readNotification');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isMuted) {
|
if (!isMuted) {
|
||||||
|
@ -56,7 +56,7 @@ const onNotification = (notification) => {
|
||||||
let connection;
|
let connection;
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
connection = stream.useChannel('main');
|
connection = useStream().useChannel('main');
|
||||||
connection.on('notification', onNotification);
|
connection.on('notification', onNotification);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { computed, provide, onUnmounted } from 'vue';
|
import { computed, provide, onUnmounted } from 'vue';
|
||||||
import MkNotes from '@/components/MkNotes.vue';
|
import MkNotes from '@/components/MkNotes.vue';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import * as sound from '@/scripts/sound';
|
import * as sound from '@/scripts/sound';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
import { defaultStore } from '@/store';
|
import { defaultStore } from '@/store';
|
||||||
|
@ -57,6 +57,8 @@ let query;
|
||||||
let connection;
|
let connection;
|
||||||
let connection2;
|
let connection2;
|
||||||
|
|
||||||
|
const stream = useStream();
|
||||||
|
|
||||||
if (props.src === 'antenna') {
|
if (props.src === 'antenna') {
|
||||||
endpoint = 'antennas/notes';
|
endpoint = 'antennas/notes';
|
||||||
query = {
|
query = {
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
import { shallowRef, computed, markRaw } from 'vue';
|
import { shallowRef, computed, markRaw } from 'vue';
|
||||||
import * as Misskey from 'misskey-js';
|
import * as Misskey from 'misskey-js';
|
||||||
import { api, apiGet } from './os';
|
import { api, apiGet } from './os';
|
||||||
import { miLocalStorage } from './local-storage';
|
import { useStream } from '@/stream';
|
||||||
import { stream } from '@/stream';
|
|
||||||
import { get, set } from '@/scripts/idb-proxy';
|
import { get, set } from '@/scripts/idb-proxy';
|
||||||
|
|
||||||
const storageCache = await get('emojis');
|
const storageCache = await get('emojis');
|
||||||
|
@ -17,6 +16,9 @@ export const customEmojiCategories = computed<[ ...string[], null ]>(() => {
|
||||||
return markRaw([...Array.from(categories), null]);
|
return markRaw([...Array.from(categories), null]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// TODO: ここら辺副作用なのでいい感じにする
|
||||||
|
const stream = useStream();
|
||||||
|
|
||||||
stream.on('emojiAdded', emojiData => {
|
stream.on('emojiAdded', emojiData => {
|
||||||
customEmojis.value = [emojiData.emoji, ...customEmojis.value];
|
customEmojis.value = [emojiData.emoji, ...customEmojis.value];
|
||||||
set('emojis', customEmojis.value);
|
set('emojis', customEmojis.value);
|
||||||
|
@ -34,10 +36,9 @@ stream.on('emojiDeleted', emojiData => {
|
||||||
|
|
||||||
export async function fetchCustomEmojis(force = false) {
|
export async function fetchCustomEmojis(force = false) {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const needsMigration = miLocalStorage.getItem('emojis') != null;
|
|
||||||
|
|
||||||
let res;
|
let res;
|
||||||
if (force || needsMigration) {
|
if (force) {
|
||||||
res = await api('emojis', {});
|
res = await api('emojis', {});
|
||||||
} else {
|
} else {
|
||||||
const lastFetchedAt = await get('lastEmojisFetchedAt');
|
const lastFetchedAt = await get('lastEmojisFetchedAt');
|
||||||
|
@ -48,10 +49,6 @@ export async function fetchCustomEmojis(force = false) {
|
||||||
customEmojis.value = res.emojis;
|
customEmojis.value = res.emojis;
|
||||||
set('emojis', res.emojis);
|
set('emojis', res.emojis);
|
||||||
set('lastEmojisFetchedAt', now);
|
set('lastEmojisFetchedAt', now);
|
||||||
if (needsMigration) {
|
|
||||||
miLocalStorage.removeItem('emojis');
|
|
||||||
miLocalStorage.removeItem('lastEmojisFetchedAt');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let cachedTags;
|
let cachedTags;
|
||||||
|
|
|
@ -1,523 +0,0 @@
|
||||||
/**
|
|
||||||
* Client entry point
|
|
||||||
*/
|
|
||||||
// https://vitejs.dev/config/build-options.html#build-modulepreload
|
|
||||||
import 'vite/modulepreload-polyfill';
|
|
||||||
|
|
||||||
import '@/style.scss';
|
|
||||||
|
|
||||||
import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent } from 'vue';
|
|
||||||
import { compareVersions } from 'compare-versions';
|
|
||||||
import JSON5 from 'json5';
|
|
||||||
|
|
||||||
import widgets from '@/widgets';
|
|
||||||
import directives from '@/directives';
|
|
||||||
import components from '@/components';
|
|
||||||
import { version, ui, lang, updateLocale } from '@/config';
|
|
||||||
import { applyTheme } from '@/scripts/theme';
|
|
||||||
import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
|
|
||||||
import { i18n, updateI18n } from '@/i18n';
|
|
||||||
import { confirm, alert, post, popup, toast } from '@/os';
|
|
||||||
import { stream } from '@/stream';
|
|
||||||
import * as sound from '@/scripts/sound';
|
|
||||||
import { $i, refreshAccount, login, updateAccount, signout } from '@/account';
|
|
||||||
import { defaultStore, ColdDeviceStorage } from '@/store';
|
|
||||||
import { fetchInstance, instance } from '@/instance';
|
|
||||||
import { makeHotkey } from '@/scripts/hotkey';
|
|
||||||
import { deviceKind } from '@/scripts/device-kind';
|
|
||||||
import { initializeSw } from '@/scripts/initialize-sw';
|
|
||||||
import { reloadChannel } from '@/scripts/unison-reload';
|
|
||||||
import { reactionPicker } from '@/scripts/reaction-picker';
|
|
||||||
import { getUrlWithoutLoginId } from '@/scripts/login-id';
|
|
||||||
import { getAccountFromId } from '@/scripts/get-account-from-id';
|
|
||||||
import { deckStore } from '@/ui/deck/deck-store';
|
|
||||||
import { miLocalStorage } from '@/local-storage';
|
|
||||||
import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
|
|
||||||
import { fetchCustomEmojis } from '@/custom-emojis';
|
|
||||||
import { mainRouter } from '@/router';
|
|
||||||
|
|
||||||
console.info(`Misskey v${version}`);
|
|
||||||
|
|
||||||
if (_DEV_) {
|
|
||||||
console.warn('Development mode!!!');
|
|
||||||
|
|
||||||
console.info(`vue ${vueVersion}`);
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
(window as any).$i = $i;
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
(window as any).$store = defaultStore;
|
|
||||||
|
|
||||||
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
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
//#region Detect language & fetch translations
|
|
||||||
const localeVersion = miLocalStorage.getItem('localeVersion');
|
|
||||||
const localeOutdated = (localeVersion == null || localeVersion !== version);
|
|
||||||
if (localeOutdated) {
|
|
||||||
const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
|
|
||||||
if (res.status === 200) {
|
|
||||||
const newLocale = await res.text();
|
|
||||||
const parsedNewLocale = JSON.parse(newLocale);
|
|
||||||
miLocalStorage.setItem('locale', newLocale);
|
|
||||||
miLocalStorage.setItem('localeVersion', version);
|
|
||||||
updateLocale(parsedNewLocale);
|
|
||||||
updateI18n(parsedNewLocale);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//#endregion
|
|
||||||
|
|
||||||
// タッチデバイスでCSSの:hoverを機能させる
|
|
||||||
document.addEventListener('touchend', () => {}, { passive: true });
|
|
||||||
|
|
||||||
// 一斉リロード
|
|
||||||
reloadChannel.addEventListener('message', path => {
|
|
||||||
if (path !== null) location.href = path;
|
|
||||||
else location.reload();
|
|
||||||
});
|
|
||||||
|
|
||||||
// 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
history.replaceState({ misskey: 'loginId' }, '', target);
|
|
||||||
}
|
|
||||||
|
|
||||||
//#endregion
|
|
||||||
|
|
||||||
//#region Fetch user
|
|
||||||
if ($i && $i.token) {
|
|
||||||
if (_DEV_) {
|
|
||||||
console.log('account cache found. refreshing...');
|
|
||||||
}
|
|
||||||
|
|
||||||
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 = '<div>Please wait...</div>';
|
|
||||||
await login(i);
|
|
||||||
} catch (err) {
|
|
||||||
// Render the error screen
|
|
||||||
// TODO: ちゃんとしたコンポーネントをレンダリングする(v10とかのトラブルシューティングゲーム付きのやつみたいな)
|
|
||||||
document.body.innerHTML = '<div id="err">Oops!</div>';
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (_DEV_) {
|
|
||||||
console.log('not signed in');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//#endregion
|
|
||||||
|
|
||||||
const fetchInstanceMetaPromise = fetchInstance();
|
|
||||||
|
|
||||||
fetchInstanceMetaPromise.then(() => {
|
|
||||||
miLocalStorage.setItem('v', instance.version);
|
|
||||||
|
|
||||||
// Init service worker
|
|
||||||
initializeSw();
|
|
||||||
});
|
|
||||||
|
|
||||||
try {
|
|
||||||
await fetchCustomEmojis();
|
|
||||||
} catch (err) { /* empty */ }
|
|
||||||
|
|
||||||
const app = createApp(
|
|
||||||
new URLSearchParams(window.location.search).has('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;
|
|
||||||
}
|
|
||||||
|
|
||||||
widgets(app);
|
|
||||||
directives(app);
|
|
||||||
components(app);
|
|
||||||
|
|
||||||
const splash = document.getElementById('splash');
|
|
||||||
// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
|
|
||||||
if (splash) splash.addEventListener('transitionend', () => {
|
|
||||||
splash.remove();
|
|
||||||
});
|
|
||||||
|
|
||||||
await deckStore.ready;
|
|
||||||
|
|
||||||
// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
|
|
||||||
// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
|
|
||||||
const rootEl = ((): HTMLElement => {
|
|
||||||
const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
|
|
||||||
|
|
||||||
const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID);
|
|
||||||
|
|
||||||
if (currentRoot) {
|
|
||||||
console.warn('multiple import detected');
|
|
||||||
return currentRoot;
|
|
||||||
}
|
|
||||||
|
|
||||||
const root = document.createElement('div');
|
|
||||||
root.id = MISSKEY_MOUNT_DIV_ID;
|
|
||||||
document.body.appendChild(root);
|
|
||||||
return root;
|
|
||||||
})();
|
|
||||||
|
|
||||||
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 = miLocalStorage.getItem('lastVersion');
|
|
||||||
if (lastVersion !== version) {
|
|
||||||
miLocalStorage.setItem('lastVersion', version);
|
|
||||||
|
|
||||||
// テーマリビルドするため
|
|
||||||
miLocalStorage.removeItem('theme');
|
|
||||||
|
|
||||||
try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
|
|
||||||
if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
|
|
||||||
// ログインしてる場合だけ
|
|
||||||
if ($i) {
|
|
||||||
popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (err) { /* empty */ }
|
|
||||||
}
|
|
||||||
|
|
||||||
await defaultStore.ready;
|
|
||||||
|
|
||||||
// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
|
|
||||||
watch(defaultStore.reactiveState.darkMode, (darkMode) => {
|
|
||||||
applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
|
|
||||||
}, { immediate: miLocalStorage.getItem('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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
|
|
||||||
import('./plugin').then(async ({ install }) => {
|
|
||||||
// Workaround for https://bugs.webkit.org/show_bug.cgi?id=242740
|
|
||||||
await new Promise(r => setTimeout(r, 0));
|
|
||||||
install(plugin);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const hotkeys = {
|
|
||||||
'd': (): void => {
|
|
||||||
defaultStore.set('darkMode', !defaultStore.state.darkMode);
|
|
||||||
},
|
|
||||||
's': (): void => {
|
|
||||||
mainRouter.push('/search');
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
if ($i) {
|
|
||||||
// only add post shortcuts if logged in
|
|
||||||
hotkeys['p|n'] = post;
|
|
||||||
|
|
||||||
defaultStore.loaded.then(() => {
|
|
||||||
if (defaultStore.state.accountSetupWizard !== -1) {
|
|
||||||
popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {}, 'closed');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if ($i.isDeleted) {
|
|
||||||
alert({
|
|
||||||
type: 'warning',
|
|
||||||
text: i18n.ts.accountDeletionInProgress,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const now = new Date();
|
|
||||||
const m = now.getMonth() + 1;
|
|
||||||
const d = now.getDate();
|
|
||||||
|
|
||||||
if ($i.birthday) {
|
|
||||||
const bm = parseInt($i.birthday.split('-')[1]);
|
|
||||||
const bd = parseInt($i.birthday.split('-')[2]);
|
|
||||||
if (m === bm && d === bd) {
|
|
||||||
claimAchievement('loggedInOnBirthday');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (m === 1 && d === 1) {
|
|
||||||
claimAchievement('loggedInOnNewYearsDay');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($i.loggedInDays >= 3) claimAchievement('login3');
|
|
||||||
if ($i.loggedInDays >= 7) claimAchievement('login7');
|
|
||||||
if ($i.loggedInDays >= 15) claimAchievement('login15');
|
|
||||||
if ($i.loggedInDays >= 30) claimAchievement('login30');
|
|
||||||
if ($i.loggedInDays >= 60) claimAchievement('login60');
|
|
||||||
if ($i.loggedInDays >= 100) claimAchievement('login100');
|
|
||||||
if ($i.loggedInDays >= 200) claimAchievement('login200');
|
|
||||||
if ($i.loggedInDays >= 300) claimAchievement('login300');
|
|
||||||
if ($i.loggedInDays >= 400) claimAchievement('login400');
|
|
||||||
if ($i.loggedInDays >= 500) claimAchievement('login500');
|
|
||||||
if ($i.loggedInDays >= 600) claimAchievement('login600');
|
|
||||||
if ($i.loggedInDays >= 700) claimAchievement('login700');
|
|
||||||
if ($i.loggedInDays >= 800) claimAchievement('login800');
|
|
||||||
if ($i.loggedInDays >= 900) claimAchievement('login900');
|
|
||||||
if ($i.loggedInDays >= 1000) claimAchievement('login1000');
|
|
||||||
|
|
||||||
if ($i.notesCount > 0) claimAchievement('notes1');
|
|
||||||
if ($i.notesCount >= 10) claimAchievement('notes10');
|
|
||||||
if ($i.notesCount >= 100) claimAchievement('notes100');
|
|
||||||
if ($i.notesCount >= 500) claimAchievement('notes500');
|
|
||||||
if ($i.notesCount >= 1000) claimAchievement('notes1000');
|
|
||||||
if ($i.notesCount >= 5000) claimAchievement('notes5000');
|
|
||||||
if ($i.notesCount >= 10000) claimAchievement('notes10000');
|
|
||||||
if ($i.notesCount >= 20000) claimAchievement('notes20000');
|
|
||||||
if ($i.notesCount >= 30000) claimAchievement('notes30000');
|
|
||||||
if ($i.notesCount >= 40000) claimAchievement('notes40000');
|
|
||||||
if ($i.notesCount >= 50000) claimAchievement('notes50000');
|
|
||||||
if ($i.notesCount >= 60000) claimAchievement('notes60000');
|
|
||||||
if ($i.notesCount >= 70000) claimAchievement('notes70000');
|
|
||||||
if ($i.notesCount >= 80000) claimAchievement('notes80000');
|
|
||||||
if ($i.notesCount >= 90000) claimAchievement('notes90000');
|
|
||||||
if ($i.notesCount >= 100000) claimAchievement('notes100000');
|
|
||||||
|
|
||||||
if ($i.followersCount > 0) claimAchievement('followers1');
|
|
||||||
if ($i.followersCount >= 10) claimAchievement('followers10');
|
|
||||||
if ($i.followersCount >= 50) claimAchievement('followers50');
|
|
||||||
if ($i.followersCount >= 100) claimAchievement('followers100');
|
|
||||||
if ($i.followersCount >= 300) claimAchievement('followers300');
|
|
||||||
if ($i.followersCount >= 500) claimAchievement('followers500');
|
|
||||||
if ($i.followersCount >= 1000) claimAchievement('followers1000');
|
|
||||||
|
|
||||||
if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365) {
|
|
||||||
claimAchievement('passedSinceAccountCreated1');
|
|
||||||
}
|
|
||||||
if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 2) {
|
|
||||||
claimAchievement('passedSinceAccountCreated2');
|
|
||||||
}
|
|
||||||
if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 3) {
|
|
||||||
claimAchievement('passedSinceAccountCreated3');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (claimedAchievements.length >= 30) {
|
|
||||||
claimAchievement('collectAchievements30');
|
|
||||||
}
|
|
||||||
|
|
||||||
window.setInterval(() => {
|
|
||||||
if (Math.floor(Math.random() * 20000) === 0) {
|
|
||||||
claimAchievement('justPlainLucky');
|
|
||||||
}
|
|
||||||
}, 1000 * 10);
|
|
||||||
|
|
||||||
window.setTimeout(() => {
|
|
||||||
claimAchievement('client30min');
|
|
||||||
}, 1000 * 60 * 30);
|
|
||||||
|
|
||||||
window.setTimeout(() => {
|
|
||||||
claimAchievement('client60min');
|
|
||||||
}, 1000 * 60 * 60);
|
|
||||||
|
|
||||||
const lastUsed = miLocalStorage.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,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
miLocalStorage.setItem('lastUsed', Date.now().toString());
|
|
||||||
|
|
||||||
const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt');
|
|
||||||
const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');
|
|
||||||
if (neverShowDonationInfo !== 'true' && (new Date($i.createdAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3))) && !location.pathname.startsWith('/miauth')) {
|
|
||||||
if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) {
|
|
||||||
popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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('readAllAntennas', () => {
|
|
||||||
updateAccount({ hasUnreadAntenna: false });
|
|
||||||
});
|
|
||||||
|
|
||||||
main.on('unreadAntenna', () => {
|
|
||||||
updateAccount({ hasUnreadAntenna: true });
|
|
||||||
sound.play('antenna');
|
|
||||||
});
|
|
||||||
|
|
||||||
main.on('readAllAnnouncements', () => {
|
|
||||||
updateAccount({ hasUnreadAnnouncement: false });
|
|
||||||
});
|
|
||||||
|
|
||||||
// トークンが再生成されたとき
|
|
||||||
// このままではMisskeyが利用できないので強制的にサインアウトさせる
|
|
||||||
main.on('myTokenRegenerated', () => {
|
|
||||||
signout();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// shortcut
|
|
||||||
document.addEventListener('keydown', makeHotkey(hotkeys));
|
|
|
@ -33,9 +33,9 @@
|
||||||
import { markRaw, onMounted, onUnmounted, ref } from 'vue';
|
import { markRaw, onMounted, onUnmounted, ref } from 'vue';
|
||||||
import XChart from './overview.queue.chart.vue';
|
import XChart from './overview.queue.chart.vue';
|
||||||
import number from '@/filters/number';
|
import number from '@/filters/number';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
|
|
||||||
const connection = markRaw(stream.useChannel('queueStats'));
|
const connection = markRaw(useStream().useChannel('queueStats'));
|
||||||
|
|
||||||
const activeSincePrevTick = ref(0);
|
const activeSincePrevTick = ref(0);
|
||||||
const active = ref(0);
|
const active = ref(0);
|
||||||
|
|
|
@ -72,7 +72,7 @@ import XRetention from './overview.retention.vue';
|
||||||
import XModerators from './overview.moderators.vue';
|
import XModerators from './overview.moderators.vue';
|
||||||
import XHeatmap from './overview.heatmap.vue';
|
import XHeatmap from './overview.heatmap.vue';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { definePageMetadata } from '@/scripts/page-metadata';
|
import { definePageMetadata } from '@/scripts/page-metadata';
|
||||||
import MkFoldableSection from '@/components/MkFoldableSection.vue';
|
import MkFoldableSection from '@/components/MkFoldableSection.vue';
|
||||||
|
@ -87,7 +87,7 @@ let federationSubActive = $ref<number | null>(null);
|
||||||
let federationSubActiveDiff = $ref<number | null>(null);
|
let federationSubActiveDiff = $ref<number | null>(null);
|
||||||
let newUsers = $ref(null);
|
let newUsers = $ref(null);
|
||||||
let activeInstances = $shallowRef(null);
|
let activeInstances = $shallowRef(null);
|
||||||
const queueStatsConnection = markRaw(stream.useChannel('queueStats'));
|
const queueStatsConnection = markRaw(useStream().useChannel('queueStats'));
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const filesPagination = {
|
const filesPagination = {
|
||||||
endpoint: 'admin/drive/files' as const,
|
endpoint: 'admin/drive/files' as const,
|
||||||
|
|
|
@ -47,11 +47,11 @@ import { markRaw, onMounted, onUnmounted, ref } from 'vue';
|
||||||
import XChart from './queue.chart.chart.vue';
|
import XChart from './queue.chart.chart.vue';
|
||||||
import number from '@/filters/number';
|
import number from '@/filters/number';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import MkFolder from '@/components/MkFolder.vue';
|
import MkFolder from '@/components/MkFolder.vue';
|
||||||
|
|
||||||
const connection = markRaw(stream.useChannel('queueStats'));
|
const connection = markRaw(useStream().useChannel('queueStats'));
|
||||||
|
|
||||||
const activeSincePrevTick = ref(0);
|
const activeSincePrevTick = ref(0);
|
||||||
const active = ref(0);
|
const active = ref(0);
|
||||||
|
|
|
@ -40,7 +40,7 @@ import MkInfo from '@/components/MkInfo.vue';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { ColdDeviceStorage, defaultStore } from '@/store';
|
import { ColdDeviceStorage, defaultStore } from '@/store';
|
||||||
import { unisonReload } from '@/scripts/unison-reload';
|
import { unisonReload } from '@/scripts/unison-reload';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { version, host } from '@/config';
|
import { version, host } from '@/config';
|
||||||
|
@ -125,7 +125,7 @@ type Profile = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const connection = $i && stream.useChannel('main');
|
const connection = $i && useStream().useChannel('main');
|
||||||
|
|
||||||
let profiles = $ref<Record<string, Profile> | null>(null);
|
let profiles = $ref<Record<string, Profile> | null>(null);
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import { $i } from './account';
|
||||||
import { api } from './os';
|
import { api } from './os';
|
||||||
import { get, set } from './scripts/idb-proxy';
|
import { get, set } from './scripts/idb-proxy';
|
||||||
import { defaultStore } from './store';
|
import { defaultStore } from './store';
|
||||||
import { stream } from './stream';
|
import { useStream } from './stream';
|
||||||
import { deepClone } from './scripts/clone';
|
import { deepClone } from './scripts/clone';
|
||||||
|
|
||||||
type StateDef = Record<string, {
|
type StateDef = Record<string, {
|
||||||
|
@ -26,8 +26,6 @@ type PizzaxChannelMessage<T extends StateDef> = {
|
||||||
userId?: string;
|
userId?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
const connection = $i && stream.useChannel('main');
|
|
||||||
|
|
||||||
export class Storage<T extends StateDef> {
|
export class Storage<T extends StateDef> {
|
||||||
public readonly ready: Promise<void>;
|
public readonly ready: Promise<void>;
|
||||||
public readonly loaded: Promise<void>;
|
public readonly loaded: Promise<void>;
|
||||||
|
@ -105,8 +103,10 @@ export class Storage<T extends StateDef> {
|
||||||
});
|
});
|
||||||
|
|
||||||
if ($i) {
|
if ($i) {
|
||||||
|
const connection = useStream().useChannel('main');
|
||||||
|
|
||||||
// streamingのuser storage updateイベントを監視して更新
|
// streamingのuser storage updateイベントを監視して更新
|
||||||
connection?.on('registryUpdated', ({ scope, key, value }: { scope?: string[], key: keyof T, value: T[typeof key]['default'] }) => {
|
connection.on('registryUpdated', ({ scope, key, value }: { scope?: string[], key: keyof T, value: T[typeof key]['default'] }) => {
|
||||||
if (!scope || scope.length !== 2 || scope[0] !== 'client' || scope[1] !== this.key || this.state[key] === value) return;
|
if (!scope || scope.length !== 2 || scope[0] !== 'client' || scope[1] !== this.key || this.state[key] === value) return;
|
||||||
|
|
||||||
this.reactiveState[key].value = this.state[key] = value;
|
this.reactiveState[key].value = this.state[key] = value;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import { DriveFile } from 'misskey-js/built/entities';
|
import { DriveFile } from 'misskey-js/built/entities';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { defaultStore } from '@/store';
|
import { defaultStore } from '@/store';
|
||||||
import { uploadFile } from '@/scripts/upload';
|
import { uploadFile } from '@/scripts/upload';
|
||||||
|
@ -51,7 +51,7 @@ export function chooseFileFromUrl(): Promise<DriveFile> {
|
||||||
|
|
||||||
const marker = Math.random().toString(); // TODO: UUIDとか使う
|
const marker = Math.random().toString(); // TODO: UUIDとか使う
|
||||||
|
|
||||||
const connection = stream.useChannel('main');
|
const connection = useStream().useChannel('main');
|
||||||
connection.on('urlUploadFinished', urlResponse => {
|
connection.on('urlUploadFinished', urlResponse => {
|
||||||
if (urlResponse.marker === marker) {
|
if (urlResponse.marker === marker) {
|
||||||
res(urlResponse.file);
|
res(urlResponse.file);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { onUnmounted, Ref } from 'vue';
|
import { onUnmounted, Ref } from 'vue';
|
||||||
import * as misskey from 'misskey-js';
|
import * as misskey from 'misskey-js';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
|
|
||||||
export function useNoteCapture(props: {
|
export function useNoteCapture(props: {
|
||||||
|
@ -9,7 +9,7 @@ export function useNoteCapture(props: {
|
||||||
isDeletedRef: Ref<boolean>;
|
isDeletedRef: Ref<boolean>;
|
||||||
}) {
|
}) {
|
||||||
const note = props.note;
|
const note = props.note;
|
||||||
const connection = $i ? stream : null;
|
const connection = $i ? useStream() : null;
|
||||||
|
|
||||||
function onStreamNoteUpdated(noteData): void {
|
function onStreamNoteUpdated(noteData): void {
|
||||||
const { type, id, body } = noteData;
|
const { type, id, body } = noteData;
|
||||||
|
|
|
@ -3,6 +3,14 @@ import { markRaw } from 'vue';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
import { url } from '@/config';
|
import { url } from '@/config';
|
||||||
|
|
||||||
export const stream = markRaw(new Misskey.Stream(url, $i ? {
|
let stream: Misskey.Stream | null = null;
|
||||||
token: $i.token,
|
|
||||||
} : null));
|
export function useStream(): Misskey.Stream {
|
||||||
|
if (stream) return stream;
|
||||||
|
|
||||||
|
stream = markRaw(new Misskey.Stream(url, $i ? {
|
||||||
|
token: $i.token,
|
||||||
|
} : null));
|
||||||
|
|
||||||
|
return stream;
|
||||||
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ import { popups, pendingApiRequestsCount } from '@/os';
|
||||||
import { uploads } from '@/scripts/upload';
|
import { uploads } from '@/scripts/upload';
|
||||||
import * as sound from '@/scripts/sound';
|
import * as sound from '@/scripts/sound';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { defaultStore } from '@/store';
|
import { defaultStore } from '@/store';
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ function onNotification(notification) {
|
||||||
if ($i.mutingNotificationTypes.includes(notification.type)) return;
|
if ($i.mutingNotificationTypes.includes(notification.type)) return;
|
||||||
|
|
||||||
if (document.visibilityState === 'visible') {
|
if (document.visibilityState === 'visible') {
|
||||||
stream.send('readNotification');
|
useStream().send('readNotification');
|
||||||
|
|
||||||
notifications.unshift(notification);
|
notifications.unshift(notification);
|
||||||
window.setTimeout(() => {
|
window.setTimeout(() => {
|
||||||
|
@ -71,7 +71,7 @@ function onNotification(notification) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($i) {
|
if ($i) {
|
||||||
const connection = stream.useChannel('main', null, 'UI');
|
const connection = useStream().useChannel('main', null, 'UI');
|
||||||
connection.on('notification', onNotification);
|
connection.on('notification', onNotification);
|
||||||
|
|
||||||
//#region Listen message from SW
|
//#region Listen message from SW
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { onUnmounted } from 'vue';
|
import { onUnmounted } from 'vue';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import MkButton from '@/components/MkButton.vue';
|
import MkButton from '@/components/MkButton.vue';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
|
@ -32,10 +32,10 @@ function reload() {
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
|
|
||||||
stream.on('_disconnected_', onDisconnected);
|
useStream().on('_disconnected_', onDisconnected);
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
stream.off('_disconnected_', onDisconnected);
|
useStream().off('_disconnected_', onDisconnected);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
34
packages/frontend/src/ui/minimum.vue
Normal file
34
packages/frontend/src/ui/minimum.vue
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
<template>
|
||||||
|
<div class="mk-app" style="container-type: inline-size;">
|
||||||
|
<RouterView/>
|
||||||
|
|
||||||
|
<XCommon/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { provide, ComputedRef } from 'vue';
|
||||||
|
import XCommon from './_common_/common.vue';
|
||||||
|
import { mainRouter } from '@/router';
|
||||||
|
import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
|
||||||
|
import { instanceName } from '@/config';
|
||||||
|
|
||||||
|
let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
|
||||||
|
|
||||||
|
provide('router', mainRouter);
|
||||||
|
provideMetadataReceiver((info) => {
|
||||||
|
pageMetadata = info;
|
||||||
|
if (pageMetadata.value) {
|
||||||
|
document.title = `${pageMetadata.value.title} | ${instanceName}`;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
document.documentElement.style.overflowY = 'scroll';
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.mk-app {
|
||||||
|
min-height: 100dvh;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -49,7 +49,7 @@
|
||||||
import { onUnmounted, reactive } from 'vue';
|
import { onUnmounted, reactive } from 'vue';
|
||||||
import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
|
import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
|
||||||
import { GetFormResultType } from '@/scripts/form';
|
import { GetFormResultType } from '@/scripts/form';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import number from '@/filters/number';
|
import number from '@/filters/number';
|
||||||
import * as sound from '@/scripts/sound';
|
import * as sound from '@/scripts/sound';
|
||||||
import { deepClone } from '@/scripts/clone';
|
import { deepClone } from '@/scripts/clone';
|
||||||
|
@ -81,7 +81,7 @@ const { widgetProps, configure } = useWidgetPropsManager(name,
|
||||||
emit,
|
emit,
|
||||||
);
|
);
|
||||||
|
|
||||||
const connection = stream.useChannel('queueStats');
|
const connection = useStream().useChannel('queueStats');
|
||||||
const current = reactive({
|
const current = reactive({
|
||||||
inbox: {
|
inbox: {
|
||||||
activeSincePrevTick: 0,
|
activeSincePrevTick: 0,
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
import { onUnmounted, ref } from 'vue';
|
import { onUnmounted, ref } from 'vue';
|
||||||
import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
|
import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget';
|
||||||
import { GetFormResultType } from '@/scripts/form';
|
import { GetFormResultType } from '@/scripts/form';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { getStaticImageUrl } from '@/scripts/media-proxy';
|
import { getStaticImageUrl } from '@/scripts/media-proxy';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import MkContainer from '@/components/MkContainer.vue';
|
import MkContainer from '@/components/MkContainer.vue';
|
||||||
|
@ -54,7 +54,7 @@ const { widgetProps, configure } = useWidgetPropsManager(name,
|
||||||
emit,
|
emit,
|
||||||
);
|
);
|
||||||
|
|
||||||
const connection = stream.useChannel('main');
|
const connection = useStream().useChannel('main');
|
||||||
const images = ref([]);
|
const images = ref([]);
|
||||||
const fetching = ref(true);
|
const fetching = ref(true);
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ import XDisk from './disk.vue';
|
||||||
import MkContainer from '@/components/MkContainer.vue';
|
import MkContainer from '@/components/MkContainer.vue';
|
||||||
import { GetFormResultType } from '@/scripts/form';
|
import { GetFormResultType } from '@/scripts/form';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import { stream } from '@/stream';
|
import { useStream } from '@/stream';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
|
|
||||||
const name = 'serverMetric';
|
const name = 'serverMetric';
|
||||||
|
@ -75,7 +75,7 @@ const toggleView = () => {
|
||||||
save();
|
save();
|
||||||
};
|
};
|
||||||
|
|
||||||
const connection = stream.useChannel('serverStats');
|
const connection = useStream().useChannel('serverStats');
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
connection.dispose();
|
connection.dispose();
|
||||||
});
|
});
|
||||||
|
|
|
@ -117,7 +117,7 @@ export function getConfig(): UserConfig {
|
||||||
manifest: 'manifest.json',
|
manifest: 'manifest.json',
|
||||||
rollupOptions: {
|
rollupOptions: {
|
||||||
input: {
|
input: {
|
||||||
app: './src/init.ts',
|
app: './src/_boot_.ts',
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
manualChunks: {
|
manualChunks: {
|
||||||
|
|
Loading…
Reference in a new issue