Fixed patreon api calls

fixed circular dependencies

package.json

@@ -35,6 +35,7 @@
 		"npm": "^7.8.0",
 		"parse-duration": "^0.4.4",
 		"patreon": "^0.4.1",
+		"patreon-discord": "^0.0.5",
 		"pluralize": "^8.0.0",
 		"prettier": "^2.8.0",
 		"random-number-csprng": "^1.0.2",

src/botHandlers/patreonHandler.js

@@ -5,6 +5,10 @@
  * For more information, see README.md and LICENSE
  */
 const axios = require('axios');
+const { Campaign } = require('patreon-discord');
+const members = {};
+const cache = {};
+let campaign;
 
 exports.request = async function (cookie) {
 	console.log('getting cowoncy...');
@@ -67,10 +71,19 @@ async function getUsers(cookie, url, list) {
 				list.push({
 					name: item.attributes?.full_name,
 					discord: discord?.user_id,
+					user_id: item.id,
 				});
+			} else if (item.type === 'member') {
+				members[item.relationships.user.data.id] = item.id;
 			}
 		});
+		for (let i in list) {
+			if (!list[i].discord) {
+				list[i].discord = await getDiscordId(list[i].user_id);
+			}
+		}
 
+		console.log('list length: ' + list.length);
 		if (data.links.next) {
 			console.log('getting next page...');
 			return getUsers(cookie, data.links.next, list);
@@ -82,6 +95,25 @@ async function getUsers(cookie, url, list) {
 	}
 }
 
+async function getDiscordId(userId) {
+	if (!campaign) {
+		campaign = new Campaign({
+			patreonToken: process.env.PATREON_ACCESS_TOKEN,
+			campaignId: 1623609,
+		});
+	}
+	const memberId = members[userId];
+
+	if (cache[memberId]) {
+		return cache[memberId];
+	}
+
+	const patron = await campaign.fetchPatron(memberId);
+	const discordId = patron.discord_user_id;
+	cache[memberId] = discordId;
+	return discordId;
+}
+
 /*
 var url = require('url');
 var patreon = require('patreon');

src/commands/command.js

@@ -296,6 +296,7 @@ function initParam(msg, command, args, main, context) {
 		dateUtil: main.dateUtil,
 		neo4j: main.neo4j,
 		giveaway: main.giveaway,
+		patreonUtil: main.patreonUtil,
 	};
 	param.setCooldown = function (cooldown) {
 		main.cooldown.setCooldown(param, aliasToCommand[command], cooldown);

src/commands/commandList/admin/getPatreonRewards.js

@@ -41,7 +41,6 @@ async function getPatreons(p) {
 		console.error(err);
 		return;
 	}
-	console.log(patreons);
 	let result = [];
 	if (p.args[0] != 'ignoresql') {
 		let sql =

src/commands/commandList/battle/util/teamUtil.js

@@ -10,7 +10,6 @@ const animalUtil = require('./animalUtil.js');
 const WeaponInterface = require('../WeaponInterface.js');
 const global = require('../../../../utils/global.js');
 const mysql = require('../../../../botHandlers/mysqlHandler.js');
-const patreonUtil = require('../../patreon/utils/patreonUtil.js');
 const defaultMaxTeams = 2;
 let weaponUtil;
 
@@ -589,7 +588,7 @@ exports.setWeaponUtil = function (util) {
 
 exports.getMaxTeams = async function (user, patreonRank) {
 	let maxTeams = defaultMaxTeams;
-	let patreon = patreonRank || (await patreonUtil.getSupporterRank(this, user));
+	let patreon = patreonRank || (await this.patreonUtil.getSupporterRank(this, user));
 	if (patreon?.benefitRank >= 3) {
 		maxTeams++;
 	}

src/owo.js

@@ -113,6 +113,8 @@ class OwO extends Base {
 		this.patreon = require('./utils/patreon.js');
 		this.patreon.init(this);
 
+		this.patreonUtil = require('./commands/commandList/patreon/utils/patreonUtil.js');
+
 		try {
 			this.badwords = require('./../../tokens/badwords.json');
 		} catch (err) {