- {{ i18n.ts.keepCw }}
+ {{ i18n.ts.keepCw }}
- {{ i18n.ts.defaultCW }}
- {{ i18n.ts.defaultCWDescription }}
+ {{ i18n.ts.defaultCW }}
+ {{ i18n.ts.defaultCWDescription }}
- {{ i18n.ts.defaultCWPriority }}
- {{ i18n.ts.defaultCWPriorityDescription }}
+ {{ i18n.ts.defaultCWPriority }}
+ {{ i18n.ts.defaultCWPriorityDescription }}
@@ -296,6 +296,7 @@ const $i = ensureSignin();
const isLocked = ref($i.isLocked);
const autoAcceptFollowed = ref($i.autoAcceptFollowed);
const noCrawle = ref($i.noCrawle);
+const preventAiLearning = ref($i.preventAiLearning);
const noindex = ref($i.noindex);
const enableRss = ref($i.enableRss);
const isExplorable = ref($i.isExplorable);
@@ -316,8 +317,6 @@ const computedAllowUnsignedFetch = computed(() => {
}
return instance.allowUnsignedFetch;
});
-
-const preventAiLearning = ref($i.preventAiLearning);
const defaultNoteVisibility = prefer.model('defaultNoteVisibility');
const defaultNoteLocalOnly = prefer.model('defaultNoteLocalOnly');
const rememberNoteVisibility = prefer.model('rememberNoteVisibility');
@@ -365,6 +364,7 @@ function save() {
isLocked: !!isLocked.value,
autoAcceptFollowed: !!autoAcceptFollowed.value,
noCrawle: !!noCrawle.value,
+ preventAiLearning: !!preventAiLearning.value,
noindex: !!noindex.value,
enableRss: !!enableRss.value,
isExplorable: !!isExplorable.value,
diff --git a/packages/frontend/src/pref-migrate.ts b/packages/frontend/src/pref-migrate.ts
index 0ed8b4e33d..a7bb82a5f0 100644
--- a/packages/frontend/src/pref-migrate.ts
+++ b/packages/frontend/src/pref-migrate.ts
@@ -139,23 +139,30 @@ export function migrateOldSettings() {
prefer.commit('sound.on.reaction', store.s.sound_reaction as any);
prefer.commit('defaultNoteVisibility', store.s.defaultNoteVisibility);
prefer.commit('defaultNoteLocalOnly', store.s.defaultNoteLocalOnly);
- // Sharkey migrations
- prefer.commit('collapseNotesRepliedTo', store.s.collapseNotesRepliedTo);
- prefer.commit('collapseFiles', store.s.collapseFiles);
- prefer.commit('uncollapseCW', store.s.uncollapseCW);
- prefer.commit('expandLongNote', store.s.expandLongNote);
- prefer.commit('like', store.s.like);
+
+ //#region Sharkey migrations
prefer.commit('autoloadConversation', store.s.autoloadConversation);
- prefer.commit('showVisibilitySelectorOnBoost', store.s.showVisibilitySelectorOnBoost);
- prefer.commit('visibilityOnBoost', store.s.visibilityOnBoost);
- prefer.commit('trustedDomains', store.s.trustedDomains);
- prefer.commit('warnExternalUrl', store.s.warnExternalUrl);
- prefer.commit('followingFeed', store.s.followingFeed);
- prefer.commit('warnMissingAltText', store.s.warnMissingAltText);
+ prefer.commit('clickToOpen', store.s.clickToOpen);
+ prefer.commit('collapseFiles', store.s.collapseFiles);
+ prefer.commit('collapseNotesRepliedTo', store.s.collapseNotesRepliedTo);
prefer.commit('disableCatSpeak', store.s.disableCatSpeak);
- prefer.commit('showTickerOnReplies', store.s.showTickerOnReplies);
- prefer.commit('searchEngine', store.s.searchEngine);
+ prefer.commit('enableFaviconNotificationDot', store.s.enableFaviconNotificationDot);
+ prefer.commit('expandLongNote', store.s.expandLongNote);
+ prefer.commit('followingFeed', store.s.followingFeed);
+ prefer.commit('like', store.s.like);
prefer.commit('noteDesign', store.s.noteDesign);
+ prefer.commit('notificationClickable', store.s.notificationClickable);
+ prefer.commit('numberOfReplies', store.s.numberOfReplies);
+ prefer.commit('oneko', store.s.oneko);
+ prefer.commit('searchEngine', store.s.searchEngine);
+ prefer.commit('showTickerOnReplies', store.s.showTickerOnReplies);
+ prefer.commit('showVisibilitySelectorOnBoost', store.s.showVisibilitySelectorOnBoost);
+ prefer.commit('trustedDomains', store.s.trustedDomains);
+ prefer.commit('uncollapseCW', store.s.uncollapseCW);
+ prefer.commit('visibilityOnBoost', store.s.visibilityOnBoost);
+ prefer.commit('warnExternalUrl', store.s.warnExternalUrl);
+ prefer.commit('warnMissingAltText', store.s.warnMissingAltText);
+ //#endregion
window.setTimeout(() => {
unisonReload();
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 110d454df9..063f3b60b8 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -130,54 +130,6 @@ export const PREF_DEF = {
collapseRenotes: {
default: false,
},
- collapseNotesRepliedTo: {
- default: false,
- },
- collapseFiles: {
- default: false,
- },
- uncollapseCW: {
- default: false,
- },
- expandLongNote: {
- default: false,
- },
- like: {
- default: null as string | null,
- },
- autoloadConversation: {
- default: true,
- },
- showVisibilitySelectorOnBoost: {
- default: true,
- },
- visibilityOnBoost: {
- default: 'public' as 'public' | 'home' | 'followers',
- },
- trustedDomains: {
- default: [] as string[],
- },
- warnExternalUrl: {
- default: true,
- },
- followingFeed: {
- default: defaultFollowingFeedState as Partial,
- },
- warnMissingAltText: {
- default: true,
- },
- disableCatSpeak: {
- default: false,
- },
- showTickerOnReplies: {
- default: false,
- },
- searchEngine: {
- default: Object.keys(searchEngineMap)[0],
- },
- noteDesign: {
- default: 'sharkey' as 'sharkey' | 'misskey',
- },
menu: {
default: [
'notifications',
@@ -452,4 +404,70 @@ export const PREF_DEF = {
'experimental.stackingRouterView': {
default: false,
},
+
+ //#region Sharkey
+ autoloadConversation: {
+ default: true,
+ },
+ clickToOpen: {
+ default: true,
+ },
+ collapseFiles: {
+ default: false,
+ },
+ collapseNotesRepliedTo: {
+ default: false,
+ },
+ disableCatSpeak: {
+ default: false,
+ },
+ enableFaviconNotificationDot: {
+ default: true,
+ },
+ expandLongNote: {
+ default: false,
+ },
+ followingFeed: {
+ default: defaultFollowingFeedState as Partial,
+ },
+ like: {
+ default: null as string | null,
+ },
+ noteDesign: {
+ default: 'sharkey' as 'sharkey' | 'misskey',
+ },
+ notificationClickable: {
+ default: false,
+ },
+ numberOfReplies: {
+ default: 5,
+ },
+ oneko: {
+ default: false,
+ },
+ searchEngine: {
+ default: Object.keys(searchEngineMap)[0],
+ },
+ showTickerOnReplies: {
+ default: false,
+ },
+ showVisibilitySelectorOnBoost: {
+ default: true,
+ },
+ trustedDomains: {
+ default: [] as string[],
+ },
+ uncollapseCW: {
+ default: false,
+ },
+ visibilityOnBoost: {
+ default: 'public' as 'public' | 'home' | 'followers',
+ },
+ warnExternalUrl: {
+ default: true,
+ },
+ warnMissingAltText: {
+ default: true,
+ },
+ //#endregion
} satisfies PreferencesDefinition;
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 245833fb43..32acaeaf99 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -470,95 +470,94 @@ export const store = markRaw(new Pizzax('base', {
sfxVolume: 1,
},
},
- collapseNotesRepliedTo: {
+ //#endregion
+
+ //#region Sharkey
+ autoloadConversation: {
+ where: 'account',
+ default: true,
+ },
+ clickToOpen: {
where: 'device',
- default: false,
+ default: true,
},
collapseFiles: {
- where: 'device',
+ where: 'account',
default: false,
},
- uncollapseCW: {
- where: 'device',
+ collapseNotesRepliedTo: {
+ where: 'account',
default: false,
},
- expandLongNote: {
- where: 'device',
- default: false,
- },
- like: {
- where: 'device',
- default: null as string | null,
- },
- autoloadConversation: {
- where: 'device',
- default: true,
- },
- showVisibilitySelectorOnBoost: {
- where: 'device',
- default: true,
- },
- visibilityOnBoost: {
- where: 'device',
- default: 'public' as 'public' | 'home' | 'followers',
- },
- trustedDomains: {
- where: 'device',
- default: [] as string[],
- },
- warnExternalUrl: {
- where: 'device',
- default: true,
- },
- followingFeed: {
- where: 'device',
- default: defaultFollowingFeedState as Partial,
- },
- warnMissingAltText: {
- where: 'device',
- default: true,
- },
disableCatSpeak: {
- where: 'device',
- default: false,
- },
- showTickerOnReplies: {
- where: 'device',
- default: false,
- },
- searchEngine: {
- where: 'device',
- default: Object.keys(searchEngineMap)[0],
- },
- noteDesign: {
- where: 'device',
- default: 'sharkey' as 'sharkey' | 'misskey',
- },
- //#endregion
- oneko: {
- where: 'device',
+ where: 'account',
default: false,
},
enableFaviconNotificationDot: {
where: 'device',
default: true,
},
- numberOfReplies: {
+ expandLongNote: {
where: 'device',
- default: 5,
+ default: false,
+ },
+ followingFeed: {
+ where: 'account',
+ default: defaultFollowingFeedState as Partial,
+ },
+ like: {
+ where: 'account',
+ default: null as string | null,
+ },
+ noteDesign: {
+ where: 'device',
+ default: 'sharkey' as 'sharkey' | 'misskey',
},
notificationClickable: {
where: 'device',
default: false,
},
- cornerRadius: {
+ numberOfReplies: {
where: 'device',
- default: null as 'Misskey' | null,
+ default: 5,
},
- clickToOpen: {
+ oneko: {
+ where: 'device',
+ default: false,
+ },
+ searchEngine: {
+ where: 'account',
+ default: Object.keys(searchEngineMap)[0],
+ },
+ showTickerOnReplies: {
+ where: 'device',
+ default: false,
+ },
+ showVisibilitySelectorOnBoost: {
+ where: 'account',
+ default: true,
+ },
+ trustedDomains: {
+ where: 'account',
+ default: [] as string[],
+ },
+ uncollapseCW: {
+ where: 'account',
+ default: false,
+ },
+ visibilityOnBoost: {
+ where: 'account',
+ default: 'public' as 'public' | 'home' | 'followers',
+ },
+ warnExternalUrl: {
+ where: 'account',
+ default: true,
+ },
+ warnMissingAltText: {
where: 'device',
default: true,
},
+ //#endregion
}));
// TODO: 他のタブと永続化されたstateを同期