summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/channels/create.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/api/endpoints/channels/create.ts
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/api/endpoints/channels/create.ts')
-rw-r--r--src/server/api/endpoints/channels/create.ts12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/api/endpoints/channels/create.ts b/src/server/api/endpoints/channels/create.ts
index 695b4515b3..1dc453c4a5 100644
--- a/src/server/api/endpoints/channels/create.ts
+++ b/src/server/api/endpoints/channels/create.ts
@@ -20,11 +20,11 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
// Create a channel
const channel = await Channel.insert({
- created_at: new Date(),
- user_id: user._id,
+ createdAt: new Date(),
+ userId: user._id,
title: title,
index: 0,
- watching_count: 1
+ watchingCount: 1
});
// Response
@@ -32,8 +32,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
// Create Watching
await Watching.insert({
- created_at: new Date(),
- user_id: user._id,
- channel_id: channel._id
+ createdAt: new Date(),
+ userId: user._id,
+ channelId: channel._id
});
});