refactor: cast unknown to Client for context

This commit is contained in:
Paul Makles
2023-04-14 20:33:48 +01:00
parent 49ca764b1e
commit 871bc6abe1
5 changed files with 14 additions and 13 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
import { ReactiveSet } from "@solid-primitives/set";
import { Channel as ApiChannel, OverrideField } from "revolt-api";
import { File } from "..";
import { Client, File } from "..";
import type { Merge } from "../lib/merge";
import { Hydrate } from ".";
@@ -47,7 +47,7 @@ export const channelHydration: Hydrate<Merge<ApiChannel>, HydratedChannel> = {
channelType: (channel) => channel.channel_type,
name: (channel) => channel.name,
description: (channel) => channel.description!,
icon: (channel, ctx) => new File(ctx, channel.icon!),
icon: (channel, ctx) => new File(ctx as Client, channel.icon!),
active: (channel) => channel.active || false,
typingIds: () => new ReactiveSet(),
recipientIds: (channel) => new ReactiveSet(channel.recipients),
+5 -4
View File
@@ -1,7 +1,7 @@
import { ReactiveMap } from "@solid-primitives/map";
import { ReactiveSet } from "@solid-primitives/set";
import { API, File, MessageEmbed, SystemMessage } from "..";
import { API, Client, File, MessageEmbed, SystemMessage } from "..";
import type { Merge } from "../lib/merge";
import { Hydrate } from ".";
@@ -39,12 +39,13 @@ export const messageHydration: Hydrate<Merge<API.Message>, HydratedMessage> = {
channelId: (message) => message.channel,
authorId: (message) => message.author,
content: (message) => message.content!,
systemMessage: (message, ctx) => SystemMessage.from(ctx, message.system!),
systemMessage: (message, ctx) =>
SystemMessage.from(ctx as Client, message.system!),
attachments: (message, ctx) =>
message.attachments!.map((file) => new File(ctx, file)),
message.attachments!.map((file) => new File(ctx as Client, file)),
editedAt: (message) => new Date(message.edited!),
embeds: (message, ctx) =>
message.embeds!.map((embed) => MessageEmbed.from(ctx, embed)),
message.embeds!.map((embed) => MessageEmbed.from(ctx as Client, embed)),
mentionIds: (message) => message.mentions!,
replyIds: (message) => message.replies!,
reactions: (message) => {
+3 -3
View File
@@ -7,7 +7,7 @@ import {
SystemMessageChannels,
} from "revolt-api";
import { File } from "..";
import { Client, File } from "..";
import { Hydrate } from ".";
@@ -55,8 +55,8 @@ export const serverHydration: Hydrate<ApiServer, HydratedServer> = {
Object.keys(server.roles!).map((id) => [id, server.roles![id]])
),
defaultPermissions: (server) => server.default_permissions,
icon: (server, ctx) => new File(ctx, server.icon!),
banner: (server, ctx) => new File(ctx, server.banner!),
icon: (server, ctx) => new File(ctx as Client, server.icon!),
banner: (server, ctx) => new File(ctx as Client, server.banner!),
flags: (server) => server.flags!,
analytics: (server) => server.analytics || false,
discoverable: (server) => server.discoverable || false,
+2 -2
View File
@@ -1,6 +1,6 @@
import { Member as ApiMember, MemberCompositeKey } from "revolt-api";
import { File } from "..";
import { Client, File } from "..";
import type { Merge } from "../lib/merge";
import { Hydrate } from ".";
@@ -26,7 +26,7 @@ export const serverMemberHydration: Hydrate<
id: (member) => member._id,
joinedAt: (member) => new Date(member.joined_at),
nickname: (member) => member.nickname!,
avatar: (member, ctx) => new File(ctx, member.avatar!),
avatar: (member, ctx) => new File(ctx as Client, member.avatar!),
roles: (member) => member.roles,
timeout: (member) => new Date(member.timeout!),
},
+2 -2
View File
@@ -5,7 +5,7 @@ import {
UserStatus,
} from "revolt-api";
import { File } from "..";
import { Client, File } from "..";
import { Hydrate } from ".";
@@ -40,7 +40,7 @@ export const userHydration: Hydrate<ApiUser, HydratedUser> = {
badges: (user) => user.badges!,
flags: (user) => user.flags!,
avatar: (user, ctx) => new File(ctx, user.avatar!),
avatar: (user, ctx) => new File(ctx as Client, user.avatar!),
status: (user) => user.status!,
bot: (user) => user.bot!,
},