Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

2023-02-03 08:07:25 +00:00 · 2023-02-03 08:07:25 +00:00 · 0d148bd23b
commit 0d148bd23b
parent ebedb81e3f 3a62625bbc
7 changed files with 79 additions and 19 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,7 +9,7 @@
 You should also include the user name that made the change.
 -->

-## 13.x.x (unreleased)
+## 13.3.0 (2023/02/03)
 ### Changes
 - twitter/github/discord連携機能が削除されました
 - ハッシュタグごとのチャートが削除されました
@ -18,8 +18,6 @@ You should also include the user name that made the change.
 ### Improvements
 - ロールで広告の非表示が有効になっている場合は最初から広告を非表示にするように

-### Bugfixes
-
 ## 13.2.6 (2023/02/01)
 ### Changes
 - docker-compose.ymlをdocker-compose.yml.exampleにしました。docker-compose.ymlとしてコピーしてから使用してください。
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.2.6",
+	"version": "13.3.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@ -274,7 +274,7 @@ export class ApRendererService {
 		} as any;

 		if (reaction.startsWith(':')) {
-			const name = reaction.replace(/:/g, '');
+			const name = reaction.replaceAll(':', '');
 			const emoji = await this.emojisRepository.findOneBy({
 				name,
 				host: IsNull(),
--- a/packages/backend/src/misc/nyaize.ts
+++ b/packages/backend/src/misc/nyaize.ts
@ -1,14 +1,14 @@
 export function nyaize(text: string): string {
 	return text
 		// ja-JP
-		.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ')
+		.replaceAll('な', 'にゃ').replaceAll('ナ', 'ニャ').replaceAll('ﾅ', 'ﾆｬ')
 		// en-US
 		.replace(/(?<=n)a/gi, x => x === 'A' ? 'YA' : 'ya')
 		.replace(/(?<=morn)ing/gi, x => x === 'ING' ? 'YAN' : 'yan')
 		.replace(/(?<=every)one/gi, x => x === 'ONE' ? 'NYAN' : 'nyan')
 		// ko-KR
 		.replace(/[나-낳]/g, match => String.fromCharCode(
-			match.charCodeAt(0)! + '냐'.charCodeAt(0) - '나'.charCodeAt(0)
+			match.charCodeAt(0)! + '냐'.charCodeAt(0) - '나'.charCodeAt(0),
 		))
 		.replace(/(다$)|(다(?=\.))|(다(?= ))|(다(?=!))|(다(?=\?))/gm, '다냥')
 		.replace(/(야(?=\?))|(야$)|(야(?= ))/gm, '냥');
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@ -62,6 +62,7 @@
 		"typescript": "4.9.5",
 		"uuid": "9.0.0",
 		"vanilla-tilt": "1.8.0",
+		"vue-plyr": "7.0.0",
 		"vite": "4.1.1",
 		"vue": "3.2.47",
 		"vue-prism-editor": "2.0.0-alpha.2",
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@ -6,19 +6,20 @@
 	</div>
 </div>
 <div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
-	<video
-		:poster="video.thumbnailUrl"
-		:title="video.comment"
-		:alt="video.comment"
-		preload="none"
-		controls
-		@contextmenu.stop
-	>
-		<source 
-			:src="video.url" 
-			:type="video.type"
+	<vue-plyr>
+		<video
+			controls
+			crossorigin
+			playsinline
+			:data-poster="video.thumbnailUrl"
 		>
-	</video>
+			<source
+				size="720"
+				:src="video.url" 
+				:type="video.type"
+			/>
+		</video>
+	</vue-plyr>
 	<i class="ti ti-eye-off" @click="hide = true"></i>
 </div>
 </template>
@ -26,7 +27,9 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
+import VuePlyr from 'vue-plyr';
 import { defaultStore } from '@/store';
+import 'vue-plyr/dist/vue-plyr.css';

 const props = defineProps<{
 	video: misskey.entities.DriveFile;
@ -39,6 +42,8 @@ const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSe
 .kkjnbbplepmiyuadieoenjgutgcmtsvu {
 	position: relative;

+	--plyr-color-main: var(--accent);
+
 	> i {
 		display: block;
 		position: absolute;
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -453,6 +453,7 @@ importers:
      vite: 4.1.1
      vue: 3.2.47
      vue-eslint-parser: 9.1.0
+      vue-plyr: 7.0.0
      vue-prism-editor: 2.0.0-alpha.2
      vue-tsc: 1.0.24
      vuedraggable: next
@ -514,6 +515,7 @@ importers:
      vanilla-tilt: 1.8.0
      vite: 4.1.1_f5vcjb3akvjdur4ffzogu2hewu
      vue: 3.2.47
+      vue-plyr: 7.0.0
      vue-prism-editor: 2.0.0-alpha.2_vue@3.2.47
      vuedraggable: 4.1.0_vue@3.2.47
    devDependencies:
@ -3111,6 +3113,14 @@ packages:
      '@vue/compiler-core': 3.2.47
      '@vue/shared': 3.2.47

+  /@vue/compiler-sfc/2.7.14:
+    resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
+    dependencies:
+      '@babel/parser': 7.20.7
+      postcss: 8.4.21
+      source-map: 0.6.1
+    dev: false
+
  /@vue/compiler-sfc/3.2.47:
    resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==}
    dependencies:
@ -4907,6 +4917,14 @@ packages:
    resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
    dev: false

+  /csstype/3.1.1:
+    resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
+    dev: false
+
+  /custom-event-polyfill/1.0.7:
+    resolution: {integrity: sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==}
+    dev: false
+
  /cwise-compiler/1.1.3:
    resolution: {integrity: sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==}
    dependencies:
@ -9023,6 +9041,10 @@ packages:
      strip-bom: 2.0.0
    dev: false

+  /loadjs/4.2.0:
+    resolution: {integrity: sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==}
+    dev: false
+
  /locate-path/5.0.0:
    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
    engines: {node: '>=8'}
@ -11096,6 +11118,10 @@ packages:
    resolution: {integrity: sha512-9CRCUX/w4+fNMzlYgA8GeJz7BZwBPwaGm3FhAm9Hi50k8wNy2CyiJQa8awygWJay87uVVCV0/FwbLcD6+/A9KQ==}
    dev: false

+  /rangetouch/2.0.1:
+    resolution: {integrity: sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==}
+    dev: false
+
  /ratelimiter/3.4.1:
    resolution: {integrity: sha512-5FJbRW/Jkkdk29ksedAfWFkQkhbUrMx3QJGwMKAypeIiQf4yrLW+gtPKZiaWt4zPrtw1uGufOjGO7UGM6VllsQ==}
    dev: false
@ -12988,6 +13014,10 @@ packages:
      requires-port: 1.0.0
    dev: false

+  /url-polyfill/1.1.12:
+    resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
+    dev: false
+
  /url/0.10.3:
    resolution: {integrity: sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==}
    dependencies:
@ -13206,6 +13236,13 @@ packages:
      - supports-color
    dev: true

+  /vue-plyr/7.0.0:
+    resolution: {integrity: sha512-NvbO/ZzV1IxlBQQbQlon5Sk8hKuGAj3k4k0XVdi7gM4oSqu8mZMhJ3WM3FfAtNfV790jbLnb8P3dHYqaBqIv6g==}
+    dependencies:
+      plyr: github.com/sampotts/plyr/d434c9af16e641400aaee93188594208d88f2658
+      vue: 2.7.14
+    dev: false
+
  /vue-prism-editor/2.0.0-alpha.2_vue@3.2.47:
    resolution: {integrity: sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==}
    engines: {node: '>=10'}
@ -13233,6 +13270,13 @@ packages:
      typescript: 4.9.5
    dev: true

+  /vue/2.7.14:
+    resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
+    dependencies:
+      '@vue/compiler-sfc': 2.7.14
+      csstype: 3.1.1
+    dev: false
+
  /vue/3.2.47:
    resolution: {integrity: sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==}
    dependencies:
@ -13655,3 +13699,15 @@ packages:
    name: browser-image-resizer
    version: 2.2.1-misskey.3
    dev: false
+
+  github.com/sampotts/plyr/d434c9af16e641400aaee93188594208d88f2658:
+    resolution: {tarball: https://codeload.github.com/sampotts/plyr/tar.gz/d434c9af16e641400aaee93188594208d88f2658}
+    name: plyr
+    version: 3.7.0
+    dependencies:
+      core-js: 3.27.1
+      custom-event-polyfill: 1.0.7
+      loadjs: 4.2.0
+      rangetouch: 2.0.1
+      url-polyfill: 1.1.12
+    dev: false