Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # package.json # packages/frontend/src/components/MkEmojiEditDialog.vue # packages/frontend/src/components/MkMenu.vue # packages/frontend/src/components/MkNote.vue # packages/frontend/src/pages/timeline.vue
This commit is contained in:
commit
78a34d3de3
115 changed files with 4837 additions and 2932 deletions
|
|
@ -8,6 +8,7 @@ import * as Misskey from 'misskey-js';
|
|||
import { miLocalStorage } from './local-storage.js';
|
||||
import type { SoundType } from '@/scripts/sound.js';
|
||||
import { Storage } from '@/pizzax.js';
|
||||
import { hemisphere } from '@/scripts/intl-const.js';
|
||||
|
||||
interface PostFormAction {
|
||||
title: string,
|
||||
|
|
@ -258,6 +259,12 @@ export const defaultStore = markRaw(new Storage('base', {
|
|||
default: {
|
||||
src: 'home' as 'home' | 'local' | 'social' | 'global' | `list:${string}`,
|
||||
userList: null as Misskey.entities.UserList | null,
|
||||
filter: {
|
||||
withReplies: true,
|
||||
withRenotes: true,
|
||||
withSensitive: true,
|
||||
onlyFiles: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
pinnedUserLists: {
|
||||
|
|
@ -625,10 +632,6 @@ export const defaultStore = markRaw(new Storage('base', {
|
|||
where: 'device',
|
||||
default: false,
|
||||
},
|
||||
tlWithReplies: {
|
||||
where: 'device',
|
||||
default: false,
|
||||
},
|
||||
defaultWithReplies: {
|
||||
where: 'account',
|
||||
default: false,
|
||||
|
|
@ -665,6 +668,10 @@ export const defaultStore = markRaw(new Storage('base', {
|
|||
sfxVolume: 1,
|
||||
},
|
||||
},
|
||||
hemisphere: {
|
||||
where: 'device',
|
||||
default: hemisphere as 'N' | 'S',
|
||||
},
|
||||
enableHorizontalSwipe: {
|
||||
where: 'device',
|
||||
default: true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue