8 Commits
2.0.5 ... 2.1.0

Author SHA1 Message Date
Fran Jurmanović
7e0c088fa7 increase minor version 2024-08-16 23:07:41 +02:00
Fran Jurmanović
43b4757696 change selectors to fit the new design 2024-08-16 23:00:39 +02:00
Fran Jurmanović
3c6bdeab60 add build script 2024-05-20 23:18:22 +02:00
Fran Jurmanović
11a26bff83 version increase 2024-04-17 20:54:09 +02:00
Fran Jurmanović
e1cf854d27 remove static plugin 2024-04-17 20:53:36 +02:00
Fran Jurmanović
972ee67f53 remove static plugin 2024-04-17 20:49:05 +02:00
Fran Jurmanović
9ecfdef62b update dockerfile 2024-04-17 20:39:46 +02:00
Fran Jurmanović
e56f0883cf increase version 2024-03-02 14:50:29 +01:00
7 changed files with 25 additions and 17 deletions

BIN
bun.lockb

Binary file not shown.

View File

@@ -1,17 +1,20 @@
# Use oven/bun as parent image # Use oven/bun as parent image
FROM oven/bun:latest FROM oven/bun:1.0.27
# Change the working directory on the Docker image to /app # Change the working directory on the Docker image to /app
WORKDIR /app WORKDIR /app
# Copy package.json and package-lock.json to the /app directory # Copy package.json and package-lock.json to the /app directory
COPY . . COPY package.json ./
COPY bun.lockb ./
COPY src ./src
COPY tsconfig.json ./
# Install dependencies # Install dependencies
RUN bun install RUN bun install --frozen-lockfile
# Expose application port # Expose application port
EXPOSE 3000 EXPOSE 3000
# Start the application # Start the application
CMD bun start CMD ["bun", "start"]

View File

@@ -1,9 +1,11 @@
{ {
"name": "legica-dana", "name": "legica-dana",
"version": "2.0.5", "version": "2.1.0",
"main": "src/app.ts", "main": "src/app.ts",
"scripts": { "scripts": {
"start": "bun src/app.ts" "start": "bun run src/app.ts",
"build-script": "bun build src/app.ts --outdir dist --target bun",
"start-build": "bun run dist/app.js"
}, },
"author": "Fran Jurmanović <fjurma12@outlook.com>", "author": "Fran Jurmanović <fjurma12@outlook.com>",
"license": "MIT", "license": "MIT",
@@ -18,6 +20,7 @@
"discord.js": "^12.5.1", "discord.js": "^12.5.1",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"elysia": "^0.7.15", "elysia": "^0.7.15",
"ffmpeg-static": "^5.2.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"minimatch": "^9.0.3", "minimatch": "^9.0.3",
"pino": "^8.15.4", "pino": "^8.15.4",

View File

@@ -5,7 +5,6 @@ import { Elysia, t } from "elysia";
import { swagger } from "@elysiajs/swagger"; import { swagger } from "@elysiajs/swagger";
import { basicAuth, BasicAuthError } from "@core"; import { basicAuth, BasicAuthError } from "@core";
import pino from "pino"; import pino from "pino";
import staticPlugin from "@elysiajs/static";
import cron from "@elysiajs/cron"; import cron from "@elysiajs/cron";
const client: Client = new Client(); const client: Client = new Client();
@@ -196,7 +195,8 @@ const taskPlugin = new Elysia({ prefix: "/job" })
return true; return true;
} catch (err) { } catch (err) {
set.status = 400; set.status = 400;
return err; logger.error(err);
return false;
} }
}, },
{ {
@@ -259,7 +259,6 @@ const app = new Elysia()
}, },
}) })
) )
.use(staticPlugin())
.use(taskPlugin) .use(taskPlugin)
.use(botPlugin) .use(botPlugin)
.listen(config.PORT); .listen(config.PORT);

View File

@@ -2,10 +2,10 @@ import { config } from "@constants";
import axios from "axios"; import axios from "axios";
import cheerio from "cheerio"; import cheerio from "cheerio";
export async function getFirstHtml(): Promise<string> { export async function getFirstHtml(): Promise<string | undefined> {
const response = await axios.get(config.LEGICA_URL); const response = await axios.get(config.LEGICA_URL);
const html = response.data; const html = response.data;
const $ = cheerio.load(html); const $ = cheerio.load(html);
const { href } = $(".News-link.c-def")?.attr() || {}; const href = $(".legica-dana").first().find("a").attr("href");
return href; return href;
} }

View File

@@ -7,8 +7,9 @@ export async function getImgTitle(href: string): Promise<Legica> {
const html = response.data; const html = response.data;
const $ = cheerio.load(html); const $ = cheerio.load(html);
const title = $(".Article-inner > h1").text(); const title = $(".article-title-container > h1").text();
const { src: img } = $(".Article-media > img").attr() || {}; const src = $(".image-holder", ".article-content").find("img").attr("src");
if (!src) throw new Error(`Image not found at ${href}.`);
return { title, img }; return { title, img: src };
} }

View File

@@ -11,7 +11,6 @@ export async function sendDiscordMessage(
url: string, url: string,
dateCheck?: dayjs.Dayjs dateCheck?: dayjs.Dayjs
): Promise<void> { ): Promise<void> {
if (!url) return;
const { img, title } = await getImgTitle(url); const { img, title } = await getImgTitle(url);
if (dateCheck) { if (dateCheck) {
@@ -26,7 +25,7 @@ export async function sendDiscordMessage(
); );
} }
client.channels.cache.forEach(async (channel) => { const promises = client.channels.cache.map(async (channel) => {
try { try {
if (channel.type !== "text") return null; if (channel.type !== "text") return null;
const embeddedMessage = new MessageEmbed().setTitle(title).setImage(img); const embeddedMessage = new MessageEmbed().setTitle(title).setImage(img);
@@ -50,13 +49,16 @@ export async function sendDiscordMessage(
console.error(`Reaction ${reaction} to channel ${channel.id} failed.`); console.error(`Reaction ${reaction} to channel ${channel.id} failed.`);
} }
} }
} catch { } catch (err) {
console.error(`Message to channel ${channel.id} failed.`); console.error(`Message to channel ${channel.id} failed.`);
throw err;
} }
}); });
await Promise.all(promises);
} }
export async function sendNextMessage(client: Client): Promise<void> { export async function sendNextMessage(client: Client): Promise<void> {
const href = await getFirstHtml(); const href = await getFirstHtml();
if (!href) throw new Error("URL cannot be empty!");
await sendDiscordMessage(client, href, dayjs()); await sendDiscordMessage(client, href, dayjs());
} }