This commit is contained in:
ITOH
2021-04-09 23:07:20 +02:00
parent b40aaf5a8f
commit 7a6b4bf2d7
41 changed files with 233 additions and 190 deletions
+3 -3
View File
@@ -45,8 +45,8 @@ export async function createChannel(
},
)) as DiscordChannel;
const channelStruct = await structures.createChannelStruct(result);
await cacheHandlers.set("channels", channelStruct.id, channelStruct);
const discordenoChannel = await structures.createDiscordenoChannel(result);
await cacheHandlers.set("channels", discordenoChannel.id, discordenoChannel);
return channelStruct;
return discordenoChannel;
}
+7 -3
View File
@@ -14,13 +14,17 @@ export async function getChannel(channelId: string, addToCache = true) {
endpoints.CHANNEL_BASE(channelId),
)) as DiscordChannel;
const channelStruct = await structures.createChannelStruct(
const discordenoChannel = await structures.createDiscordenoChannel(
result,
result.guild_id,
);
if (addToCache) {
await cacheHandlers.set("channels", channelStruct.id, channelStruct);
await cacheHandlers.set(
"channels",
discordenoChannel.id,
discordenoChannel,
);
}
return channelStruct;
return discordenoChannel;
}
+10 -3
View File
@@ -15,11 +15,18 @@ export async function getChannels(guildId: string, addToCache = true) {
) as DiscordChannel[]);
return Promise.all(result.map(async (res) => {
const channelStruct = await structures.createChannelStruct(res, guildId);
const discordenoChannel = await structures.createDiscordenoChannel(
res,
guildId,
);
if (addToCache) {
await cacheHandlers.set("channels", channelStruct.id, channelStruct);
await cacheHandlers.set(
"channels",
discordenoChannel.id,
discordenoChannel,
);
}
return channelStruct;
return discordenoChannel;
}));
}
+1 -1
View File
@@ -11,6 +11,6 @@ export async function getPins(channelId: string) {
)) as DiscordMessage[];
return Promise.all(
result.map((res) => structures.createMessageStruct(res)),
result.map((res) => structures.createDiscordenoMessage(res)),
);
}
+1 -1
View File
@@ -71,7 +71,7 @@ export async function editSlashResponse(
// If the original message was edited, this will not return a message
if (!options.messageId) return result;
const message = await structures.createMessageStruct(
const message = await structures.createDiscordenoMessage(
result as DiscordMessage,
);
return message;
+1 -1
View File
@@ -12,5 +12,5 @@ export async function createGuild(options: CreateGuild) {
options,
)) as DiscordGuild;
return structures.createGuildStruct(guild, 0);
return structures.createDiscordenoGuild(guild, 0);
}
+1 -1
View File
@@ -28,5 +28,5 @@ export async function editGuild(guildId: string, options: ModifyGuild) {
options,
) as DiscordGuild;
return structures.createGuildStruct(result, -1);
return structures.createDiscordenoGuild(result, -1);
}
+1 -1
View File
@@ -70,7 +70,7 @@ export async function editMember(
endpoints.GUILD_MEMBER(guildId, memberId),
options,
) as MemberCreatePayload;
const member = await structures.createMemberStruct(result, guildId);
const member = await structures.createDiscordenoMember(result, guildId);
return member;
}
+6 -3
View File
@@ -20,8 +20,11 @@ export async function getMember(
endpoints.GUILD_MEMBER(guildId, id),
)) as MemberCreatePayload;
const memberStruct = await structures.createMemberStruct(data, guildId);
await cacheHandlers.set("members", memberStruct.id, memberStruct);
const discordenoMember = await structures.createDiscordenoMember(
data,
guildId,
);
await cacheHandlers.set("members", discordenoMember.id, discordenoMember);
return memberStruct;
return discordenoMember;
}
+11 -7
View File
@@ -51,22 +51,26 @@ export async function getMembers(guildId: string, options?: GetMemberOptions) {
}${options?.after ? `&after=${options.after}` : ""}`,
)) as DiscordGuildMember[];
const memberStructures = await Promise.all(
const discordenoMembers = await Promise.all(
result.map(async (member) => {
const memberStruct = await structures.createMemberStruct(
const discordenoMember = await structures.createDiscordenoMember(
member,
guildId,
);
await cacheHandlers.set("members", memberStruct.id, memberStruct);
await cacheHandlers.set(
"members",
discordenoMember.id,
discordenoMember,
);
return memberStruct;
return discordenoMember;
}),
) as Member[];
if (!memberStructures.length) break;
if (!discordenoMembers.length) break;
memberStructures.forEach((member) => {
discordenoMembers.forEach((member) => {
eventHandlers.debug?.(
"loop",
`Running forEach loop in get_members file.`,
@@ -76,7 +80,7 @@ export async function getMembers(guildId: string, options?: GetMemberOptions) {
options = {
limit: options?.limit,
after: memberStructures[memberStructures.length - 1].id,
after: discordenoMembers[discordenoMembers.length - 1].id,
};
membersLeft -= 1000;
+3 -3
View File
@@ -15,12 +15,12 @@ export async function sendDirectMessage(
const dmChannelData = await rest.runMethod("post", endpoints.USER_DM, {
recipient_id: memberId,
}) as DMChannelCreatePayload;
const channelStruct = await structures.createChannelStruct(
const discordenoChannel = await structures.createDiscordenoChannel(
dmChannelData as unknown as ChannelCreatePayload,
);
// Recreate the channel and add it undert he users id
await cacheHandlers.set("channels", memberId, channelStruct);
dmChannel = channelStruct;
await cacheHandlers.set("channels", memberId, discordenoChannel);
dmChannel = discordenoChannel;
}
// If it does exist try sending a message to this user
+1 -1
View File
@@ -33,5 +33,5 @@ export async function editMessage(
content,
);
return structures.createMessageStruct(result as MessageCreateOptions);
return structures.createDiscordenoMessage(result as MessageCreateOptions);
}
+1 -1
View File
@@ -18,5 +18,5 @@ export async function getMessage(channelId: string, id: string) {
endpoints.CHANNEL_MESSAGE(channelId, id),
)) as MessageCreateOptions;
return structures.createMessageStruct(result);
return structures.createDiscordenoMessage(result);
}
+1 -1
View File
@@ -26,6 +26,6 @@ export async function getMessages(
)) as MessageCreateOptions[];
return Promise.all(
result.map((res) => structures.createMessageStruct(res)),
result.map((res) => structures.createDiscordenoMessage(res)),
);
}
+1 -1
View File
@@ -9,5 +9,5 @@ export async function publishMessage(channelId: string, messageId: string) {
endpoints.CHANNEL_MESSAGE_CROSSPOST(channelId, messageId),
)) as MessageCreateOptions;
return structures.createMessageStruct(data);
return structures.createDiscordenoMessage(data);
}
+1 -1
View File
@@ -107,5 +107,5 @@ export async function sendMessage(
}),
)) as DiscordMessage;
return structures.createMessageStruct(result);
return structures.createDiscordenoMessage(result);
}
+1 -1
View File
@@ -22,7 +22,7 @@ export async function createRole(
});
const roleData = result as RoleData;
const role = await structures.createRoleStruct(roleData);
const role = await structures.createDiscordenoRole(roleData);
const guild = await cacheHandlers.get("guilds", guildId);
guild?.roles.set(role.id, role);
+1 -1
View File
@@ -55,6 +55,6 @@ export async function editWebhookMessage(
{ ...options, allowed_mentions: options.allowed_mentions },
) as MessageCreateOptions;
const message = await structures.createMessageStruct(result);
const message = await structures.createDiscordenoMessage(result);
return message;
}
+1 -1
View File
@@ -60,5 +60,5 @@ export async function executeWebhook(
);
if (!options.wait) return;
return structures.createMessageStruct(result as MessageCreateOptions);
return structures.createDiscordenoMessage(result as MessageCreateOptions);
}