Merge branch 'develop'

MisskeyIO · Mar 2, 2021 · 9a4a534 · 9a4a534
2 parents b090ff9 + 0e89a9f
commit 9a4a534
Show file tree

Hide file tree

Showing 88 changed files with 733 additions and 389 deletions.
diff --git a/gulpfile.ts b/gulpfile.ts
@@ -45,7 +45,7 @@ gulp.task('build:copy:locales', cb => {
 });
 
 gulp.task('build:client:script', () => {
-	return gulp.src(['./src/server/web/boot.js'])
+	return gulp.src(['./src/server/web/boot.js', './src/server/web/bios.js', './src/server/web/cli.js'])
 		.pipe(replace('VERSION', JSON.stringify(meta.version)))
 		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
 		.pipe(terser({
@@ -55,7 +55,7 @@ gulp.task('build:client:script', () => {
 });
 
 gulp.task('build:client:style', () => {
-	return gulp.src(['./src/server/web/style.css'])
+	return gulp.src(['./src/server/web/style.css', './src/server/web/bios.css', './src/server/web/cli.css'])
 		.pipe(cssnano())
 		.pipe(gulp.dest('./built/server/web/'));
 });

diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <[email protected]>",
-	"version": "12.72.0",
+	"version": "12.73.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -120,7 +120,7 @@
 		"broadcast-channel": "3.4.1",
 		"bull": "3.20.1",
 		"cafy": "15.2.1",
-		"cbor": "7.0.1",
+		"cbor": "7.0.3",
 		"chalk": "4.1.0",
 		"chart.js": "2.9.4",
 		"cli-highlight": "2.1.10",
@@ -250,7 +250,7 @@
 		"vue-json-pretty": "1.7.1",
 		"vue-loader": "16.1.2",
 		"vue-prism-editor": "2.0.0-alpha.2",
-		"vue-router": "4.0.3",
+		"vue-router": "4.0.4",
 		"vue-style-loader": "4.1.2",
 		"vuedraggable": "4.0.1",
 		"web-push": "3.4.4",

diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue
@@ -401,8 +401,7 @@ export default defineComponent({
 	z-index: 65535;
 	max-width: 100%;
 	margin-top: calc(1em + 8px);
-	overflow: hidden; // overflow: clip; をSafariが対応したら消す
-	overflow: clip;
+	overflow: hidden;
 	transition: top 0.1s ease, left 0.1s ease;
 
 	> ol {
@@ -419,8 +418,7 @@ export default defineComponent({
 			align-items: center;
 			padding: 4px 12px;
 			white-space: nowrap;
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			font-size: 0.9em;
 			cursor: default;
 
@@ -429,8 +427,7 @@ export default defineComponent({
 			}
 
 			* {
-				overflow: hidden; // overflow: clip; をSafariが対応したら消す
-				overflow: clip;
+				overflow: hidden;
 				text-overflow: ellipsis;
 			}
 

diff --git a/src/client/components/channel-preview.vue b/src/client/components/channel-preview.vue
@@ -66,8 +66,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 .eftoefju {
 	display: block;
-	overflow: hidden; // overflow: clip; をSafariが対応したら消す
-	overflow: clip;
+	overflow: hidden;
 	width: 100%;
 
 	&:hover {

diff --git a/src/client/components/drive.file.vue b/src/client/components/drive.file.vue
@@ -342,8 +342,7 @@ export default defineComponent({
 		text-align: center;
 		word-break: break-all;
 		color: var(--fg);
-		overflow: hidden; // overflow: clip; をSafariが対応したら消す
-		overflow: clip;
+		overflow: hidden;
 
 		> .ext {
 			opacity: 0.5;

diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue
@@ -62,10 +62,6 @@
 			<header class="_acrylic">{{ $ts.emoji }}</header>
 			<XSection v-for="category in categories" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)">{{ category }}</XSection>
 		</div>
-		<div>
-			<header class="_acrylic">{{ $ts.tags }}</header>
-			<XSection v-for="tag in emojiTags" :emojis="customEmojis.filter(e => e.aliases.includes(tag)).map(e => ':' + e.name + ':')">{{ tag }}</XSection>
-		</div>
 	</div>
 	<div class="tabs">
 		<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><Fa :icon="faAsterisk" fixed-width/></button>
@@ -86,7 +82,7 @@ import Particle from '@/components/particle.vue';
 import * as os from '@/os';
 import { isDeviceTouch } from '@/scripts/is-device-touch';
 import { isMobile } from '@/scripts/is-mobile';
-import { emojiCategories, emojiTags } from '@/instance';
+import { emojiCategories } from '@/instance';
 import XSection from './emoji-picker.section.vue';
 
 export default defineComponent({
@@ -115,7 +111,6 @@ export default defineComponent({
 			height: this.asReactionPicker ? this.$store.state.reactionPickerHeight : 2,
 			big: this.asReactionPicker ? isDeviceTouch : false,
 			customEmojiCategories: emojiCategories,
-			emojiTags,
 			customEmojis: this.$instance.emojis,
 			q: null,
 			searchResultCustom: [],

diff --git a/src/client/components/form/input.vue b/src/client/components/form/input.vue
@@ -261,8 +261,7 @@ export default defineComponent({
 				display: inline-block;
 				min-width: 16px;
 				max-width: 150px;
-				overflow: hidden; // overflow: clip; をSafariが対応したら消す
-				overflow: clip;
+				overflow: hidden;
 				white-space: nowrap;
 				text-overflow: ellipsis;
 			}

diff --git a/src/client/components/form/link.vue b/src/client/components/form/link.vue
@@ -8,7 +8,7 @@
 			<Fa :icon="faExternalLinkAlt" class="icon"/>
 		</span>
 	</a>
-	<MkA class="main _button _formPanel _formClickable" :class="{ active }" :to="to" v-else>
+	<MkA class="main _button _formPanel _formClickable" :class="{ active }" :to="to" :behavior="behavior" v-else>
 		<span class="icon"><slot name="icon"></slot></span>
 		<span class="text"><slot></slot></span>
 		<span class="right">
@@ -38,6 +38,10 @@ export default defineComponent({
 			type: Boolean,
 			required: false
 		},
+		behavior: {
+			type: String,
+			required: false,
+		},
 	},
 	data() {
 		return {
@@ -83,8 +87,7 @@ export default defineComponent({
 		> .text {
 			white-space: nowrap;
 			text-overflow: ellipsis;
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			padding-right: 12px;
 		}
 

diff --git a/src/client/components/global/a.vue b/src/client/components/global/a.vue
@@ -98,6 +98,11 @@ export default defineComponent({
 		},
 
 		nav() {
+			if (this.behavior === 'browser') {
+				location.href = this.to;
+				return;
+			}
+
 			if (this.to.startsWith('/my/messaging')) {
 				if (ColdDeviceStorage.get('chatOpenBehavior') === 'window') return this.window();
 				if (ColdDeviceStorage.get('chatOpenBehavior') === 'popout') return this.popout();

diff --git a/src/client/components/global/avatar.vue b/src/client/components/global/avatar.vue
@@ -101,8 +101,7 @@ export default defineComponent({
 		top: 0;
 		border-radius: 100%;
 		z-index: 1;
-		overflow: hidden; // overflow: clip; をSafariが対応したら消す
-		overflow: clip;
+		overflow: hidden;
 		object-fit: cover;
 		width: 100%;
 		height: 100%;

diff --git a/src/client/components/global/misskey-flavored-markdown.vue b/src/client/components/global/misskey-flavored-markdown.vue
@@ -126,8 +126,7 @@ export default defineComponent({
 	&.nowrap {
 		white-space: pre;
 		word-wrap: normal; // https://codeday.me/jp/qa/20190424/690106.html
-		overflow: hidden; // overflow: clip; をSafariが対応したら消す
-		overflow: clip;
+		overflow: hidden;
 		text-overflow: ellipsis;
 	}
 

diff --git a/src/client/components/instance-stats.vue b/src/client/components/instance-stats.vue
@@ -692,8 +692,7 @@ export default defineComponent({
 
 						> dd {
 							text-overflow: ellipsis;
-							overflow: hidden; // overflow: clip; をSafariが対応したら消す
-							overflow: clip;
+							overflow: hidden;
 							white-space: nowrap;
 						}
 

diff --git a/src/client/components/instance-ticker.vue b/src/client/components/instance-ticker.vue
@@ -44,8 +44,7 @@ export default defineComponent({
 
 	height: $height;
 	border-radius: 4px 0 0 4px;
-	overflow: hidden; // overflow: clip; をSafariが対応したら消す
-	overflow: clip;
+	overflow: hidden;
 	color: #fff;
 
 	> .icon {

diff --git a/src/client/components/media-banner.vue b/src/client/components/media-banner.vue
@@ -62,8 +62,7 @@ export default defineComponent({
 	width: 100%;
 	border-radius: 4px;
 	margin-top: 4px;
-	overflow: hidden; // overflow: clip; をSafariが対応したら消す
-	overflow: clip;
+	overflow: hidden;
 
 	> .download,
 	> .sensitive {
@@ -78,8 +77,7 @@ export default defineComponent({
 		}
 
 		> b {
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			text-overflow: ellipsis;
 		}
 

diff --git a/src/client/components/media-image.vue b/src/client/components/media-image.vue
@@ -143,8 +143,7 @@ export default defineComponent({
 	> a {
 		display: block;
 		cursor: zoom-in;
-		overflow: hidden; // overflow: clip; をSafariが対応したら消す
-		overflow: clip;
+		overflow: hidden;
 		width: 100%;
 		height: 100%;
 		background-position: center;

diff --git a/src/client/components/media-list.vue b/src/client/components/media-list.vue
@@ -105,8 +105,7 @@ export default defineComponent({
 			grid-gap: 4px;
 
 			> * {
-				overflow: hidden; // overflow: clip; をSafariが対応したら消す
-				overflow: clip;
+				overflow: hidden;
 				border-radius: 6px;
 			}
 

diff --git a/src/client/components/media-video.vue b/src/client/components/media-video.vue
@@ -78,8 +78,7 @@ export default defineComponent({
 		align-items: center;
 
 		font-size: 3.5em;
-		overflow: hidden; // overflow: clip; をSafariが対応したら消す
-		overflow: clip;
+		overflow: hidden;
 		background-position: center;
 		background-size: cover;
 		width: 100%;

diff --git a/src/client/components/note-detailed.vue b/src/client/components/note-detailed.vue
@@ -886,8 +886,7 @@ export default defineComponent({
 .note {
 	position: relative;
 	transition: box-shadow 0.1s ease;
-	overflow: hidden; // overflow: clip; をSafariが対応したら消す
-	overflow: clip;
+	overflow: hidden;
 	contain: content;
 
 	&:focus-visible {
@@ -947,8 +946,7 @@ export default defineComponent({
 		}
 
 		> span {
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			flex-shrink: 1;
 			text-overflow: ellipsis;
 			white-space: nowrap;

diff --git a/src/client/components/note-header.vue b/src/client/components/note-header.vue
@@ -61,8 +61,7 @@ export default defineComponent({
 		display: block;
 		margin: 0 .5em 0 0;
 		padding: 0;
-		overflow: hidden; // overflow: clip; をSafariが対応したら消す
-		overflow: clip;
+		overflow: hidden;
 		font-size: 1em;
 		font-weight: bold;
 		text-decoration: none;
@@ -91,8 +90,7 @@ export default defineComponent({
 
 	> .username {
 		margin: 0 .5em 0 0;
-		overflow: hidden; // overflow: clip; をSafariが対応したら消す
-		overflow: clip;
+		overflow: hidden;
 		text-overflow: ellipsis;
 	}
 

diff --git a/src/client/components/note-preview.vue b/src/client/components/note-preview.vue
@@ -50,8 +50,7 @@ export default defineComponent({
 	display: flex;
 	margin: 0;
 	padding: 0;
-	overflow: hidden; // overflow: clip; をSafariが対応したら消す
-	overflow: clip;
+	overflow: hidden;
 	font-size: 0.95em;
 
 	> .avatar {

diff --git a/src/client/components/note.vue b/src/client/components/note.vue
@@ -861,8 +861,7 @@ export default defineComponent({
 .tkcbzcuz {
 	position: relative;
 	transition: box-shadow 0.1s ease;
-	overflow: hidden; // overflow: clip; をSafariが対応したら消す
-	overflow: clip;
+	overflow: hidden;
 	contain: content;
 
 	// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
@@ -949,8 +948,7 @@ export default defineComponent({
 		}
 
 		> span {
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			flex-shrink: 1;
 			text-overflow: ellipsis;
 			white-space: nowrap;
@@ -1022,8 +1020,7 @@ export default defineComponent({
 					&.collapsed {
 						position: relative;
 						max-height: 9em;
-						overflow: hidden; // overflow: clip; をSafariが対応したら消す
-						overflow: clip;
+						overflow: hidden;
 
 						> .fade {
 							display: block;

diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue
@@ -257,8 +257,7 @@ export default defineComponent({
 				text-overflow: ellipsis;
 				white-space: nowrap;
 				min-width: 0;
-				overflow: hidden; // overflow: clip; をSafariが対応したら消す
-				overflow: clip;
+				overflow: hidden;
 			}
 
 			> .time {
@@ -269,8 +268,7 @@ export default defineComponent({
 
 		> .text {
 			white-space: nowrap;
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			text-overflow: ellipsis;
 
 			> [data-icon] {

diff --git a/src/client/components/poll.vue b/src/client/components/poll.vue
@@ -112,8 +112,7 @@ export default defineComponent({
 			padding: 4px 8px;
 			border: solid 1px var(--divider);
 			border-radius: 4px;
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			cursor: pointer;
 
 			&:hover {

diff --git a/src/client/components/post-form-attaches.vue b/src/client/components/post-form-attaches.vue
@@ -127,8 +127,7 @@ export default defineComponent({
 			height: 64px;
 			margin-right: 4px;
 			border-radius: 4px;
-			overflow: hidden; // overflow: clip; をSafariが対応したら消す
-			overflow: clip;
+			overflow: hidden;
 			cursor: move;
 
 			&:hover > .remove {

diff --git a/src/client/components/sidebar.vue b/src/client/components/sidebar.vue
@@ -390,8 +390,7 @@ export default defineComponent({
 				font-size: $ui-font-size;
 				line-height: 3rem;
 				text-overflow: ellipsis;
-				overflow: hidden; // overflow: clip; をSafariが対応したら消す
-				overflow: clip;
+				overflow: hidden;
 				white-space: nowrap;
 				width: 100%;
 				text-align: left;