sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
syuilo
2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/api/endpoints/sw/register.ts
View File

@ -28,11 +28,11 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
// if already subscribed
const exist = await Subscription.findOne({
user_id: user._id,
userId: user._id,
endpoint: endpoint,
auth: auth,
publickey: publickey,
deleted_at: { $exists: false }
deletedAt: { $exists: false }
});
if (exist !== null) {
@ -40,7 +40,7 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
}
await Subscription.insert({
user_id: user._id,
userId: user._id,
endpoint: endpoint,
auth: auth,
publickey: publickey