summaryrefslogtreecommitdiff
path: root/src/api/endpoints
diff options
context:
space:
mode:
Diffstat (limited to 'src/api/endpoints')
-rw-r--r--src/api/endpoints/auth/accept.ts2
-rw-r--r--src/api/endpoints/following/create.ts2
-rw-r--r--src/api/endpoints/following/delete.ts2
-rw-r--r--src/api/endpoints/i.ts2
-rw-r--r--src/api/endpoints/i/2fa/done.ts4
-rw-r--r--src/api/endpoints/i/2fa/register.ts2
-rw-r--r--src/api/endpoints/i/2fa/unregister.ts6
-rw-r--r--src/api/endpoints/i/change_password.ts4
-rw-r--r--src/api/endpoints/i/regenerate_token.ts4
-rw-r--r--src/api/endpoints/i/update.ts14
-rw-r--r--src/api/endpoints/i/update_client_setting.ts4
-rw-r--r--src/api/endpoints/i/update_home.ts6
-rw-r--r--src/api/endpoints/i/update_mobile_home.ts6
-rw-r--r--src/api/endpoints/mute/create.ts2
-rw-r--r--src/api/endpoints/mute/delete.ts2
-rw-r--r--src/api/endpoints/posts/categorize.ts2
-rw-r--r--src/api/endpoints/posts/create.ts2
-rw-r--r--src/api/endpoints/posts/polls/vote.ts2
-rw-r--r--src/api/endpoints/posts/reactions/create.ts2
-rw-r--r--src/api/endpoints/users/recommendation.ts2
20 files changed, 36 insertions, 36 deletions
diff --git a/src/api/endpoints/auth/accept.ts b/src/api/endpoints/auth/accept.ts
index 4ee20a6d25..8955738ebf 100644
--- a/src/api/endpoints/auth/accept.ts
+++ b/src/api/endpoints/auth/accept.ts
@@ -45,7 +45,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Fetch token
const session = await AuthSess
- .findOne({ token: token });
+ .findOne({ 'account.token': token });
if (session === null) {
return rej('session not found');
diff --git a/src/api/endpoints/following/create.ts b/src/api/endpoints/following/create.ts
index 8e1aa34713..767b837b35 100644
--- a/src/api/endpoints/following/create.ts
+++ b/src/api/endpoints/following/create.ts
@@ -32,7 +32,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
- profile: false
+ 'account.profile': false
}
});
diff --git a/src/api/endpoints/following/delete.ts b/src/api/endpoints/following/delete.ts
index b68cec09dd..64b9a8cecb 100644
--- a/src/api/endpoints/following/delete.ts
+++ b/src/api/endpoints/following/delete.ts
@@ -31,7 +31,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
- profile: false
+ 'account.profile': false
}
});
diff --git a/src/api/endpoints/i.ts b/src/api/endpoints/i.ts
index 7efdbcd7c9..32b0382faf 100644
--- a/src/api/endpoints/i.ts
+++ b/src/api/endpoints/i.ts
@@ -22,7 +22,7 @@ module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) =>
// Update lastUsedAt
User.update({ _id: user._id }, {
$set: {
- last_used_at: new Date()
+ 'account.last_used_at': new Date()
}
});
});
diff --git a/src/api/endpoints/i/2fa/done.ts b/src/api/endpoints/i/2fa/done.ts
index 0b36033bb6..0f1db73829 100644
--- a/src/api/endpoints/i/2fa/done.ts
+++ b/src/api/endpoints/i/2fa/done.ts
@@ -28,8 +28,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
- two_factor_secret: user.two_factor_temp_secret,
- two_factor_enabled: true
+ 'account.two_factor_secret': user.two_factor_temp_secret,
+ 'account.two_factor_enabled': true
}
});
diff --git a/src/api/endpoints/i/2fa/register.ts b/src/api/endpoints/i/2fa/register.ts
index c2b5037a29..24abfcdfc5 100644
--- a/src/api/endpoints/i/2fa/register.ts
+++ b/src/api/endpoints/i/2fa/register.ts
@@ -14,7 +14,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (passwordErr) return rej('invalid password param');
// Compare password
- const same = await bcrypt.compare(password, user.password);
+ const same = await bcrypt.compare(password, user.account.password);
if (!same) {
return rej('incorrect password');
diff --git a/src/api/endpoints/i/2fa/unregister.ts b/src/api/endpoints/i/2fa/unregister.ts
index 6bee6a26f2..c43f9ccc44 100644
--- a/src/api/endpoints/i/2fa/unregister.ts
+++ b/src/api/endpoints/i/2fa/unregister.ts
@@ -11,7 +11,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (passwordErr) return rej('invalid password param');
// Compare password
- const same = await bcrypt.compare(password, user.password);
+ const same = await bcrypt.compare(password, user.account.password);
if (!same) {
return rej('incorrect password');
@@ -19,8 +19,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
- two_factor_secret: null,
- two_factor_enabled: false
+ 'account.two_factor_secret': null,
+ 'account.two_factor_enabled': false
}
});
diff --git a/src/api/endpoints/i/change_password.ts b/src/api/endpoints/i/change_password.ts
index 16f1a2e4ec..88fb36b1fb 100644
--- a/src/api/endpoints/i/change_password.ts
+++ b/src/api/endpoints/i/change_password.ts
@@ -22,7 +22,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (newPasswordErr) return rej('invalid new_password param');
// Compare password
- const same = await bcrypt.compare(currentPassword, user.password);
+ const same = await bcrypt.compare(currentPassword, user.account.password);
if (!same) {
return rej('incorrect password');
@@ -34,7 +34,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
- password: hash
+ 'account.password': hash
}
});
diff --git a/src/api/endpoints/i/regenerate_token.ts b/src/api/endpoints/i/regenerate_token.ts
index 653468330f..9ac7b55071 100644
--- a/src/api/endpoints/i/regenerate_token.ts
+++ b/src/api/endpoints/i/regenerate_token.ts
@@ -20,7 +20,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (passwordErr) return rej('invalid password param');
// Compare password
- const same = await bcrypt.compare(password, user.password);
+ const same = await bcrypt.compare(password, user.account.password);
if (!same) {
return rej('incorrect password');
@@ -31,7 +31,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
- token: secret
+ 'account.token': secret
}
});
diff --git a/src/api/endpoints/i/update.ts b/src/api/endpoints/i/update.ts
index 76bad2d156..db8a3f25bd 100644
--- a/src/api/endpoints/i/update.ts
+++ b/src/api/endpoints/i/update.ts
@@ -29,12 +29,12 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
// Get 'location' parameter
const [location, locationErr] = $(params.location).optional.nullable.string().pipe(isValidLocation).$;
if (locationErr) return rej('invalid location param');
- if (location !== undefined) user.profile.location = location;
+ if (location !== undefined) user.account.profile.location = location;
// Get 'birthday' parameter
const [birthday, birthdayErr] = $(params.birthday).optional.nullable.string().pipe(isValidBirthday).$;
if (birthdayErr) return rej('invalid birthday param');
- if (birthday !== undefined) user.profile.birthday = birthday;
+ if (birthday !== undefined) user.account.profile.birthday = birthday;
// Get 'avatar_id' parameter
const [avatarId, avatarIdErr] = $(params.avatar_id).optional.id().$;
@@ -49,12 +49,12 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
// Get 'is_bot' parameter
const [isBot, isBotErr] = $(params.is_bot).optional.boolean().$;
if (isBotErr) return rej('invalid is_bot param');
- if (isBot != null) user.is_bot = isBot;
+ if (isBot != null) user.account.is_bot = isBot;
// Get 'auto_watch' parameter
const [autoWatch, autoWatchErr] = $(params.auto_watch).optional.boolean().$;
if (autoWatchErr) return rej('invalid auto_watch param');
- if (autoWatch != null) user.settings.auto_watch = autoWatch;
+ if (autoWatch != null) user.account.settings.auto_watch = autoWatch;
await User.update(user._id, {
$set: {
@@ -62,9 +62,9 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
description: user.description,
avatar_id: user.avatar_id,
banner_id: user.banner_id,
- profile: user.profile,
- is_bot: user.is_bot,
- settings: user.settings
+ 'account.profile': user.account.profile,
+ 'account.is_bot': user.account.is_bot,
+ 'account.settings': user.account.settings
}
});
diff --git a/src/api/endpoints/i/update_client_setting.ts b/src/api/endpoints/i/update_client_setting.ts
index b817ff354c..c772ed5dc3 100644
--- a/src/api/endpoints/i/update_client_setting.ts
+++ b/src/api/endpoints/i/update_client_setting.ts
@@ -22,14 +22,14 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (valueErr) return rej('invalid value param');
const x = {};
- x[`client_settings.${name}`] = value;
+ x[`account.client_settings.${name}`] = value;
await User.update(user._id, {
$set: x
});
// Serialize
- user.client_settings[name] = value;
+ user.account.client_settings[name] = value;
const iObj = await pack(user, user, {
detail: true,
includeSecrets: true
diff --git a/src/api/endpoints/i/update_home.ts b/src/api/endpoints/i/update_home.ts
index 394686cbd1..9ce44e25ee 100644
--- a/src/api/endpoints/i/update_home.ts
+++ b/src/api/endpoints/i/update_home.ts
@@ -26,7 +26,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (home) {
await User.update(user._id, {
$set: {
- 'client_settings.home': home
+ 'account.client_settings.home': home
}
});
@@ -38,7 +38,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
} else {
if (id == null && data == null) return rej('you need to set id and data params if home param unset');
- const _home = user.client_settings.home;
+ const _home = user.account.client_settings.home;
const widget = _home.find(w => w.id == id);
if (widget == null) return rej('widget not found');
@@ -47,7 +47,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
- 'client_settings.home': _home
+ 'account.client_settings.home': _home
}
});
diff --git a/src/api/endpoints/i/update_mobile_home.ts b/src/api/endpoints/i/update_mobile_home.ts
index 70181431a2..1daddf42b9 100644
--- a/src/api/endpoints/i/update_mobile_home.ts
+++ b/src/api/endpoints/i/update_mobile_home.ts
@@ -25,7 +25,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (home) {
await User.update(user._id, {
$set: {
- 'client_settings.mobile_home': home
+ 'account.client_settings.mobile_home': home
}
});
@@ -37,7 +37,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
} else {
if (id == null && data == null) return rej('you need to set id and data params if home param unset');
- const _home = user.client_settings.mobile_home || [];
+ const _home = user.account.client_settings.mobile_home || [];
const widget = _home.find(w => w.id == id);
if (widget == null) return rej('widget not found');
@@ -46,7 +46,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
- 'client_settings.mobile_home': _home
+ 'account.client_settings.mobile_home': _home
}
});
diff --git a/src/api/endpoints/mute/create.ts b/src/api/endpoints/mute/create.ts
index f44854ab52..f99b40d32e 100644
--- a/src/api/endpoints/mute/create.ts
+++ b/src/api/endpoints/mute/create.ts
@@ -30,7 +30,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
- profile: false
+ 'account.profile': false
}
});
diff --git a/src/api/endpoints/mute/delete.ts b/src/api/endpoints/mute/delete.ts
index d6bff3353a..36e2fd101a 100644
--- a/src/api/endpoints/mute/delete.ts
+++ b/src/api/endpoints/mute/delete.ts
@@ -30,7 +30,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
- profile: false
+ 'account.profile': false
}
});
diff --git a/src/api/endpoints/posts/categorize.ts b/src/api/endpoints/posts/categorize.ts
index 3530ba6bc4..0c85c2b4e0 100644
--- a/src/api/endpoints/posts/categorize.ts
+++ b/src/api/endpoints/posts/categorize.ts
@@ -12,7 +12,7 @@ import Post from '../../models/post';
* @return {Promise<any>}
*/
module.exports = (params, user) => new Promise(async (res, rej) => {
- if (!user.is_pro) {
+ if (!user.account.is_pro) {
return rej('This endpoint is available only from a Pro account');
}
diff --git a/src/api/endpoints/posts/create.ts b/src/api/endpoints/posts/create.ts
index 1c3ab53457..f46a84e1f1 100644
--- a/src/api/endpoints/posts/create.ts
+++ b/src/api/endpoints/posts/create.ts
@@ -390,7 +390,7 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
});
// この投稿をWatchする
- if (user.settings.auto_watch !== false) {
+ if (user.account.settings.auto_watch !== false) {
watch(user._id, reply);
}
diff --git a/src/api/endpoints/posts/polls/vote.ts b/src/api/endpoints/posts/polls/vote.ts
index 8222fe5326..16ce76a6fa 100644
--- a/src/api/endpoints/posts/polls/vote.ts
+++ b/src/api/endpoints/posts/polls/vote.ts
@@ -100,7 +100,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
});
// この投稿をWatchする
- if (user.settings.auto_watch !== false) {
+ if (user.account.settings.auto_watch !== false) {
watch(user._id, post);
}
});
diff --git a/src/api/endpoints/posts/reactions/create.ts b/src/api/endpoints/posts/reactions/create.ts
index 93d9756d02..f77afed40c 100644
--- a/src/api/endpoints/posts/reactions/create.ts
+++ b/src/api/endpoints/posts/reactions/create.ts
@@ -116,7 +116,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
});
// この投稿をWatchする
- if (user.settings.auto_watch !== false) {
+ if (user.account.settings.auto_watch !== false) {
watch(user._id, post);
}
});
diff --git a/src/api/endpoints/users/recommendation.ts b/src/api/endpoints/users/recommendation.ts
index 736233b340..f1f5bcd0ac 100644
--- a/src/api/endpoints/users/recommendation.ts
+++ b/src/api/endpoints/users/recommendation.ts
@@ -30,7 +30,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
_id: {
$nin: followingIds
},
- last_used_at: {
+ 'account.last_used_at': {
$gte: new Date(Date.now() - ms('7days'))
}
}, {
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 16:52:31 +0000