refactor: remove raw avatar ulr

src/helpers/members/avatar_url.ts

@@ -1,17 +1,15 @@
-import { Member } from "../../structures/mod.ts";
-import { rawAvatarURL } from "./raw_avatar_url.ts";
+import { endpoints } from "../../util/constants.ts";
+import { formatImageURL } from "../../util/utils.ts";
 
-/** The users custom avatar or the default avatar */
+/** The users custom avatar or the default avatar if you don't have a member object. */
 export function avatarURL(
-  member: Member,
+  userId: string,
+  discriminator: string,
+  avatar?: string | null,
   size: ImageSize = 128,
   format?: ImageFormats,
 ) {
-  return rawAvatarURL(
-    member.id,
-    member.discriminator,
-    member.avatar,
-    size,
-    format,
-  );
+  return avatar
+    ? formatImageURL(endpoints.USER_AVATAR(userId, avatar), size, format)
+    : endpoints.USER_DEFAULT_AVATAR(Number(discriminator) % 5);
 }

src/helpers/members/raw_avatar_url.ts

@@ -1,15 +0,0 @@
-import { endpoints } from "../../util/constants.ts";
-import { formatImageURL } from "../../util/utils.ts";
-
-/** The users custom avatar or the default avatar if you don't have a member object. */
-export function rawAvatarURL(
-  userId: string,
-  discriminator: string,
-  avatar?: string | null,
-  size: ImageSize = 128,
-  format?: ImageFormats,
-) {
-  return avatar
-    ? formatImageURL(endpoints.USER_AVATAR(userId, avatar), size, format)
-    : endpoints.USER_DEFAULT_AVATAR(Number(discriminator) % 5);
-}

src/helpers/mod.ts

@@ -70,7 +70,6 @@ import { getMembersByQuery } from "./members/get_members_by_query.ts";
 import { kick, kickMember } from "./members/kick_member.ts";
 import { moveMember } from "./members/move_member.ts";
 import { pruneMembers } from "./members/prune_members.ts";
-import { rawAvatarURL } from "./members/raw_avatar_url.ts";
 import { sendDirectMessage } from "./members/send_direct_message.ts";
 import { unban, unbanMember } from "./members/unban_member.ts";
 import { addReaction } from "./messages/add_reaction.ts";

src/structures/member.ts

@@ -1,8 +1,8 @@
 import { cache, cacheHandlers } from "../cache.ts";
+import { avatarURL } from "../helpers/members/avatar_url.ts";
 import { banMember } from "../helpers/members/ban_member.ts";
 import { editMember } from "../helpers/members/edit_member.ts";
 import { kickMember } from "../helpers/members/kick_member.ts";
-import { rawAvatarURL } from "../helpers/members/raw_avatar_url.ts";
 import { sendDirectMessage } from "../helpers/members/send_direct_message.ts";
 import { addRole } from "../helpers/roles/add_role.ts";
 import { removeRole } from "../helpers/roles/remove_role.ts";
@@ -11,7 +11,7 @@ import { createNewProp } from "../util/utils.ts";
 
 const baseMember: Partial<Member> = {
   get avatarURL() {
-    return rawAvatarURL(this.id!, this.discriminator!, this.avatar!);
+    return avatarURL(this.id!, this.discriminator!, this.avatar!);
   },
   get mention() {
     return `<@!${this.id!}>`;