Release: 0.4.1 (#267)

yojo-art · Aug 2, 2024 · f1a6604 · f1a6604
2 parents 337e4c4 + 27bf432
commit f1a6604
Show file tree

Hide file tree

Showing 33 changed files with 55 additions and 67 deletions.
diff --git a/CHANGELOG_yojo.md b/CHANGELOG_yojo.md
@@ -30,6 +30,23 @@
 
 ### Misc
 
+## 0.4.1
+
+### Release Date
+2024-08-02
+
+### General
+- Fix: チャンネルに関する権限定義を削除
+
+### Client
+- Fix: 非ログイン状態でメディアタイムラインが選べないバグ修正
+- Fix: NSFWを常に表示にする設定でも年齢確認処理を行う前は隠す
+
+### Server
+-
+
+### Misc
+
 ## 0.4.0
 Cherrypick 4.9.0
 

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
@@ -1329,8 +1329,6 @@ _permissions:
   "read:page-likes": "يعرض ما أعجبك من ملاحظات في صفحات"
   "read:user-groups": "اعرض فِرق المستخدمين"
   "write:user-groups": "عدّل أو احذف فِرق المستخدمين"
-  "read:channels": "طالع قنواتك"
-  "write:channels": "عدّل القنوات"
   "read:gallery": "اعرض المعرض"
   "write:gallery": "عدّل المعرض"
   "read:gallery-likes": "يعرض ما أعجبك من مشاركات المعرض"

diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
@@ -1188,8 +1188,6 @@ _permissions:
   "write:page-likes": "পৃষ্ঠায় দেয়া পছন্দগুলি সম্পাদনা করুন"
   "read:user-groups": "ব্যাবহারকারী গ্রুপগুলি দেখুন"
   "write:user-groups": "ব্যাবহারকারী গ্রুপগুলি সম্পাদনা করুন"
-  "read:channels": "চ্যানেলগুলি দেখুন"
-  "write:channels": "চ্যানেলগুলি সম্পাদনা করুন"
   "read:gallery": "গ্যালারী দেখুন"
   "write:gallery": "গ্যালারী সম্পাদনা করুন"
   "read:gallery-likes": "গ্যালারীর পছন্দগুলি দেখুন"

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
@@ -1983,8 +1983,6 @@ _permissions:
   "write:page-likes": "Editar la llista de les pàgines que t'han agradat"
   "read:user-groups": "Veure els teus grups d'usuaris "
   "write:user-groups": "Editar o esborrar els teus grups d'usuaris "
-  "read:channels": "Veure els teus canals"
-  "write:channels": "Editar els teus canals"
   "read:gallery": "Veure la teva galeria "
   "write:gallery": "Editar la teva galeria"
   "read:gallery-likes": "Veure la llista de publicacions de galeries que t'han agradat"

diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
@@ -1716,8 +1716,6 @@ _permissions:
   "write:page-likes": "Upravit to se mi líbí na stránkách"
   "read:user-groups": "Zobrazit skupiny uživatelů"
   "write:user-groups": "Upravit nebo odstranit skupiny uživatelů"
-  "read:channels": "Zobrazit své kanály"
-  "write:channels": "Upravit kanály"
   "read:gallery": "Zobrazit galerii"
   "write:gallery": "Upravit galerii"
   "read:gallery-likes": "Zobrazit seznam to se mi líbí příspěvků v galerii"

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
@@ -1959,8 +1959,6 @@ _permissions:
   "write:page-likes": "Liste der Seiten, die mir gefallen, bearbeiten"
   "read:user-groups": "Benutzergruppen lesen"
   "write:user-groups": "Benutzergruppen bearbeiten oder löschen"
-  "read:channels": "Kanäle lesen"
-  "write:channels": "Kanäle bedienen"
   "read:gallery": "Beiträge deiner Galerie lesen"
   "write:gallery": "Deine Galerie bearbeiten"
   "read:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge lesen"

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -2337,8 +2337,6 @@ _permissions:
   "write:page-likes": "Edit list of liked Pages"
   "read:user-groups": "View your user groups"
   "write:user-groups": "Edit or delete your user groups"
-  "read:channels": "View your channels"
-  "write:channels": "Edit your channels"
   "read:gallery": "View your gallery"
   "write:gallery": "Edit your gallery"
   "read:gallery-likes": "View your list of liked gallery posts"

diff --git a/locales/es-ES.yml b/locales/es-ES.yml
@@ -2095,8 +2095,6 @@ _permissions:
   "write:page-likes": "Administrar páginas que te gustan"
   "read:user-groups": "Ver grupos de usuarios"
   "write:user-groups": "Administrar grupos de usuarios"
-  "read:channels": "Ver canal"
-  "write:channels": "Modificar canal"
   "read:gallery": "Ver galería"
   "write:gallery": "Editar galería"
   "read:gallery-likes": "Ver favoritos de la galería"

diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
@@ -1873,8 +1873,6 @@ _permissions:
   "write:page-likes": "Gérer les mentions « J'aime » sur les pages"
   "read:user-groups": "Voir les groupes d'utilisateur·rice·s"
   "write:user-groups": "Éditer les groupes d'utilisateur·rice·s"
-  "read:channels": "Lire les canaux"
-  "write:channels": "Gérer les canaux"
   "read:gallery": "Voir la galerie"
   "write:gallery": "Éditer la galerie"
   "read:gallery-likes": "Voir les mentions « J'aime » dans la galerie"

diff --git a/locales/id-ID.yml b/locales/id-ID.yml
@@ -2105,8 +2105,6 @@ _permissions:
   "write:page-likes": "Sunting suka pada Halaman"
   "read:user-groups": "Lihat grup pengguna"
   "write:user-groups": "Sunting atau hapus grup pengguna"
-  "read:channels": "Lihat Kanal"
-  "write:channels": "Sunting Kanal"
   "read:gallery": "Lihat galeri"
   "write:gallery": "Sunting galeri"
   "read:gallery-likes": "Lihat daftar postingan galeri yang disukai"

diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -9223,14 +9223,6 @@ export interface Locale extends ILocale {
          * ユーザーグループを操作する
          */
         "write:user-groups": string;
-        /**
-         * チャンネルを見る
-         */
-        "read:channels": string;
-        /**
-         * チャンネルを操作する
-         */
-        "write:channels": string;
         /**
          * ギャラリーを見る
          */

diff --git a/locales/it-IT.yml b/locales/it-IT.yml
@@ -2091,8 +2091,6 @@ _permissions:
   "write:page-likes": "Gestire i \"Mi piace\" di pagine"
   "read:user-groups": "Vedere i gruppi di utenti"
   "write:user-groups": "Gestire i gruppi di utenti"
-  "read:channels": "Visualizza canali"
-  "write:channels": "Gerisci canali"
   "read:gallery": "Visualizza la galleria."
   "write:gallery": "Gestione della galleria"
   "read:gallery-likes": "Visualizza i contenuti della galleria."

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -2428,8 +2428,6 @@ _permissions:
   "write:page-likes": "ページのいいねを操作する"
   "read:user-groups": "ユーザーグループを見る"
   "write:user-groups": "ユーザーグループを操作する"
-  "read:channels": "チャンネルを見る"
-  "write:channels": "チャンネルを操作する"
   "read:gallery": "ギャラリーを見る"
   "write:gallery": "ギャラリーを操作する"
   "read:gallery-likes": "ギャラリーのいいねを見る"

diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
@@ -2099,8 +2099,6 @@ _permissions:
   "write:page-likes": "ページのええやんを操作する"
   "read:user-groups": "ユーザーグループを見る"
   "write:user-groups": "ユーザーグループで操作するで"
-  "read:channels": "チャンネルを見る"
-  "write:channels": "チャンネルを操作するで"
   "read:gallery": "ギャラリーを見るで"
   "write:gallery": "ギャラリーを操作するで"
   "read:gallery-likes": "ギャラリーのいいねを見るで"

diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
@@ -2315,8 +2315,6 @@ _permissions:
   "write:page-likes": "페이지에 좋아요를 추가하거나 취소합니다"
   "read:user-groups": "사용자 그룹을 조회합니다"
   "write:user-groups": "사용자 그룹을 만들거나, 초대하거나, 이름을 변경하거나, 양도하거나, 삭제합니다"
-  "read:channels": "채널을 보기"
-  "write:channels": "채널을 추가하거나 삭제합니다"
   "read:gallery": "갤러리를 봅니다"
   "write:gallery": "갤러리를 추가하거나 삭제합니다"
   "read:gallery-likes": "갤러리의 좋아요를 확인합니다"

diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
@@ -1354,8 +1354,6 @@ _permissions:
   "write:page-likes": "Edycja polubień na stronach"
   "read:user-groups": "Wyświetlanie grup użytkownika"
   "write:user-groups": "Edycja lub usuwanie grup użytkownika"
-  "read:channels": "Zobacz swoje kanały"
-  "write:channels": "Edytuj swoje kanały"
   "read:gallery": "Zobacz swoją galerię"
   "write:gallery": "Edytuj swoją galerię"
   "read:gallery-likes": "Wyświetlanie listy polubionych postów w galerii"

diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
@@ -1359,8 +1359,6 @@ _permissions:
   "write:page-likes": "Editar as suas curtidas em páginas"
   "read:user-groups": "Visualizar os seus grupos de usuários"
   "write:user-groups": "Editar ou excluir os seus grupos de usuários"
-  "read:channels": "Visualizar os seus canais"
-  "write:channels": "Editar os seus canais"
   "read:gallery": "Visualizar a sua galeria"
   "write:gallery": "Editar sua galeria"
   "read:gallery-likes": "Visualizar a sua lista de curtidas da galeria"

diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
@@ -1771,8 +1771,6 @@ _permissions:
   "write:page-likes": "Изменять добавления страниц в избранное"
   "read:user-groups": "Смотреть группы пользователей"
   "write:user-groups": "Изменять и удалять группы пользователей"
-  "read:channels": "Смотреть каналы"
-  "write:channels": "Изменять каналы"
   "read:gallery": "Просмотр галереи"
   "write:gallery": "Редактирование галереи"
   "read:gallery-likes": "Просмотр списка понравившегося в галерее"

diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
@@ -1260,8 +1260,6 @@ _permissions:
   "write:page-likes": "Upraviť páčiky na stránkach"
   "read:user-groups": "Vidieť vaše skupiny"
   "write:user-groups": "Upraviť alebo odstrániť vaše skupiny"
-  "read:channels": "Čítať vaše kanály"
-  "write:channels": "Upravovať vaše kanály"
   "read:gallery": "Vidieť vašu galériu"
   "write:gallery": "Upravovať vašu galériu"
   "read:gallery-likes": "Vidieť zoznam obľúbených príspevkov z galérie"

diff --git a/locales/th-TH.yml b/locales/th-TH.yml
@@ -2099,8 +2099,6 @@ _permissions:
   "write:page-likes": "แก้ไขรายการเพจที่ถูกใจ"
   "read:user-groups": "ดูกลุ่มผู้ใช้ของคุณ"
   "write:user-groups": "แก้ไขหรือลบกลุ่มผู้ใช้ของคุณ"
-  "read:channels": "ดูแชนแนลของคุณ"
-  "write:channels": "แก้ไขแชนแนลของคุณ"
   "read:gallery": "ดูแกลเลอรี่"
   "write:gallery": "แก้ไขแกลเลอรี่ของคุณ"
   "read:gallery-likes": "ดูรายการโพสต์แกลเลอรีที่ถูกใจไว้"

diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
@@ -1448,8 +1448,6 @@ _permissions:
   "write:page-likes": "Змінювати вподобання сторінок"
   "read:user-groups": "Переглядати групи користувача"
   "write:user-groups": "Змінювати групи користувача"
-  "read:channels": "Переглядати канали"
-  "write:channels": "Змінювати канали"
   "read:gallery": "Перегляд галереї"
 _auth:
   shareAccess: "Ви хочете надати \"{name}\" доступ до цього акаунту?"

diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
@@ -1709,8 +1709,6 @@ _permissions:
   "write:page-likes": "Sửa lượt thích của tôi trên trang"
   "read:user-groups": "Xem nhóm của tôi"
   "write:user-groups": "Sửa hoặc xóa nhóm của tôi"
-  "read:channels": "Xem kênh của tôi"
-  "write:channels": "Sửa kênh của tôi"
   "read:gallery": "Xem kho ảnh của tôi"
   "write:gallery": "Sửa kho ảnh của tôi"
   "read:gallery-likes": "Xem danh sách các tút đã thích trong thư viện của tôi"

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
@@ -2109,8 +2109,6 @@ _permissions:
   "write:page-likes": "操作喜欢的页面"
   "read:user-groups": "查看用户组"
   "write:user-groups": "操作用户组"
-  "read:channels": "查看频道"
-  "write:channels": "管理频道"
   "read:gallery": "浏览图库"
   "write:gallery": "操作图库"
   "read:gallery-likes": "读取喜欢的图片"

diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
@@ -2112,8 +2112,6 @@ _permissions:
   "write:page-likes": "編輯頁面上喜歡"
   "read:user-groups": "顯示使用者群組"
   "write:user-groups": "編輯使用者群組"
-  "read:channels": "已查看的頻道"
-  "write:channels": "編輯頻道"
   "read:gallery": "瀏覽相簿"
   "write:gallery": "編輯相簿"
   "read:gallery-likes": "瀏覽相簿的讚"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "4.9.0-yojo0.4.0",
+	"version": "4.9.0-yojo0.4.1",
 	"basedMisskeyVersion": "2024.5.0",
 	"codename": "nasubi",
 	"repository": {

diff --git a/packages/cherrypick-js/etc/cherrypick-js.api.md b/packages/cherrypick-js/etc/cherrypick-js.api.md
@@ -2817,7 +2817,7 @@ type PagesUpdateRequest = operations['pages___update']['requestBody']['content']
 function parse(acct: string): Acct;
 
 // @public (undocumented)
-export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse", "write:admin:official-tags"];
+export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse", "write:admin:official-tags"];
 
 // @public (undocumented)
 type PingResponse = operations['ping']['responses']['200']['content']['application/json'];

diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.9.0-yojo0.4.0",
+	"version": "4.9.0-yojo0.4.1",
 	"basedMisskeyVersion": "2024.5.0",
 	"description": "CherryPick SDK for JavaScript",
 	"license": "MIT",

diff --git a/packages/cherrypick-js/src/consts.ts b/packages/cherrypick-js/src/consts.ts
@@ -35,8 +35,6 @@ export const permissions = [
 	'read:page-likes',
 	'read:user-groups',
 	'write:user-groups',
-	'read:channels',
-	'write:channels',
 	'read:gallery',
 	'write:gallery',
 	'read:gallery-likes',

diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
@@ -65,7 +65,7 @@ import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 import { $i, iAmModerator } from '@/account.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
-import { confirmR18 } from '@/scripts/check-r18.js';
+import { confirmR18, wasConfirmR18 } from '@/scripts/check-r18.js';
 
 const props = withDefaults(defineProps<{
 	image: Misskey.entities.DriveFile;
@@ -121,7 +121,17 @@ function resetTimer() {
 
 // Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
 watch(() => props.image, () => {
-	hide.value = (defaultStore.state.nsfw === 'force' || defaultStore.state.dataSaver.media) ? true : (props.image.isSensitive && defaultStore.state.nsfw !== 'ignore');
+	if (defaultStore.state.nsfw === 'force' || defaultStore.state.dataSaver.media) {
+		hide.value = true;
+	} else if (props.image.isSensitive) {
+		if (defaultStore.state.nsfw !== 'ignore') {
+			hide.value = true;
+		} else {
+			hide.value = !wasConfirmR18();
+		}
+	} else {
+		hide.value = false;
+	}
 }, {
 	deep: true,
 	immediate: true,

diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
@@ -122,7 +122,7 @@ import hasAudio from '@/scripts/media-has-audio.js';
 import MkMediaRange from '@/components/MkMediaRange.vue';
 import { $i, iAmModerator } from '@/account.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
-import { confirmR18 } from '@/scripts/check-r18.js';
+import { confirmR18, wasConfirmR18 } from '@/scripts/check-r18.js';
 
 const props = defineProps<{
 	video: Misskey.entities.DriveFile;
@@ -469,7 +469,17 @@ onDeactivated(() => {
 	elapsedTimeMs.value = 0;
 	durationMs.value = 0;
 	bufferedEnd.value = 0;
-	hide.value = (defaultStore.state.nsfw === 'force' || defaultStore.state.dataSaver.media) ? true : (props.video.isSensitive && defaultStore.state.nsfw !== 'ignore');
+	if (defaultStore.state.nsfw === 'force' || defaultStore.state.dataSaver.media) {
+		hide.value = true;
+	} else if (props.video.isSensitive) {
+		if (defaultStore.state.nsfw !== 'ignore') {
+			hide.value = true;
+		} else {
+			hide.value = !wasConfirmR18();
+		}
+	} else {
+		hide.value = false;
+	}
 	stopVideoElWatch();
 	onceInit = false;
 	if (mediaTickFrameId) {

diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
@@ -43,7 +43,8 @@ type Keys =
 	'emojis' | // DEPRECATED, stored in indexeddb (13.9.0~);
 	`channelLastReadedAt:${string}` |
 	'neverShowNoteEditInfo' |
-	'showPushNotificationDialog'
+	'showPushNotificationDialog' |
+	'checkR18'
 
 export const miLocalStorage = {
 	getItem: (key: Keys): string | null => window.localStorage.getItem(key),

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
@@ -101,7 +101,7 @@ const tlComponent = shallowRef<InstanceType<typeof MkTimeline>>();
 const rootEl = shallowRef<HTMLElement>();
 
 const queue = ref(0);
-const srcWhenNotSignin = ref<'local' | 'global'>(isLocalTimelineAvailable ? 'local' : 'global');
+const srcWhenNotSignin = ref<'local' | 'global' | 'media'>(isLocalTimelineAvailable ? 'local' : 'global');
 const src = computed<'home' | 'local' | 'media' | 'social' | 'global' | 'media' | `list:${string}`>({
 	get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin.value),
 	set: (x) => saveSrc(x),
@@ -266,8 +266,8 @@ function saveSrc(newSrc: 'home' | 'local' | 'media' | 'social' | 'global' | 'med
 	}
 
 	defaultStore.set('tl', out);
-	if (['local', 'global'].includes(newSrc)) {
-		srcWhenNotSignin.value = newSrc as 'local' | 'global';
+	if (['local', 'global', 'media'].includes(newSrc)) {
+		srcWhenNotSignin.value = newSrc as 'local' | 'global' | 'media';
 	}
 }