diff --git a/services/gunDB/contact-api/actions.js b/services/gunDB/contact-api/actions.js index edebb53f..316360ee 100644 --- a/services/gunDB/contact-api/actions.js +++ b/services/gunDB/contact-api/actions.js @@ -760,42 +760,14 @@ const saveChannelsBackup = async (backups, user, SEA) => { /** * @returns {Promise} */ -const setLastSeenApp = () => - /** @type {Promise} */ (new Promise((res, rej) => { - require('../Mediator') - .getUser() - .get(Key.LAST_SEEN_APP) - .put(Date.now(), ack => { - if ( - ack.err && - typeof ack.err !== 'number' && - typeof ack.err !== 'object' - ) { - rej(new Error(ack.err)) - } else { - res() - } - }) - })).then( - () => - new Promise((res, rej) => { - require('../Mediator') - .getUser() - .get(Key.PROFILE) - .get(Key.LAST_SEEN_APP) - .put(Date.now(), ack => { - if ( - ack.err && - typeof ack.err !== 'number' && - typeof ack.err !== 'object' - ) { - rej(new Error(ack.err)) - } else { - res() - } - }) - }) - ) +const setLastSeenApp = () => { + const user = require('../Mediator').getUser() + + return user + .get(Key.PROFILE) + .get(Key.LAST_SEEN_APP) + .pPut(Date.now()) +} /** * @param {string[]} tags diff --git a/services/gunDB/contact-api/jobs/lastSeenNode.js b/services/gunDB/contact-api/jobs/lastSeenNode.js index 1842ef30..c92ef7e6 100644 --- a/services/gunDB/contact-api/jobs/lastSeenNode.js +++ b/services/gunDB/contact-api/jobs/lastSeenNode.js @@ -27,32 +27,12 @@ const Key = require('../key') */ const lastSeenNode = user => { if (!user.is) { - logger.warn('onOrders() -> tried to sub without authing') + logger.warn('lastSeenNode() -> tried to sub without authing') throw new Error(ErrorCode.NOT_AUTH) } - let gotLatestUserAck = true + let gotLatestProfileAck = true - setInterval(() => { - if (!user.is) { - return - } - if (!gotLatestUserAck) { - logger.error(`lastSeenNode user job: didnt get latest ack`) - return - } - gotLatestUserAck = false - user.get(Key.LAST_SEEN_NODE).put(Date.now(), ack => { - if ( - ack.err && - typeof ack.err !== 'number' && - typeof ack.err !== 'object' - ) { - logger.error(`Error inside lastSeenNode user job: ${ack.err}`) - } - gotLatestUserAck = true - }) - }, LAST_SEEN_NODE_INTERVAL) setInterval(() => { if (!user.is) { return