From fe51bcfe1a81413ee333c5723a65915fc290e282 Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Thu, 22 Jul 2021 17:02:15 -0400 Subject: [PATCH] Remove unused follows-related code/routes --- services/gunDB/contact-api/getters/follows.js | 66 ------------------- services/gunDB/contact-api/getters/index.js | 1 - src/routes.js | 17 ----- 3 files changed, 84 deletions(-) delete mode 100644 services/gunDB/contact-api/getters/follows.js diff --git a/services/gunDB/contact-api/getters/follows.js b/services/gunDB/contact-api/getters/follows.js deleted file mode 100644 index e7972276..00000000 --- a/services/gunDB/contact-api/getters/follows.js +++ /dev/null @@ -1,66 +0,0 @@ -/** - * @format - */ -const Common = require('shock-common') -const Logger = require('../../../../config/log') -const size = require('lodash/size') - -const Utils = require('../utils') -const Key = require('../key') - -/** - * @typedef {Common.Schema.Follow} Follow - */ - -/** - * @throws {TypeError} - * @returns {Promise>} - */ -exports.currentFollows = async () => { - /** - * @type {Record} - */ - const raw = await Utils.tryAndWait( - (_, user) => - new Promise(res => - // @ts-expect-error - user.get(Key.FOLLOWS).load(res) - ), - v => { - if (typeof v !== 'object' || v === null) { - return true - } - - // load sometimes returns an empty set on the first try - if (size(v) === 0) { - return true - } - - // sometimes it returns empty sub objects - return Object.values(v) - .filter(Common.Schema.isObj) - .some(obj => size(obj) === 0) - } - ) - - if (typeof raw !== 'object' || raw === null) { - Logger.error( - `Expected user.follows to be an object but instead got: ${JSON.stringify( - raw - )}` - ) - throw new TypeError('Could not get follows, not an object') - } - - const clean = { - ...raw - } - - for (const [key, followOrNull] of Object.entries(clean)) { - if (!Common.Schema.isFollow(followOrNull)) { - delete clean[key] - } - } - - return clean -} diff --git a/services/gunDB/contact-api/getters/index.js b/services/gunDB/contact-api/getters/index.js index 3f0cdba6..fb3223fe 100644 --- a/services/gunDB/contact-api/getters/index.js +++ b/services/gunDB/contact-api/getters/index.js @@ -119,6 +119,5 @@ const getUserInfo = async publicKey => { module.exports.getMyUser = getMyUser module.exports.getUserInfo = getUserInfo -module.exports.Follows = require('./follows') module.exports.getAnUser = User.getAnUser diff --git a/src/routes.js b/src/routes.js index ac04a05a..0446ae40 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2327,21 +2327,6 @@ module.exports = async ( * @prop {(string|undefined)=} publicKey */ - /** - * @type {RequestHandler} - */ - const apiGunFollowsGet = async (_, res) => { - try { - const currFollows = await GunGetters.Follows.currentFollows() - - return res.status(200).json(currFollows) - } catch (err) { - return res.status(500).json({ - errorMessage: err.message || 'Unknown ERR at GET /api/follows' - }) - } - } - /** * @type {RequestHandler} */ @@ -2398,8 +2383,6 @@ module.exports = async ( }) } }) - ap.get('/api/gun/follows/', apiGunFollowsGet) - ap.get('/api/gun/follows/:publicKey', apiGunFollowsGet) ap.put(`/api/gun/follows/:publicKey`, apiGunFollowsPut) ap.delete(`/api/gun/follows/:publicKey`, apiGunFollowsDelete)