@fallencodes/seyfert-utils 1.3.6 → 1.4.1

package/build/options.d.ts

@@ -1,4 +1,4 @@
-import { OKFunction, GuildRole, StopFunction, AllGuildChannels, CommandContext } from 'seyfert';
+import { OKFunction, GuildRole, StopFunction, AllGuildChannels, CommandContext, User } from 'seyfert';
 interface StringOption {
     value: string;
     context: CommandContext;
@@ -9,5 +9,6 @@ export declare function dateOptionValue({ value }: StringOption, ok: OKFunction<
 export declare function relativeTimeOptionValue({ value }: StringOption, ok: OKFunction<number>, fail: StopFunction): void;
 export declare function rolesOptionValue({ value: values, context }: StringOption, ok: OKFunction<[GuildRole, ...GuildRole[]]>, fail: StopFunction): Promise<void>;
 export declare function channelsOptionValue({ value: values, context }: StringOption, ok: OKFunction<[AllGuildChannels, ...AllGuildChannels[]]>, fail: StopFunction): Promise<void>;
+export declare function usersOptionValue({ value: values, context }: StringOption, ok: OKFunction<[User, ...User[]]>, fail: StopFunction): Promise<void>;
 export {};
 //# sourceMappingURL=options.d.ts.map

package/build/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAOhG,UAAU,YAAY;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,cAAc,CAAC;CAC3B;AAGD,eAAO,MAAM,oBAAoB,GAAI,WAAW,YAAY,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,YAAY,SAGvG,CAAC;AAGF,eAAO,MAAM,mBAAmB,GAAI,WAAW,YAAY,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,YAAY,SAStG,CAAC;AAGF,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,QAIhG;AAGD,wBAAgB,uBAAuB,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,YAAY,QAI1G;AAGD,wBAAsB,gBAAgB,CAClC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,YAAY,EACxC,EAAE,EAAE,UAAU,CAAC,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC,EAC3C,IAAI,EAAE,YAAY,iBA4BrB;AAGD,wBAAsB,mBAAmB,CACrC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,YAAY,EACxC,EAAE,EAAE,UAAU,CAAC,CAAC,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC,EACzD,IAAI,EAAE,YAAY,iBA8BrB"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAOtG,UAAU,YAAY;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,cAAc,CAAC;CAC3B;AAGD,eAAO,MAAM,oBAAoB,GAAI,WAAW,YAAY,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,YAAY,SAGvG,CAAC;AAGF,eAAO,MAAM,mBAAmB,GAAI,WAAW,YAAY,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,YAAY,SAStG,CAAC;AAGF,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,QAIhG;AAGD,wBAAgB,uBAAuB,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,YAAY,QAI1G;AAGD,wBAAsB,gBAAgB,CAClC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,YAAY,EACxC,EAAE,EAAE,UAAU,CAAC,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC,EAC3C,IAAI,EAAE,YAAY,iBA4BrB;AAGD,wBAAsB,mBAAmB,CACrC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,YAAY,EACxC,EAAE,EAAE,UAAU,CAAC,CAAC,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC,EACzD,IAAI,EAAE,YAAY,iBA8BrB;AAED,wBAAsB,gBAAgB,CAClC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,YAAY,EACxC,EAAE,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,EACjC,IAAI,EAAE,YAAY,iBAkBrB"}

package/build/options.js

@@ -2,7 +2,7 @@ import { isValidSnowflake } from './utilities.js';
 import dayjs from 'dayjs';
 import ms from 'ms';
 import fuzzy from 'fuzzysort';
-import { channelMentionRegex, hexRegex, roleMentionRegex } from './variables.js';
+import { channelMentionRegex, hexRegex, roleMentionRegex, userMentionRegex } from './variables.js';
 /* Returns a valid string snowflake value. */
 export const snowflakeOptionValue = ({ value }, ok, fail) => {
     if (isValidSnowflake(value))
@@ -106,3 +106,24 @@ export async function channelsOptionValue({ value: values, context }, ok, fail)
     ok(resolvedChannels);
 }
 ;
+export async function usersOptionValue({ value: values, context }, ok, fail) {
+    const resolvedUsers = [];
+    for await (const value of values.split(',').map((value) => value.trim())) {
+        let user;
+        const mentionMatch = userMentionRegex.exec(value)?.[1];
+        if (mentionMatch)
+            user = await context.client.users.fetch(mentionMatch).catch(() => undefined);
+        if (!user && isValidSnowflake(value))
+            user = await context.client.users.fetch(value).catch(() => undefined);
+        if (user)
+            resolvedUsers.push(user);
+        else
+            return fail(`Hold up! | The specified user "${user}" wasn't found.`);
+    }
+    ;
+    if (resolvedUsers.length < 1)
+        return fail(`Hold up! | You didn't specify any valid users.`);
+    // @ts-expect-error
+    ok(resolvedUsers);
+}
+;

package/build/utilities.d.ts

@@ -6,7 +6,7 @@ export declare function randomId(length: number): string;
 export declare function wait(time: number): Promise<unknown>;
 export declare function isValidSnowflake(snowflake: string): boolean;
 export declare function truncateString(string: string, maxLength?: number): string;
-type NameType = 'display' | 'display-s' | 'display-username' | 'display-username-s' | 'username-id' | 'username-id-s';
+type NameType = 'display' | 'display-s' | 'display-username' | 'display-username-s' | 'username-id' | 'username-id-s' | 'multi-line';
 export declare function name(user: User | GuildMember | InteractionGuildMember, type?: NameType): string;
 export declare function reviver(_key: string, value: any): any;
 export declare function replacer(_key: string, value: any): any;

package/build/utilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAAgB,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEzC;AAGD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE/C;AAGD,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnD;AAGD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAI3D;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAY,GAAG,MAAM,CAI9E;AAED,KAAK,QAAQ,GACX,SAAS,GACT,WAAW,GACX,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,eAAe,CAAA;AAGjB,wBAAgB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,GAAG,sBAAsB,EAAE,IAAI,GAAE,QAAoB,GAAG,MAAM,CAW1G;AAGD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAG/C;AAGD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAIhD;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,UAExC;AAGD,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,MAAM,EAAE,CAUtG;AAID,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAE5G;AAGD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,GAAE,MAAa,EAAE,SAAS,GAAE,MAAa,YActG;AAGD,wBAAgB,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CASxD"}
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAAgB,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEzC;AAGD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE/C;AAGD,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnD;AAGD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAI3D;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAY,GAAG,MAAM,CAI9E;AAED,KAAK,QAAQ,GACX,SAAS,GACT,WAAW,GACX,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,eAAe,GACf,YAAY,CAAA;AAGd,wBAAgB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,GAAG,sBAAsB,EAAE,IAAI,GAAE,QAAoB,GAAG,MAAM,CAgB1G;AAGD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAG/C;AAGD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAIhD;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,UAExC;AAGD,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,MAAM,EAAE,CAUtG;AAID,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAE5G;AAGD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,GAAE,MAAa,EAAE,SAAS,GAAE,MAAa,YActG;AAGD,wBAAgB,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CASxD"}

package/build/utilities.js

@@ -39,10 +39,15 @@ export function name(user, type = 'display') {
     switch (type) {
         case 'display': return display ?? user.username;
         case 'display-s': return s(display ?? user.username);
-        case 'display-username': return display ? `${display} (${user.username})` : user.username;
-        case 'display-username-s': return s(display ? `${display} (${user.username})` : user.username);
-        case 'username-id': return `${user.username} (${user.id})`;
-        case 'username-id-s': return s(`${user.username} (${user.id})`);
+        case 'display-username': return display ? `${display} (@${user.username})` : user.username;
+        case 'display-username-s': return s(display ? `${display} (@${user.username})` : user.username);
+        case 'username-id': return `${user.username} [${user.id}]`;
+        case 'username-id-s': return s(`${user.username} [${user.id}]`);
+        case 'multi-line': return [
+            `__ID__: ${user.id}\n`,
+            `__Mention__: ${user.toString()}\n`,
+            `__Display Name: ${s(display ? `${display} (@${user.username})` : user.username)}`
+        ].join('');
     }
     ;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fallencodes/seyfert-utils",
   "type": "module",
-  "version": "1.3.6",
+  "version": "1.4.1",
   "license": "MIT",
   "description": "A collection of various utility/helper code I use in my Seyfert projects.",
   "main": "build/index.js",