profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
syuilo 2022-08-27 00:40:31 +09:00
commit 4373019b36
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/components/url-preview.vue
View file

@ -68,7 +68,7 @@ let tweetHeight = $ref(150);
const requestUrl = new URL(props.url); const requestUrl = new URL(props.url);
if (requestUrl.hostname === 'twitter.com') { if (requestUrl.hostname === 'twitter.com' || requestUrl.hostname === 'mobile.twitter.com') {
const m = requestUrl.pathname.match(/^\/.+\/status(?:es)?\/(\d+)/); const m = requestUrl.pathname.match(/^\/.+\/status(?:es)?\/(\d+)/);
if (m) tweetId = m[1]; if (m) tweetId = m[1];
} }

2
packages/client/src/pages/settings/sounds.vue
View file

@ -90,7 +90,7 @@ async function edit(type) {
}, },
volume: { volume: {
type: 'range', type: 'range',
mim: 0, min: 0,
max: 1, max: 1,
step: 0.05, step: 0.05,
textConverter: (v) => `${Math.floor(v * 100)}%`, textConverter: (v) => `${Math.floor(v * 100)}%`,

8
packages/client/src/router.ts
View file

@ -133,6 +133,10 @@ export const routes = [{
path: '/api', path: '/api',
name: 'api', name: 'api',
component: page(() => import('./pages/settings/api.vue')), component: page(() => import('./pages/settings/api.vue')),
}, {
path: '/apps',
name: 'api',
component: page(() => import('./pages/settings/apps.vue')),
}, { }, {
path: '/webhook/edit/:webhookId', path: '/webhook/edit/:webhookId',
name: 'webhook', name: 'webhook',
@ -157,6 +161,10 @@ export const routes = [{
path: '/custom-css', path: '/custom-css',
name: 'general', name: 'general',
component: page(() => import('./pages/settings/custom-css.vue')), component: page(() => import('./pages/settings/custom-css.vue')),
}, {
path: '/accounts',
name: 'profile',
component: page(() => import('./pages/settings/accounts.vue')),
}, { }, {
path: '/account-info', path: '/account-info',
name: 'other', name: 'other',