2.37.4

New Crowdin translations

locales/de.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "Serverinformationen"
   toggle: "Sicht umschalten"

locales/en.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "Toggle views"
 common/views/widgets/hashtags.vue:
   title: "Hashtags"
+  count: "{} users mentioned"
 common/views/widgets/server.vue:
   title: "Server info"
   toggle: "Toggle views"

locales/es.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "サーバー情報"
   toggle: "表示を切り替え"

locales/fr.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "Info sur le serveur"
   toggle: "Afficher les vues"

locales/it.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "サーバー情報"
   toggle: "表示を切り替え"

locales/ko.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "サーバー情報"
   toggle: "表示を切り替え"

locales/pl.yml

@@ -70,7 +70,7 @@ common:
     donation: "Dotacje"
     nav: "Nawigacja"
     tips: "Wskazówki"
-    hashtags: "ハッシュタグ"
+    hashtags: "Hashtagi"
   deck:
     widgets: "Widżety"
     home: "Strona główna"
@@ -226,7 +226,8 @@ common/views/widgets/posts-monitor.vue:
   title: "Wykres wpisów"
   toggle: "Przełącz widok"
 common/views/widgets/hashtags.vue:
-  title: "ハッシュタグ"
+  title: "Hashtagi"
+  count: "Wspomniany przez {} użytkowników"
 common/views/widgets/server.vue:
   title: "Informacje o serwerze"
   toggle: "Przełącz widok"

locales/pt.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "サーバー情報"
   toggle: "表示を切り替え"

locales/ru.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "サーバー情報"
   toggle: "表示を切り替え"

locales/zh.yml

@@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
   toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
   title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
   title: "サーバー情報"
   toggle: "表示を切り替え"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.37.2",
+	"version": "2.37.4",
-	"clientVersion": "1.0.6437",
+	"clientVersion": "1.0.6465",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/common/views/widgets/hashtags.chart.vue

@@ -49,7 +49,8 @@ export default Vue.extend({
 			polylinePoints: '',
 			polygonPoints: '',
 			headX: null,
-			headY: null
+			headY: null,
+			clock: null
 		};
 	},
 	watch: {
@@ -59,6 +60,12 @@ export default Vue.extend({
 	},
 	created() {
 		this.draw();
+
+		// Vueが何故かWatchを発動させない場合があるので
+		this.clock = setInterval(this.draw, 1000);
+	},
+	beforeDestroy() {
+		clearInterval(this.clock);
 	},
 	methods: {
 		draw() {

src/client/app/common/views/widgets/hashtags.vue

@@ -5,15 +5,15 @@
 
 		<div class="mkw-hashtags--body" :data-mobile="platform == 'mobile'">
 			<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
-			<div v-else>
+			<transition-group v-else tag="div" name="chart">
 				<div v-for="stat in stats" :key="stat.tag">
 					<div class="tag">
-						<router-link :to="`/tags/${ stat.tag }`">#{{ stat.tag }}</router-link>
+						<router-link :to="`/tags/${ stat.tag }`" :title="stat.tag">#{{ stat.tag }}</router-link>
 						<p>{{ '%i18n:@count%'.replace('{}', stat.usersCount) }}</p>
 					</div>
 					<x-chart class="chart" :src="stat.chart"/>
 				</div>
-			</div>
+			</transition-group>
 		</div>
 	</mk-widget-container>
 </div>
@@ -41,7 +41,7 @@ export default define({
 	},
 	mounted() {
 		this.fetch();
-		this.clock = setInterval(this.fetch, 1000 * 60 * 10);
+		this.clock = setInterval(this.fetch, 1000 * 60);
 	},
 	beforeDestroy() {
 		clearInterval(this.clock);
@@ -74,6 +74,14 @@ root(isDark)
 				margin-right 4px
 
 		> div
+			.chart-enter
+			.chart-leave-to
+				opacity 0
+				transform translateY(-30px)
+
+			> *
+				transition transform .3s ease, opacity .3s ease
+
 			> div
 				display flex
 				align-items center
@@ -84,10 +92,16 @@ root(isDark)
 
 				> .tag
 					flex 1
+					overflow hidden
 					font-size 14px
 					color isDark ? #9baec8 : #65727b
 
 					> a
+						display block
+						width 100%
+						white-space nowrap
+						overflow hidden
+						text-overflow ellipsis
 						color inherit
 
 					> p

src/server/api/endpoints/hashtags/trend.ts

@@ -1,13 +1,24 @@
 import Note from '../../../../models/note';
 
+/*
+トレンドに載るためには「『直近a分間のユニーク投稿数が今からa分前～今からb分前の間のユニーク投稿数のn倍以上』のハッシュタグの上位5位以内に入る」ことが必要
+ユニーク投稿数とはそのハッシュタグと投稿ユーザーのペアのカウントで、例えば同じユーザーが複数回同じハッシュタグを投稿してもそのハッシュタグのユニーク投稿数は1とカウントされる
+*/
+
+const rangeA = 1000 * 60 * 30; // 30分
+const rangeB = 1000 * 60 * 120; // 2時間
+const coefficient = 1.5; // 「n倍」の部分
+const requiredUsers = 3; // 最低何人がそのタグを投稿している必要があるか
+
 /**
  * Get trends of hashtags
  */
-module.exports = (params, user) => new Promise(async (res, rej) => {
+module.exports = () => new Promise(async (res, rej) => {
+	//#region 1. 直近Aの内に投稿されたハッシュタグ(とユーザーのペア)を集計
 	const data = await Note.aggregate([{
 		$match: {
 			createdAt: {
-				$gt: new Date(Date.now() - 1000 * 60 * 60)
+				$gt: new Date(Date.now() - rangeA)
 			},
 			tags: {
 				$exists: true,
@@ -26,13 +37,15 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 			userId: any;
 		}
 	}>;
+	//#endregion
 
 	if (data.length == 0) {
 		return res([]);
 	}
 
-	const tags = [];
+	let tags = [];
 
+	// カウント
 	data.map(x => x._id).forEach(x => {
 		const i = tags.findIndex(tag => tag.name == x.tags);
 		if (i != -1) {
@@ -45,11 +58,34 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		}
 	});
 
-	const hots = tags
+	// 最低要求投稿者数を下回るならカットする
+	tags = tags.filter(tag => tag.count >= requiredUsers);
+
+	//#region 2. 1で取得したそれぞれのタグについて、「直近a分間のユニーク投稿数が今からa分前～今からb分前の間のユニーク投稿数のn倍以上」かどうかを判定する
+	const hotsPromises = tags.map(async tag => {
+		const passedCount = (await Note.distinct('userId', {
+			tags: tag.name,
+			createdAt: {
+				$lt: new Date(Date.now() - rangeA),
+				$gt: new Date(Date.now() - rangeB)
+			}
+		}) as any).length;
+
+		if (tag.count > (passedCount * coefficient)) {
+			return tag;
+		} else {
+			return null;
+		}
+	});
+	//#endregion
+
+	const hots = (await Promise.all(hotsPromises))
+		.filter(x => x != null)
 		.sort((a, b) => b.count - a.count)
 		.map(tag => tag.name)
 		.slice(0, 5);
 
+	//#region 2で話題と判定されたタグそれぞれについて過去の投稿数グラフを取得する
 	const countPromises: Array<Promise<any[]>> = [];
 
 	const range = 20;
@@ -58,7 +94,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const interval = 1000 * 60 * 10;
 
 	for (let i = 0; i < range; i++) {
-
 		countPromises.push(Promise.all(hots.map(tag => Note.distinct('userId', {
 			tags: tag,
 			createdAt: {
@@ -76,6 +111,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 			$gt: new Date(Date.now() - (interval * range))
 		}
 	})));
+	//#endregion
 
 	const stats = hots.map((tag, i) => ({
 		tag,