misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'misskey-develop' into merge/2025-03-24

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/core/entities/NotificationEntityService.ts
#	packages/backend/src/types.ts
#	packages/frontend/src/pages/admin/modlog.ModLog.vue
#	packages/misskey-js/src/consts.ts
#	packages/misskey-js/src/entities.ts
This commit is contained in:
Hazelnoot 2025-03-25 16:17:34 -04:00
commit 40975719ec
82 changed files with 1563 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

129
packages/frontend/src/utility/autogen/settings-search-index.ts
View file

@ -279,62 +279,62 @@ export const searchIndexes: SearchIndexItem[] = [
id: 'AKvDrxSj5',
children: [
{
id: 'cAszhShB0',
id: 'a5b9RjEvq',
label: i18n.ts.uiLanguage,
keywords: ['language'],
},
{
id: 'apz9AutPm',
id: '9ragaff40',
label: i18n.ts.overridedDeviceKind,
keywords: ['device', 'type', 'kind', 'smartphone', 'tablet', 'desktop'],
},
{
id: 'nqRVtw1xw',
id: 'lfI3yMX9g',
label: i18n.ts.useBlurEffect,
keywords: ['blur'],
},
{
id: 'EO5WHBeG8',
id: '31Y4IcGEf',
label: i18n.ts.useBlurEffectForModal,
keywords: ['blur', 'modal'],
},
{
id: 'CWpyT9vLK',
id: '78q2asrLS',
label: i18n.ts.showAvatarDecorations,
keywords: ['avatar', 'icon', 'decoration', 'show'],
},
{
id: '1wwACqQz1',
id: 'zydOfGYip',
label: i18n.ts.alwaysConfirmFollow,
keywords: ['follow', 'confirm', 'always'],
},
{
id: '1x3JNXj8N',
id: 'wqpOC22Zm',
label: i18n.ts.highlightSensitiveMedia,
keywords: ['highlight', 'sensitive', 'nsfw', 'image', 'photo', 'picture', 'media', 'thumbnail'],
},
{
id: 'CfAg0Qekq',
id: 'c98gbF9c6',
label: i18n.ts.confirmWhenRevealingSensitiveMedia,
keywords: ['sensitive', 'nsfw', 'media', 'image', 'photo', 'picture', 'attachment', 'confirm'],
},
{
id: 'aefexW9fD',
id: '4LxdiOMNh',
label: i18n.ts.enableAdvancedMfm,
keywords: ['mfm', 'enable', 'show', 'advanced'],
},
{
id: 'lu9v5Spqg',
id: '9gTCaLkIf',
label: i18n.ts.enableInfiniteScroll,
keywords: ['auto', 'load', 'auto', 'more', 'scroll'],
},
{
id: '6kMj4HVOg',
id: 'jmJT0twuJ',
label: i18n.ts.emojiStyle,
keywords: ['emoji', 'style', 'native', 'system', 'fluent', 'twemoji'],
},
{
id: 'DftdlLbNu',
id: 'igFN7RIUa',
label: i18n.ts.pinnedList,
keywords: ['pinned', 'list'],
},
@ -343,85 +343,85 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['general'],
},
{
id: 'CQldliCSi',
id: 'ufc2X9voy',
children: [
{
id: 'kMB2hPyq3',
id: 'd2H4E5ys6',
label: i18n.ts.showFixedPostForm,
keywords: ['post', 'form', 'timeline'],
},
{
id: 'jC7LtTnmc',
id: '1LHOhDKGW',
label: i18n.ts.showFixedPostFormInChannel,
keywords: ['post', 'form', 'timeline', 'channel'],
},
{
id: 'p2wlrnwLo',
id: 'DSzwvTp7i',
label: i18n.ts.collapseRenotes,
keywords: ['renote', i18n.ts.collapseRenotesDescription],
},
{
id: '6SFn3t8VS',
id: 'jb3HUeyrx',
label: i18n.ts.showGapBetweenNotesInTimeline,
keywords: ['note', 'timeline', 'gap'],
},
{
id: 'nygexkaUk',
id: '2LNjwv1cr',
label: i18n.ts.disableStreamingTimeline,
keywords: ['disable', 'streaming', 'timeline'],
},
{
id: '7vnQgR42v',
id: '7W6g8Dcqz',
label: i18n.ts.showNoteActionsOnlyHover,
keywords: ['hover', 'show', 'footer', 'action'],
},
{
id: 'x5q4XZ7Kv',
id: 'uAOoH3LFF',
label: i18n.ts.showClipButtonInNoteFooter,
keywords: ['footer', 'action', 'clip', 'show'],
},
{
id: 'x9irZWjaF',
id: 'eCiyZLC8n',
label: i18n.ts.showReactionsCount,
keywords: ['reaction', 'count', 'show'],
},
{
id: 'dHPv9mrxi',
id: '68u9uRmFP',
label: i18n.ts.confirmOnReact,
keywords: ['reaction', 'confirm'],
},
{
id: 'bj42W4cvN',
id: 'rHWm4sXIe',
label: i18n.ts.loadRawImages,
keywords: ['image', 'photo', 'picture', 'media', 'thumbnail', 'quality', 'raw', 'attachment'],
},
{
id: 'fzPca1Gk9',
id: '9L2XGJw7e',
label: i18n.ts.useReactionPickerForContextMenu,
keywords: ['reaction', 'picker', 'contextmenu', 'open'],
},
{
id: 'mNU5IBln7',
id: 'uIMCIK7kG',
label: i18n.ts.reactionsDisplaySize,
keywords: ['reaction', 'size', 'scale', 'display'],
},
{
id: 'kYgorbLUy',
id: 'uMckjO9bz',
label: i18n.ts.limitWidthOfReaction,
keywords: ['reaction', 'size', 'scale', 'display', 'width', 'limit'],
},
{
id: 'm75VEWI3S',
id: 'yeghU4qiH',
label: i18n.ts.mediaListWithOneImageAppearance,
keywords: ['attachment', 'image', 'photo', 'picture', 'media', 'thumbnail', 'list', 'size', 'height'],
},
{
id: 'CA42sC9Mx',
id: 'yYSOPoAKE',
label: i18n.ts.instanceTicker,
keywords: ['ticker', 'information', 'label', 'instance', 'server', 'host', 'federation'],
},
{
id: 'knEhibyFp',
id: 'iOHiIu32L',
label: i18n.ts.displayOfSensitiveMedia,
keywords: ['attachment', 'image', 'photo', 'picture', 'media', 'thumbnail', 'nsfw', 'sensitive', 'display', 'show', 'hide', 'visibility'],
},
@ -430,25 +430,25 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['timeline', 'note'],
},
{
id: 'yIR4YP0yU',
id: 'eROFRMtXv',
children: [
{
id: 'cBkUgQNpH',
id: 'BaQfrVO82',
label: i18n.ts.keepCw,
keywords: ['remember', 'keep', 'note', 'cw'],
},
{
id: 'Bv4YywaKL',
id: 'vFerPo2he',
label: i18n.ts.rememberNoteVisibility,
keywords: ['remember', 'keep', 'note', 'visibility'],
},
{
id: 'F3kpUNvSQ',
id: 'dcAC0yJcH',
label: i18n.ts.enableQuickAddMfmFunction,
keywords: ['mfm', 'enable', 'show', 'advanced', 'picker', 'form', 'function', 'fn'],
},
{
id: 'BBxwy4F6E',
id: 'bECeWZVMb',
label: i18n.ts.defaultNoteVisibility,
keywords: ['default', 'note', 'visibility'],
},
@ -457,20 +457,20 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['post', 'form'],
},
{
id: 'e5XnQWk68',
id: 'tsSP93Cc6',
children: [
{
id: 'rOttgccaS',
id: 'dtw8FepYL',
label: i18n.ts.useGroupedNotifications,
keywords: ['group'],
},
{
id: 'Ek4Cw3VPq',
id: 'eb0yCYJTn',
label: i18n.ts.position,
keywords: ['position'],
},
{
id: 'pZLzt3i0s',
id: '1Spt4Gpr5',
label: i18n.ts.stackAxis,
keywords: ['stack', 'axis', 'direction'],
},
@ -479,55 +479,72 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['notification'],
},
{
id: 'c9mbgmHQp',
id: 'SYmWxGOF',
label: i18n.ts.dataSaver,
keywords: ['datasaver'],
},
{
id: '5h8vhCX1S',
id: 'vPQPvmntL',
children: [
{
id: 'bDv03znUy',
id: 'zZxyXHk3A',
label: i18n.ts._settings._chat.showSenderName,
keywords: ['show', 'sender', 'name'],
},
{
id: 'omEy5Q3Ev',
label: i18n.ts._settings._chat.sendOnEnter,
keywords: ['send', 'enter', 'newline'],
},
],
label: i18n.ts.chat,
keywords: ['chat', 'messaging'],
},
{
id: '5fy7VEy6i',
children: [
{
id: 'EosiWZvak',
label: i18n.ts.squareAvatars,
keywords: ['avatar', 'icon', 'square'],
},
{
id: 'nkR2LWURW',
id: 'qY5xTzl35',
label: i18n.ts.seasonalScreenEffect,
keywords: ['effect', 'show'],
},
{
id: 'sCscGhMmH',
id: '2VSnj81vC',
label: i18n.ts.openImageInNewTab,
keywords: ['image', 'photo', 'picture', 'media', 'thumbnail', 'new', 'tab'],
},
{
id: '4yCgcFElF',
id: 'hdQa7W2H1',
label: i18n.ts.withRepliesByDefaultForNewlyFollowed,
keywords: ['follow', 'replies'],
},
{
id: '5iMpm5rES',
id: 'nnj4DkjhP',
label: i18n.ts.whenServerDisconnected,
keywords: ['server', 'disconnect', 'reconnect', 'reload', 'streaming'],
},
{
id: 'dlQjnWBVU',
id: 'Eh7vTluDO',
label: i18n.ts.numberOfPageCache,
keywords: ['cache', 'page'],
},
{
id: 'qY5xTzl35',
id: 'vTRSKf1JA',
label: i18n.ts.forceShowAds,
keywords: ['ad', 'show'],
},
{
id: '2VSnj81vC',
id: 'dwhQfcLGt',
label: i18n.ts.hemisphere,
keywords: [],
},
{
id: 'vuG3aG3IE',
id: 'Ar1lj7f7U',
label: i18n.ts.additionalEmojiDictionary,
keywords: ['emoji', 'dictionary', 'additional', 'extra'],
},
@ -587,6 +604,20 @@ export const searchIndexes: SearchIndexItem[] = [
path: '/settings/other',
icon: 'ti ti-dots',
},
{
id: '9bNikHWzQ',
children: [
{
id: 'appYJbpkK',
label: i18n.ts._settings.showNavbarSubButtons,
keywords: ['navbar', 'sidebar', 'toggle', 'button', 'sub'],
},
],
label: i18n.ts.navbar,
keywords: ['navbar', 'menu', 'sidebar'],
path: '/settings/navbar',
icon: 'ti ti-list',
},
{
id: '3icEvyv2D',
children: [