etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-11-25 07:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(frontend): search user with trailing space (#11184)

Browse source 
* fix(frontend): search user with trailing space

* fix(backend): search user with trailing space

* Update search.ts

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
nomad 2023-07-08 16:41:52 +08:00 committed by GitHub
parent 0fbb46c981
commit e40a0b98e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/backend/src/server/api/endpoints/users/search.ts
View file

@ -52,6 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
super(meta, paramDef, async (ps, me) => { super(meta, paramDef, async (ps, me) => {
const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日 const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
ps.query = ps.query.trim();
const isUsername = ps.query.startsWith('@'); const isUsername = ps.query.startsWith('@');
let users: User[] = []; let users: User[] = [];

1
packages/backend/src/server/api/endpoints/users/show.ts
View file

@ -91,6 +91,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
let user; let user;
const isModerator = await this.roleService.isModerator(me); const isModerator = await this.roleService.isModerator(me);
ps.username = ps.username?.trim();
if (ps.userIds) { if (ps.userIds) {
if (ps.userIds.length === 0) { if (ps.userIds.length === 0) {

2
packages/frontend/src/pages/search.user.vue
View file

@ -67,7 +67,7 @@ async function search() {
endpoint: 'users/search', endpoint: 'users/search',
limit: 10, limit: 10,
params: { params: {
query: searchQuery, query: query,
origin: searchOrigin, origin: searchOrigin,
}, },
}; };

3
packages/frontend/src/scripts/lookup.ts
View file

@ -6,9 +6,10 @@ import { Router } from '@/nirax';
export async function lookup(router?: Router) { export async function lookup(router?: Router) {
const _router = router ?? mainRouter; const _router = router ?? mainRouter;
const { canceled, result: query } = await os.inputText({ const { canceled, result: temp } = await os.inputText({
title: i18n.ts.lookup, title: i18n.ts.lookup,
}); });
const query = temp ? temp.trim() : '';
if (canceled) return; if (canceled) return;
if (query.startsWith('@') && !query.includes(' ')) { if (query.startsWith('@') && !query.includes(' ')) {