Merge pull request #1784 from TeamBlackCrystal/develop

chore: bump version

.github/workflows/e2e.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 17.x]
+        node-version: [14.x, 16.x, 17.x, 18.x]
         python-version: [3.9]
 
     services:

.github/workflows/nodejs.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 17.x]
+        node-version: [14.x, 16.x, 17.x, 18.x]
 
     services:
       postgres:

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.14.0-alpine3.15 AS base
+FROM node:16.14.2-alpine3.15 AS base
 
 ENV NODE_ENV=production
 

package.json

@@ -5,7 +5,7 @@
 		"yupix <[email protected]>",
 		"syuilo <[email protected]>"
 	],
-	"version": "11.37.1-rei0784-5.20.0",
+	"version": "11.37.1-rei0784-5.21.0",
 	"codename": "malachite",
 	"repository": {
 		"type": "git",
@@ -42,14 +42,14 @@
 	},
 	"dependencies": {
 		"@ayuskey/summaly": "2.5.0-rei0784.3",
-		"@ayuskey/xev": "2.0.1-rei0784.1",
+		"@ayuskey/xev": "2.0.1-rei0784.2",
 		"@elastic/elasticsearch": "7.17.0",
-		"@fortawesome/fontawesome-svg-core": "1.2.36",
-		"@fortawesome/free-brands-svg-icons": "5.15.4",
-		"@fortawesome/free-regular-svg-icons": "5.15.4",
-		"@fortawesome/free-solid-svg-icons": "5.15.4",
+		"@fortawesome/fontawesome-svg-core": "6.1.1",
+		"@fortawesome/free-brands-svg-icons": "6.1.1",
+		"@fortawesome/free-regular-svg-icons": "6.1.1",
+		"@fortawesome/free-solid-svg-icons": "6.1.1",
 		"@fortawesome/vue-fontawesome": "2.0.6",
-		"@koa/cors": "3.1.0",
+		"@koa/cors": "3.3.0",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "8.0.8",
 		"@types/animejs": "3.1.4",
@@ -69,21 +69,21 @@
 		"@types/js-yaml": "4.0.5",
 		"@types/jsdom": "16.2.14",
 		"@types/jsonld": "1.5.6",
-		"@types/katex": "0.11.1",
+		"@types/katex": "0.14.0",
 		"@types/koa": "2.13.4",
-		"@types/koa-bodyparser": "4.3.5",
+		"@types/koa-bodyparser": "4.3.7",
 		"@types/koa-cors": "0.0.2",
 		"@types/koa-favicon": "2.0.21",
 		"@types/koa-logger": "3.1.2",
 		"@types/koa-mount": "4.0.1",
 		"@types/koa-send": "4.1.3",
 		"@types/koa-views": "2.0.4",
-		"@types/koa__cors": "3.1.1",
+		"@types/koa__cors": "3.3.0",
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/lolex": "5.1.2",
-		"@types/mocha": "9.1.0",
-		"@types/node": "16.11.27",
+		"@types/mocha": "9.1.1",
+		"@types/node": "16.11.29",
 		"@types/node-fetch": "2.6.1",
 		"@types/nodemailer": "6.4.4",
 		"@types/nprogress": "0.2.0",
@@ -97,16 +97,14 @@
 		"@types/ratelimiter": "3.4.3",
 		"@types/redis": "2.8.32",
 		"@types/rename": "1.0.4",
-		"@types/request": "2.48.8",
-		"@types/request-promise-native": "1.0.18",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "3.0.2",
 		"@types/seedrandom": "3.0.2",
 		"@types/sharp": "0.29.5",
-		"@types/showdown": "1.9.4",
+		"@types/showdown": "2.0.0",
 		"@types/speakeasy": "2.0.7",
 		"@types/three": "0.134.0",
-		"@types/throttle-debounce": "2.1.0",
+		"@types/throttle-debounce": "4.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/tmp": "0.2.3",
 		"@types/uuid": "8.3.4",
@@ -115,20 +113,20 @@
 		"@types/webpack-stream": "3.2.12",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/parser": "5.20.0",
-		"@vue/composition-api": "1.4.9",
+		"@typescript-eslint/parser": "5.21.0",
+		"@vue/composition-api": "1.5.0",
 		"abort-controller": "3.0.0",
 		"animejs": "3.2.1",
-		"apexcharts": "3.33.2",
+		"apexcharts": "3.35.0",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.1",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1116.0",
+		"aws-sdk": "2.1121.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
 		"bootstrap-vue": "2.22.0",
 		"broadcast-channel": "4.11.0",
-		"bull": "3.29.3",
+		"bull": "4.8.2",
 		"cacheable-lookup": "6.0.4",
 		"cafy": "15.2.1",
 		"cbor": "8.1.0",
@@ -144,8 +142,8 @@
 		"dateformat": "4.6.3",
 		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
-		"eslint": "8.13.0",
-		"eslint-plugin-vue": "8.5.0",
+		"eslint": "8.14.0",
+		"eslint-plugin-vue": "8.7.1",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.2",
 		"file-type": "16.5.3",
@@ -166,14 +164,14 @@
 		"http-signature": "1.3.6",
 		"insert-text-at-cursor": "0.3.0",
 		"ioredis": "4.28.5",
-		"ip-cidr": "3.0.4",
+		"ip-cidr": "3.0.7",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
 		"jsdom": "19.0.0",
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
 		"jsonld": "5.2.0",
-		"jsrsasign": "10.5.17",
+		"jsrsasign": "10.5.20",
 		"katex": "0.15.3",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
@@ -183,7 +181,7 @@
 		"koa-mount": "4.0.0",
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
-		"koa-views": "7.0.2",
+		"koa-views": "8.0.0",
 		"langmap": "0.0.16",
 		"loader-utils": "2.0.0",
 		"lodash": "4.17.21",
@@ -221,36 +219,34 @@
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
-		"request": "2.88.2",
-		"request-promise-native": "1.0.9",
 		"request-stats": "3.0.0",
 		"require-all": "3.0.0",
 		"rimraf": "3.0.2",
 		"rndstr": "1.0.0",
-		"sass": "1.49.9",
+		"sass": "1.51.0",
 		"sass-loader": "12.6.0",
 		"seedrandom": "3.0.5",
 		"sharp": "0.29.3",
-		"showdown": "1.9.1",
+		"showdown": "2.1.0",
 		"showdown-highlightjs-extension": "0.1.2",
-		"sonic-channel": "1.2.6",
+		"sonic-channel": "1.2.7",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
-		"stylus": "0.56.0",
+		"stylus": "0.57.0",
 		"stylus-loader": "6.2.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.11.6",
+		"systeminformation": "5.11.14",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "4.2.3",
 		"textarea-caret": "3.1.0",
 		"three": "0.134.0",
-		"throttle-debounce": "3.0.1",
+		"throttle-debounce": "4.0.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
 		"ts-loader": "9.2.8",
 		"ts-node": "10.7.0",
-		"tsc-alias": "1.6.6",
-		"tsconfig-paths": "3.12.0",
+		"tsc-alias": "1.6.7",
+		"tsconfig-paths": "3.14.1",
 		"tslint": "5.20.1",
 		"tslint-sonarts": "1.9.0",
 		"typeorm": "0.2.44",
@@ -264,14 +260,14 @@
 		"vue-color": "2.8.1",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "4.2.0",
-		"vue-i18n": "8.27.0",
+		"vue-i18n": "8.27.1",
 		"vue-js-modal": "1.3.35",
 		"vue-loader": "15.9.8",
 		"vue-marquee-text-component": "1.2.0",
 		"vue-router": "3.5.3",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.3",
-		"vue-svg-inline-loader": "2.1.2",
+		"vue-svg-inline-loader": "2.1.3",
 		"vue-template-compiler": "2.6.14",
 		"vuedraggable": "2.24.3",
 		"vuewordcloud": "18.7.12",
@@ -284,7 +280,7 @@
 		"ws": "8.5.0"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.85",
+		"@redocly/openapi-core": "1.0.0-beta.94",
 		"npm-run-all": "4.1.5",
 		"webpack-dev-server": "4.8.1"
 	}

src/client/app/common/views/components/media-banner.vue

@@ -18,6 +18,8 @@
 		:href="media.url"
 		:title="media.name"
 		:download="media.name"
+		target="_blank"
+		rel="noopener"
 	>
 		<span class="icon"><fa icon="download"/></span>
 		<b>{{ media.name }}</b>

src/client/app/desktop/views/components/note.sub.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="tkfdzaxtkdeianobciwadajxzbddorql" :class="{ mini: narrow }" :title="title">
+<div class="tkfdzaxtkdeianobciwadajxzbddorql" :class="{ mini: narrow }" :title="title" style="border-left: solid 2px var(--primary)">
 	<mk-avatar class="avatar" :user="note.user"/>
 	<div class="main">
 		<mk-note-header class="header" :note="note"/>

src/client/app/desktop/views/components/note.vue

@@ -1,7 +1,7 @@
 <template>
 <div
 	class="note"
-	:class="{ mini: narrow }"
+	:class="{ mini: narrow, 'note-reply-frame': appearNote.reply }"
 	v-show="(this.$store.state.settings.remainDeletedNote || appearNote.deletedAt == null) && !hideThisNote"
 	:tabindex="appearNote.deletedAt == null ? '-1' : null"
 	v-hotkey="keymap"
@@ -11,8 +11,8 @@
 	<div class="reply-to" v-if="appearNote.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)">
 		<x-sub :note="appearNote.reply"/>
 	</div>
-	<mk-renote class="renote" v-if="isRenote" :note="note"/>
-	<article class="article">
+	<mk-renote class="renote" v-if="isRenote" :note="note" :class="{'reply-border': appearNote.reply}"/>
+	<article class="article" :class="{'reply-border': appearNote.reply}">
 		<mk-avatar class="avatar" :user="appearNote.user"/>
 		<div class="main">
 			<mk-note-header class="header" :note="appearNote" :mini="narrow"/>
@@ -154,12 +154,23 @@ export default Vue.extend({
 });
 </script>
 
+<style lang="css" scoped>
+.reply-border {
+	border-left: solid 2px var(--primary)
+}
+
+.note-reply-frame {
+	border: solid 1px var(--primaryAlpha03) !important
+}
+</style>
+
 <style lang="stylus" scoped>
 .note
 	margin 0
 	padding 0
 	overflow hidden
 	background var(--face)
+	border-radius 6px
 	border-bottom solid var(--lineWidth) var(--faceDivider)
 
 	&.mini
@@ -171,7 +182,6 @@ export default Vue.extend({
 			.avatar
 				width 20px
 				height 20px
-
 		> .article
 			padding 16px 16px 4px
 

src/client/app/mobile/views/components/note.sub.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="zlrxdaqttccpwhpaagdmkawtzklsccam" :class="{ smart: $store.state.device.postStyle == 'smart', mini: narrow }">
+<div class="zlrxdaqttccpwhpaagdmkawtzklsccam" :class="{ smart: $store.state.device.postStyle == 'smart', mini: narrow }" style="border-left: solid 2px var(--primary)">
 	<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart'"/>
 	<div class="main">
 		<mk-note-header class="header" :note="note" :mini="true"/>

src/client/app/mobile/views/components/note.vue

@@ -3,15 +3,15 @@
 	class="note"
 	v-show="appearNote.deletedAt == null && !hideThisNote"
 	:tabindex="appearNote.deletedAt == null ? '-1' : null"
-	:class="{ renote: isRenote, smart: $store.state.device.postStyle == 'smart', mini: narrow }"
+	:class="{ renote: isRenote, smart: $store.state.device.postStyle == 'smart', mini: narrow, 'note-reply-frame': appearNote.reply }"
 	v-hotkey="keymap"
 >
 	<x-sub v-for="note in conversation" :key="note.id" :note="note"/>
 	<div class="reply-to" v-if="appearNote.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)">
 		<x-sub :note="appearNote.reply"/>
 	</div>
 	<mk-renote class="renote" v-if="isRenote" :note="note"/>
-	<article class="article">
+	<article class="article" :class="{'reply-border': appearNote.reply}">
 		<mk-avatar class="avatar" :user="appearNote.user" v-if="$store.state.device.postStyle != 'smart'"/>
 		<div class="main">
 			<mk-note-header class="header" :note="appearNote" :mini="true"/>
@@ -146,10 +146,22 @@ export default Vue.extend({
 });
 </script>
 
+
+<style lang="css" scoped>
+.reply-border {
+	border-left: solid 2px var(--primary)
+}
+
+.note-reply-frame {
+	border: solid 1px var(--primaryAlpha03) !important
+}
+</style>
+
 <style lang="stylus" scoped>
 .note
 	overflow hidden
 	font-size 13px
+	border-radius 6px
 	border-bottom solid var(--lineWidth) var(--faceDivider)
 
 	&:last-of-type

src/server/api/endpoints/antennas/notes.ts

@@ -53,18 +53,22 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchAntenna);
 	}
 
+	/* old
 	const antennaQuery = AntennaNotes.createQueryBuilder('joining')
 		.select('joining.noteId')
 		.where('joining.antennaId = :antennaId', { antennaId: antenna.id });
+	*/
 
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
-		.andWhere(`note.id IN (${ antennaQuery.getQuery() })`)
+		//.andWhere(`note.id IN (${ antennaQuery.getQuery() })`)
+		.innerJoin(AntennaNotes.metadata.targetName, 'antennaNote', 'antennaNote.noteId = note.id')
 		.leftJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('note.reply', 'reply')
 		.leftJoinAndSelect('note.renote', 'renote')
 		.leftJoinAndSelect('reply.user', 'replyUser')
 		.leftJoinAndSelect('renote.user', 'renoteUser')
-		.setParameters(antennaQuery.getParameters());
+		.andWhere('antennaNote.antennaId = :antennaId', { antennaId: antenna.id });
+		//.setParameters(antennaQuery.getParameters());
 
 	generateVisibilityQuery(query, user);
 	generateMutedUserQuery(query, user);

src/server/api/endpoints/clips/notes.ts

@@ -66,18 +66,14 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchClip);
 	}
 
-	const clipQuery = ClipNotes.createQueryBuilder('joining')
-		.select('joining.noteId')
-		.where('joining.clipId = :clipId', { clipId: clip.id });
-
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
-		.andWhere(`note.id IN (${ clipQuery.getQuery() })`)
+		.innerJoin(ClipNotes.metadata.targetName, 'clipNote', 'clipNote.noteId = note.id')
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('note.reply', 'reply')
 		.leftJoinAndSelect('note.renote', 'renote')
 		.leftJoinAndSelect('reply.user', 'replyUser')
 		.leftJoinAndSelect('renote.user', 'renoteUser')
-		.setParameters(clipQuery.getParameters());
+		.andWhere('clipNote.clipId = :clipId', { clipId: clip.id });
 
 	if (user) {
 		generateVisibilityQuery(query, user);