Use latest endpoint to handle join requests

Author: suufi

lib/group/getJoinRequests.js

@@ -1,45 +1,49 @@
-// Dependencies
-var parser = require('cheerio')
-
 // Includes
 var http = require('../util/http.js').func
-var getDate = require('../util/getDate.js').func
+var getGeneralToken = require('../util/getGeneralToken.js').func
 
 // Args
 exports.required = ['group']
-exports.optional = ['jar']
+exports.optional = ['sortOrder', 'limit', 'cursor', 'jar']
 
 // Define
-exports.func = function (args) {
-  var httpOpt = {
-    url: '//www.roblox.com/groups/' + args.group + '/joinrequests-html',
-    options: {
-      jar: args.jar,
-      followRedirect: false,
-      resolveWithFullResponse: true
+function getJoinRequests (jar, token, group, sortOrder, limit, cursor) {
+  return new Promise((resolve, reject) => {
+    var httpOpt = {
+      url: `//groups.roblox.com/v1/groups/${group}/join-requests?limit=${limit}&sortOrder=${sortOrder}&cursor=${cursor}`,
+      options: {
+        method: 'GET',
+        jar: jar,
+        headers: {
+          'X-CSRF-TOKEN': token
+        },
+        resolveWithFullResponse: true
+      }
     }
-  }
-  return http(httpOpt)
-    .then(function (res) {
-      if (res.statusCode === 200 && res.body !== '') {
-        var requests = []
-        var $ = parser.load(res.body)
-        var found = $('#JoinRequestsList').find('tr')
-        var len = found.length
-        if (len === 1) {
-          return false
-        }
-        for (var i = 1; i < len - 1; i++) {
-          var data = found.eq(i).find('td')
-          requests.push({
-            username: data.eq(1).text(),
-            date: getDate({ time: data.eq(2).text(), timezone: 'CT' }),
-            requestId: parseInt(data.eq(3).find('span').attr('data-rbx-join-request'), 10)
-          })
+    return http(httpOpt)
+      .then(function (res) {
+        if (res.statusCode === 200) {
+          resolve(JSON.parse(res.body))
+        } else {
+          const body = JSON.parse(res.body) || {}
+          if (body.errors && body.errors.length > 0) {
+            var errors = body.errors.map((e) => {
+              return e.message
+            })
+            reject(new Error(`${res.statusCode} ${errors.join(', ')}`))
+          }
         }
-        return requests
-      } else {
-        throw new Error('Group admin page load failed, make sure the user is in the group and is allowed to handle join requests')
-      }
+      })
+  })
+}
+
+exports.func = function (args) {
+  const jar = args.jar
+  const sortOrder = args.sortOrder || 'Asc'
+  const limit = args.limit || (10).toString()
+  const cursor = args.cursor || ''
+  return getGeneralToken({ jar: jar })
+    .then(function (xcsrf) {
+      return getJoinRequests(jar, xcsrf, args.group, sortOrder, limit, cursor)
     })
 }

lib/group/onJoinRequestHandle.js

@@ -5,20 +5,29 @@ var Promise = require('bluebird')
 var settings = require('../../settings.json')
 var shortPoll = require('../util/shortPoll.js').func
 var getJoinRequests = require('./getJoinRequests.js').func
-var handleJoinRequestId = require('./handleJoinRequestId.js').func
+var handleJoinRequest = require('./handleJoinRequest.js').func
 
 // Args
 exports.required = ['group']
 exports.optional = ['jar']
 
+async function getRequests (jar, group, cursor) {
+  const requests = []
+  await getJoinRequests({ jar, group, cursor, limit: 100 }).timeout(settings.event.timeout).then(async (res) => {
+    requests.push.apply(requests, res.data)
+    if (res.nextPageCursor) {
+      requests.push.apply(requests, await getRequests(jar, group, res.nextPageCursor))
+    }
+  })
+  return requests
+}
+
 // Define
 exports.func = function (args) {
   var group = args.group
   var jar = args.jar
-  var timeout = settings.event.timeout
   function getLatest (latest, evt) {
-    return getJoinRequests({ jar: jar, group: group })
-      .timeout(timeout)
+    return getRequests(jar, group)
       .then(function (requests) {
         var complete = {
           data: [],
@@ -30,8 +39,8 @@ exports.func = function (args) {
         if (requests.length > 0) {
           promise = new Promise(function (resolve, reject) {
             evt.on('handle', function (request, accept, callback) {
-              var id = request.requestId
-              handleJoinRequestId({ jar: jar, group: group, requestId: id, accept: accept })
+              var id = request.requester.userId
+              handleJoinRequest({ jar: jar, group, userId: id, accept: accept })
                 .then(function () {
                   handled++
                   if (callback) {