Merge branch 'develop'

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -7,6 +7,11 @@ assignees: ''
 
 ---
 
+<!--
+Thanks for reporting!
+First, in order to avoid duplicate Issues, please search to see if the problem you found has already been reported.
+-->
+
 ## 💡 Summary
 
 <!-- Tell us what the bug is -->

CHANGELOG.md

@@ -1 +1 @@
-see [releases](https://github.com/syuilo/misskey/releases)
+see [releases](https://github.com/misskey-dev/misskey/releases)

CONTRIBUTING.md

@@ -8,7 +8,7 @@
   - 温度感高めで見てほしいものは責付いてください。
 
 ## Issues
-Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .
+Feature suggestions and bug reports are filed in https://github.com/misskey-dev/misskey/issues .
 
 * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
 * If you have multiple independent issues, please submit them separately.

README.md

@@ -4,8 +4,8 @@
 
 <div align="center">
 
-[![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
-[![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/syuilo/misskey)
+[![CircleCI](https://img.shields.io/circleci/project/github/misskey-dev/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/misskey-dev/misskey)
+[![Dependencies](https://img.shields.io/david/misskey-dev/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/misskey-dev/misskey)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
 [![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
 
@@ -22,11 +22,16 @@ Why don't you take a short break from the hustle and bustle of the city, and div
 
 ---
 
+Do you have a question? Or are you experiencing trouble?
+Visit [our forum](https://forum.misskey.io/)!
+
+---
+
 ![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
 
 :sparkles: Features
 ----------------------------------------------------------------
-<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
+<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
 <h3>Posting</h3>
 <p>

docs/docker.en.md

@@ -12,13 +12,13 @@ This guide describes how to install and setup Misskey with Docker.
 ----------------------------------------------------------------
 1. Clone Misskey repository's master branch.
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 2. Move to misskey directory.
 
 	`cd misskey`
 
-3. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
+3. Checkout to the [latest release](https://github.com/misskey-dev/misskey/releases/latest) tag.
 
 	`git checkout master`
 

docs/docker.fr.md

@@ -13,13 +13,13 @@ Ce guide explique comment installer et configurer Misskey avec Docker.
 ----------------------------------------------------------------
 1. Clone le dépôt de Misskey sur la branche master.
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 2. Naviguez dans le dossier du dépôt.
 
 	`cd misskey`
 
-3. Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
+3. Checkout sur le tag de la [dernière version](https://github.com/misskey-dev/misskey/releases/latest).
 
 	`git checkout master`
 

docs/docker.ja.md

@@ -12,13 +12,13 @@ Dockerを使ったMisskey構築方法
 ----------------------------------------------------------------
 1. masterブランチからMisskeyレポジトリをクローン
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 2. misskeyディレクトリに移動
 
 	`cd misskey`
 
-3. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+3. [最新のリリース](https://github.com/misskey-dev/misskey/releases/latest)を確認
 
 	`git checkout master`
 

docs/docker.zh.md

@@ -12,13 +12,13 @@ Docker 部署指南
 ----------------------------------------------------------------
 1. 克隆 Misskey 项目的 master 分支。
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 2. 进入 misskey 文件夹。
 
 	`cd misskey`
 
-3. 检查 [最新发布版](https://github.com/syuilo/misskey/releases/latest) 标签。
+3. 检查 [最新发布版](https://github.com/misskey-dev/misskey/releases/latest) 标签。
 
 	`git checkout master`
 

docs/setup.en.md

@@ -40,13 +40,13 @@ Please install and setup these softwares:
 
 2. Clone the misskey repo from master branch.
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 3. Navigate to misskey directory
 
 	`cd misskey`
 
-4. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
+4. Checkout to the [latest release](https://github.com/misskey-dev/misskey/releases/latest)
 
 	`git checkout master`
 

docs/setup.fr.md

@@ -41,13 +41,13 @@ Installez les paquets suivants :
 
 2. Clonez la branche master du dépôt misskey.
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 3. Accédez au dossier misskey.
 
 	`cd misskey`
 
-4. Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
+4. Checkout sur le tag de la [version la plus récente](https://github.com/misskey-dev/misskey/releases/latest)
 
 	`git checkout master`
 

docs/setup.ja.md

@@ -42,13 +42,13 @@ adduser --disabled-password --disabled-login misskey
 
 2. masterブランチからMisskeyレポジトリをクローン
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 3. misskeyディレクトリに移動
 
 	`cd misskey`
 
-4. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+4. [最新のリリース](https://github.com/misskey-dev/misskey/releases/latest)を確認
 
 	`git checkout master`
 

docs/setup.zh.md

@@ -40,13 +40,13 @@ adduser --disabled-password --disabled-login misskey
 
 2. 克隆 Misskey 项目的 master 分支。
 
-	`git clone -b master git://github.com/syuilo/misskey.git`
+	`git clone -b master git://github.com/misskey-dev/misskey.git`
 
 3. 进入 misskey 文件夹。
 
 	`cd misskey`
 
-4. 检查 [最新发布版](https://github.com/syuilo/misskey/releases/latest) 标签。
+4. 检查 [最新发布版](https://github.com/misskey-dev/misskey/releases/latest) 标签。
 
 	`git checkout master`
 

locales/README.md

@@ -1,6 +1,6 @@
 # **DO NOT edit locale files** except `ja-JP.yml`.
 
-When you add text to the ja-JP file (of syuilo/misskey), it will automatically be applied to other language files.
+When you add text to the ja-JP file (of misskey-dev/misskey), it will automatically be applied to other language files.
 Translations added in ja-JP file should contain the original Japanese strings.
 
 Please see [Contribution guide](../CONTRIBUTING.md) for more information.

locales/ja-JP.yml

@@ -687,6 +687,7 @@ textColor: "文字"
 saveAs: "名前を付けて保存"
 advanced: "高度"
 value: "値"
+createdAt: "作成日時"
 updatedAt: "更新日時"
 saveConfirm: "保存しますか？"
 deleteConfirm: "削除しますか？"
@@ -710,6 +711,12 @@ typingUsers: "{users}が入力中"
 jumpToSpecifiedDate: "特定の日付にジャンプ"
 showingPastTimeline: "過去のタイムラインを表示しています"
 clear: "クリア"
+markAllAsRead: "全て既読にする"
+goBack: "戻る"
+unlikeConfirm: "いいね解除しますか？"
+fullView: "フルビュー"
+quitFullView: "フルビュー解除"
+addDescription: "説明を追加"
 
 _email:
   _follow:
@@ -878,6 +885,7 @@ _theme:
   install: "テーマのインストール"
   manage: "テーマの管理"
   code: "テーマコード"
+  description: "説明"
   installed: "{name}をインストールしました"
   installedThemes: "インストールされたテーマ"
   builtinThemes: "標準のテーマ"

migration/1557761316509-AddSomeUrls.ts

@@ -4,8 +4,8 @@ export class AddSomeUrls1557761316509 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/syuilo/misskey'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/syuilo/misskey/issues/new'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://github.com/misskey-dev/misskey'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://github.com/misskey-dev/misskey/issues/new'`);
     }
 
     public async down(queryRunner: QueryRunner): Promise<any> {

package.json

@@ -1,11 +1,11 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.75.1",
+	"version": "12.76.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/syuilo/misskey.git"
+		"url": "https://github.com/misskey-dev/misskey.git"
 	},
 	"main": "./index.js",
 	"private": true,
@@ -88,6 +88,7 @@
 		"@types/parsimmon": "1.10.6",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
+		"@types/punycode": "2.1.0",
 		"@types/qrcode": "1.4.0",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.1",
@@ -109,7 +110,7 @@
 		"@types/websocket": "1.0.2",
 		"@types/ws": "7.4.0",
 		"@typescript-eslint/parser": "4.18.0",
-		"@vue/compiler-sfc": "3.0.7",
+		"@vue/compiler-sfc": "3.0.8",
 		"abort-controller": "3.0.0",
 		"apexcharts": "3.26.0",
 		"autobind-decorator": "2.4.0",
@@ -180,6 +181,7 @@
 		"markdown-it": "12.0.4",
 		"markdown-it-anchor": "7.1.0",
 		"matter-js": "0.16.1",
+		"mfm-js": "0.14.0",
 		"mocha": "8.3.2",
 		"moji": "0.5.1",
 		"ms": "2.1.3",
@@ -190,7 +192,6 @@
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
 		"parse5": "6.0.1",
-		"parsimmon": "1.16.0",
 		"pg": "8.5.1",
 		"portscanner": "2.2.0",
 		"postcss": "8.2.8",
@@ -245,13 +246,14 @@
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.0",
-		"vue": "3.0.7",
+		"vue": "3.0.8",
 		"vue-color": "2.8.1",
 		"vue-json-pretty": "1.7.1",
 		"vue-loader": "16.1.2",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vue-router": "4.0.5",
 		"vue-style-loader": "4.1.3",
+		"vue-svg-loader": "0.17.0-beta.2",
 		"vuedraggable": "4.0.1",
 		"web-push": "3.4.4",
 		"webpack": "5.27.2",

src/client/components/abuse-report-window.vue

@@ -8,19 +8,15 @@
 			</template>
 		</I18n>
 	</template>
-	<div class="dpvffvvy">
+	<div class="dpvffvvy _monolithic_">
 		<div class="_section">
-			<div class="_content">
-				<MkTextarea v-model:value="comment">
-					<span>{{ $ts.details }}</span>
-					<template #desc>{{ $ts.fillAbuseReportDescription }}</template>
-				</MkTextarea>
-			</div>
+			<MkTextarea v-model:value="comment">
+				<span>{{ $ts.details }}</span>
+				<template #desc>{{ $ts.fillAbuseReportDescription }}</template>
+			</MkTextarea>
 		</div>
 		<div class="_section">
-			<div class="_content">
-				<MkButton @click="send" primary full :disabled="comment.length === 0">{{ $ts.send }}</MkButton>
-			</div>
+			<MkButton @click="send" primary full :disabled="comment.length === 0">{{ $ts.send }}</MkButton>
 		</div>
 	</div>
 </XWindow>
@@ -80,6 +76,6 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .dpvffvvy {
-	--section-padding: 16px;
+	--root-margin: 16px;
 }
 </style>

src/client/components/channel-preview.vue

@@ -123,7 +123,7 @@ export default defineComponent({
 
 	> footer {
 		padding: 12px 16px;
-		border-top: solid 1px var(--divider);
+		border-top: solid 0.5px var(--divider);
 
 		> span {
 			opacity: 0.7;

src/client/components/date-separated-list.vue

@@ -37,14 +37,16 @@ export default defineComponent({
 			});
 		}
 
+		const noGap = [...document.querySelectorAll('._noGap_')].some(el => el.contains(this.$parent.$el));
+
 		return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? {
-			class: 'sqadhkmv _list_',
+			class: 'sqadhkmv' + (noGap ? ' _block' : ''),
 			name: 'list',
 			tag: 'div',
 			'data-direction': this.direction,
 			'data-reversed': this.reversed ? 'true' : 'false',
 		} : {
-			class: 'sqadhkmv _list_',
+			class: 'sqadhkmv',
 		}, this.items.map((item, i) => {
 			const el = this.$slots.default({
 				item: item
@@ -117,11 +119,7 @@ export default defineComponent({
 			transform: translateY(-64px);
 		}
 	}
-}
-</style>
 
-<style lang="scss">
-.sqadhkmv {
 	> .separator {
 		text-align: center;
 
@@ -155,4 +153,25 @@ export default defineComponent({
 		}
 	}
 }
+
+._noGap_ .sqadhkmv {
+	> * {
+		margin: 0 !important;
+		border: none;
+		border-radius: 0;
+		box-shadow: none;
+
+		&:not(:last-child) {
+			border-bottom: solid 0.5px var(--divider);
+		}
+	}
+}
+
+._inContainer_ .sqadhkmv > * {
+	margin: 0 !important;
+	border: none;
+	border-bottom: solid 0.5px var(--divider);
+	border-radius: 0;
+	box-shadow: none;
+}
 </style>