Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1187 from DEVTomatoCake/fix/widget.png-image-loading

Browse Source 
Fix widget.png guild icon loading
This commit is contained in:
Madeline 2024-08-18 22:44:29 +10:00 committed by GitHub
commit 086625902d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/routes/guilds/#guild_id/widget.png.ts
View File

@ -1,17 +1,17 @@
/* /*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 Spacebar and Spacebar Contributors Copyright (C) 2023 Spacebar and Spacebar Contributors
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
@ -24,6 +24,7 @@ import { Request, Response, Router } from "express";
import fs from "fs"; import fs from "fs";
import { HTTPError } from "lambert-server"; import { HTTPError } from "lambert-server";
import path from "path"; import path from "path";
import { storage } from "../../../../cdn/util/Storage";
const router: Router = Router(); const router: Router = Router();
@ -51,7 +52,7 @@ router.get(
if (!guild.widget_enabled) throw new HTTPError("Unknown Guild", 404); if (!guild.widget_enabled) throw new HTTPError("Unknown Guild", 404);
// Fetch guild information // Fetch guild information
const icon = guild.icon; const icon = "avatars/" + guild_id + "/" + guild.icon;
const name = guild.name; const name = guild.name;
const presence = guild.presence_count + " ONLINE"; const presence = guild.presence_count + " ONLINE";
@ -69,8 +70,7 @@ router.get(
} }
// Setup canvas // Setup canvas
const { createCanvas } = require("canvas"); const { createCanvas, loadImage } = require("canvas");
const { loadImage } = require("canvas");
const sizeOf = require("image-size"); const sizeOf = require("image-size");
// TODO: Widget style templates need Spacebar branding // TODO: Widget style templates need Spacebar branding
@ -211,8 +211,8 @@ async function drawIcon(
scale: number, scale: number,
icon: string, icon: string,
) { ) {
const img = new (require("canvas").Image)(); const { loadImage } = require("canvas");
img.src = icon; const img = await loadImage(await storage.get(icon));
// Do some canvas clipping magic! // Do some canvas clipping magic!
canvas.save(); canvas.save();