From b1a29fd3ff56f80ac79227cea227958329243005 Mon Sep 17 00:00:00 2001
From: Aster Fialla <asterfialla@gmail.com>
Date: Thu, 19 Feb 2026 20:30:55 -0500
Subject: [PATCH] edit enums, tweak import content command

---
 src/commands.js | 8 ++++----
 src/enums.js    | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/commands.js b/src/commands.js
index bdfd9ce..4e2673e 100644
--- a/src/commands.js
+++ b/src/commands.js
@@ -12,7 +12,7 @@ cmds.set('member', {
         const authorFull = `${message.author.username}#${message.author.discriminator}`
         const attachmentUrl = message.attachments.size > 0 ? message.attachments.first().url : null;
         const attachmentExpires = message.attachments.size > 0 ? message.attachments.first().expires_at : null;
-        const reply = await memberHelper.parseMemberCommand(message.author.id, authorFull, args, attachmentUrl, attachmentExpires).catch(e =>{throw e});
+        const reply = await memberHelper.parseMemberCommand(message.author.id, authorFull, args, attachmentUrl, attachmentExpires).catch(async (e) =>{await message.reply(e.message);});
         if (typeof reply === 'string') {
             return await message.reply(reply);
         }
@@ -47,11 +47,11 @@ cmds.set('import', {
     description: enums.help.SHORT_DESC_IMPORT,
     async execute(message, client, args) {
         console.log(args);
-        if (message.content.includes('--help') || (args[0] === '' && args.length === 1)) {
+
+        const attachmentUrl = message.attachments.size > 0 ? message.attachments.first().url : null;
+        if ((message.content.includes('--help') || (args[0] === '' && args.length === 1)) && !attachmentUrl ) {
             return await message.reply(enums.help.IMPORT);
         }
-        const attachmentUrl = message.attachments.size > 0 ? message.attachments.first().url : null;
-
         return await importHelper.pluralKitImport(message.author.id, attachmentUrl).then(async (successfullyAdded) => {
             await message.reply(successfullyAdded);
         }).catch(async (error) => {
diff --git a/src/enums.js b/src/enums.js
index 0a72cb0..a0bc118 100644
--- a/src/enums.js
+++ b/src/enums.js
@@ -7,7 +7,7 @@ helperEnums.err = {
     ADD_ERROR: "Error adding member.",
     MEMBER_EXISTS: "A member with that name already exists. Please pick a unique name.",
     USER_NO_MEMBERS: "You have no members created.",
-    DISPLAY_NAME_TOO_LONG: "The display name is too long. Please limit it to 32 characters or less.",
+    DISPLAY_NAME_TOO_LONG: "The maximum length of a display name is 32 characters.",
     PROXY_EXISTS: "A duplicate proxy already exists for one of your members. Please pick a new one, or change the old one first.",
     NO_SUCH_COMMAND: "No such command exists.",
     PROPIC_FAILS_REQUIREMENTS: "Profile picture must be in JPG, PNG, or WEBP format and less than 10MB.",
@@ -37,7 +37,8 @@ helperEnums.help = {
     DISPLAY_NAME: "Updates the display name for a specific member based on their name, for example: `pf;member jane \"Jane Doe | ze/hir\"`.This can be up to 32 characters long. If it has spaces, put it in __double quotes__.",
     PROXY: "Updates the proxy tag for a specific member based on their name. The proxy must be formatted with the tags surrounding the word 'text', for example: `pf;member jane proxy Jane:text` or `pf;member amal proxy [text]` This is so the bot can detect what the proxy tags are. **Only one proxy can be set per member currently.**",
     PROPIC: "Updates the profile picture for the member. Must be in JPG, PNG, or WEBP format and less than 10MB. The two options are:\n1. Pass in a direct remote image URL, for example: `pf;member jane propic https://cdn.pixabay.com/photo/2020/05/02/02/54/animal-5119676_1280.jpg`. You can upload images on sites like https://imgbb.com/.\n2. Upload an attachment directly.\n\n**NOTE:** Fluxer does not save your attachments forever, so option #1 is recommended.",
-    IMPORT: "Imports from PluralKit using the JSON file provided by their export command. Importing from other proxy bots is TBD. `pf;import` and attach your JSON file to the message. This will only save the fields that are present in the bot currently, not anything else like birthdays or system handles (yet?). **Only one proxy can be set per member currently.**"
+    IMPORT: "Imports from PluralKit using the JSON file provided by their export command. Importing from other proxy bots is TBD. `pf;import` and attach your JSON file to the message. This will only save the fields that are present in the bot currently, not anything else like birthdays or system handles (yet?). **Only one proxy can be set per member currently.**",
+    SET_TO_NULL: "It has been set to null instead."
 }
 
 helperEnums.misc = {