From 835aad44bbf7245e039227ffa48e611b3bc330f2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 17 Oct 2021 01:33:15 +0900
Subject: feat: ユーザーのリアクション一覧を見れるように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/api/endpoints/users/reactions.ts | 67 +++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/server/api/endpoints/users/reactions.ts

(limited to 'src/server/api/endpoints/users')

diff --git a/src/server/api/endpoints/users/reactions.ts b/src/server/api/endpoints/users/reactions.ts
new file mode 100644
index 0000000000..44d7887482
--- /dev/null
+++ b/src/server/api/endpoints/users/reactions.ts
@@ -0,0 +1,67 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../define';
+import { NoteReactions } from '@/models/index';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+import { generateVisibilityQuery } from '../../common/generate-visibility-query';
+
+export const meta = {
+	tags: ['users', 'reactions'],
+
+	requireCredential: false as const,
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+		},
+
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10,
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+
+		sinceDate: {
+			validator: $.optional.num,
+		},
+
+		untilDate: {
+			validator: $.optional.num,
+		},
+	},
+
+	res: {
+		type: 'array' as const,
+		optional: false as const, nullable: false as const,
+		items: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'NoteReaction',
+		}
+	},
+
+	errors: {
+	}
+};
+
+export default define(meta, async (ps, me) => {
+	const query = makePaginationQuery(NoteReactions.createQueryBuilder('reaction'),
+			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+		.andWhere(`reaction.userId = :userId`, { userId: ps.userId })
+		.leftJoinAndSelect('reaction.note', 'note');
+
+	generateVisibilityQuery(query, me);
+
+	const reactions = await query
+		.take(ps.limit!)
+		.getMany();
+
+	return await Promise.all(reactions.map(reaction => NoteReactions.pack(reaction, me, { withNote: true })));
+});
-- 
cgit v1.2.3-freya


From dec69cc67b060eec244eb8d2df7dcd362359514b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 17 Oct 2021 16:26:35 +0900
Subject: enhance: ユーザー検索の精度を強化
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       |   2 +
 src/client/components/form/radios.vue              |  12 --
 src/client/pages/explore.vue                       |  19 ++-
 .../endpoints/users/search-by-username-and-host.ts |   9 +-
 src/server/api/endpoints/users/search.ts           | 127 +++++++++++++--------
 5 files changed, 104 insertions(+), 65 deletions(-)

(limited to 'src/server/api/endpoints/users')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1139707b5a..ef9934f6d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,9 @@
 
 ### Improvements
 - クライアント: ユーザーのリアクション一覧を見れるように
+- クライアント: ユーザー検索の精度を強化
 - API: ユーザーのリアクション一覧を取得する users/reactions を追加
+- API: users/search および users/search-by-username-and-host を強化
 
 ### Bugfixes
 
diff --git a/src/client/components/form/radios.vue b/src/client/components/form/radios.vue
index 1d3d80172a..998a738202 100644
--- a/src/client/components/form/radios.vue
+++ b/src/client/components/form/radios.vue
@@ -22,7 +22,6 @@ export default defineComponent({
 		}
 	},
 	render() {
-		const label = this.$slots.desc();
 		let options = this.$slots.default();
 
 		// なぜかFragmentになることがあるため
@@ -31,7 +30,6 @@ export default defineComponent({
 		return h('div', {
 			class: 'novjtcto'
 		}, [
-			h('div', { class: 'label' }, label),
 			...options.map(option => h(MkRadio, {
 				key: option.key,
 				value: option.props.value,
@@ -45,16 +43,6 @@ export default defineComponent({
 
 <style lang="scss">
 .novjtcto {
-	> .label {
-		font-size: 0.85em;
-		padding: 0 0 8px 12px;
-		user-select: none;
-
-		&:empty {
-			display: none;
-		}
-	}
-
 	&:first-child {
 		margin-top: 0;
 	}
diff --git a/src/client/pages/explore.vue b/src/client/pages/explore.vue
index 2ca0668611..596bc1f0ed 100644
--- a/src/client/pages/explore.vue
+++ b/src/client/pages/explore.vue
@@ -65,13 +65,18 @@
 			</div>
 			<div v-else-if="tab === 'search'">
 				<div class="_isolated">
-					<MkInput v-model="query" :debounce="true" type="search">
+					<MkInput v-model="searchQuery" :debounce="true" type="search">
 						<template #prefix><i class="fas fa-search"></i></template>
 						<template #label>{{ $ts.searchUser }}</template>
 					</MkInput>
+					<MkRadios v-model="searchScope">
+						<option value="local">{{ $ts.local }}</option>
+						<option value="remote">{{ $ts.remote }}</option>
+						<option value="both">{{ $ts.both }}</option>
+					</MkRadios>
 				</div>
 
-				<XUserList v-if="query" class="_gap" :pagination="searchPagination" ref="search"/>
+				<XUserList v-if="searchQuery" class="_gap" :pagination="searchPagination" ref="search"/>
 			</div>
 		</div>
 	</MkSpacer>
@@ -83,6 +88,7 @@ import { computed, defineComponent } from 'vue';
 import XUserList from '@client/components/user-list.vue';
 import MkFolder from '@client/components/ui/folder.vue';
 import MkInput from '@client/components/form/input.vue';
+import MkRadios from '@client/components/form/radios.vue';
 import number from '@client/filters/number';
 import * as os from '@client/os';
 import * as symbols from '@client/symbols';
@@ -92,6 +98,7 @@ export default defineComponent({
 		XUserList,
 		MkFolder,
 		MkInput,
+		MkRadios,
 	},
 
 	props: {
@@ -158,14 +165,16 @@ export default defineComponent({
 			searchPagination: {
 				endpoint: 'users/search',
 				limit: 10,
-				params: computed(() => (this.query && this.query !== '') ? {
-					query: this.query
+				params: computed(() => (this.searchQuery && this.searchQuery !== '') ? {
+					query: this.searchQuery,
+					scope: this.searchScope,
 				} : null)
 			},
 			tagsLocal: [],
 			tagsRemote: [],
 			stats: null,
-			query: null,
+			searchQuery: null,
+			searchScope: 'both',
 			num: number,
 		};
 	},
diff --git a/src/server/api/endpoints/users/search-by-username-and-host.ts b/src/server/api/endpoints/users/search-by-username-and-host.ts
index b9fbf48fb2..8fdc710658 100644
--- a/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -1,6 +1,8 @@
 import $ from 'cafy';
 import define from '../../define';
 import { Users } from '@/models/index';
+import { Brackets } from 'typeorm';
+import { USER_ACTIVE_THRESHOLD } from '@/const';
 
 export const meta = {
 	tags: ['users'],
@@ -64,8 +66,11 @@ export default define(meta, async (ps, me) => {
 			.where('user.host IS NULL')
 			.andWhere('user.isSuspended = FALSE')
 			.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
-			.andWhere('user.updatedAt IS NOT NULL')
-			.orderBy('user.updatedAt', 'DESC')
+			.andWhere(new Brackets(qb => { qb
+				.where('user.lastActiveDate IS NULL')
+				.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+			}))
+			.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST')
 			.take(ps.limit!)
 			.skip(ps.offset)
 			.getMany();
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index 8011d90b3d..e4fbfedd10 100644
--- a/src/server/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -2,6 +2,8 @@ import $ from 'cafy';
 import define from '../../define';
 import { UserProfiles, Users } from '@/models/index';
 import { User } from '@/models/entities/user';
+import { Brackets } from 'typeorm';
+import { USER_ACTIVE_THRESHOLD } from '@/const';
 
 export const meta = {
 	tags: ['users'],
@@ -23,9 +25,9 @@ export const meta = {
 			default: 10,
 		},
 
-		localOnly: {
-			validator: $.optional.bool,
-			default: false,
+		scope: {
+			validator: $.optional.str.or(['local', 'remote', 'both']),
+			default: 'both',
 		},
 
 		detail: {
@@ -51,58 +53,91 @@ export default define(meta, async (ps, me) => {
 	let users: User[] = [];
 
 	if (isUsername) {
-		users = await Users.createQueryBuilder('user')
-			.where('user.host IS NULL')
-			.andWhere('user.isSuspended = FALSE')
-			.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
-			.andWhere('user.updatedAt IS NOT NULL')
-			.orderBy('user.updatedAt', 'DESC')
+		const usernameQuery = Users.createQueryBuilder('user')
+			.where('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
+			.andWhere(new Brackets(qb => { qb
+				.where('user.lastActiveDate IS NULL')
+				.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+			}))
+			.andWhere('user.isSuspended = FALSE');
+
+		if (ps.scope === 'local') {
+			usernameQuery
+				.andWhere('user.host IS NULL')
+				.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST');
+		} else if (ps.scope === 'remote') {
+			usernameQuery
+				.andWhere('user.host IS NOT NULL')
+				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+		} else { // both
+			usernameQuery
+				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+		}
+
+		users = await usernameQuery
 			.take(ps.limit!)
 			.skip(ps.offset)
 			.getMany();
-
-		if (users.length < ps.limit! && !ps.localOnly) {
-			const otherUsers = await Users.createQueryBuilder('user')
-				.where('user.host IS NOT NULL')
-				.andWhere('user.isSuspended = FALSE')
-				.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
-				.andWhere('user.updatedAt IS NOT NULL')
-				.orderBy('user.updatedAt', 'DESC')
-				.take(ps.limit! - users.length)
-				.getMany();
-
-			users = users.concat(otherUsers);
-		}
 	} else {
-		const profQuery = UserProfiles.createQueryBuilder('prof')
-			.select('prof.userId')
-			.where('prof.userHost IS NULL')
-			.andWhere('prof.description ilike :query', { query: '%' + ps.query + '%' });
-
-		users = await Users.createQueryBuilder('user')
-			.where(`user.id IN (${ profQuery.getQuery() })`)
-			.setParameters(profQuery.getParameters())
-			.andWhere('user.updatedAt IS NOT NULL')
-			.orderBy('user.updatedAt', 'DESC')
+		const nameQuery = Users.createQueryBuilder('user')
+			.where('user.name ilike :query', { query: '%' + ps.query + '%' })
+			.andWhere(new Brackets(qb => { qb
+				.where('user.lastActiveDate IS NULL')
+				.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+			}))
+			.andWhere('user.isSuspended = FALSE');
+
+		if (ps.scope === 'local') {
+			nameQuery
+				.andWhere('user.host IS NULL')
+				.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST');
+		} else if (ps.scope === 'remote') {
+			nameQuery
+				.andWhere('user.host IS NOT NULL')
+				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+		} else { // both
+			nameQuery
+				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+		}
+
+		users = await nameQuery
 			.take(ps.limit!)
 			.skip(ps.offset)
 			.getMany();
 
-		if (users.length < ps.limit! && !ps.localOnly) {
-			const profQuery2 = UserProfiles.createQueryBuilder('prof')
+		if (users.length < ps.limit!) {
+			const profQuery = UserProfiles.createQueryBuilder('prof')
 				.select('prof.userId')
-				.where('prof.userHost IS NOT NULL')
-				.andWhere('prof.description ilike :query', { query: '%' + ps.query + '%' });
-
-			const otherUsers = await Users.createQueryBuilder('user')
-				.where(`user.id IN (${ profQuery2.getQuery() })`)
-				.setParameters(profQuery2.getParameters())
-				.andWhere('user.updatedAt IS NOT NULL')
-				.orderBy('user.updatedAt', 'DESC')
-				.take(ps.limit! - users.length)
-				.getMany();
-
-			users = users.concat(otherUsers);
+				.where('prof.description ilike :query', { query: '%' + ps.query + '%' });
+
+			if (ps.scope === 'local') {
+				profQuery.andWhere('prof.userHost IS NULL');
+			} else if (ps.scope === 'remote') {
+				profQuery.andWhere('prof.userHost IS NOT NULL');
+			}
+
+			const query = Users.createQueryBuilder('user')
+				.where(`user.id IN (${ profQuery.getQuery() })`)
+				.andWhere(new Brackets(qb => { qb
+					.where('user.lastActiveDate IS NULL')
+					.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+				}))
+				.andWhere('user.isSuspended = FALSE')
+				.setParameters(profQuery.getParameters());
+
+			if (ps.scope === 'local') {
+				query.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST');
+			} else if (ps.scope === 'remote') {
+				query.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+			} else { // both
+				query.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+			}
+
+			users = users.concat(await query
+				.take(ps.limit!)
+				.skip(ps.offset)
+				.getMany()
+			);
 		}
 	}
 
-- 
cgit v1.2.3-freya


From 3a11dba24f839016bad295ce2e68dac04d7a3d5b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 17 Oct 2021 18:38:38 +0900
Subject: #7880

---
 src/client/pages/explore.vue                       |  6 +-
 .../endpoints/users/search-by-username-and-host.ts | 14 +++--
 src/server/api/endpoints/users/search.ts           | 72 ++++++++--------------
 3 files changed, 38 insertions(+), 54 deletions(-)

(limited to 'src/server/api/endpoints/users')

diff --git a/src/client/pages/explore.vue b/src/client/pages/explore.vue
index 596bc1f0ed..0c29b11b38 100644
--- a/src/client/pages/explore.vue
+++ b/src/client/pages/explore.vue
@@ -69,7 +69,7 @@
 						<template #prefix><i class="fas fa-search"></i></template>
 						<template #label>{{ $ts.searchUser }}</template>
 					</MkInput>
-					<MkRadios v-model="searchScope">
+					<MkRadios v-model="searchOrigin">
 						<option value="local">{{ $ts.local }}</option>
 						<option value="remote">{{ $ts.remote }}</option>
 						<option value="both">{{ $ts.both }}</option>
@@ -167,14 +167,14 @@ export default defineComponent({
 				limit: 10,
 				params: computed(() => (this.searchQuery && this.searchQuery !== '') ? {
 					query: this.searchQuery,
-					scope: this.searchScope,
+					origin: this.searchOrigin,
 				} : null)
 			},
 			tagsLocal: [],
 			tagsRemote: [],
 			stats: null,
 			searchQuery: null,
-			searchScope: 'both',
+			searchOrigin: 'both',
 			num: number,
 		};
 	},
diff --git a/src/server/api/endpoints/users/search-by-username-and-host.ts b/src/server/api/endpoints/users/search-by-username-and-host.ts
index 8fdc710658..3b8d024af5 100644
--- a/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -46,13 +46,15 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
+	const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
+
 	if (ps.host) {
 		const q = Users.createQueryBuilder('user')
 			.where('user.isSuspended = FALSE')
 			.andWhere('user.host LIKE :host', { host: ps.host.toLowerCase() + '%' });
 
 		if (ps.username) {
-			q.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' });
+			q.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' });
 		}
 
 		q.andWhere('user.updatedAt IS NOT NULL');
@@ -65,12 +67,12 @@ export default define(meta, async (ps, me) => {
 		let users = await Users.createQueryBuilder('user')
 			.where('user.host IS NULL')
 			.andWhere('user.isSuspended = FALSE')
-			.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
+			.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 			.andWhere(new Brackets(qb => { qb
-				.where('user.lastActiveDate IS NULL')
-				.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+				.where('user.updatedAt IS NULL')
+				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
 			}))
-			.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST')
+			.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
 			.take(ps.limit!)
 			.skip(ps.offset)
 			.getMany();
@@ -79,7 +81,7 @@ export default define(meta, async (ps, me) => {
 			const otherUsers = await Users.createQueryBuilder('user')
 				.where('user.host IS NOT NULL')
 				.andWhere('user.isSuspended = FALSE')
-				.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
+				.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 				.andWhere('user.updatedAt IS NOT NULL')
 				.orderBy('user.updatedAt', 'DESC')
 				.take(ps.limit! - users.length)
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index e4fbfedd10..9aa988d9ed 100644
--- a/src/server/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -3,7 +3,6 @@ import define from '../../define';
 import { UserProfiles, Users } from '@/models/index';
 import { User } from '@/models/entities/user';
 import { Brackets } from 'typeorm';
-import { USER_ACTIVE_THRESHOLD } from '@/const';
 
 export const meta = {
 	tags: ['users'],
@@ -25,9 +24,9 @@ export const meta = {
 			default: 10,
 		},
 
-		scope: {
-			validator: $.optional.str.or(['local', 'remote', 'both']),
-			default: 'both',
+		origin: {
+			validator: $.optional.str.or(['local', 'remote', 'combined']),
+			default: 'combined',
 		},
 
 		detail: {
@@ -48,59 +47,49 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
+	const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
+
 	const isUsername = ps.query.startsWith('@');
 
 	let users: User[] = [];
 
 	if (isUsername) {
 		const usernameQuery = Users.createQueryBuilder('user')
-			.where('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
+			.where('user.usernameLower LIKE :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
 			.andWhere(new Brackets(qb => { qb
-				.where('user.lastActiveDate IS NULL')
-				.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+				.where('user.updatedAt IS NULL')
+				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
 			}))
 			.andWhere('user.isSuspended = FALSE');
 
-		if (ps.scope === 'local') {
-			usernameQuery
-				.andWhere('user.host IS NULL')
-				.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST');
-		} else if (ps.scope === 'remote') {
-			usernameQuery
-				.andWhere('user.host IS NOT NULL')
-				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
-		} else { // both
-			usernameQuery
-				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+		if (ps.origin === 'local') {
+			usernameQuery.andWhere('user.host IS NULL');
+		} else if (ps.origin === 'remote') {
+			usernameQuery.andWhere('user.host IS NOT NULL');
 		}
 
 		users = await usernameQuery
+			.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
 			.take(ps.limit!)
 			.skip(ps.offset)
 			.getMany();
 	} else {
 		const nameQuery = Users.createQueryBuilder('user')
-			.where('user.name ilike :query', { query: '%' + ps.query + '%' })
+			.where('user.name ILIKE :query', { query: '%' + ps.query + '%' })
 			.andWhere(new Brackets(qb => { qb
-				.where('user.lastActiveDate IS NULL')
-				.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+				.where('user.updatedAt IS NULL')
+				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
 			}))
 			.andWhere('user.isSuspended = FALSE');
 
-		if (ps.scope === 'local') {
-			nameQuery
-				.andWhere('user.host IS NULL')
-				.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST');
-		} else if (ps.scope === 'remote') {
-			nameQuery
-				.andWhere('user.host IS NOT NULL')
-				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
-		} else { // both
-			nameQuery
-				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
+		if (ps.origin === 'local') {
+			nameQuery.andWhere('user.host IS NULL');
+		} else if (ps.origin === 'remote') {
+			nameQuery.andWhere('user.host IS NOT NULL');
 		}
 
 		users = await nameQuery
+			.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
 			.take(ps.limit!)
 			.skip(ps.offset)
 			.getMany();
@@ -108,32 +97,25 @@ export default define(meta, async (ps, me) => {
 		if (users.length < ps.limit!) {
 			const profQuery = UserProfiles.createQueryBuilder('prof')
 				.select('prof.userId')
-				.where('prof.description ilike :query', { query: '%' + ps.query + '%' });
+				.where('prof.description ILIKE :query', { query: '%' + ps.query + '%' });
 
-			if (ps.scope === 'local') {
+			if (ps.origin === 'local') {
 				profQuery.andWhere('prof.userHost IS NULL');
-			} else if (ps.scope === 'remote') {
+			} else if (ps.origin === 'remote') {
 				profQuery.andWhere('prof.userHost IS NOT NULL');
 			}
 
 			const query = Users.createQueryBuilder('user')
 				.where(`user.id IN (${ profQuery.getQuery() })`)
 				.andWhere(new Brackets(qb => { qb
-					.where('user.lastActiveDate IS NULL')
-					.orWhere('user.lastActiveDate > :activeThreshold', { activeThreshold: new Date(Date.now() - USER_ACTIVE_THRESHOLD) });
+					.where('user.updatedAt IS NULL')
+					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
 				}))
 				.andWhere('user.isSuspended = FALSE')
 				.setParameters(profQuery.getParameters());
 
-			if (ps.scope === 'local') {
-				query.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST');
-			} else if (ps.scope === 'remote') {
-				query.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
-			} else { // both
-				query.orderBy('user.updatedAt', 'DESC', 'NULLS LAST');
-			}
-
 			users = users.concat(await query
+				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
 				.take(ps.limit!)
 				.skip(ps.offset)
 				.getMany()
-- 
cgit v1.2.3-freya


From 7413634734d31b4558a5fbaed01d8d2a88c20742 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 18 Oct 2021 01:16:59 +0900
Subject: リアクション一覧の公開をオプトインに
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                     |  3 ++-
 locales/ja-JP.yml                                |  2 ++
 migration/1634486652000-user-public-reactions.ts | 14 ++++++++++++++
 src/client/pages/settings/privacy.vue            |  7 +++++++
 src/client/pages/user/index.vue                  |  4 ++--
 src/models/entities/user-profile.ts              |  5 +++++
 src/models/repositories/user.ts                  |  1 +
 src/server/api/endpoints/i/update.ts             |  5 +++++
 src/server/api/endpoints/users/reactions.ts      | 14 +++++++++++++-
 9 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 migration/1634486652000-user-public-reactions.ts

(limited to 'src/server/api/endpoints/users')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c58886e0b6..a07096b3dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@
 ## 12.x.x (unreleased)
 
 ### Improvements
-- クライアント: ユーザーのリアクション一覧を見れるように
+- クライアント: 自分のリアクション一覧を見れるように
+	- 設定により、リアクション一覧を全員に公開することも可能
 - クライアント: ユーザー検索の精度を強化
 - クライアント: 新しいライトテーマを追加
 - API: ユーザーのリアクション一覧を取得する users/reactions を追加
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 358da897d0..5402a05e4f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -797,6 +797,8 @@ unread: "未読"
 filter: "フィルタ"
 controllPanel: "コントロールパネル"
 manageAccounts: "アカウントを管理"
+makeReactionsPublic: "リアクション一覧を公開する"
+makeReactionsPublicDescription: "あなたがしたリアクション一覧を誰でも見れるようにします。"
 
 _signup:
   almostThere: "ほとんど完了です"
diff --git a/migration/1634486652000-user-public-reactions.ts b/migration/1634486652000-user-public-reactions.ts
new file mode 100644
index 0000000000..da57a13269
--- /dev/null
+++ b/migration/1634486652000-user-public-reactions.ts
@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class userPublicReactions1634486652000 implements MigrationInterface {
+    name = 'userPublicReactions1634486652000'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+			await queryRunner.query(`ALTER TABLE "user_profile" ADD "publicReactions" boolean NOT NULL DEFAULT false`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "publicReactions"`);
+    }
+
+}
diff --git a/src/client/pages/settings/privacy.vue b/src/client/pages/settings/privacy.vue
index 7756158578..2a60ae1f46 100644
--- a/src/client/pages/settings/privacy.vue
+++ b/src/client/pages/settings/privacy.vue
@@ -5,6 +5,10 @@
 		<FormSwitch v-model="autoAcceptFollowed" :disabled="!isLocked" @update:modelValue="save()">{{ $ts.autoAcceptFollowed }}</FormSwitch>
 		<template #caption>{{ $ts.lockedAccountInfo }}</template>
 	</FormGroup>
+	<FormSwitch v-model="publicReactions" @update:modelValue="save()">
+		{{ $ts.makeReactionsPublic }}
+		<template #desc>{{ $ts.makeReactionsPublicDescription }}</template>
+	</FormSwitch>
 	<FormSwitch v-model="hideOnlineStatus" @update:modelValue="save()">
 		{{ $ts.hideOnlineStatus }}
 		<template #desc>{{ $ts.hideOnlineStatusDescription }}</template>
@@ -64,6 +68,7 @@ export default defineComponent({
 			noCrawle: false,
 			isExplorable: false,
 			hideOnlineStatus: false,
+			publicReactions: false,
 		}
 	},
 
@@ -80,6 +85,7 @@ export default defineComponent({
 		this.noCrawle = this.$i.noCrawle;
 		this.isExplorable = this.$i.isExplorable;
 		this.hideOnlineStatus = this.$i.hideOnlineStatus;
+		this.publicReactions = this.$i.publicReactions;
 	},
 
 	mounted() {
@@ -94,6 +100,7 @@ export default defineComponent({
 				noCrawle: !!this.noCrawle,
 				isExplorable: !!this.isExplorable,
 				hideOnlineStatus: !!this.hideOnlineStatus,
+				publicReactions: !!this.publicReactions,
 			});
 		}
 	}
diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue
index 6811dff2db..f74bf49883 100644
--- a/src/client/pages/user/index.vue
+++ b/src/client/pages/user/index.vue
@@ -270,12 +270,12 @@ export default defineComponent({
 					title: this.$ts.overview,
 					icon: 'fas fa-home',
 					onClick: () => { this.$router.push('/@' + getAcct(this.user)); },
-				}, {
+				}, ...(this.$i && (this.$i.id === this.user.id)) || this.user.publicReactions ? [{
 					active: this.page === 'reactions',
 					title: this.$ts.reaction,
 					icon: 'fas fa-laugh',
 					onClick: () => { this.$router.push('/@' + getAcct(this.user) + '/reactions'); },
-				}, {
+				}] : [], {
 					active: this.page === 'clips',
 					title: this.$ts.clips,
 					icon: 'fas fa-paperclip',
diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts
index a2da07d76f..1f450f223d 100644
--- a/src/models/entities/user-profile.ts
+++ b/src/models/entities/user-profile.ts
@@ -75,6 +75,11 @@ export class UserProfile {
 	})
 	public emailNotificationTypes: string[];
 
+	@Column('boolean', {
+		default: false,
+	})
+	public publicReactions: boolean;
+
 	@Column('varchar', {
 		length: 128, nullable: true,
 	})
diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts
index b6f27e32e2..2b77b613a8 100644
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@@ -231,6 +231,7 @@ export class UserRepository extends Repository<User> {
 				}),
 				pinnedPageId: profile!.pinnedPageId,
 				pinnedPage: profile!.pinnedPageId ? Pages.pack(profile!.pinnedPageId, me) : null,
+				publicReactions: profile!.publicReactions,
 				twoFactorEnabled: profile!.twoFactorEnabled,
 				usePasswordLessLogin: profile!.usePasswordLessLogin,
 				securityKeys: profile!.twoFactorEnabled
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 9dd637251d..3b8b1579ea 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -68,6 +68,10 @@ export const meta = {
 			validator: $.optional.bool,
 		},
 
+		publicReactions: {
+			validator: $.optional.bool,
+		},
+
 		carefulBot: {
 			validator: $.optional.bool,
 		},
@@ -180,6 +184,7 @@ export default define(meta, async (ps, _user, token) => {
 	if (typeof ps.isLocked === 'boolean') updates.isLocked = ps.isLocked;
 	if (typeof ps.isExplorable === 'boolean') updates.isExplorable = ps.isExplorable;
 	if (typeof ps.hideOnlineStatus === 'boolean') updates.hideOnlineStatus = ps.hideOnlineStatus;
+	if (typeof ps.publicReactions === 'boolean') profileUpdates.publicReactions = ps.publicReactions;
 	if (typeof ps.isBot === 'boolean') updates.isBot = ps.isBot;
 	if (typeof ps.carefulBot === 'boolean') profileUpdates.carefulBot = ps.carefulBot;
 	if (typeof ps.autoAcceptFollowed === 'boolean') profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;
diff --git a/src/server/api/endpoints/users/reactions.ts b/src/server/api/endpoints/users/reactions.ts
index 44d7887482..fe5e4d84a9 100644
--- a/src/server/api/endpoints/users/reactions.ts
+++ b/src/server/api/endpoints/users/reactions.ts
@@ -1,9 +1,10 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../define';
-import { NoteReactions } from '@/models/index';
+import { NoteReactions, UserProfiles } from '@/models/index';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
+import { ApiError } from '../../error';
 
 export const meta = {
 	tags: ['users', 'reactions'],
@@ -48,10 +49,21 @@ export const meta = {
 	},
 
 	errors: {
+		reactionsNotPublic: {
+			message: 'Reactions of the user is not public.',
+			code: 'REACTIONS_NOT_PUBLIC',
+			id: '673a7dd2-6924-1093-e0c0-e68456ceae5c'
+		},
 	}
 };
 
 export default define(meta, async (ps, me) => {
+	const profile = await UserProfiles.findOneOrFail(ps.userId);
+
+	if (me == null || (me.id !== ps.userId && !profile.publicReactions)) {
+		throw new ApiError(meta.errors.reactionsNotPublic);
+	}
+
 	const query = makePaginationQuery(NoteReactions.createQueryBuilder('reaction'),
 			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 		.andWhere(`reaction.userId = :userId`, { userId: ps.userId })
-- 
cgit v1.2.3-freya


From 2d196b6779e2c4a0594fdd512c6cd4caaba043b0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 20 Oct 2021 00:53:38 +0900
Subject: Update search-by-username-and-host.ts

---
 .../endpoints/users/search-by-username-and-host.ts | 71 ++++++++++++++--------
 1 file changed, 46 insertions(+), 25 deletions(-)

(limited to 'src/server/api/endpoints/users')

diff --git a/src/server/api/endpoints/users/search-by-username-and-host.ts b/src/server/api/endpoints/users/search-by-username-and-host.ts
index 3b8d024af5..f03a55449d 100644
--- a/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -1,8 +1,9 @@
 import $ from 'cafy';
 import define from '../../define';
-import { Users } from '@/models/index';
+import { Followings, Users } from '@/models/index';
 import { Brackets } from 'typeorm';
 import { USER_ACTIVE_THRESHOLD } from '@/const';
+import { User } from '@/models/entities/user';
 
 export const meta = {
 	tags: ['users'],
@@ -18,11 +19,6 @@ export const meta = {
 			validator: $.optional.nullable.str,
 		},
 
-		offset: {
-			validator: $.optional.num.min(0),
-			default: 0,
-		},
-
 		limit: {
 			validator: $.optional.num.range(1, 100),
 			default: 10,
@@ -60,34 +56,59 @@ export default define(meta, async (ps, me) => {
 		q.andWhere('user.updatedAt IS NOT NULL');
 		q.orderBy('user.updatedAt', 'DESC');
 
-		const users = await q.take(ps.limit!).skip(ps.offset).getMany();
+		const users = await q.take(ps.limit!).getMany();
 
 		return await Users.packMany(users, me, { detail: ps.detail });
 	} else if (ps.username) {
-		let users = await Users.createQueryBuilder('user')
-			.where('user.host IS NULL')
-			.andWhere('user.isSuspended = FALSE')
-			.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
-			.andWhere(new Brackets(qb => { qb
-				.where('user.updatedAt IS NULL')
-				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-			}))
-			.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-			.take(ps.limit!)
-			.skip(ps.offset)
-			.getMany();
-
-		if (users.length < ps.limit!) {
-			const otherUsers = await Users.createQueryBuilder('user')
-				.where('user.host IS NOT NULL')
+		let users: User[] = [];
+
+		if (me) {
+			const followingQuery = Followings.createQueryBuilder('following')
+				.select('following.followeeId')
+				.where('following.followerId = :followerId', { followerId: me.id });
+
+			const query = Users.createQueryBuilder('user')
+				.where(`user.id IN (${ followingQuery.getQuery() })`)
+				.andWhere(`user.id != :meId`, { meId: me.id })
 				.andWhere('user.isSuspended = FALSE')
 				.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
+				.andWhere(new Brackets(qb => { qb
+					.where('user.updatedAt IS NULL')
+					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+				}));
+
+			query.setParameters(followingQuery.getParameters());
+
+			users = await query
+				.orderBy('user.usernameLower', 'ASC')
+				.take(ps.limit!)
+				.getMany();
+
+			if (users.length < ps.limit!) {
+				const otherQuery = await Users.createQueryBuilder('user')
+					.where(`user.id NOT IN (${ followingQuery.getQuery() })`)
+					.andWhere(`user.id != :meId`, { meId: me.id })
+					.andWhere('user.isSuspended = FALSE')
+					.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
+					.andWhere('user.updatedAt IS NOT NULL');
+	
+				otherQuery.setParameters(followingQuery.getParameters());
+	
+				const otherUsers = await otherQuery
+					.orderBy('user.updatedAt', 'DESC')
+					.take(ps.limit! - users.length)
+					.getMany();
+	
+				users = users.concat(otherUsers);
+			}
+		} else {
+			users = await Users.createQueryBuilder('user')
+				.where('user.isSuspended = FALSE')
+				.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 				.andWhere('user.updatedAt IS NOT NULL')
 				.orderBy('user.updatedAt', 'DESC')
 				.take(ps.limit! - users.length)
 				.getMany();
-
-			users = users.concat(otherUsers);
 		}
 
 		return await Users.packMany(users, me, { detail: ps.detail });
-- 
cgit v1.2.3-freya


From 202cb38c40cd07137290377fc9274d67c289efba Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 20 Oct 2021 01:15:14 +0900
Subject: lint

---
 src/server/api/endpoints/users/search-by-username-and-host.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server/api/endpoints/users')

diff --git a/src/server/api/endpoints/users/search-by-username-and-host.ts b/src/server/api/endpoints/users/search-by-username-and-host.ts
index f03a55449d..1ec5e1a743 100644
--- a/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -91,14 +91,14 @@ export default define(meta, async (ps, me) => {
 					.andWhere('user.isSuspended = FALSE')
 					.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 					.andWhere('user.updatedAt IS NOT NULL');
-	
+
 				otherQuery.setParameters(followingQuery.getParameters());
-	
+
 				const otherUsers = await otherQuery
 					.orderBy('user.updatedAt', 'DESC')
 					.take(ps.limit! - users.length)
 					.getMany();
-	
+
 				users = users.concat(otherUsers);
 			}
 		} else {
-- 
cgit v1.2.3-freya