🐛 Fixed deadline bugs

mukeran · Jul 4, 2020 · 1eb97ce · 1eb97ce
1 parent e2e1f4b
commit 1eb97ce
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/response/offlineTransfer.js b/src/response/offlineTransfer.js
@@ -49,6 +49,13 @@ function queryOfflineTransfers (packet, client) {
           if (offlineTransfers === null) offlineTransfers = []
           const record = []
           await Promise.all(offlineTransfers.map(offlineTransfer => {
+            if (offlineTransfer.deadline.getTime() < new Date().getTime()) {
+              OfflineTransferModel.deleteOne({ _id: offlineTransfer._id })
+                .then(offlineTransferRequest => {
+                  console.log('Offline transfer request: ' + offlineTransferRequest._id + ' is out of date')
+                })
+              return
+            }
             return UserModel.findOne({ _id: offlineTransfer.toUserId })
               .then(user => {
                 record.push({
@@ -89,6 +96,14 @@ function answerOfflineTransfer (packet, client) {
             sendResponse(client, { status: status.UNKNOWN_ERROR }, packet)
             return
           }
+          if (transferRequest.deadline.getTime() < new Date().getTime()) {
+            OfflineTransferModel.deleteOne({ _id: transferRequest._id })
+              .then(offlineTransferRequest => {
+                console.log('Offline transfer request: ' + offlineTransferRequest._id + ' is out of date')
+                sendResponse(client, { status: status.NOT_FOUND }, packet)
+              })
+            return
+          }
           if (transferRequest.toUserId !== session.userId) {
             sendResponse(client, { status: status.UNKNOWN_ERROR }, packet)
             return

diff --git a/src/status.js b/src/status.js
@@ -5,6 +5,7 @@ module.exports = {
   OK: 0,
   UNKNOWN_ERROR: -1,
   ACCESS_DENIED: -2,
+  NOT_FOUND: -3,
   session: {
     NO_SUCH_SESSION: 1
   },