🐛 fix non query error

This commit is contained in:
kawamataryo 2023-10-03 10:02:58 +09:00
parent 02ced36232
commit eaa6b88ecb
2 changed files with 24 additions and 15 deletions

View File

@ -1,7 +1,7 @@
import { isOutOfTopViewport, removeReloadEl } from './domHelpers'; import { isOutOfTopViewport, removeReloadEl } from './domHelpers';
import { getAccountNameAndDisplayName, getUserCells, insertBskyProfileEl, insertNotFoundEl, insertReloadEl } from "~lib/domHelpers"; import { getAccountNameAndDisplayName, getUserCells, insertBskyProfileEl, insertNotFoundEl, insertReloadEl } from "~lib/domHelpers";
import { isSimilarUser } from "~lib/bskyHelpers"; import { isSimilarUser } from "~lib/bskyHelpers";
import { debugLog } from "~lib/utils"; import { debugLog, isOneSymbol } from "~lib/utils";
import type { BskyClient } from './bskyClient'; import type { BskyClient } from './bskyClient';
import type { ViewerState } from '@atproto/api/dist/client/types/app/bsky/actor/defs'; import type { ViewerState } from '@atproto/api/dist/client/types/app/bsky/actor/defs';
import type { UserCellBtnLabel } from './components/BskyUserCell'; import type { UserCellBtnLabel } from './components/BskyUserCell';
@ -62,24 +62,29 @@ export const searchAndInsertBskyUsers = async (
// Loop over search parameters and break if a user is found // Loop over search parameters and break if a user is found
for (const term of searchTerms) { for (const term of searchTerms) {
if (!term) { // one symbol is not a valid search term for bsky
if (!term || isOneSymbol(term)) {
continue continue
} }
const [searchResult] = await agent.searchUser({ try {
term: term, const [searchResult] = await agent.searchUser({
limit: 1, term: term,
}) limit: 1,
})
const { isSimilar: isUserFound, type } = isSimilarUser({ const { isSimilar: isUserFound, type } = isSimilarUser({
accountName: twAccountName, accountName: twAccountName,
accountNameRemoveUnderscore: twAccountNameRemoveUnderscore, accountNameRemoveUnderscore: twAccountNameRemoveUnderscore,
displayName: twDisplayName, displayName: twDisplayName,
}, searchResult) }, searchResult)
if (isUserFound) { if (isUserFound) {
targetAccount = searchResult targetAccount = searchResult
matchType = type matchType = type
break; // Stop searching when a user is found break; // Stop searching when a user is found
}
} catch (e) {
console.error(e)
} }
} }

View File

@ -3,3 +3,7 @@ export const debugLog = (message: string) => {
console.log(`🔷 [Sky Follower Bridge] ${message}`) console.log(`🔷 [Sky Follower Bridge] ${message}`)
} }
} }
export const isOneSymbol = (str: string) => {
return /^[^\w\s]$/.test(str);
}