diff --git a/CHANGELOG.md b/CHANGELOG.md index cc5561fd6e..d8714599f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,8 +14,8 @@ ## 2023.10.0 ### NOTE -- muted_noteテーブルは使われなくなったため手動で削除を行ってください。 - 2023.9.2で導入されたノート編集機能はクオリティの高い実装が困難であることが判明したため撤回されました +- アップデートを行うと、タイムラインが一時的にリセットされます ### Changes - API: users/notes, notes/local-timeline で fileType 指定はできなくなりました diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 6d6771ac0f..4baa3d672e 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -995,9 +995,6 @@ _theme: infoFg: "তথ্যের পাঠ্য" infoWarnBg: "ওয়ার্নিং এর পটভূমি" infoWarnFg: "ওয়ার্নিং এর পাঠ্য" - cwBg: "CW বাটনের পটভূমি" - cwFg: "CW বাটনের পাঠ্য" - cwHoverBg: "CW বাটনের পটভূমি (হভার)" toastBg: "বিজ্ঞপ্তির পটভূমি" toastFg: "বিজ্ঞপ্তির পাঠ্য" buttonBg: "বাটনের পটভূমি" diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index db9105a13a..6bd21de93a 100644 --- a/locales/cs-CZ.yml +++ b/locales/cs-CZ.yml @@ -1622,9 +1622,6 @@ _theme: infoFg: "Text informací" infoWarnBg: "Pozadí varování" infoWarnFg: "Text varování" - cwBg: "Pozadí CW tlačítka" - cwFg: "Text CW tlačítka" - cwHoverBg: "Pozadí CW tlačítka (Hover)" toastBg: "Pozadí oznámení" toastFg: "Text oznámení" buttonBg: "Pozadí tlačítka" diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 402b5af093..e4725ca723 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1685,9 +1685,6 @@ _theme: infoFg: "Text von Informationen" infoWarnBg: "Hintergrund von Warnungen" infoWarnFg: "Text von Warnungen" - cwBg: "Hintergrund des Inhaltswarnungsknopfs" - cwFg: "Text des Inhaltswarnungsknopfs" - cwHoverBg: "Hintergrund des Inhaltswarnungsknopfs (Mouseover)" toastBg: "Hintergrund von Benachrichtigungen" toastFg: "Text von Benachrichtigungen" buttonBg: "Hintergrund von Schaltflächen" diff --git a/locales/en-US.yml b/locales/en-US.yml index 5e13a30c54..2fc1ead99f 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1693,9 +1693,6 @@ _theme: infoFg: "Information text" infoWarnBg: "Warning background" infoWarnFg: "Warning text" - cwBg: "CW button background" - cwFg: "CW button text" - cwHoverBg: "CW button background (Hover)" toastBg: "Notification background" toastFg: "Notification text" buttonBg: "Button background" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index f3e4bd7c75..3a01f40dfd 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1666,9 +1666,6 @@ _theme: infoFg: "Texto de información" infoWarnBg: "Fondo de advertencias" infoWarnFg: "Texto de advertencias" - cwBg: "Fondo del botón CW" - cwFg: "Texto del botón CW" - cwHoverBg: "Fondo del botón CW (hover)" toastBg: "Fondo de notificaciones" toastFg: "Texto de notificaciones" buttonBg: "Fondo de botón" diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index b6c2aa889e..0ad1247ff0 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -1358,9 +1358,6 @@ _theme: infoFg: "Texte d'information" infoWarnBg: "Arrière-plan des avertissements" infoWarnFg: "Texte d’avertissement" - cwBg: "Arrière-plan du CW" - cwFg: "Texte du bouton CW" - cwHoverBg: "Arrière-plan du bouton CW (survolé)" toastBg: "Arrière-plan de la bulle de notification" toastFg: "Texte de la bulle de notification" buttonBg: "Arrière-plan du bouton" diff --git a/locales/id-ID.yml b/locales/id-ID.yml index 109dfb7603..90bca65119 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -1627,9 +1627,6 @@ _theme: infoFg: "Teks informasi" infoWarnBg: "Latar belakang peringatan" infoWarnFg: "Teks peringatan" - cwBg: "Latar belakang tombol Sembunyikan Konten" - cwFg: "Teks tombol Sembunyikan Konten" - cwHoverBg: "Latar belakang tombol Sembunyikan Konten (Mengambang)" toastBg: "Latar belakang notifikasi" toastFg: "Teks notifikasi" buttonBg: "Latar belakang tombol" diff --git a/locales/it-IT.yml b/locales/it-IT.yml index c881e5c012..fa8670d115 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -1685,9 +1685,6 @@ _theme: infoFg: "Testo di informazioni" infoWarnBg: "Sfondo degli avvisi" infoWarnFg: "Testo di avviso" - cwBg: "Sfondo del CW" - cwFg: "Testo del pulsante CW" - cwHoverBg: "Sfondo del pulsante CW (sorvolato)" toastBg: "Sfondo di notifica a comparsa" toastFg: "Testo di notifica a comparsa" buttonBg: "Sfondo del pulsante" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 43d98fdd04..5efd8cd119 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -1649,9 +1649,6 @@ _theme: infoFg: "情報の文字" infoWarnBg: "警告の背景" infoWarnFg: "警告の文字" - cwBg: "CW ボタンの背景" - cwFg: "CW ボタンの文字" - cwHoverBg: "CW ボタンの背景 (ホバー)" toastBg: "通知トーストの背景" toastFg: "通知トーストの文字" buttonBg: "ボタンの背景" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 4009b7df5f..d5c346717b 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1663,9 +1663,6 @@ _theme: infoFg: "정보창 텍스트" infoWarnBg: "경고창 배경" infoWarnFg: "경고창 텍스트" - cwBg: "CW 버튼 배경" - cwFg: "CW 버튼 텍스트" - cwHoverBg: "CW 버튼 배경 (호버)" toastBg: "알림창 배경" toastFg: "알림창 텍스트" buttonBg: "버튼 배경" diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 4e5eb147ea..f88055cc29 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -1043,9 +1043,6 @@ _theme: infoFg: "Tekst informacji" infoWarnBg: "Tło ostrzeżenia" infoWarnFg: "Tekst ostrzeżenia" - cwBg: "Tło CW" - cwFg: "Tekst CW" - cwHoverBg: "Tło CW (po najechaniu)" toastBg: "Tło powiadomień" toastFg: "Tekst powiadomień" buttonBg: "Tło przycisku" diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index ac30e3a98c..19e4baccb1 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -1551,9 +1551,6 @@ _theme: infoFg: "Текст сообщения" infoWarnBg: "Фон предупреждения" infoWarnFg: "Текст предупреждения" - cwBg: "Фон предупреждения о содержимом" - cwFg: "Текст предупреждения о содержимом" - cwHoverBg: "Фон предупреждения о содержимом (под указателем)" toastBg: "Фон оповещения" toastFg: "Текст оповещения" buttonBg: "Фон кнопки" diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 811f93e711..181e725d75 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -1102,9 +1102,6 @@ _theme: infoFg: "Informačný text" infoWarnBg: "Pozadie varovania" infoWarnFg: "Text varovania" - cwBg: "CW pozadie tlačidla" - cwFg: "CW text tlačidla" - cwHoverBg: "CW pozadie tlačidla (pod kurzorom)" toastBg: "Pozadie upozornenia" toastFg: "Text upozornenia" buttonBg: "Pozadie tlačidla" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index 6a553dab52..1c655f5886 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -1663,9 +1663,6 @@ _theme: infoFg: "ข้อความข้อมูล" infoWarnBg: "คำเตือนพื้นหลัง" infoWarnFg: "คำเตือนข้อความ" - cwBg: "ปุ่ม CW พื้นหลัง" - cwFg: "ปุ่ม CW ข้อความ" - cwHoverBg: "ปุ่ม CW พื้นหลัง (โฮเวอร์)" toastBg: "ประวัติการแจ้งเตือน" toastFg: "ข้อความแจ้งเตือน" buttonBg: "ปุ่มพื้นหลัง" diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index a0e2a52826..8d843d67f8 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -1290,9 +1290,6 @@ _theme: infoFg: "Текст інформації" infoWarnBg: "Фон попередження" infoWarnFg: "Текст попередження" - cwBg: "Фон чутливого змісту" - cwFg: "Текст чутливого змісту" - cwHoverBg: "Фон чутливого змісту (при наведенні)" toastBg: "Фон повідомлення" toastFg: "Текст повідомлення" buttonBg: "Фон кнопки" diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 0c32735c31..b8a77a9200 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1467,9 +1467,6 @@ _theme: infoFg: "Chữ thông tin" infoWarnBg: "Nền cảnh báo" infoWarnFg: "Chữ cảnh báo" - cwBg: "Nền nút nội dung ẩn" - cwFg: "Chữ nút nội dung ẩn" - cwHoverBg: "Nền nút nội dung ẩn (Chạm)" toastBg: "Nền thông báo" toastFg: "Chữ thông báo" buttonBg: "Nền nút" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 5f4db9192b..dfc4ccb688 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1673,9 +1673,6 @@ _theme: infoFg: "信息文本" infoWarnBg: "警告背景" infoWarnFg: "警告文本" - cwBg: "隐藏内容按钮背景" - cwFg: "隐藏内容按钮文本" - cwHoverBg: "隐藏内容按钮背景（悬停）" toastBg: "Toast 通知背景" toastFg: "Toast 通知文本" buttonBg: "按钮背景" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 4cc336e35c..e715cae547 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1685,9 +1685,6 @@ _theme: infoFg: "資訊內容" infoWarnBg: "警告背景" infoWarnFg: "警告文字" - cwBg: "隱藏內容按鈕背景" - cwFg: "隱藏內容按鈕文字" - cwHoverBg: "隱藏內容按鈕背景（懸浮）" toastBg: "通知背景" toastFg: "通知文本" buttonBg: "按鈕背景" diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts index 1efaef19a3..5ebcc6c22b 100644 --- a/packages/backend/src/server/api/endpoints/channels/timeline.ts +++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts @@ -94,7 +94,7 @@ export default class extends Endpoint { // eslint- ] = me ? await Promise.all([ this.cacheService.userMutingsCache.fetch(me.id), ]) : [new Set()]; - console.log(userIdsWhoMeMuting) + let noteIds = await this.redisTimelineService.get(`channelTimeline:${channel.id}`, untilId, sinceId); noteIds = noteIds.slice(0, ps.limit); diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index d2a65142a5..dfef35986e 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -77,6 +77,7 @@ export default class extends Endpoint { // eslint- const untilId = ps.untilId ?? (ps.untilDate ? this.idService.genId(new Date(ps.untilDate!)) : null); const sinceId = ps.sinceId ?? (ps.sinceDate ? this.idService.genId(new Date(ps.sinceDate!)) : null); const isRangeSpecified = untilId != null && sinceId != null; + const isSelf = me && (me.id === ps.userId); if (isRangeSpecified || sinceId == null) { const [ @@ -100,7 +101,7 @@ export default class extends Endpoint { // eslint- noteIds = noteIds.slice(0, ps.limit); if (noteIds.length > 0) { - const isFollowing = me ? me.id === ps.userId || Object.hasOwn(await this.cacheService.userFollowingsCache.fetch(me.id), ps.userId) : false; + const isFollowing = me && Object.hasOwn(await this.cacheService.userFollowingsCache.fetch(me.id), ps.userId); const query = this.notesRepository.createQueryBuilder('note') .where('note.id IN (:...noteIds)', { noteIds: noteIds }) @@ -122,8 +123,9 @@ export default class extends Endpoint { // eslint- } } + if (note.channel?.isSensitive && !isSelf) return false; if (note.visibility === 'specified' && (!me || (me.id !== note.userId && !note.visibleUserIds.some(v => v === me.id)))) return false; - if (note.visibility === 'followers' && !isFollowing) return false; + if (note.visibility === 'followers' && !isFollowing && !isSelf) return false; return true; }); diff --git a/packages/frontend/src/pages/user/index.files.vue b/packages/frontend/src/pages/user/index.files.vue index 4c0b0e3fad..b6101a20e3 100644 --- a/packages/frontend/src/pages/user/index.files.vue +++ b/packages/frontend/src/pages/user/index.files.vue @@ -10,15 +10,18 @@ SPDX-License-Identifier: AGPL-3.0-only
- - - - +

{{ i18n.ts.nothing }}

@@ -45,6 +48,7 @@ let files = $ref<{ note: Misskey.entities.Note; file: Misskey.entities.DriveFile; }[]>([]); +let showingFiles = $ref([]); function thumbnail(image: Misskey.entities.DriveFile): string { return defaultStore.state.disableShowingAnimatedImages @@ -96,4 +100,9 @@ onMounted(() => { padding: 16px; text-align: center; } + +.sensitive { + display: grid; + place-items: center; +}