Merge branch 'release/11.37.1-rei0784-5.18.0' into v11-lts

TeamBlackCrystal · Jan 25, 2022 · 410286f · 410286f
2 parents 471b28a + 1f5ef76
commit 410286f
Show file tree

Hide file tree

Showing 25 changed files with 184 additions and 483 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,10 @@
+[gitflow "branch"]
+	master = v11-lts
+	develop = develop
+[gitflow "prefix"]
+	feature = feat/
+	bugfix = fix/
+	release = release/
+	hotfix = fix/
+	support = chore/
+	versiontag =  
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,6 +10,7 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 99
+    target-branch: "develop"
     labels:
       - "📦Dependencies"
       - "🧶JavaScript"
@@ -18,6 +19,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    target-branch: "develop"
     labels:
       - "📦Dependencies"
       - "⚓Docker"
@@ -26,6 +28,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    target-branch: "develop"
     labels:
       - "📦Dependencies"
       - "⛓Submodules"
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -59,11 +59,13 @@ jobs:
         run: docker build . --file Dockerfile --tag $IMAGE_NAME
 
       - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        #run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Push image
         run: |
-          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
+          #IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
+          IMAGE_ID=ghcr.io/teamblackcrystal/$IMAGE_NAME
 
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [12.x, 14.x, 16.x, 17.x]
         python-version: [3.9]
 
     services:

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [12.x, 14.x, 16.x, 17.x]
 
     services:
       postgres:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,13 +17,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - クライアント: メンションにユーザーのアバターを表示するように
 - インスタンスプロフィールレンダリング ready
-- カスタム絵文字エクスポート機能
+- 猫耳動かす AS-3
+
+### Changed
+
+- 通知にブラーと丸みを追加 AS-20
+	- firefoxはconfigでブラーを有効にしても正常に動作しない可能性があります
+- ウィジェットの丸みを強化 AS-16
 
 ### Fixed
 
+- バッヂにカーソルを合わせた際に説明を出すように
+- フォロー申請を有効にした状態でフォローリクエストが来ると メニューにtrueと表示される AS-15
 - デスクトップ版で通知が何もないとemptyと出る不具合 AS-10
 - YAMLファイルへのバックスペース文字混入対策
-
+- 猫耳の色が場所によって違う AS-17
 
 ## [11.37.1-rei0784-5.17.2] 2021-12-07
 

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -378,6 +378,10 @@ common:
   update-available-title: "更新があります"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  admin-user: "管理者"
+  lady-user: "お嬢様"
+  bot-user: "Bot"
+  cat-user: "猫(=^・・^=)"
   verified-user: "公式アカウント"
   premium-user: "プレミアムユーザー"
   hide-password: "パスワードを隠す"
@@ -1392,6 +1396,7 @@ desktop/views/components/ui.header.account.vue:
   follow-requests: "フォロー申請"
   admin: "管理"
   room: "ルーム"
+  follow-request-true: 新着
 
 desktop/views/components/ui.header.nav.vue:
   game: "ゲーム"

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
 		"yupix <[email protected]>",
 		"syuilo <[email protected]>"
 	],
-	"version": "11.37.1-rei0784-5.17.2",
+	"version": "11.37.1-rei0784-5.18.0",
 	"codename": "malachite",
 	"repository": {
 		"type": "git",
@@ -41,7 +41,7 @@
 		"gulp/gulp-cli/yargs/yargs-parser": "5.0.0-security.0"
 	},
 	"dependencies": {
-		"@ayuskey/summaly": "2.4.1-rei0784.3",
+		"@ayuskey/summaly": "2.5.0-rei0784.3",
 		"@elastic/elasticsearch": "7.16.0",
 		"@fortawesome/fontawesome-svg-core": "1.2.36",
 		"@fortawesome/free-brands-svg-icons": "5.15.4",
@@ -117,7 +117,6 @@
 		"@typescript-eslint/parser": "5.8.0",
 		"@vue/composition-api": "1.4.3",
 		"abort-controller": "3.0.0",
-		"archiver": "5.3.0",
 		"animejs": "3.2.1",
 		"apexcharts": "3.32.1",
 		"autobind-decorator": "2.4.0",
@@ -187,7 +186,6 @@
 		"langmap": "0.0.16",
 		"loader-utils": "2.0.0",
 		"lodash": "4.17.21",
-		"mime-types": "2.1.34",
 		"mocha": "9.1.3",
 		"moji": "0.5.1",
 		"ms": "2.1.3",

diff --git a/src/client/app/admin/views/dashboard.charts.vue b/src/client/app/admin/views/dashboard.charts.vue
@@ -496,6 +496,10 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
+select
+	border-radius 16px
+	transition 2s
+
 .qvgidhudpqhjttdhxubzuyrhyzgslujw
 	display block
 	flex 1

diff --git a/src/client/app/common/views/components/avatar.vue b/src/client/app/common/views/components/avatar.vue
@@ -75,6 +75,19 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
+@keyframes earwiggleleft
+	from { transform: rotate(37.6deg) skew(30deg); }
+	25% { transform: rotate(10deg) skew(30deg); }
+	50% { transform: rotate(20deg) skew(30deg); }
+	75% { transform: rotate(0deg) skew(30deg); }
+	to { transform: rotate(37.6deg) skew(30deg); }
+@keyframes earwiggleright
+	from { transform: rotate(-37.6deg) skew(-30deg); }
+	30% { transform: rotate(-10deg) skew(-30deg); }
+	55% { transform: rotate(-20deg) skew(-30deg); }
+	75% { transform: rotate(0deg) skew(-30deg); }
+	to { transform: rotate(-37.6deg) skew(-30deg); }
+
 .mk-avatar
 	display inline-block
 	vertical-align bottom
@@ -102,6 +115,12 @@ export default Vue.extend({
 		border-radius 75% 0 75% 75%
 		transform rotate(-37.5deg) skew(-30deg)
 
+	&.cat:hover
+		&::before
+			animation: earwiggleleft 1s infinite;
+		&::after
+			animation: earwiggleright 1s infinite;
+
 	.inner
 		bottom 0
 		left 0

diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue
@@ -5,10 +5,10 @@
 		<mk-user-name :user="note.user"/>
 	</router-link>
 	<span class="is-premium" v-if="note.user.isPremium"><fa icon="crown"/></span>
-	<span class="is-admin" v-if="note.user.isAdmin">admin</span>
-	<span class="is-bot" v-if="note.user.isBot">bot</span>
-	<span class="is-cat" v-if="note.user.isCat">cat</span>
-	<span class="is-lady" v-if="note.user.isLady">lady</span>
+	<span class="is-admin" v-if="note.user.isAdmin" :title="$t('@.admin-user')">admin</span>
+	<span class="is-bot" v-if="note.user.isBot" :title="$t('@.bot-user')">bot</span>
+	<span class="is-cat" v-if="note.user.isCat" :title="$t('@.cat-user')">cat</span>
+	<span class="is-lady" v-if="note.user.isLady" :title="$t('@.lady-user')">lady</span>
 	<span class="username"><mk-acct :user="note.user"/></span>
 	<span class="is-verified" v-if="note.user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
 	<div class="info">

diff --git a/src/client/app/desktop/views/components/ui-container.vue b/src/client/app/desktop/views/components/ui-container.vue
@@ -63,7 +63,7 @@ export default Vue.extend({
 		background var(--face)
 
 		&.round
-			border-radius 6px
+			border-radius 12px
 
 		&.shadow
 			box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -52,7 +52,7 @@
 				<li>
 					<router-link to="/i/follow-requests">
 						<i><fa :icon="['far', 'envelope']" fixed-width/></i>
-						<span>{{ $t('follow-requests') }}<i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $store.state.i.pendingReceivedFollowRequestsCount }}</i></span>
+						<span>{{ $t('follow-requests') }}<i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $t(`follow-request-${$store.state.i.pendingReceivedFollowRequestsCount}`) }}</i></span>
 						<i><fa icon="angle-right"/></i>
 					</router-link>
 				</li>

diff --git a/src/client/app/desktop/views/components/ui.header.clock.vue b/src/client/app/desktop/views/components/ui.header.clock.vue
@@ -7,7 +7,7 @@
 			<span class="hhnn">{{ hh }}<span :style="{ visibility: now.getSeconds() % 2 == 0 ? 'visible' : 'hidden' }">:</span>{{ nn }}</span>
 		</time>
 	</div>
-	<div class="content">
+	<div class="content" :class="{ round: $store.state.device.roundedCorners }">  <!--TODO: オプションでoffにできるようにする-->
 		<mk-analog-clock :dark="true"/>
 	</div>
 </div>
@@ -106,4 +106,8 @@ export default Vue.extend({
 		width 256px
 		background #899492
 
+		&.round
+			// TODO:2021/12/30
+			border-radius 16px
+
 </style>
diff --git a/src/client/app/desktop/views/components/ui.header.notifications.vue b/src/client/app/desktop/views/components/ui.header.notifications.vue
@@ -101,7 +101,9 @@ export default Vue.extend({
 		right -72px
 		width 300px
 		background $bgcolor
-		border-radius 4px
+		border-radius 16px
+		padding 16px
+		backdrop-filter blur(10px)
 		box-shadow 0 1px 4px rgba(#000, 0.25)
 
 		&:before

diff --git a/src/client/app/desktop/views/widgets/profile.vue b/src/client/app/desktop/views/widgets/profile.vue
@@ -54,6 +54,12 @@ export default define({
 });
 </script>
 
+<style lang="stylus">
+
+.mk-avatar /*アバターが初期状態の際 テーマと合わせれる為に必要*/
+	color: var(--link)
+</style>
+
 <style lang="stylus" scoped>
 .egwyvoaaryotefqhqtmiyawwefemjfsd-body
 	&[data-compact]
@@ -70,7 +76,6 @@ export default define({
 			border none
 			border-radius 100%
 			box-shadow 0 0 16px rgba(#000, 0.5)
-
 		> .name
 			position absolute
 			top 0

diff --git a/src/client/themes/classic-light.json5 b/src/client/themes/classic-light.json5
@@ -80,7 +80,7 @@
 		radioBorder: 'rgba(0, 0, 0, 0.4)',
 		inputBorder: 'rgba(0, 0, 0, 0.42)',
 		inputLabel: 'rgba(0, 0, 0, 0.54)',
-		inputText: '#000',
+		inputText: '#222',
 
 		buttonBg: 'rgba(0, 0, 0, 0.05)',
 		buttonHoverBg: 'rgba(0, 0, 0, 0.1)',

diff --git a/src/client/themes/light.json5 b/src/client/themes/light.json5
@@ -80,7 +80,7 @@
 		radioBorder: 'rgba(0, 0, 0, 0.4)',
 		inputBorder: 'rgba(0, 0, 0, 0.42)',
 		inputLabel: 'rgba(0, 0, 0, 0.54)',
-		inputText: '#000',
+		inputText: '#222',
 
 		buttonBg: 'rgba(0, 0, 0, 0.05)',
 		buttonHoverBg: 'rgba(0, 0, 0, 0.1)',

diff --git a/src/misc/download-url.ts b/src/misc/download-url.ts
@@ -11,7 +11,7 @@ const PrivateIp = require('private-ip');
 
 const pipeline = util.promisify(stream.pipeline);
 
-export async function downloadUrl(url: string, path: string): Promise<void> {
+export async function downloadUrl(url: string, path: string) {
 	const logger = new Logger('download');
 
 	logger.info(`Downloading ${chalk.cyan(url)} ...`);

diff --git a/src/queue/index.ts b/src/queue/index.ts
@@ -13,7 +13,6 @@ import { DriveFile } from '../models/entities/drive-file';
 import { getJobInfo } from './get-job-info';
 import { IActivity } from '../remote/activitypub/type';
 import { dbQueue, deliverQueue, inboxQueue, objectStorageQueue } from './queues';
-import { ThinUser } from './types';
 
 function renderError(e: Error): any {
 	return {
@@ -109,15 +108,6 @@ export function createDeleteDriveFilesJob(user: ILocalUser) {
 	});
 }
 
-export function createExportCustomEmojisJob(user: ILocalUser) {
-	return dbQueue.add('exportCustomEmojis', {
-		user: user,
-	}, {
-		removeOnComplete: true,
-		removeOnFail: true,
-	});
-}
-
 export function createExportNotesJob(user: ILocalUser) {
 	return dbQueue.add('exportNotes', {
 		user: user