Merge pull request #2828 from hakaba-hitoyo/feature/external-user-recommendation

External user recommendation

.config/example.yml

@@ -159,3 +159,10 @@ drive:
 
 # Summaly proxy
 # summalyProxy: "http://example.com"
+
+# User recommendation
+user_recommendation:
+  external: true
+  engine: http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}
+  timeout: 300000
+

src/client/app/desktop/views/components/friends-maker.vue

@@ -8,7 +8,6 @@
 				<router-link class="name" :to="user | userPage" v-user-preview="user.id">{{ user | userName }}</router-link>
 				<p class="username">@{{ user | acct }}</p>
 			</div>
-			<mk-follow-button :user="user"/>
 		</div>
 	</div>
 	<p class="empty" v-if="!fetching && users.length == 0">%i18n:@empty%</p>

src/client/app/desktop/views/widgets/users.vue

@@ -13,7 +13,6 @@
 						<router-link class="name" :to="_user | userPage" v-user-preview="_user.id">{{ _user | userName }}</router-link>
 						<p class="username">@{{ _user | acct }}</p>
 					</div>
-					<mk-follow-button :user="_user"/>
 				</div>
 			</template>
 			<p class="empty" v-else>%i18n:@no-one%</p>

src/config/types.ts

@@ -96,6 +96,12 @@ export type Source = {
 	google_maps_api_key: string;
 
 	clusterLimit?: number;
+
+	user_recommendation: {
+		external: boolean;
+		engine: string;
+		timeout: number;
+	};
 };
 
 /**

src/server/api/endpoints/users/recommendation.ts

@@ -3,6 +3,8 @@ import $ from 'cafy';
 import User, { pack, ILocalUser } from '../../../../models/user';
 import { getFriendIds } from '../../common/get-friends';
 import Mute from '../../../../models/mute';
+import * as request from 'request'
+import config from '../../../../config'
 
 export const meta = {
 	desc: {
@@ -15,44 +17,74 @@ export const meta = {
 };
 
 export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
-	// Get 'limit' parameter
+	if (config.user_recommendation && config.user_recommendation.external) {
-	const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
+		const userName = me.username
-	if (limitErr) return rej('invalid limit param');
+		const hostName = config.hostname
-
+		const limit = params.limit
-	// Get 'offset' parameter
+		const offset = params.offset
-	const [offset = 0, offsetErr] = $.num.optional.min(0).get(params.offset);
+		const timeout = config.user_recommendation.timeout
-	if (offsetErr) return rej('invalid offset param');
+		const engine = config.user_recommendation.engine
-
+		const url = engine
-	// ID list of the user itself and other users who the user follows
+			.replace('{{host}}', hostName)
-	const followingIds = await getFriendIds(me._id);
+			.replace('{{user}}', userName)
-
+			.replace('{{limit}}', limit)
-	// ミュートしているユーザーを取得
+			.replace('{{offset}}', offset)
-	const mutedUserIds = (await Mute.find({
+		request(
-		muterId: me._id
+			{
-	})).map(m => m.muteeId);
+				url: url,
-
+				timeout: timeout,
-	const users = await User
+				json: true,
-		.find({
+				followRedirect: true,
-			_id: {
+				followAllRedirects: true
-				$nin: followingIds.concat(mutedUserIds)
 			},
-			isLocked: false,
+			(error: any, response: any, body: any) => {
-			$or: [{
+				if (!error && response.statusCode == 200) {
-				lastUsedAt: {
+					res(body)
-					$gte: new Date(Date.now() - ms('7days'))
+				} else {
+					res([])
 				}
-			}, {
-				host: null
-			}]
-		}, {
-			limit: limit,
-			skip: offset,
-			sort: {
-				followersCount: -1
 			}
-		});
+		)
+	} else {
+		// Get 'limit' parameter
+		const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
+		if (limitErr) return rej('invalid limit param');
 
-	// Serialize
+		// Get 'offset' parameter
-	res(await Promise.all(users.map(async user =>
+		const [offset = 0, offsetErr] = $.num.optional.min(0).get(params.offset);
-		await pack(user, me, { detail: true }))));
+		if (offsetErr) return rej('invalid offset param');
+
+		// ID list of the user itself and other users who the user follows
+		const followingIds = await getFriendIds(me._id);
+
+		// ミュートしているユーザーを取得
+		const mutedUserIds = (await Mute.find({
+			muterId: me._id
+		})).map(m => m.muteeId);
+
+		const users = await User
+			.find({
+				_id: {
+					$nin: followingIds.concat(mutedUserIds)
+				},
+				isLocked: false,
+				$or: [{
+					lastUsedAt: {
+						$gte: new Date(Date.now() - ms('7days'))
+					}
+				}, {
+					host: null
+				}]
+			}, {
+				limit: limit,
+				skip: offset,
+				sort: {
+					followersCount: -1
+				}
+			});
+
+		// Serialize
+		res(await Promise.all(users.map(async user =>
+			await pack(user, me, { detail: true }))));
+	}
 });