summaryrefslogtreecommitdiff
path: root/src/api/models
diff options
context:
space:
mode:
Diffstat (limited to 'src/api/models')
-rw-r--r--src/api/models/channel-watching.ts2
-rw-r--r--src/api/models/channel.ts2
-rw-r--r--src/api/models/messaging-message.ts8
-rw-r--r--src/api/models/notification.ts22
-rw-r--r--src/api/models/othello-game.ts8
-rw-r--r--src/api/models/othello-matching.ts4
-rw-r--r--src/api/models/post-reaction.ts2
-rw-r--r--src/api/models/post.ts36
-rw-r--r--src/api/models/user.ts117
9 files changed, 101 insertions, 100 deletions
diff --git a/src/api/models/channel-watching.ts b/src/api/models/channel-watching.ts
index 23886d0c76..ec0c8135dc 100644
--- a/src/api/models/channel-watching.ts
+++ b/src/api/models/channel-watching.ts
@@ -9,6 +9,6 @@ export interface IChannelWatching {
_id: mongo.ObjectID;
createdAt: Date;
deletedAt: Date;
- channel_id: mongo.ObjectID;
+ channelId: mongo.ObjectID;
userId: mongo.ObjectID;
}
diff --git a/src/api/models/channel.ts b/src/api/models/channel.ts
index a753a4ebad..aab21db070 100644
--- a/src/api/models/channel.ts
+++ b/src/api/models/channel.ts
@@ -63,7 +63,7 @@ export const pack = (
//#region Watchしているかどうか
const watch = await Watching.findOne({
userId: meId,
- channel_id: _channel.id,
+ channelId: _channel.id,
deletedAt: { $exists: false }
});
diff --git a/src/api/models/messaging-message.ts b/src/api/models/messaging-message.ts
index 026b23cf36..9a2f813879 100644
--- a/src/api/models/messaging-message.ts
+++ b/src/api/models/messaging-message.ts
@@ -66,16 +66,16 @@ export const pack = (
}
// Populate user
- _message.user = await packUser(_message.user_id, me);
+ _message.user = await packUser(_message.userId, me);
- if (_message.file_id) {
+ if (_message.fileId) {
// Populate file
- _message.file = await packFile(_message.file_id);
+ _message.file = await packFile(_message.fileId);
}
if (opts.populateRecipient) {
// Populate recipient
- _message.recipient = await packUser(_message.recipient_id, me);
+ _message.recipient = await packUser(_message.recipientId, me);
}
resolve(_message);
diff --git a/src/api/models/notification.ts b/src/api/models/notification.ts
index fa7049d312..910f539479 100644
--- a/src/api/models/notification.ts
+++ b/src/api/models/notification.ts
@@ -9,7 +9,7 @@ export default Notification;
export interface INotification {
_id: mongo.ObjectID;
- created_at: Date;
+ createdAt: Date;
/**
* 通知の受信者
@@ -19,7 +19,7 @@ export interface INotification {
/**
* 通知の受信者
*/
- notifiee_id: mongo.ObjectID;
+ notifieeId: mongo.ObjectID;
/**
* イニシエータ(initiator)、Origin。通知を行う原因となったユーザー
@@ -29,7 +29,7 @@ export interface INotification {
/**
* イニシエータ(initiator)、Origin。通知を行う原因となったユーザー
*/
- notifier_id: mongo.ObjectID;
+ notifierId: mongo.ObjectID;
/**
* 通知の種類。
@@ -46,7 +46,7 @@ export interface INotification {
/**
* 通知が読まれたかどうか
*/
- is_read: Boolean;
+ isRead: Boolean;
}
/**
@@ -75,15 +75,15 @@ export const pack = (notification: any) => new Promise<any>(async (resolve, reje
_notification.id = _notification._id;
delete _notification._id;
- // Rename notifier_id to user_id
- _notification.user_id = _notification.notifier_id;
- delete _notification.notifier_id;
+ // Rename notifierId to userId
+ _notification.userId = _notification.notifierId;
+ delete _notification.notifierId;
- const me = _notification.notifiee_id;
- delete _notification.notifiee_id;
+ const me = _notification.notifieeId;
+ delete _notification.notifieeId;
// Populate notifier
- _notification.user = await packUser(_notification.user_id, me);
+ _notification.user = await packUser(_notification.userId, me);
switch (_notification.type) {
case 'follow':
@@ -96,7 +96,7 @@ export const pack = (notification: any) => new Promise<any>(async (resolve, reje
case 'reaction':
case 'poll_vote':
// Populate post
- _notification.post = await packPost(_notification.post_id, me);
+ _notification.post = await packPost(_notification.postId, me);
break;
default:
console.error(`Unknown type: ${_notification.type}`);
diff --git a/src/api/models/othello-game.ts b/src/api/models/othello-game.ts
index b9e57632d4..70e0c696c8 100644
--- a/src/api/models/othello-game.ts
+++ b/src/api/models/othello-game.ts
@@ -97,10 +97,10 @@ export const pack = (
}
// Populate user
- _game.user1 = await packUser(_game.user1_id, meId);
- _game.user2 = await packUser(_game.user2_id, meId);
- if (_game.winner_id) {
- _game.winner = await packUser(_game.winner_id, meId);
+ _game.user1 = await packUser(_game.user1Id, meId);
+ _game.user2 = await packUser(_game.user2Id, meId);
+ if (_game.winnerId) {
+ _game.winner = await packUser(_game.winnerId, meId);
} else {
_game.winner = null;
}
diff --git a/src/api/models/othello-matching.ts b/src/api/models/othello-matching.ts
index 9c84d7fb9f..8beedf72cf 100644
--- a/src/api/models/othello-matching.ts
+++ b/src/api/models/othello-matching.ts
@@ -37,8 +37,8 @@ export const pack = (
delete _matching._id;
// Populate user
- _matching.parent = await packUser(_matching.parent_id, meId);
- _matching.child = await packUser(_matching.child_id, meId);
+ _matching.parent = await packUser(_matching.parentId, meId);
+ _matching.child = await packUser(_matching.childId, meId);
resolve(_matching);
});
diff --git a/src/api/models/post-reaction.ts b/src/api/models/post-reaction.ts
index f581f01535..82613eb262 100644
--- a/src/api/models/post-reaction.ts
+++ b/src/api/models/post-reaction.ts
@@ -47,7 +47,7 @@ export const pack = (
delete _reaction._id;
// Populate user
- _reaction.user = await packUser(_reaction.user_id, me);
+ _reaction.user = await packUser(_reaction.userId, me);
resolve(_reaction);
});
diff --git a/src/api/models/post.ts b/src/api/models/post.ts
index fc44256516..4ab840b5ed 100644
--- a/src/api/models/post.ts
+++ b/src/api/models/post.ts
@@ -100,21 +100,21 @@ export const pack = async (
}
// Populate user
- _post.user = packUser(_post.user_id, meId);
+ _post.user = packUser(_post.userId, meId);
// Populate app
- if (_post.app_id) {
- _post.app = packApp(_post.app_id);
+ if (_post.appId) {
+ _post.app = packApp(_post.appId);
}
// Populate channel
- if (_post.channel_id) {
- _post.channel = packChannel(_post.channel_id);
+ if (_post.channelId) {
+ _post.channel = packChannel(_post.channelId);
}
// Populate media
- if (_post.media_ids) {
- _post.media = Promise.all(_post.media_ids.map(fileId =>
+ if (_post.mediaIds) {
+ _post.media = Promise.all(_post.mediaIds.map(fileId =>
packFile(fileId)
));
}
@@ -124,7 +124,7 @@ export const pack = async (
// Get previous post info
_post.prev = (async () => {
const prev = await Post.findOne({
- user_id: _post.user_id,
+ userId: _post.userId,
_id: {
$lt: id
}
@@ -142,7 +142,7 @@ export const pack = async (
// Get next post info
_post.next = (async () => {
const next = await Post.findOne({
- user_id: _post.user_id,
+ userId: _post.userId,
_id: {
$gt: id
}
@@ -157,16 +157,16 @@ export const pack = async (
return next ? next._id : null;
})();
- if (_post.reply_id) {
+ if (_post.replyId) {
// Populate reply to post
- _post.reply = pack(_post.reply_id, meId, {
+ _post.reply = pack(_post.replyId, meId, {
detail: false
});
}
- if (_post.repost_id) {
+ if (_post.repostId) {
// Populate repost
- _post.repost = pack(_post.repost_id, meId, {
+ _post.repost = pack(_post.repostId, meId, {
detail: _post.text == null
});
}
@@ -176,8 +176,8 @@ export const pack = async (
_post.poll = (async (poll) => {
const vote = await Vote
.findOne({
- user_id: meId,
- post_id: id
+ userId: meId,
+ postId: id
});
if (vote != null) {
@@ -196,9 +196,9 @@ export const pack = async (
_post.my_reaction = (async () => {
const reaction = await Reaction
.findOne({
- user_id: meId,
- post_id: id,
- deleted_at: { $exists: false }
+ userId: meId,
+ postId: id,
+ deletedAt: { $exists: false }
});
if (reaction) {
diff --git a/src/api/models/user.ts b/src/api/models/user.ts
index 9aa7c4efae..8c68b06dfa 100644
--- a/src/api/models/user.ts
+++ b/src/api/models/user.ts
@@ -47,24 +47,25 @@ export type ILocalAccount = {
token: string;
twitter: {
accessToken: string;
- access_token_secret: string;
- user_id: string;
- screen_name: string;
+ accessTokenSecret: string;
+ userId: string;
+ screenName: string;
};
line: {
- user_id: string;
+ userId: string;
};
profile: {
location: string;
birthday: string; // 'YYYY-MM-DD'
tags: string[];
};
- last_used_at: Date;
- is_bot: boolean;
- is_pro: boolean;
- two_factor_secret: string;
- two_factor_enabled: boolean;
- client_settings: any;
+ lastUsedAt: Date;
+ isBot: boolean;
+ isPro: boolean;
+ twoFactorSecret: string;
+ twoFactorEnabled: boolean;
+ twoFactorTempSecret: string;
+ clientSettings: any;
settings: any;
};
@@ -74,33 +75,33 @@ export type IRemoteAccount = {
export type IUser = {
_id: mongo.ObjectID;
- created_at: Date;
- deleted_at: Date;
- followers_count: number;
- following_count: number;
+ createdAt: Date;
+ deletedAt: Date;
+ followersCount: number;
+ followingCount: number;
name: string;
- posts_count: number;
- drive_capacity: number;
+ postsCount: number;
+ driveCapacity: number;
username: string;
- username_lower: string;
- avatar_id: mongo.ObjectID;
- banner_id: mongo.ObjectID;
+ usernameLower: string;
+ avatarId: mongo.ObjectID;
+ bannerId: mongo.ObjectID;
data: any;
description: string;
latest_post: IPost;
- pinned_post_id: mongo.ObjectID;
- is_suspended: boolean;
+ pinnedPostId: mongo.ObjectID;
+ isSuspended: boolean;
keywords: string[];
host: string;
- host_lower: string;
+ hostLower: string;
account: ILocalAccount | IRemoteAccount;
};
export function init(user): IUser {
user._id = new mongo.ObjectID(user._id);
- user.avatar_id = new mongo.ObjectID(user.avatar_id);
- user.banner_id = new mongo.ObjectID(user.banner_id);
- user.pinned_post_id = new mongo.ObjectID(user.pinned_post_id);
+ user.avatarId = new mongo.ObjectID(user.avatarId);
+ user.bannerId = new mongo.ObjectID(user.bannerId);
+ user.pinnedPostId = new mongo.ObjectID(user.pinnedPostId);
return user;
}
@@ -131,7 +132,7 @@ export const pack = (
const fields = opts.detail ? {
} : {
'account.settings': false,
- 'account.client_settings': false,
+ 'account.clientSettings': false,
'account.profile': false,
'account.keywords': false,
'account.domains': false
@@ -173,12 +174,12 @@ export const pack = (
delete _user.account.keypair;
delete _user.account.password;
delete _user.account.token;
- delete _user.account.two_factor_temp_secret;
- delete _user.account.two_factor_secret;
- delete _user.username_lower;
+ delete _user.account.twoFactorTempSecret;
+ delete _user.account.twoFactorSecret;
+ delete _user.usernameLower;
if (_user.account.twitter) {
- delete _user.account.twitter.access_token;
- delete _user.account.twitter.access_token_secret;
+ delete _user.account.twitter.accessToken;
+ delete _user.account.twitter.accessTokenSecret;
}
delete _user.account.line;
@@ -186,36 +187,36 @@ export const pack = (
if (!opts.includeSecrets) {
delete _user.account.email;
delete _user.account.settings;
- delete _user.account.client_settings;
+ delete _user.account.clientSettings;
}
if (!opts.detail) {
- delete _user.account.two_factor_enabled;
+ delete _user.account.twoFactorEnabled;
}
}
- _user.avatar_url = _user.avatar_id != null
- ? `${config.drive_url}/${_user.avatar_id}`
+ _user.avatar_url = _user.avatarId != null
+ ? `${config.drive_url}/${_user.avatarId}`
: `${config.drive_url}/default-avatar.jpg`;
- _user.banner_url = _user.banner_id != null
- ? `${config.drive_url}/${_user.banner_id}`
+ _user.banner_url = _user.bannerId != null
+ ? `${config.drive_url}/${_user.bannerId}`
: null;
if (!meId || !meId.equals(_user.id) || !opts.detail) {
- delete _user.avatar_id;
- delete _user.banner_id;
+ delete _user.avatarId;
+ delete _user.bannerId;
- delete _user.drive_capacity;
+ delete _user.driveCapacity;
}
if (meId && !meId.equals(_user.id)) {
// Whether the user is following
_user.is_following = (async () => {
const follow = await Following.findOne({
- follower_id: meId,
- followee_id: _user.id,
- deleted_at: { $exists: false }
+ followerId: meId,
+ followeeId: _user.id,
+ deletedAt: { $exists: false }
});
return follow !== null;
})();
@@ -223,9 +224,9 @@ export const pack = (
// Whether the user is followed
_user.is_followed = (async () => {
const follow2 = await Following.findOne({
- follower_id: _user.id,
- followee_id: meId,
- deleted_at: { $exists: false }
+ followerId: _user.id,
+ followeeId: meId,
+ deletedAt: { $exists: false }
});
return follow2 !== null;
})();
@@ -233,18 +234,18 @@ export const pack = (
// Whether the user is muted
_user.is_muted = (async () => {
const mute = await Mute.findOne({
- muter_id: meId,
- mutee_id: _user.id,
- deleted_at: { $exists: false }
+ muterId: meId,
+ muteeId: _user.id,
+ deletedAt: { $exists: false }
});
return mute !== null;
})();
}
if (opts.detail) {
- if (_user.pinned_post_id) {
+ if (_user.pinnedPostId) {
// Populate pinned post
- _user.pinned_post = packPost(_user.pinned_post_id, meId, {
+ _user.pinnedPost = packPost(_user.pinnedPostId, meId, {
detail: true
});
}
@@ -254,16 +255,16 @@ export const pack = (
// Get following you know count
_user.following_you_know_count = Following.count({
- followee_id: { $in: myFollowingIds },
- follower_id: _user.id,
- deleted_at: { $exists: false }
+ followeeId: { $in: myFollowingIds },
+ followerId: _user.id,
+ deletedAt: { $exists: false }
});
// Get followers you know count
_user.followers_you_know_count = Following.count({
- followee_id: _user.id,
- follower_id: { $in: myFollowingIds },
- deleted_at: { $exists: false }
+ followeeId: _user.id,
+ followerId: { $in: myFollowingIds },
+ deletedAt: { $exists: false }
});
}
}
@@ -322,7 +323,7 @@ export const packForAp = (
"name": _user.name,
"summary": _user.description,
"icon": [
- `${config.drive_url}/${_user.avatar_id}`
+ `${config.drive_url}/${_user.avatarId}`
]
});
});
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 16:45:42 +0000