Infrastructure/zipline
1
Fork 0
Code Issues Pull requests Activity

fix: #166

Browse source
This commit is contained in:
diced 2022-09-05 15:06:07 -07:00
parent 67ff93e640
commit 4589c6ee0a
No known key found for this signature in database
GPG key ID: 370BD1BA142842D1
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib/discord.ts
View file

@ -3,7 +3,7 @@ import { ConfigDiscordContent } from 'lib/config/Config';
import config from 'lib/config';
import Logger from './logger';
// [user, image, url, route (ex. https://example.com/u/something.png)]
// [user, image, url, route (ex. https://example.com/r/something.png)]
export type Args = [User, Image?, Url?, string?];
function parse(str: string, args: Args) {
@ -16,12 +16,12 @@ function parse(str: string, args: Args) {
.replace(/{link}/gi, args[3]);
if (args[1]) str = str
.replace(/{image.id}/gi, args[1].id.toString())
.replace(/{image.mime}/gi, args[1].mimetype)
.replace(/{image.file}/gi, args[1].file)
.replace(/{image.created_at.full_string}/gi, args[1].created_at.toLocaleString())
.replace(/{image.created_at.time_string}/gi, args[1].created_at.toLocaleTimeString())
.replace(/{image.created_at.date_string}/gi, args[1].created_at.toLocaleDateString());
.replace(/{file.id}/gi, args[1].id.toString())
.replace(/{file.mime}/gi, args[1].mimetype)
.replace(/{file.file}/gi, args[1].file)
.replace(/{file.created_at.full_string}/gi, args[1].created_at.toLocaleString())
.replace(/{file.created_at.time_string}/gi, args[1].created_at.toLocaleTimeString())
.replace(/{file.created_at.date_string}/gi, args[1].created_at.toLocaleDateString());
if (args[2]) str = str
.replace(/{url.id}/gi, args[2].id.toString())
@ -87,7 +87,9 @@ export async function sendUpload(user: User, image: Image, host: string) {
});
if (!res.ok) {
const text = await res.text();
Logger.get('discord').error(`Failed to send upload notification to discord: ${res.status} ${res.statusText}`);
Logger.get('discord').error(`Received response: ${text}`);
}
return;

2
src/pages/api/upload.ts
View file

@ -130,7 +130,7 @@ async function handler(req: NextApiReq, res: NextApiRes) {
}
if (zconfig.discord?.upload) {
await sendUpload(user, image, `${zconfig.core.https ? 'https' : 'http'}://${req.headers.host}${zconfig.uploader.route === '/' ? '' : zconfig.uploader.route}/${invis ? invis.invis : image.file}`);
await sendUpload(user, image, `${zconfig.core.https ? 'https' : 'http'}://${req.headers.host}/r/${invis ? invis.invis : image.file}`);
}
}