Merge branch 'develop' into fix-issue-15270-2

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2025.2.0
+
+### General
+-
+
+### Client
+- Fix: 一部環境でセンシティブなファイルを含むノートの非表示が効かない問題 
+- Fix: データセーバー有効時にもユーザーページの「ファイル」タブで画像が読み込まれてしまう問題を修正
+- Fix: ドライブ画面でデフォルト以外のソートである場合、ページング結果が正しくない問題を修正 ( #15270 )
+
+### Server
+- Fix: 個別お知らせページのmetaタグ出力の条件が間違っていたのを修正
+
+
 ## 2025.1.0
 
 ### Note
@@ -50,7 +64,7 @@
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656)
 - Fix: URLにはじめから`#pswp`が含まれている場合に画像ビューワーがブラウザの戻るボタンで閉じられない問題を修正
 - Fix: ロール作成画面で設定できるアイコンデコレーションの最大取付個数を16に制限
-- Fix: ドライブ画面でデフォルト以外のソートである場合、ページング結果が正しくない問題を修正 ( #15270 )
+- Fix: Firefox Nightlyなどでアイコンが読み込めない問題を修正
 
 ### Server
 - Enhance: pg_bigmが利用できるよう、ノートの検索をILIKE演算子でなくLIKE演算子でLOWER()をかけたテキストに対して行うように

SECURITY.md

@@ -7,6 +7,11 @@ bug report to the GitHub repository.
 
 Thanks for helping make Misskey safe for everyone.
 
+> [!note]
+> CNA [requires](https://www.cve.org/ResourcesSupport/AllResources/CNARules#section_5-2_Description) that CVEs include a description in English for inclusion in the CVE Catalog.
+> 
+> When creating a security advisory, all content must be written in English (it is acceptable to include a non-English description along with the English one).
+
 ## When create a patch
 
 If you can also create a patch to fix the vulnerability, please create a PR on the private fork.

locales/de-DE.yml

@@ -5,6 +5,7 @@ introMisskey: "Willkommen! Misskey ist eine dezentralisierte Open-Source Microbl
 poweredByMisskeyDescription: "{name} ist einer der durch die Open-Source-Plattform <b>Misskey</b> betriebenen Dienste."
 monthAndDay: "{day}.{month}."
 search: "Suchen"
+reset: "Zurücksetzen"
 notifications: "Benachrichtigungen"
 username: "Benutzername"
 password: "Passwort"
@@ -48,6 +49,7 @@ pin: "An dein Profil anheften"
 unpin: "Von deinem Profil lösen"
 copyContent: "Inhalt kopieren"
 copyLink: "Link kopieren"
+copyRemoteLink: "Renote-Link kopieren"
 copyLinkRenote: "Renote-Link kopieren"
 delete: "Löschen"
 deleteAndEdit: "Löschen und Bearbeiten"
@@ -517,6 +519,7 @@ emojiStyle: "Emoji-Stil"
 native: "Nativ"
 menuStyle: "Menü Stil"
 style: "Stil"
+drawer: "App-Übersicht"
 popup: "Pop-up"
 showNoteActionsOnlyHover: "Notizmenü nur bei Mouseover anzeigen"
 showReactionsCount: "Zeige die Anzahl der Reaktionen auf Notizen an"
@@ -691,6 +694,7 @@ regexpError: "Fehler in einem regulären Ausdruck"
 regexpErrorDescription: "Im regulären Ausdruck deiner in Zeile {line} von {tab}en Wortstummschaltungen ist ein Fehler aufgetreten:"
 instanceMute: "Instanzstummschaltungen"
 userSaysSomething: "{name} hat etwas gesagt"
+userSaysSomethingAbout: "{name} sagt etwas über '{word}'"
 makeActive: "Aktivieren"
 display: "Anzeigeart"
 copy: "Kopieren"
@@ -859,6 +863,7 @@ administration: "Verwaltung"
 accounts: "Benutzerkonten"
 switch: "Wechseln"
 noMaintainerInformationWarning: "Betreiberinformationen sind nicht konfiguriert."
+noInquiryUrlWarning: "Keine gültige URL."
 noBotProtectionWarning: "Schutz vor Bots ist nicht konfiguriert."
 configure: "Konfigurieren"
 postToGallery: "Neuen Galeriebeitrag erstellen"
@@ -1091,6 +1096,7 @@ retryAllQueuesConfirmTitle: "Wirklich erneut versuchen?"
 retryAllQueuesConfirmText: "Dies wird zu einer temporären Erhöhung der Serverlast führen."
 enableChartsForRemoteUser: "Diagramme für Nutzer fremder Instanzen erstellen"
 enableChartsForFederatedInstances: "Diagramme für fremde Instanzen erstellen"
+enableStatsForFederatedInstances: "Abruf von Informationen über förderierte Server"
 showClipButtonInNoteFooter: "\"Clip\" zum Notizmenu hinzufügen"
 reactionsDisplaySize: "Reaktionsanzeigegröße"
 limitWidthOfReaction: "Begrenze die Breite der Reaktion und zeige sie verkleinert an"
@@ -1139,6 +1145,8 @@ preventAiLearningDescription: "Fordert Crawler auf, gepostetes Text- oder Bildma
 options: "Optionen"
 specifyUser: "Spezifischer Benutzer"
 lookupConfirm: "Zustimmen?"
+openTagPageConfirm: "Hashtag Seite wirklich öffnen?"
+specifyHost: "Host"
 failedToPreviewUrl: "Vorschau nicht anzeigbar"
 update: "Aktualisieren"
 rolesThatCanBeUsedThisEmojiAsReaction: "Rollen, die dieses Emoji als Reaktion verwenden können"
@@ -1197,6 +1205,7 @@ showRenotes: "Renotes anzeigen"
 edited: "Bearbeitet"
 notificationRecieveConfig: "Benachrichtigungseinstellungen"
 mutualFollow: "Gegenseitig gefolgt"
+followingOrFollower: "Follow oder Follower"
 fileAttachedOnly: "Nur Notizen mit Dateien"
 showRepliesToOthersInTimeline: "Antworten in Chronik anzeigen"
 hideRepliesToOthersInTimeline: "Antworten nicht in Chronik anzeigen"

locales/en-US.yml

@@ -2745,6 +2745,7 @@ _customEmojisManager:
     deleteSelectionRanges: "Delete rows in the selection"
     searchSettings: "Search settings"
     searchSettingCaption: "Set detailed search criteria."
+    searchLimit: ""
     sortOrder: "Sort order"
     registrationLogs: "Registration log"
     registrationLogsCaption: "Logs will be displayed when updating or deleting Emojis. They will disappear after updating or deleting them, moving to a new page, or reloading."
@@ -2769,8 +2770,11 @@ _customEmojisManager:
       markAsDeleteTargetRanges: "Mark rows in the selection as a target to delete"
       alertUpdateEmojisNothingDescription: "There are no updated Emojis."
       alertDeleteEmojisNothingDescription: "There are no Emojis to be deleted."
+      confirmMovePage: ""
+      confirmChangeView: ""
       confirmUpdateEmojisDescription: "Update {count} Emoji(s). Are you sure to continue?"
       confirmDeleteEmojisDescription: "Delete checked {count} Emoji(s). Are you sure to continue?"
+      confirmResetDescription: ""
       dialogSelectRoleTitle: "Search by roll set in Emojis"
     _register:
       uploadSettingTitle: "Upload settings"

locales/es-ES.yml

@@ -5,6 +5,7 @@ introMisskey: "¡Bienvenido/a! Misskey es un servicio de microblogging descentra
 poweredByMisskeyDescription: "{name} es uno de los servicios (también llamado instancia) que usa la plataforma de código abierto <b>Misskey</b>"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
+reset: "Reiniciar"
 notifications: "Notificaciones"
 username: "Nombre de usuario"
 password: "Contraseña"
@@ -518,6 +519,7 @@ emojiStyle: "Estilo de emoji"
 native: "Nativo"
 menuStyle: "Diseño del menú"
 style: "Diseño"
+drawer: "Cajón de Aplicaciones"
 popup: "Ventana emergente"
 showNoteActionsOnlyHover: "Mostrar acciones de la nota sólo al pasar el cursor"
 showReactionsCount: "Mostrar el número de reacciones en las notas"
@@ -683,7 +685,10 @@ smtpSecure: "Usar SSL/TLS implícito en la conexión SMTP"
 smtpSecureInfo: "Apagar cuando se use STARTTLS"
 testEmail: "Prueba de envío"
 wordMute: "Silenciar palabras"
+wordMuteDescription: "Minimiza las notas que contienen la palabra o frase especificada. Las notas minimizadas pueden visualizarse haciendo clic sobre ellas."
 hardWordMute: "Filtro de palabra fuerte"
+showMutedWord: "Mostrar palabras silenciadas."
+hardWordMuteDescription: "Oculta las notas que contienen la palabra o frase especificada. A diferencia de Silenciar palabra, la nota quedará completamente oculta a la vista."
 regexpError: "Error de la expresión regular"
 regexpErrorDescription: "Ocurrió un error en la expresión regular en la linea {line} de las palabras muteadas {tab}"
 instanceMute: "Instancias silenciadas"
@@ -1134,6 +1139,7 @@ preventAiLearningDescription: "Pedirle a las arañas (crawlers) no usar los text
 options: "Opción"
 specifyUser: "Especificar usuario"
 lookupConfirm: "¿Quiere informarse?"
+specifyHost: "Especificar Host"
 failedToPreviewUrl: "No se pudo generar la vista previa"
 update: "Actualizar"
 rolesThatCanBeUsedThisEmojiAsReaction: "Roles que pueden usar este emoji como reacción"

locales/it-IT.yml

@@ -107,7 +107,7 @@ makeFollowManuallyApprove: "Approva i follower manualmente"
 defaultNoteVisibility: "Privacy predefinita delle note"
 follow: "Segui"
 followRequest: "Richiesta di follow"
-followRequests: "Richieste di follow"
+followRequests: "Relazioni"
 unfollow: "Togli Following"
 followRequestPending: "Richiesta in approvazione"
 enterEmoji: "Inserisci emoji"
@@ -537,7 +537,7 @@ regenerate: "Generare di nuovo"
 fontSize: "Dimensione carattere"
 mediaListWithOneImageAppearance: "Altezza dell'elenco media con una sola immagine "
 limitTo: "Limita a {x}"
-noFollowRequests: "Non hai alcuna richiesta di follow"
+noFollowRequests: "Non ci sono richieste di relazione"
 openImageInNewTab: "Apri le immagini in un nuovo tab"
 dashboard: "Pannello di controllo"
 local: "Locale"
@@ -1933,7 +1933,7 @@ _serverDisconnectedBehavior:
   quiet: "Visualizza avviso in modo discreto"
 _channel:
   create: "Nuovo canale"
-  edit: "Gerisci canale"
+  edit: "Modifica il canale"
   setBanner: "Scegli intestazione"
   removeBanner: "Rimuovi intestazione"
   featured: "Popolari nel canale"
@@ -1961,7 +1961,7 @@ _instanceMute:
 _theme:
   explore: "Esplora temi"
   install: "Installa un tema"
-  manage: "Gestione temi"
+  manage: "Gestione dei temi"
   code: "Codice tema"
   description: "Descrizione"
   installed: "{name} è installato"
@@ -2108,12 +2108,12 @@ _permissions:
   "read:messaging": "Visualizzare la chat"
   "write:messaging": "Gestire la chat"
   "read:mutes": "Vedi i profili silenziati"
-  "write:mutes": "Gestisci i profili silenziati"
+  "write:mutes": "Gestione dei profili silenziati"
   "write:notes": "Creare / Eliminare note"
   "read:notifications": "Visualizzare notifiche"
-  "write:notifications": "Gestire notifiche"
+  "write:notifications": "Gestione delle notifiche"
   "read:reactions": "Vedi reazioni"
-  "write:reactions": "Gerisci reazioni"
+  "write:reactions": "Gestione delle reazioni"
   "write:votes": "Votare"
   "read:pages": "Visualizzare pagine"
   "write:pages": "Gestire pagine"
@@ -2122,7 +2122,7 @@ _permissions:
   "read:user-groups": "Vedere i gruppi di utenti"
   "write:user-groups": "Gestire i gruppi di utenti"
   "read:channels": "Visualizza canali"
-  "write:channels": "Gerisci canali"
+  "write:channels": "Gestione dei canali"
   "read:gallery": "Visualizza la galleria."
   "write:gallery": "Gestione della galleria"
   "read:gallery-likes": "Visualizza i contenuti della galleria."

locales/ko-KR.yml

@@ -1283,7 +1283,7 @@ confirmWhenRevealingSensitiveMedia: "민감한 미디어를 열 때 두 번 확
 sensitiveMediaRevealConfirm: "민감한 미디어입니다. 표시할까요?"
 createdLists: "만든 리스트"
 createdAntennas: "만든 안테나"
-fromX: "{x}부터"
+fromX: "{x}에서"
 genEmbedCode: "임베디드 코드 만들기"
 noteOfThisUser: "이 유저의 노트 목록"
 clipNoteLimitExceeded: "더 이상 이 클립에 노트를 추가 할 수 없습니다."

locales/zh-CN.yml

@@ -49,7 +49,7 @@ pin: "置顶"
 unpin: "取消置顶"
 copyContent: "复制内容"
 copyLink: "复制链接"
-copyRemoteLink: "复制远程连接"
+copyRemoteLink: "复制远程链接"
 copyLinkRenote: "复制转帖链接"
 delete: "删除"
 deleteAndEdit: "删除并编辑"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.1.0-beta.3",
+	"version": "2025.2.0-alpha.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/boot/master.ts

@@ -92,7 +92,7 @@ export async function masterMain() {
 	}
 
 	bootLogger.info(
-		`mode: [disableClustering: ${envOption.disableClustering}, onlyServer: ${envOption.onlyServer}, onlyQueue: ${envOption.onlyQueue}]`
+		`mode: [disableClustering: ${envOption.disableClustering}, onlyServer: ${envOption.onlyServer}, onlyQueue: ${envOption.onlyQueue}]`,
 	);
 
 	if (!envOption.disableClustering) {
@@ -107,7 +107,6 @@ export async function masterMain() {
 			await jobQueue();
 		} else {
 			await server();
-			await jobQueue();
 		}
 
 		await spawnWorkers(config.clusterLimit);

packages/backend/src/server/web/ClientServerService.ts

@@ -817,6 +817,7 @@ export class ClientServerService {
 		fastify.get<{ Params: { announcementId: string; } }>('/announcements/:announcementId', async (request, reply) => {
 			const announcement = await this.announcementsRepository.findOneBy({
 				id: request.params.announcementId,
+				userId: IsNull(),
 			});
 
 			if (announcement) {

packages/frontend-embed/package.json

@@ -14,7 +14,7 @@
 		"@rollup/plugin-json": "6.1.0",
 		"@rollup/plugin-replace": "5.0.7",
 		"@rollup/pluginutils": "5.1.3",
-		"@tabler/icons-webfont": "3.3.0",
+		"@tabler/icons-webfont": "https://github.com/misskey-dev/tabler-icons/archive/refs/tags/3.29.0-mi.1913+5921534bc.tar.gz",
 		"@twemoji/parser": "15.1.1",
 		"@vitejs/plugin-vue": "5.2.0",
 		"@vue/compiler-sfc": "3.5.12",

packages/frontend-shared/build.js

@@ -23,10 +23,14 @@ const options = {
 	sourcemap: 'linked',
 };
 
+const args = process.argv.slice(2).map(arg => arg.toLowerCase());
+
 // js-built配下をすべて削除する
-fs.rmSync('./js-built', { recursive: true, force: true });
+if (!args.includes('--no-clean')) {
+	fs.rmSync('./js-built', { recursive: true, force: true });
+}
 
-if (process.argv.map(arg => arg.toLowerCase()).includes('--watch')) {
+if (args.includes('--watch')) {
 	await watchSrc();
 } else {
 	await buildSrc();

packages/frontend/package.json

@@ -24,7 +24,7 @@
 		"@rollup/plugin-replace": "5.0.7",
 		"@rollup/pluginutils": "5.1.3",
 		"@syuilo/aiscript": "0.19.0",
-		"@tabler/icons-webfont": "3.3.0",
+		"@tabler/icons-webfont": "https://github.com/misskey-dev/tabler-icons/archive/refs/tags/3.29.0-mi.1913+5921534bc.tar.gz",
 		"@twemoji/parser": "15.1.1",
 		"@vitejs/plugin-vue": "5.2.0",
 		"@vue/compiler-sfc": "3.5.12",

packages/frontend/src/account.ts

@@ -41,6 +41,12 @@ export async function signout() {
 	if (!$i) return;
 
 	waiting();
+	document.cookie.split(';').forEach((cookie) => {
+		const cookieName = cookie.split('=')[0].trim();
+		if (cookieName === 'token') {
+			document.cookie = `${cookieName}=; max-age=0; path=/`;
+		}
+	});
 	miLocalStorage.removeItem('account');
 	await removeAccount($i.id);
 	const accounts = await getAccounts();
@@ -101,6 +107,9 @@ export async function removeAccount(idOrToken: Account['id']) {
 }
 
 function fetchAccount(token: string, id?: string, forceShowDialog?: boolean): Promise<Account> {
+	document.cookie = "token=; path=/; max-age=0";
+	document.cookie = `token=${token}; path=/queue; max-age=86400; SameSite=Strict; Secure`; // bull dashboardの認証とかで使う
+
 	return new Promise((done, fail) => {
 		window.fetch(`${apiUrl}/i`, {
 			method: 'POST',
@@ -213,7 +222,6 @@ export async function login(token: Account['token'], redirect?: string) {
 			throw reason;
 		});
 	miLocalStorage.setItem('account', JSON.stringify(me));
-	document.cookie = `token=${token}; path=/; max-age=31536000`; // bull dashboardの認証とかで使う
 	await addAccount(me.id, token);
 
 	if (redirect) {

packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue

@@ -57,7 +57,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import * as Misskey from 'misskey-js';
-import { defineProps, shallowRef } from 'vue';
+import { shallowRef } from 'vue';
 import MkLink from '@/components/MkLink.vue';
 import { i18n } from '@/i18n.js';
 import MkModalWindow from '@/components/MkModalWindow.vue';

packages/frontend/src/components/MkDriveFileThumbnail.vue

@@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		:alt="file.name"
 		:title="file.name"
 		:cover="fit !== 'contain'"
-		:forceBlurHash="forceBlurhash"
+		:forceBlurhash="forceBlurhash"
 	/>
 	<i v-else-if="is === 'image'" class="ti ti-photo" :class="$style.icon"></i>
 	<i v-else-if="is === 'video'" class="ti ti-video" :class="$style.icon"></i>

packages/frontend/src/components/MkNote.vue

@@ -304,16 +304,16 @@ function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: false): Array<string | string[]> | false | 'sensitiveMute';
 */
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly = false): Array<string | string[]> | false | 'sensitiveMute' {
-	if (mutedWords == null) return false;
+	if (mutedWords != null) {
+		const result = checkWordMute(noteToCheck, $i, mutedWords);
+		if (Array.isArray(result)) return result;
 
-	const result = checkWordMute(noteToCheck, $i, mutedWords);
-	if (Array.isArray(result)) return result;
+		const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, $i, mutedWords);
+		if (Array.isArray(replyResult)) return replyResult;
 
-	const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, $i, mutedWords);
-	if (Array.isArray(replyResult)) return replyResult;
-
-	const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, $i, mutedWords);
-	if (Array.isArray(renoteResult)) return renoteResult;
+		const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, $i, mutedWords);
+		if (Array.isArray(renoteResult)) return renoteResult;
+	}
 
 	if (checkOnly) return false;