not async user creation

This commit is contained in:
Sendou 2020-05-26 11:09:40 +03:00
parent 22f0b6d140
commit bebf6ce437
2 changed files with 21 additions and 23 deletions

View File

@ -26,25 +26,28 @@ const UserSearchPage: React.FC<RouteComponentProps> = () => {
if (error) return <Error errorMessage={error.message} />
if (loading) return <Loading />
const usersFiltered = data!.users.filter((user) => {
const filterLower = filter.toLowerCase()
if (user.discord_id.includes(filterLower)) return true
const usersFiltered =
filter === ""
? data!.users
: data!.users.filter((user) => {
const filterLower = filter.toLowerCase()
if (user.discord_id.includes(filterLower)) return true
if (
`${user.username}#${user.discriminator}`
.toLowerCase()
.includes(filterLower)
)
return true
if (
`${user.username}#${user.discriminator}`
.toLowerCase()
.includes(filterLower)
)
return true
if (
user.twitter_name &&
user.twitter_name.toLowerCase().includes(filterLower)
)
return true
if (
user.twitter_name &&
user.twitter_name.toLowerCase().includes(filterLower)
)
return true
return false
})
return false
})
const usersSliced = usersFiltered.slice(
20 * (currentPage - 1),

View File

@ -30,7 +30,7 @@ passport.use(
callbackURL,
scope: ["identify", "connections"],
},
async function (accessToken, refreshToken, profile, cb) {
function (accessToken, refreshToken, profile, cb) {
const userToSave = {
username: profile.username,
discriminator: profile.discriminator,
@ -48,12 +48,7 @@ passport.use(
}
}
await Player.updateOne(
{ discord_id: userToSave.discord_id },
{ $set: { twitter: userToSave.twitter_name } }
)
await User.updateOne(
User.updateOne(
{ discord_id: userToSave.discord_id },
userToSave,
{ upsert: true },