Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts:
#	packages/frontend/src/ui/universal.vue
This commit is contained in:
mattyatea 2023-11-04 10:15:02 +09:00
commit bee34b41e0
8 changed files with 111 additions and 108 deletions

View file

@ -481,6 +481,31 @@ export const defaultStore = markRaw(new Storage('base', {
where: 'device',
default: true,
},
sound_masterVolume: {
where: 'device',
default: 0.3,
},
sound_note: {
where: 'device',
default: { type: 'syuilo/n-aec', volume: 1 },
},
sound_noteMy: {
where: 'device',
default: { type: 'syuilo/n-cea-4va', volume: 1 },
},
sound_notification: {
where: 'device',
default: { type: 'syuilo/n-ea', volume: 1 },
},
sound_antenna: {
where: 'device',
default: { type: 'syuilo/triple', volume: 1 },
},
sound_channel: {
where: 'device',
default: { type: 'syuilo/square-pico', volume: 1 },
},
}));