mirror of
https://github.com/pieartsy/PluralFlux.git
synced 2026-04-17 06:25:28 +10:00
* refactored async/await for import helper to not also use then/catch * added enum * refactor webhookHelper and tests to not use then/catch * changed docstring * refactoring bot and tests to not use then/catch * refactoring commands.js and tests to not use then/catch * refactoring memberHelper.js and tests to not use then/catch * removing then/catch from messageHelper.test.js * fixed set up for commands tests * edited bot to have top level main function * one more test in commands.js, and removed console.error * fixed typo in webhookHelper * forgot to switch over some tests in bot.test and commands.test * removed console.log from import helper * put console.error in commands * converted utils.js to not use then/catch * tested utils checkImageFormatValidity * removed jest-fetch-mock since it turns out I was just manually mocking it anyway * refactored database to not use then/catch * added dash to commands.js and test to pass * added the remaining webhook tests * changed utils to check for 10MB size not 1MB * removed unnecessary try/catch from utils * Simplify getWebhook to use .find() instead of foreach logic * make memberCommand exit when error occurs with parseMemberCommand * changed commands.js to not have user interaction within the catch * updated console.error message in database.js * made importHelper mock throw error instead of "resolve" error * replaced "pk;" with "pf;" in test * Got rid of unnecessary check for empty message from user (Fluxer doesn't allow this to happen) Removed export of token * getAllMembersInfo checks for fields.length * added default case to memberCommandHandler to throw error if command is not recognized * reversed check for valid proxy (was returning valid if the proxy existed and invalid if it didn't) * pushes e.message instead of full error object to errors array in importHelper * adjusted tests to properly use mockRejectedValue for async rejections * changed getAllMembersInfo map to say `index` not `name` as it actually gets the index of a member and then the member object * adjusted importHelper to properly test throwing of aggregate error * revamped setting of expiration warning (moved to utils and changed logic, wrote tests) --------- Co-authored-by: Aster Fialla <asterfialla@gmail.com>
58 lines
1.9 KiB
JavaScript
58 lines
1.9 KiB
JavaScript
import {enums} from "../enums.js";
|
|
import {memberHelper} from "./memberHelper.js";
|
|
|
|
const ih = {};
|
|
|
|
/**
|
|
* Tries to import from Pluralkit.
|
|
*
|
|
* @async
|
|
* @param {string} authorId - The author of the message
|
|
* @param {string | null} [attachmentUrl] - The attached JSON url.
|
|
* @returns {Promise<string>} A successful addition of all members.
|
|
* @throws {Error} When the member exists, or creating a member doesn't work.
|
|
*/
|
|
ih.pluralKitImport = async function (authorId, attachmentUrl= null) {
|
|
let fetchResult, pkData;
|
|
if (!attachmentUrl) {
|
|
throw new Error(enums.err.NOT_JSON_FILE);
|
|
}
|
|
try {
|
|
fetchResult = await fetch(attachmentUrl);
|
|
}
|
|
catch(e) {
|
|
throw new Error(enums.err.CANNOT_FETCH_RESOURCE, { cause: e });
|
|
}
|
|
|
|
try {
|
|
pkData = await fetchResult.json();
|
|
}
|
|
catch(e) {
|
|
throw new Error(enums.err.NOT_JSON_FILE, { cause: e })
|
|
}
|
|
|
|
const pkMembers = pkData.members;
|
|
let errors = [];
|
|
let addedMembers = [];
|
|
for (let pkMember of pkMembers) {
|
|
const proxy = pkMember.proxy_tags[0] ? `${pkMember.proxy_tags[0].prefix ?? ''}text${pkMember.proxy_tags[0].suffix ?? ''}` : null;
|
|
try {
|
|
const memberObj = await memberHelper.addFullMember(authorId, pkMember.name, pkMember.display_name, proxy, pkMember.avatar_url);
|
|
addedMembers.push(memberObj.member.name);
|
|
if (memberObj.errors.length > 0) {
|
|
errors.push(`\n**${pkMember.name}:** `);
|
|
errors = errors.concat(memberObj.errors);
|
|
}
|
|
}
|
|
catch(e) {
|
|
errors.push(e.message);
|
|
}
|
|
}
|
|
const aggregatedText = addedMembers.length > 0 ? `Successfully added members: ${addedMembers.join(', ')}` : `${enums.err.NO_MEMBERS_IMPORTED}`;
|
|
if (errors.length > 0) {
|
|
throw new AggregateError(errors, aggregatedText);
|
|
}
|
|
return aggregatedText;
|
|
}
|
|
|
|
export const importHelper = ih; |