summaryrefslogtreecommitdiff
path: root/src/server/api/common/read-notification.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/common/read-notification.ts
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/api/common/read-notification.ts')
-rw-r--r--src/server/api/common/read-notification.ts8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/api/common/read-notification.ts b/src/server/api/common/read-notification.ts
index 3009cc5d08..5bbf136323 100644
--- a/src/server/api/common/read-notification.ts
+++ b/src/server/api/common/read-notification.ts
@@ -29,10 +29,10 @@ export default (
// Update documents
await Notification.update({
_id: { $in: ids },
- is_read: false
+ isRead: false
}, {
$set: {
- is_read: true
+ isRead: true
}
}, {
multi: true
@@ -41,8 +41,8 @@ export default (
// Calc count of my unread notifications
const count = await Notification
.count({
- notifiee_id: userId,
- is_read: false
+ notifieeId: userId,
+ isRead: false
});
if (count == 0) {