From 85959a3b9bef93e9b26e6b58c49145d6f67ea571 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 17 Apr 2019 14:30:31 +0900 Subject: Fix #4721 Fix #4722 --- src/server/api/endpoints/i/update.ts | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'src/server/api/endpoints') diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index d06ab621c6..8649b59c00 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -13,6 +13,7 @@ import { ApiError } from '../../error'; import { Users, DriveFiles, UserProfiles } from '../../../../models'; import { User } from '../../../../models/entities/user'; import { UserProfile } from '../../../../models/entities/user-profile'; +import { ensure } from '../../../../prelude/ensure'; export const meta = { desc: { @@ -157,22 +158,24 @@ export default define(meta, async (ps, user, app) => { const isSecure = user != null && app == null; const updates = {} as Partial; - const profile = {} as Partial; + const profileUpdates = {} as Partial; + + const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); if (ps.name !== undefined) updates.name = ps.name; - if (ps.description !== undefined) profile.description = ps.description; + if (ps.description !== undefined) profileUpdates.description = ps.description; //if (ps.lang !== undefined) updates.lang = ps.lang; - if (ps.location !== undefined) profile.location = ps.location; - if (ps.birthday !== undefined) profile.birthday = ps.birthday; + if (ps.location !== undefined) profileUpdates.location = ps.location; + if (ps.birthday !== undefined) profileUpdates.birthday = ps.birthday; if (ps.avatarId !== undefined) updates.avatarId = ps.avatarId; if (ps.bannerId !== undefined) updates.bannerId = ps.bannerId; if (typeof ps.isLocked == 'boolean') updates.isLocked = ps.isLocked; if (typeof ps.isBot == 'boolean') updates.isBot = ps.isBot; - if (typeof ps.carefulBot == 'boolean') profile.carefulBot = ps.carefulBot; - if (typeof ps.autoAcceptFollowed == 'boolean') profile.autoAcceptFollowed = ps.autoAcceptFollowed; + if (typeof ps.carefulBot == 'boolean') profileUpdates.carefulBot = ps.carefulBot; + if (typeof ps.autoAcceptFollowed == 'boolean') profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed; if (typeof ps.isCat == 'boolean') updates.isCat = ps.isCat; - if (typeof ps.autoWatch == 'boolean') profile.autoWatch = ps.autoWatch; - if (typeof ps.alwaysMarkNsfw == 'boolean') profile.alwaysMarkNsfw = ps.alwaysMarkNsfw; + if (typeof ps.autoWatch == 'boolean') profileUpdates.autoWatch = ps.autoWatch; + if (typeof ps.alwaysMarkNsfw == 'boolean') profileUpdates.alwaysMarkNsfw = ps.alwaysMarkNsfw; if (ps.avatarId) { const avatar = await DriveFiles.findOne(ps.avatarId); @@ -201,16 +204,20 @@ export default define(meta, async (ps, user, app) => { } //#region emojis/tags + let emojis = [] as string[]; let tags = [] as string[]; - if (updates.name != null) { - const tokens = parsePlain(updates.name); + const newName = updates.name === undefined ? user.name : updates.name; + const newDescription = profileUpdates.description === undefined ? profile.description : profileUpdates.description; + + if (newName != null) { + const tokens = parsePlain(newName); emojis = emojis.concat(extractEmojis(tokens!)); } - if (profile.description != null) { - const tokens = parse(profile.description); + if (newDescription != null) { + const tokens = parse(newDescription); emojis = emojis.concat(extractEmojis(tokens!)); tags = extractHashtags(tokens!).map(tag => tag.toLowerCase()); } @@ -224,7 +231,7 @@ export default define(meta, async (ps, user, app) => { //#endregion if (Object.keys(updates).length > 0) await Users.update(user.id, updates); - if (Object.keys(profile).length > 0) await UserProfiles.update({ userId: user.id }, profile); + if (Object.keys(profileUpdates).length > 0) await UserProfiles.update({ userId: user.id }, profileUpdates); const iObj = await Users.pack(user.id, user, { detail: true, -- cgit v1.2.3-freya From 0ede390fefb4aae460deccc09755af85e5af6002 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 17 Apr 2019 14:32:59 +0900 Subject: Refactor --- src/models/repositories/user.ts | 2 +- src/remote/activitypub/renderer/person.ts | 2 +- src/server/api/endpoints/i/2fa/done.ts | 2 +- src/server/api/endpoints/i/2fa/register.ts | 2 +- src/server/api/endpoints/i/2fa/unregister.ts | 2 +- src/server/api/endpoints/i/change-password.ts | 2 +- src/server/api/endpoints/i/delete-account.ts | 2 +- src/server/api/endpoints/i/regenerate-token.ts | 2 +- src/server/api/endpoints/i/update-email.ts | 2 +- src/server/api/endpoints/i/update.ts | 2 +- src/server/api/endpoints/notes/polls/vote.ts | 2 +- src/server/api/private/signin.ts | 2 +- src/server/web/feed.ts | 2 +- src/services/drive/add-file.ts | 2 +- src/services/note/create.ts | 2 +- src/services/note/polls/vote.ts | 2 +- src/services/note/reaction/create.ts | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/server/api/endpoints') diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index 30c77e78ca..36bba05e8e 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -82,7 +82,7 @@ export class UserRepository extends Repository { const relation = meId && (meId !== user.id) && opts.detail ? await this.getRelation(meId, user.id) : null; const pins = opts.detail ? await UserNotePinings.find({ userId: user.id }) : []; - const profile = opts.detail ? await UserProfiles.findOne({ userId: user.id }).then(ensure) : null; + const profile = opts.detail ? await UserProfiles.findOne(user.id).then(ensure) : null; const falsy = opts.detail ? false : undefined; diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts index 3fb164ef4e..efe52cdefb 100644 --- a/src/remote/activitypub/renderer/person.ts +++ b/src/remote/activitypub/renderer/person.ts @@ -17,7 +17,7 @@ export async function renderPerson(user: ILocalUser) { const [avatar, banner, profile] = await Promise.all([ user.avatarId ? DriveFiles.findOne(user.avatarId) : Promise.resolve(undefined), user.bannerId ? DriveFiles.findOne(user.bannerId) : Promise.resolve(undefined), - UserProfiles.findOne({ userId: user.id }).then(ensure) + UserProfiles.findOne(user.id).then(ensure) ]); const attachment: { diff --git a/src/server/api/endpoints/i/2fa/done.ts b/src/server/api/endpoints/i/2fa/done.ts index e23678dcbb..c134e1b226 100644 --- a/src/server/api/endpoints/i/2fa/done.ts +++ b/src/server/api/endpoints/i/2fa/done.ts @@ -19,7 +19,7 @@ export const meta = { export default define(meta, async (ps, user) => { const token = ps.token.replace(/\s/g, ''); - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); if (profile.twoFactorTempSecret == null) { throw new Error('二段階認証の設定が開始されていません'); diff --git a/src/server/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts index 76d79b3a49..bd46b7c68c 100644 --- a/src/server/api/endpoints/i/2fa/register.ts +++ b/src/server/api/endpoints/i/2fa/register.ts @@ -20,7 +20,7 @@ export const meta = { }; export default define(meta, async (ps, user) => { - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // Compare password const same = await bcrypt.compare(ps.password, profile.password!); diff --git a/src/server/api/endpoints/i/2fa/unregister.ts b/src/server/api/endpoints/i/2fa/unregister.ts index 9c7857e7ef..99483143cc 100644 --- a/src/server/api/endpoints/i/2fa/unregister.ts +++ b/src/server/api/endpoints/i/2fa/unregister.ts @@ -17,7 +17,7 @@ export const meta = { }; export default define(meta, async (ps, user) => { - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // Compare password const same = await bcrypt.compare(ps.password, profile.password!); diff --git a/src/server/api/endpoints/i/change-password.ts b/src/server/api/endpoints/i/change-password.ts index 0dda125b9c..07d2d864d2 100644 --- a/src/server/api/endpoints/i/change-password.ts +++ b/src/server/api/endpoints/i/change-password.ts @@ -21,7 +21,7 @@ export const meta = { }; export default define(meta, async (ps, user) => { - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // Compare password const same = await bcrypt.compare(ps.currentPassword, profile.password!); diff --git a/src/server/api/endpoints/i/delete-account.ts b/src/server/api/endpoints/i/delete-account.ts index 389d0b3212..8ec85c9f41 100644 --- a/src/server/api/endpoints/i/delete-account.ts +++ b/src/server/api/endpoints/i/delete-account.ts @@ -17,7 +17,7 @@ export const meta = { }; export default define(meta, async (ps, user) => { - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // Compare password const same = await bcrypt.compare(ps.password, profile.password!); diff --git a/src/server/api/endpoints/i/regenerate-token.ts b/src/server/api/endpoints/i/regenerate-token.ts index 56c0362c88..e27cf0b18c 100644 --- a/src/server/api/endpoints/i/regenerate-token.ts +++ b/src/server/api/endpoints/i/regenerate-token.ts @@ -19,7 +19,7 @@ export const meta = { }; export default define(meta, async (ps, user) => { - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // Compare password const same = await bcrypt.compare(ps.password, profile.password!); diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts index 15c62a9d08..e02f53a643 100644 --- a/src/server/api/endpoints/i/update-email.ts +++ b/src/server/api/endpoints/i/update-email.ts @@ -33,7 +33,7 @@ export const meta = { }; export default define(meta, async (ps, user) => { - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // Compare password const same = await bcrypt.compare(ps.password, profile.password!); diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 8649b59c00..2951072cf6 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -160,7 +160,7 @@ export default define(meta, async (ps, user, app) => { const updates = {} as Partial; const profileUpdates = {} as Partial; - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); if (ps.name !== undefined) updates.name = ps.name; if (ps.description !== undefined) profileUpdates.description = ps.description; diff --git a/src/server/api/endpoints/notes/polls/vote.ts b/src/server/api/endpoints/notes/polls/vote.ts index d13405597d..0510e70d3e 100644 --- a/src/server/api/endpoints/notes/polls/vote.ts +++ b/src/server/api/endpoints/notes/polls/vote.ts @@ -150,7 +150,7 @@ export default define(meta, async (ps, user) => { } }); - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // この投稿をWatchする if (profile.autoWatch !== false) { diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts index 676546f2aa..02361a139d 100644 --- a/src/server/api/private/signin.ts +++ b/src/server/api/private/signin.ts @@ -46,7 +46,7 @@ export default async (ctx: Koa.BaseContext) => { return; } - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); // Compare password const same = await bcrypt.compare(password, profile.password!); diff --git a/src/server/web/feed.ts b/src/server/web/feed.ts index 6b660fe188..88a61af7cc 100644 --- a/src/server/web/feed.ts +++ b/src/server/web/feed.ts @@ -11,7 +11,7 @@ export default async function(user: User) { name: user.name || user.username }; - const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure); + const profile = await UserProfiles.findOne(user.id).then(ensure); const notes = await Notes.find({ where: { diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index cdb1a60092..9287fa820b 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -372,7 +372,7 @@ export default async function( propPromises = [calcWh(), calcAvg()]; } - const profile = await UserProfiles.findOne({ userId: user.id }); + const profile = await UserProfiles.findOne(user.id); const [folder] = await Promise.all([fetchFolder(), Promise.all(propPromises)]); diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 8c85a5c275..02e33d6789 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -253,7 +253,7 @@ export default async (user: User, data: Option, silent = false) => new Promise { } }); - const profile = await UserProfiles.findOne({ userId: user.id }); + const profile = await UserProfiles.findOne(user.id); // ユーザーがローカルユーザーかつ自動ウォッチ設定がオンならばこの投稿をWatchする if (Users.isLocalUser(user) && profile!.autoWatch) { -- cgit v1.2.3-freya