1
0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-11 05:02:37 +01:00

Merge pull request #430 from Thesourtimes/master

Implement GIF route
This commit is contained in:
Flam3rboy 2021-10-11 16:34:45 +02:00 committed by GitHub
commit dbd327f89d
5 changed files with 116 additions and 11 deletions

View File

@ -0,0 +1,24 @@
import { Router, Response, Request } from "express";
import fetch from "node-fetch";
import { route } from "@fosscord/api";
import { getGifApiKey, parseGifResult } from "./trending";
const router = Router();
router.get("/", route({}), async (req: Request, res: Response) => {
// TODO: Custom providers
const { q, media_format, locale } = req.query;
const apiKey = getGifApiKey();
const response = await fetch(`https://g.tenor.com/v1/search?q=${q}&media_format=${media_format}&locale=${locale}&key=${apiKey}`, {
method: "get",
headers: { "Content-Type": "application/json" }
});
const { results } = await response.json();
res.json(results.map(parseGifResult)).status(200);
});
export default router;

View File

@ -0,0 +1,24 @@
import { Router, Response, Request } from "express";
import fetch from "node-fetch";
import { route } from "@fosscord/api";
import { getGifApiKey, parseGifResult } from "./trending";
const router = Router();
router.get("/", route({}), async (req: Request, res: Response) => {
// TODO: Custom providers
const { media_format, locale } = req.query;
const apiKey = getGifApiKey();
const response = await fetch(`https://g.tenor.com/v1/trending?media_format=${media_format}&locale=${locale}&key=${apiKey}`, {
method: "get",
headers: { "Content-Type": "application/json" }
});
const { results } = await response.json();
res.json(results.map(parseGifResult)).status(200);
});
export default router;

View File

@ -0,0 +1,57 @@
import { Router, Response, Request } from "express";
import fetch from "node-fetch";
import { route } from "@fosscord/api";
import { Config } from "@fosscord/util";
import { HTTPError } from "lambert-server";
const router = Router();
export function parseGifResult(result: any) {
return {
id: result.id,
title: result.title,
url: result.itemurl,
src: result.media[0].mp4.url,
gif_src: result.media[0].gif.url,
width: result.media[0].mp4.dims[0],
height: result.media[0].mp4.dims[1],
preview: result.media[0].mp4.preview
};
}
export function getGifApiKey() {
const { enabled, provider, apiKey } = Config.get().gif;
if (!enabled) throw new HTTPError(`Gifs are disabled`);
if (provider !== "tenor" || !apiKey) throw new HTTPError(`${provider} gif provider not supported`);
return apiKey;
}
router.get("/", route({}), async (req: Request, res: Response) => {
// TODO: Custom providers
// TODO: return gifs as mp4
const { media_format, locale } = req.query;
const apiKey = getGifApiKey();
const [responseSource, trendGifSource] = await Promise.all([
fetch(`https://g.tenor.com/v1/categories?locale=${locale}&key=${apiKey}`, {
method: "get",
headers: { "Content-Type": "application/json" }
}),
fetch(`https://g.tenor.com/v1/trending?locale=${locale}&key=${apiKey}`, {
method: "get",
headers: { "Content-Type": "application/json" }
})
]);
const { tags } = await responseSource.json();
const { results } = await trendGifSource.json();
res.json({
categories: tags.map((x: any) => ({ name: x.searchterm, src: x.image })),
gifs: [parseGifResult(results[0])]
}).status(200);
});
export default router;

View File

@ -25,6 +25,7 @@ import cheerio from "cheerio";
import { MessageCreateSchema } from "../routes/channels/#channel_id/messages"; import { MessageCreateSchema } from "../routes/channels/#channel_id/messages";
// TODO: check webhook, application, system author // TODO: check webhook, application, system author
// TODO: embed gifs/videos/images
const LINK_REGEX = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/g; const LINK_REGEX = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/g;

View File

@ -51,11 +51,6 @@ export interface ConfigValue {
general: { general: {
instanceId: string; instanceId: string;
}; };
permissions: {
user: {
createGuilds: boolean;
};
};
limits: { limits: {
user: { user: {
maxGuilds: number; maxGuilds: number;
@ -154,6 +149,11 @@ export interface ConfigValue {
canLeave: boolean; canLeave: boolean;
}; };
}; };
gif: {
enabled: boolean;
provider: "tenor"; // more coming soon
apiKey?: string;
};
rabbitmq: { rabbitmq: {
host: string | null; host: string | null;
}; };
@ -176,11 +176,6 @@ export const DefaultConfigOptions: ConfigValue = {
general: { general: {
instanceId: Snowflake.generate(), instanceId: Snowflake.generate(),
}, },
permissions: {
user: {
createGuilds: true,
},
},
limits: { limits: {
user: { user: {
maxGuilds: 100, maxGuilds: 100,
@ -307,7 +302,6 @@ export const DefaultConfigOptions: ConfigValue = {
}, },
], ],
}, },
guild: { guild: {
showAllGuildsInDiscovery: false, showAllGuildsInDiscovery: false,
autoJoin: { autoJoin: {
@ -316,6 +310,11 @@ export const DefaultConfigOptions: ConfigValue = {
guilds: [], guilds: [],
}, },
}, },
gif: {
enabled: true,
provider: "tenor",
apiKey: "LIVDSRZULELA",
},
rabbitmq: { rabbitmq: {
host: null, host: null,
}, },