Merge branch 'develop'

locales/de-DE.yml

@@ -326,6 +326,7 @@ driveCapacityPerRemoteAccount: "Drive-Kapazität pro Benutzer anderer Instanzen"
 inMb: "In Megabytes"
 iconUrl: "Icon-URL"
 bannerUrl: "Banner-URL"
+backgroundImageUrl: "Hintergrundbild-URL"
 basicInfo: "Basisdaten"
 pinnedUsers: "Angepinnte Benutzer"
 pinnedUsersDescription: "Gib einen Benutzernamen pro Zeile ein. Diese werden im \"Erkunden\" Tab angezeigt."

locales/en-US.yml

@@ -326,6 +326,7 @@ driveCapacityPerRemoteAccount: "Drive capacity per remote user"
 inMb: "In megabytes"
 iconUrl: "Icon URL"
 bannerUrl: "Banner image URL"
+backgroundImageUrl: "Background image URL"
 basicInfo: "Basic info"
 pinnedUsers: "Pinned user"
 pinnedUsersDescription: "List one username per line. Users listed here will be pinned under \"Explore\" tab."

locales/fr-FR.yml

@@ -279,6 +279,7 @@ emptyDrive: "Le Drive est vide"
 emptyFolder: "Le dossier est vide"
 unableToDelete: "Suppression impossible"
 inputNewFileName: "Entrez un nouveau nom de fichier"
+inputNewDescription: "Veuillez entrer une nouvelle description"
 inputNewFolderName: "Entrez un nouveau nom de dossier"
 circularReferenceFolder: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
 hasChildFilesOrFolders: "Impossible de supprimer ce dossier car il n'est pas vide."
@@ -310,6 +311,8 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Pages"
 integration: "Intégrations"
+connectService: "Connexion"
+disconnectService: "Déconnexion"
 enableLocalTimeline: "Activer le fil local"
 enableGlobalTimeline: "Activer le fil global"
 disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur·rice·s et les modérateur·rice·s pourront toujours y accéder."
@@ -544,6 +547,8 @@ disablePlayer: "Fermer le lecteur vidéo"
 expandTweet: "Étendre le tweet"
 themeEditor: "Éditeur de thèmes"
 description: "Description"
+describeFile: "Ajouter une description d'image"
+enterFileDescription: "Saisissez une description"
 author: "Auteur·rice"
 leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous les ignorer ?"
 manage: "Gestion"

locales/it-IT.yml

@@ -274,6 +274,7 @@ emptyDrive: "Il Drive è vuoto"
 emptyFolder: "La cartella è vuota"
 unableToDelete: "Eliminazione impossibile"
 inputNewFileName: "Inserisci nome del nuovo file"
+inputNewDescription: "Inserisci una nuova descrizione"
 inputNewFolderName: "Inserisci nome della nuova cartella"
 circularReferenceFolder: "La cartella di destinazione è una sottocartella della cartella che vuoi spostare."
 hasChildFilesOrFolders: "Impossibile eliminare la cartella perché non è vuota"
@@ -305,6 +306,8 @@ monthX: "{month}"
 yearX: "{year}"
 pages: "Pagine"
 integration: "App collegate"
+connectService: "Connessione"
+disconnectService: "Disconnessione "
 enableLocalTimeline: "Abilita Timeline locale"
 enableGlobalTimeline: "Abilita Timeline federata"
 disablingTimelinesInfo: "Anche se disabiliti queste timeline, gli amministratori e i moderatori potranno sempre accederci."
@@ -531,6 +534,8 @@ disablePlayer: "Chiudi lettore video"
 expandTweet: "Espandi tweet"
 themeEditor: "Editor di temi"
 description: "Descrizione"
+describeFile: "Aggiungi una descrizione d'immagine"
+enterFileDescription: "Inserisci descrizione"
 author: "Autore"
 leaveConfirm: "Ci sono delle modifiche ancora non salvate. Vuoi cancellarle?"
 manage: "Gestione"

locales/ja-JP.yml

@@ -326,6 +326,7 @@ driveCapacityPerRemoteAccount: "リモートユーザーひとりあたりのド
 inMb: "メガバイト単位"
 iconUrl: "アイコン画像のURL (faviconなど)"
 bannerUrl: "バナー画像のURL"
+backgroundImageUrl: "背景画像のURL"
 basicInfo: "基本情報"
 pinnedUsers: "ピン留めユーザー"
 pinnedUsersDescription: "「みつける」ページなどにピン留めしたいユーザーを改行で区切って記述します。"

locales/ko-KR.yml

@@ -326,6 +326,7 @@ driveCapacityPerRemoteAccount: "리모트 유저 한 명당 드라이브 용량"
 inMb: "메가바이트 단위"
 iconUrl: "아이콘 URL"
 bannerUrl: "배너 이미지 URL"
+backgroundImageUrl: "배경 이미지 URL"
 basicInfo: "기본 정보"
 pinnedUsers: "고정된 유저"
 pinnedUsersDescription: "\"발견하기\" 페이지 등에 고정하고 싶은 유저를 한 줄에 한 명씩 적습니다."

locales/zh-CN.yml

@@ -326,6 +326,7 @@ driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
 inMb: "以兆字节(MegaByte)为单位"
 iconUrl: "图标URL"
 bannerUrl: "Banner URL"
+backgroundImageUrl: "背景图URL"
 basicInfo: "基本信息"
 pinnedUsers: "置顶用户"
 pinnedUsersDescription: "在「发现」页面中使用换行标记想要置顶的用户。"

migration/1622679304522-user-profile-description-length.ts

@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class userProfileDescriptionLength1622679304522 implements MigrationInterface {
+	name = 'userProfileDescriptionLength1622679304522';
+
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "description" TYPE character varying(2048)`, undefined);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "description" TYPE character varying(1024)`, undefined);
+	}
+}

migration/1622681548499-log-message-length.ts

@@ -0,0 +1,12 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class logMessageLength1622681548499 implements MigrationInterface {
+	name = 'logMessageLength1622681548499';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "log" ALTER COLUMN "message" TYPE character varying(2048)`, undefined);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(`ALTER TABLE "log" ALTER COLUMN "message" TYPE character varying(1024)`, undefined);
+	}
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.82.0",
+	"version": "12.83.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -60,7 +60,7 @@
 		"@types/jsonld": "1.5.5",
 		"@types/katex": "0.11.0",
 		"@types/koa": "2.13.3",
-		"@types/koa-bodyparser": "4.3.0",
+		"@types/koa-bodyparser": "4.3.1",
 		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
@@ -70,10 +70,10 @@
 		"@types/koa__cors": "3.0.2",
 		"@types/koa__multer": "2.0.2",
 		"@types/koa__router": "8.0.4",
-		"@types/markdown-it": "12.0.1",
+		"@types/markdown-it": "12.0.2",
 		"@types/matter-js": "0.14.12",
 		"@types/mocha": "8.2.2",
-		"@types/node": "15.6.1",
+		"@types/node": "15.12.2",
 		"@types/node-fetch": "2.5.10",
 		"@types/nodemailer": "6.4.2",
 		"@types/nprogress": "0.2.0",
@@ -91,7 +91,7 @@
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "3.0.0",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.28.2",
+		"@types/sharp": "0.28.3",
 		"@types/sinonjs__fake-timers": "6.0.2",
 		"@types/speakeasy": "2.0.5",
 		"@types/throttle-debounce": "2.1.0",
@@ -103,18 +103,18 @@
 		"@types/webpack-stream": "3.2.12",
 		"@types/websocket": "1.0.2",
 		"@types/ws": "7.4.4",
-		"@typescript-eslint/parser": "4.25.0",
-		"@vue/compiler-sfc": "3.0.11",
+		"@typescript-eslint/parser": "4.26.1",
+		"@vue/compiler-sfc": "3.1.1",
 		"abort-controller": "3.0.0",
-		"apexcharts": "3.26.3",
+		"apexcharts": "3.27.1",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.4",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.918.0",
+		"aws-sdk": "2.923.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.3",
 		"broadcast-channel": "3.6.0",
-		"bull": "3.22.6",
+		"bull": "3.22.7",
 		"cafy": "15.2.1",
 		"cbor": "7.0.5",
 		"chalk": "4.1.1",
@@ -123,14 +123,14 @@
 		"commander": "7.2.0",
 		"concurrently": "6.2.0",
 		"content-disposition": "0.5.3",
-		"core-js": "3.13.1",
+		"core-js": "3.14.0",
 		"crc-32": "1.2.0",
 		"css-loader": "5.2.6",
 		"cssnano": "5.0.5",
 		"dateformat": "4.5.1",
 		"diskusage": "1.1.3",
 		"escape-regexp": "0.0.1",
-		"eslint": "7.27.0",
+		"eslint": "7.28.0",
 		"eslint-plugin-vue": "7.10.0",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.2",
@@ -174,8 +174,8 @@
 		"markdown-it": "12.0.6",
 		"markdown-it-anchor": "7.1.0",
 		"matter-js": "0.17.1",
-		"mfm-js": "0.16.4",
-		"misskey-js": "0.0.2",
+		"mfm-js": "0.18.0",
+		"misskey-js": "0.0.4",
 		"mocha": "8.4.0",
 		"moji": "0.5.1",
 		"ms": "2.1.3",
@@ -191,7 +191,7 @@
 		"postcss": "8.3.0",
 		"postcss-loader": "5.3.0",
 		"prismjs": "1.23.0",
-		"probe-image-size": "7.1.1",
+		"probe-image-size": "7.2.1",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "3.0.2",
@@ -212,8 +212,8 @@
 		"rimraf": "3.0.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.34.0",
-		"sass-loader": "11.1.1",
+		"sass": "1.34.1",
+		"sass-loader": "12.0.0",
 		"seedrandom": "3.0.5",
 		"sharp": "0.28.3",
 		"speakeasy": "2.0.0",
@@ -228,20 +228,20 @@
 		"throttle-debounce": "3.0.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "9.2.2",
+		"ts-loader": "9.2.3",
 		"ts-node": "10.0.0",
-		"tsc-alias": "1.2.11",
+		"tsc-alias": "1.3.2",
 		"tsconfig-paths": "3.9.0",
 		"tslint": "6.1.3",
 		"tslint-sonarts": "1.9.0",
 		"twemoji-parser": "13.1.0",
-		"typeorm": "0.2.32",
+		"typeorm": "0.2.34",
 		"typescript": "4.3.2",
 		"ulid": "2.3.0",
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.0",
-		"vue": "3.0.11",
+		"vue": "3.1.1",
 		"vue-color": "2.8.1",
 		"vue-json-pretty": "1.7.1",
 		"vue-loader": "16.1.2",
@@ -252,7 +252,7 @@
 		"vuedraggable": "4.0.1",
 		"web-push": "3.4.4",
 		"webpack": "5.38.1",
-		"webpack-cli": "4.7.0",
+		"webpack-cli": "4.7.2",
 		"websocket": "1.0.34",
 		"ws": "7.4.6",
 		"xev": "2.0.1"

src/client/components/featured-photos.vue

@@ -1,7 +1,5 @@
 <template>
-<div class="xfbouadm" v-if="meta" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }">
-
-</div>
+<div class="xfbouadm" v-if="meta" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }"></div>
 </template>
 
 <script lang="ts">

src/client/components/link.vue

@@ -87,8 +87,6 @@ export default defineComponent({
 	> .icon {
 		padding-left: 2px;
 		font-size: .9em;
-		font-weight: 400;
-		font-style: normal;
 	}
 }
 </style>

src/client/pages/instance/settings.vue

@@ -19,6 +19,11 @@
 			<span>{{ $ts.bannerUrl }}</span>
 		</FormInput>
 
+		<FormInput v-model:value="backgroundImageUrl">
+			<template #prefix><i class="fas fa-link"></i></template>
+			<span>{{ $ts.backgroundImageUrl }}</span>
+		</FormInput>
+
 		<FormInput v-model:value="tosUrl">
 			<template #prefix><i class="fas fa-link"></i></template>
 			<span>{{ $ts.tosUrl }}</span>
@@ -88,6 +93,7 @@ export default defineComponent({
 			maintainerEmail: null,
 			iconUrl: null,
 			bannerUrl: null,
+			backgroundImageUrl: null,
 			maxNoteTextLength: 0,
 			enableLocalTimeline: false,
 			enableGlobalTimeline: false,
@@ -106,6 +112,7 @@ export default defineComponent({
 			this.tosUrl = meta.tosUrl;
 			this.iconUrl = meta.iconUrl;
 			this.bannerUrl = meta.bannerUrl;
+			this.backgroundImageUrl = meta.backgroundImageUrl;
 			this.maintainerName = meta.maintainerName;
 			this.maintainerEmail = meta.maintainerEmail;
 			this.maxNoteTextLength = meta.maxNoteTextLength;
@@ -120,6 +127,7 @@ export default defineComponent({
 				tosUrl: this.tosUrl,
 				iconUrl: this.iconUrl,
 				bannerUrl: this.bannerUrl,
+				backgroundImageUrl: this.backgroundImageUrl,
 				maintainerName: this.maintainerName,
 				maintainerEmail: this.maintainerEmail,
 				maxNoteTextLength: this.maxNoteTextLength,

src/client/pages/reversi/game.board.vue

@@ -350,6 +350,9 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+
+@use "sass:math";
+
 .xqnhankfuuilcwvhgsopeqncafzsquya {
 	text-align: center;
 
@@ -388,11 +391,11 @@ export default defineComponent({
 				font-size: 0.8em;
 
 				&:first-child {
-					margin-left: -($gap / 2);
+					margin-left: -(math.div($gap, 2));
 				}
 
 				&:last-child {
-					margin-right: -($gap / 2);
+					margin-right: -(math.div($gap, 2));
 				}
 			}
 		}
@@ -413,11 +416,11 @@ export default defineComponent({
 					font-size: 12px;
 
 					&:first-child {
-						margin-top: -($gap / 2);
+						margin-top: -(math.div($gap, 2));
 					}
 
 					&:last-child {
-						margin-bottom: -($gap / 2);
+						margin-bottom: -(math.div($gap, 2));
 					}
 				}
 			}

src/client/pages/settings/drive.vue

@@ -220,19 +220,22 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+
+@use "sass:math";
+
 .uawsfosz {
 	> div {
 		padding: 24px;
 
 		> .meter {
 			$size: 12px;
 			background: rgba(0, 0, 0, 0.1);
-			border-radius: ($size / 2);
+			border-radius: math.div($size, 2);
 			overflow: hidden;
 
 			> div {
 				height: $size;
-				border-radius: ($size / 2);
+				border-radius: math.div($size, 2);
 			}
 		}
 	}