some updates

This commit is contained in:
2026-01-28 19:47:50 +03:00
parent 8cf1773926
commit 73905780b9
3 changed files with 19 additions and 12 deletions
+8 -3
View File
@@ -1,13 +1,18 @@
import {ChatCommand} from "../base/chat-command"; import {ChatCommand} from "../base/chat-command";
import {logError, oldSendMessage} from "../util/utils"; import {logError, replyToMessage} from "../util/utils";
import {Message} from "typescript-telegram-bot-api"; import {Message} from "typescript-telegram-bot-api";
import {systemInfoText} from "../index";
export class SystemInfo extends ChatCommand { export class SystemInfo extends ChatCommand {
title = "/systemInfo"; title = "/systemInfo";
description = "System information"; description = "System information";
private static systemInfoText: string;
static setSystemInfo(info: string) {
SystemInfo.systemInfoText = info;
}
async execute(msg: Message) { async execute(msg: Message) {
await oldSendMessage(msg, systemInfoText).catch(logError); await replyToMessage({message: msg, text: SystemInfo.systemInfoText}).catch(logError);
} }
} }
-6
View File
@@ -117,12 +117,6 @@ export function abortOllamaRequest(uuid: string): boolean {
} }
} }
export let systemInfoText: string = "";
export function setSystemInfo(info: string) {
systemInfoText = info;
}
export const chatCommands: ChatCommand[] = [ export const chatCommands: ChatCommand[] = [
new Start(), new Start(),
new Help(), new Help(),
+11 -3
View File
@@ -12,7 +12,7 @@ import {
} from "typescript-telegram-bot-api"; } from "typescript-telegram-bot-api";
import {Environment} from "../common/environment"; import {Environment} from "../common/environment";
import {TelegramError} from "typescript-telegram-bot-api/dist/errors"; import {TelegramError} from "typescript-telegram-bot-api/dist/errors";
import {bot, botUser, messageDao, setSystemInfo} from "../index"; import {bot, botUser, messageDao} from "../index";
import os from "os"; import os from "os";
import axios from "axios"; import axios from "axios";
import {MessagePart} from "../common/message-part"; import {MessagePart} from "../common/message-part";
@@ -24,6 +24,7 @@ import {sql, type SQL} from "drizzle-orm";
import fs from "node:fs"; import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import {MessageStore} from "../common/message-store"; import {MessageStore} from "../common/message-store";
import {SystemInfo} from "../commands/system-info";
export const ignore = () => { export const ignore = () => {
}; };
@@ -252,6 +253,7 @@ export type SendOptions = {
message_id?: number; message_id?: number;
text: string, text: string,
parse_mode?: ParseMode, parse_mode?: ParseMode,
disableLinkPreview?: boolean
}; };
export async function oldSendMessage(message: Message, text: string, parseMode?: ParseMode): Promise<Message> { export async function oldSendMessage(message: Message, text: string, parseMode?: ParseMode): Promise<Message> {
@@ -268,7 +270,10 @@ export async function sendMessage(options: SendOptions): Promise<Message> {
const response = await bot.sendMessage({ const response = await bot.sendMessage({
chat_id: options.chat_id ?? options.message?.chat?.id, chat_id: options.chat_id ?? options.message?.chat?.id,
text: options.text, text: options.text,
parse_mode: options.parse_mode parse_mode: options.parse_mode,
link_preview_options: {
is_disabled: options.disableLinkPreview
}
}); });
return Promise.resolve(response); return Promise.resolve(response);
@@ -281,6 +286,9 @@ export async function replyToMessage(options: SendOptions): Promise<Message> {
parse_mode: options.parse_mode, parse_mode: options.parse_mode,
reply_parameters: { reply_parameters: {
message_id: options.message_id || options.message?.message_id message_id: options.message_id || options.message?.message_id
},
link_preview_options: {
is_disabled: options.disableLinkPreview
} }
}); });
@@ -318,7 +326,7 @@ export async function initSystemSpecs(): Promise<void> {
`CPU: ${cpu.manufacturer} ${cpu.brand} ${cpu.physicalCores} cores ${cpu.cores} threads\n` + `CPU: ${cpu.manufacturer} ${cpu.brand} ${cpu.physicalCores} cores ${cpu.cores} threads\n` +
`RAM: ${ramSize} GB`; `RAM: ${ramSize} GB`;
setSystemInfo(text); SystemInfo.setSystemInfo(text);
return Promise.resolve(); return Promise.resolve();
} catch (e) { } catch (e) {
return Promise.reject(e); return Promise.reject(e);