Lightning 0.8.0

.github/workflows/publish.yml

@@ -6,48 +6,44 @@ on:
     types: [published]
 
 permissions:
+  contents: read
   packages: write
+  id-token: write
 
 jobs:
   publish:
+    name: publish to jsr and ghcr
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write # auth w/JSR
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: setup deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.45.5
-      - name: setup qemu
+          deno-version: v2.3.5
+      - name: publish to jsr
+        run: deno publish
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      - name: setup buildx
-        uses: docker/setup-buildx-action@v3
-      - name: login to docker hub
-        uses: docker/login-action@v3
+      - name: login to ghcr
+        uses: redhat-actions/podman-login@v1
         with:
-          username: williamfromnj
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: go to the directory
-        run: cd packages/lightning
-      - name: publish to jsr
-        run: |
-              deno publish
-              cd packages/lightning
-      - name: setup docker metadata
-        id: metadata
-        uses: docker/metadata-action@v5
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - name: build image with podman
+        id: build-image
+        uses: redhat-actions/buildah-build@v2
         with:
-          images: williamfromnj/bolt
-          tags: type=ref,event=tag
-      - name: build and push
-        uses: docker/build-push-action@v6
+          image: ghcr.io/williamhorning/lightning
+          archs: amd64, arm64
+          tags: latest ${{github.ref_name}}
+          containerfiles: ./containerfile
+      - name: push to ghcr.io
+        uses: redhat-actions/push-to-registry@v2
         with:
-          context: .
-          file: ./packages/lightning/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.metadata.outputs.tags }}
-          labels: ${{ steps.metadata.outputs.labels }}
+          image: ${{ steps.build-image.outputs.image }}
+          tags: ${{ steps.build-image.outputs.tags }}
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,3 +1,2 @@
 /.env
-/config
-/config.ts
+/lightning.toml

.mailmap

@@ -0,0 +1,2 @@
+Jersey <wgyt735yt@gmail.com> William Horning <github@williamhorning.dev>
+Jersey <wgyt735yt@gmail.com> William Horning <wgyt735yt@gmail.com>

containerfile

@@ -0,0 +1,22 @@
+FROM denoland/deno:alpine-2.3.5
+
+# make a deno cache directory
+RUN ["mkdir", "/deno_dir"]
+ENV DENO_DIR=/deno_dir
+
+# install lightning
+RUN ["deno", "install", "-gA", "--unstable-temporal", "--unstable-net", "jsr:@lightning/lightning@0.8.0-alpha.5"]
+RUN ["chown", "--recursive", "1001:1001", "/deno_dir"]
+
+# run as user instead of root
+USER 1001:1001
+
+# the volume containing your lightning.toml file
+VOLUME [ "/data" ]
+WORKDIR /data
+
+# this is the lightning command line
+ENTRYPOINT [ "lightning" ]
+
+# run the bot using the user-provided lightning.toml file
+CMD [ "run" ]

deno.jsonc

@@ -19,13 +19,7 @@
 			]
 		}
 	},
-	"workspace": [
-		"./packages/lightning",
-		"./packages/lightning-plugin-telegram",
-		"./packages/lightning-plugin-revolt",
-		"./packages/lightning-plugin-guilded",
-		"./packages/lightning-plugin-discord"
-	],
+	"workspace": ["./packages/*"],
 	"lock": false,
-	"unstable": ["temporal"]
+	"unstable": ["net", "temporal"]
 }

packages/discord/README.md

@@ -0,0 +1,14 @@
+# @lightning/discord
+
+[![JSR](https://jsr.io/badges/@lightning/discord)](https://jsr.io/@lightning/discord)
+
+@lightning/discord adds support for Discord to Lightning. To use it, you'll
+first need to create a Discord bot at the
+[Discord Developer Portal](https://discord.com/developers/applications). After
+you do that, you will need to add the following to your `lightning.toml` file:
+
+```toml
+[[plugins]]
+plugin = "jsr:@lightning/discord@0.8.0-alpha.5"
+config.token = "your_bot_token"
+```

packages/discord/deno.json

@@ -0,0 +1,12 @@
+{
+	"name": "@lightning/discord",
+	"version": "0.8.0-alpha.5",
+	"license": "MIT",
+	"exports": "./src/mod.ts",
+	"imports": {
+		"@discordjs/core": "npm:@discordjs/core@^2.1.0",
+		"@discordjs/rest": "npm:@discordjs/rest@^2.5.0",
+		"@discordjs/ws": "npm:@discordjs/ws@^2.0.2",
+		"@lightning/lightning": "jsr:@lightning/lightning@0.8.0-alpha.5"
+	}
+}

packages/discord/src/commands.ts

@@ -0,0 +1,36 @@
+import type { API } from '@discordjs/core';
+import type { command } from '@lightning/lightning';
+
+export async function setup_commands(
+	api: API,
+	commands: command[],
+): Promise<void> {
+	const format_arguments = (args: command['arguments']) =>
+		args?.map((arg) => ({
+			name: arg.name,
+			description: arg.description,
+			type: 3,
+			required: arg.required,
+		})) ?? [];
+
+	const format_subcommands = (subcommands: command['subcommands']) =>
+		subcommands?.map((subcommand) => ({
+			name: subcommand.name,
+			description: subcommand.description,
+			type: 1,
+			options: format_arguments(subcommand.arguments),
+		})) ?? [];
+
+	await api.applicationCommands.bulkOverwriteGlobalCommands(
+		(await api.applications.getCurrent()).id,
+		commands.map((cmd) => ({
+			name: cmd.name,
+			type: 1,
+			description: cmd.description,
+			options: [
+				...format_arguments(cmd.arguments),
+				...format_subcommands(cmd.subcommands),
+			],
+		})),
+	);
+}

packages/discord/src/errors.ts

@@ -0,0 +1,33 @@
+import { DiscordAPIError } from '@discordjs/rest';
+import { log_error } from '@lightning/lightning';
+
+const errors = [
+	[30007, 'Too many webhooks in channel, try deleting some', false, true],
+	[30058, 'Too many webhooks in guild, try deleting some', false, true],
+	[50013, 'Missing permissions to make webhook', false, true],
+	[10003, 'Unknown channel, disabling channel', true, true],
+	[10015, 'Unknown message, disabling channel', false, true],
+	[50027, 'Invalid webhook token, disabling channel', false, true],
+	[0, 'Unknown DiscordAPIError, not disabling channel', false, false],
+] as const;
+
+export function handle_error(
+	err: unknown,
+	channel: string,
+	edit?: boolean,
+) {
+	if (err instanceof DiscordAPIError) {
+		if (edit && err.code === 10008) return []; // message already deleted or non-existent
+
+		const extra = { channel, code: err.code };
+		const [, message, read, write] = errors.find((e) => e[0] === err.code) ??
+			errors[errors.length - 1];
+
+		log_error(err, { disable: { read, write }, message, extra });
+	} else {
+		log_error(err, {
+			message: `unknown discord error`,
+			extra: { channel },
+		});
+	}
+}