Skip to content

Commit

Permalink
switch to deno linting and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@williamhorning
williamhorning committed May 19, 2024
1 parent dedb7b2 commit dea8767
Show file tree
Hide file tree
Showing 32 changed files with 370 additions and 358 deletions.
12 changes: 0 additions & 12 deletions .prettierrc
View file

This file was deleted.

22 changes: 22 additions & 0 deletions deno.jsonc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"fmt": {
"lineWidth": 80,
"proseWrap": "always",
"semiColons": true,
"useTabs": true,
"singleQuote": true
},
"lint": {
"rules": {
"include": [
"ban-untagged-todo",
"default-param-last",
"eqeqeq",
"no-eval",
"no-external-import",
"triple-slash-reference",
"verbatim-module-syntax"
]
}
}
}
108 changes: 54 additions & 54 deletions packages/bolt-discord/conv.ts
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type {
API,
APIInteraction,
RawFile,
command,
command_arguments,
message,
RawFile,
update_data,
wh_query,
wh_token
wh_token,
} from './deps.ts';

async function async_flat<A, B>(arr: A[], f: (a: A) => Promise<B>) {
Expand All @@ -16,7 +16,7 @@ async function async_flat<A, B>(arr: A[], f: (a: A) => Promise<B>) {

function to_instant(id: string) {
return Temporal.Instant.fromEpochMilliseconds(
Number(BigInt(id) >> 22n) + 1420070400000
Number(BigInt(id) >> 22n) + 1420070400000,
);
}

Expand All @@ -26,7 +26,7 @@ type webhook_message = wh_query & wh_token & { files?: RawFile[]; wait: true };

export async function to_discord(
message: message,
replied_message?: discord_message
replied_message?: discord_message,
): Promise<webhook_message> {
if (message.reply_id && replied_message) {
if (!message.embeds) message.embeds = [];
Expand All @@ -39,48 +39,49 @@ export async function to_discord(
replied_message.author?.username ||
'a user'
}`,
icon_url: `https://cdn.discordapp.com/avatars/${replied_message.author?.id}/${replied_message.author?.avatar}.png`
icon_url:
`https://cdn.discordapp.com/avatars/${replied_message.author?.id}/${replied_message.author?.avatar}.png`,
},
description: replied_message.content
description: replied_message.content,
},
...(replied_message.embeds || []).map(i => {
...(replied_message.embeds || []).map((i) => {
return {
...i,
timestamp: i.timestamp ? Number(i.timestamp) : undefined,
video: i.video ? { ...i.video, url: i.video.url || '' } : undefined
video: i.video ? { ...i.video, url: i.video.url || '' } : undefined,
};
})
}),
);
}
return {
avatar_url: message.author.profile,
content: message.content,
embeds: message.embeds?.map(i => {
embeds: message.embeds?.map((i) => {
return {
...i,
timestamp: i.timestamp ? String(i.timestamp) : undefined
timestamp: i.timestamp ? String(i.timestamp) : undefined,
};
}),
files: message.attachments
? await async_flat(message.attachments, async a => {
if (a.size > 25) return [];
if (!a.name) a.name = a.file.split('/').pop();
return [
{
name: a.name || 'file',
data: new Uint8Array(await (await fetch(a.file)).arrayBuffer())
}
];
})
? await async_flat(message.attachments, async (a) => {
if (a.size > 25) return [];
if (!a.name) a.name = a.file.split('/').pop();
return [
{
name: a.name || 'file',
data: new Uint8Array(await (await fetch(a.file)).arrayBuffer()),
},
];
})
: undefined,
username: message.author.username,
wait: true
wait: true,
};
}

export async function to_core(
api: API,
message: discord_message
message: discord_message,
): Promise<message> {
if (message.flags && message.flags & 128) message.content = 'Loading...';
if (message.type === 7) message.content = '*joined on discord*';
Expand All @@ -101,7 +102,7 @@ export async function to_core(
filename: `${sticker.name}.${type}`,
size: 0,
id: sticker.id,
proxy_url: url
proxy_url: url,
});
} else {
message.content = '*used sticker*';
Expand All @@ -110,48 +111,47 @@ export async function to_core(
}
const data = {
author: {
profile: `https://cdn.discordapp.com/avatars/${message.author?.id}/${message.author?.avatar}.png`,
username:
message.member?.nick ||
profile:
`https://cdn.discordapp.com/avatars/${message.author?.id}/${message.author?.avatar}.png`,
username: message.member?.nick ||
message.author?.global_name ||
message.author?.username ||
'discord user',
rawname: message.author?.username || 'discord user',
id: message.author?.id || message.webhook_id || '',
color: '#5865F2'
color: '#5865F2',
},
channel: message.channel_id,
content:
(message.content?.length || 0) > 2000
? `${message.content?.substring(0, 1997)}...`
: message.content,
content: (message.content?.length || 0) > 2000
? `${message.content?.substring(0, 1997)}...`
: message.content,
id: message.id,
timestamp: to_instant(message.id),
embeds: message.embeds?.map(i => {
embeds: message.embeds?.map((i) => {
return {
...i,
timestamp: i.timestamp ? Number(i.timestamp) : undefined
timestamp: i.timestamp ? Number(i.timestamp) : undefined,
};
}),
reply: async (msg: message) => {
if (!data.author.id || data.author.id == '') return;
if (!data.author.id || data.author.id === '') return;
await api.channels.createMessage(message.channel_id, {
...(await to_discord(msg)),
message_reference: {
message_id: message.id
}
message_id: message.id,
},
});
},
plugin: 'bolt-discord',
attachments: message.attachments?.map(i => {
attachments: message.attachments?.map((i) => {
return {
file: i.url,
alt: i.description,
name: i.filename,
size: i.size / 1000000
size: i.size / 1000000,
};
}),
reply_id: message.referenced_message?.id
reply_id: message.referenced_message?.id,
};
return data as message;
}
Expand All @@ -169,17 +169,17 @@ export function to_command(interaction: { api: API; data: APIInteraction }) {
return {
cmd: interaction.data.data.name,
subcmd,
reply: async msg => {
reply: async (msg) => {
await interaction.api.interactions.reply(
interaction.data.id,
interaction.data.token,
await to_discord(msg)
await to_discord(msg),
);
},
channel: interaction.data.channel.id,
plugin: 'bolt-discord',
opts,
timestamp: to_instant(interaction.data.id)
timestamp: to_instant(interaction.data.id),
} as command_arguments;
}

Expand All @@ -191,29 +191,29 @@ export function to_intent_opts({ options }: command) {
name: options.argument_name,
description: 'option to pass to this command',
type: 3,
required: options.argument_required
required: options.argument_required,
});
}

if (options?.subcommands) {
opts.push(
...options.subcommands.map(i => {
...options.subcommands.map((i) => {
return {
name: i.name,
description: i.description || i.name,
type: 1,
options: i.options?.argument_name
? [
{
name: i.options.argument_name,
description: i.options.argument_name,
type: 3,
required: i.options.argument_required || false
}
]
: undefined
{
name: i.options.argument_name,
description: i.options.argument_name,
type: 3,
required: i.options.argument_required || false,
},
]
: undefined,
};
})
}),
);
}

Expand Down
13 changes: 6 additions & 7 deletions packages/bolt-discord/deps.ts
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
export {
Client,
GatewayDispatchEvents,
type API,
type APIInteraction,
Client,
GatewayDispatchEvents,
type GatewayMessageUpdateDispatchData as update_data,
type RESTPostAPIWebhookWithTokenJSONBody as wh_token,
type RESTPostAPIWebhookWithTokenQuery as wh_query,
type RESTPostAPIWebhookWithTokenJSONBody as wh_token
} from 'npm:@discordjs/core@1.2.0';
export { REST, type RawFile } from 'npm:@discordjs/rest@2.3.0';
export { type RawFile, REST } from 'npm:@discordjs/rest@2.3.0';
export { WebSocketManager } from 'npm:@discordjs/ws@1.1.0';
export {
plugin,
type bridge_channel,
type command,
type command_arguments,
type deleted_message,
type lightning,
type message
type message,
plugin,
} from '../lightning/mod.ts';

26 changes: 13 additions & 13 deletions packages/bolt-discord/mod.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import type { deleted_message, lightning, message } from './deps.ts';
import {
Client,
GatewayDispatchEvents,
plugin,
REST,
WebSocketManager,
plugin
} from './deps.ts';
import * as to from './to.ts';

Expand All @@ -32,13 +32,13 @@ export class discord_plugin extends plugin<discord_config> {
const rest = new REST({
version: '10',
/* @ts-ignore this works */
makeRequest: fetch
makeRequest: fetch,
}).setToken(this.config.token);

const gateway = new WebSocketManager({
rest,
token: this.config.token,
intents: 0 | 33281
intents: 0 | 33281,
});

gateway.connect();
Expand All @@ -47,21 +47,21 @@ export class discord_plugin extends plugin<discord_config> {
}

private setup_events() {
this.bot.on(GatewayDispatchEvents.MessageCreate, async msg => {
this.bot.on(GatewayDispatchEvents.MessageCreate, async (msg) => {
this.emit('create_message', await conv.to_core(msg.api, msg.data));
});

this.bot.on(GatewayDispatchEvents.MessageUpdate, async msg => {
this.bot.on(GatewayDispatchEvents.MessageUpdate, async (msg) => {
this.emit('edit_message', await conv.to_core(msg.api, msg.data));
});

this.bot.on(GatewayDispatchEvents.MessageDelete, async msg => {
this.bot.on(GatewayDispatchEvents.MessageDelete, async (msg) => {
this.emit('delete_message', await conv.to_core(msg.api, msg.data));
});

this.bot.on(GatewayDispatchEvents.InteractionCreate, interaction => {
this.bot.on(GatewayDispatchEvents.InteractionCreate, (interaction) => {
const cmd = conv.to_command(interaction);
if (cmd) this.emit("run_command", cmd);
if (cmd) this.emit('run_command', cmd);
});
}

Expand All @@ -70,14 +70,14 @@ export class discord_plugin extends plugin<discord_config> {

this.bot.api.applicationCommands.bulkOverwriteGlobalCommands(
this.config.app_id,
[...this.lightning.commands.values()].map(command => {
[...this.lightning.commands.values()].map((command) => {
return {
name: command.name,
type: 1,
description: command.description || 'a command',
options: conv.to_intent_opts(command)
options: conv.to_intent_opts(command),
};
})
}),
);
}

Expand All @@ -89,7 +89,7 @@ export class discord_plugin extends plugin<discord_config> {
msg: message,
bridge: to.channel,
_?: undefined,
reply_id?: string
reply_id?: string,
): Promise<string> {
return to.send_to_discord(this.bot.api, msg, bridge, _, reply_id);
}
Expand All @@ -98,7 +98,7 @@ export class discord_plugin extends plugin<discord_config> {
msg: message,
bridge: to.channel,
edit_id: string,
reply_id?: string
reply_id?: string,
): Promise<string> {
return to.send_to_discord(this.bot.api, msg, bridge, edit_id, reply_id);
}
Expand Down
Loading

0 comments on commit dea8767

Please sign in to comment.