Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions i18n/de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ CHOOSE_LANG: Sprache auswählen
SET_LANG_TO: Sprache einstellen auf
LANG_USAGE: 'Verwendung: /lang Sprache ändern'
CHOOSE_UNSUB: Wähle das Abonnement, das du abbestellen möchtest
EXPORT_SUCCESS: Export abgeschlossen
RESPONSE_TOO_LONG: Das Ergebnis ist zu lang, um es anzuzeigen.
2 changes: 2 additions & 0 deletions i18n/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ ACTIVE_FEED_COUNT_WITH_ERROR: Number of active feeds with error
TOTAL_ACTIVE_FEED_COUNT: Total number of active feeds
CREATOR_ONLY: Bot Craetor only
ALLOW_LIST_NOT_INCLUDE: This bot has enabled allow list and you are blocked
EXPORT_SUCCESS: Export complete
RESPONSE_TOO_LONG: The result is too long to display.
2 changes: 2 additions & 0 deletions i18n/es-es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ CHOOSE_LANG: Seleccione idiomas
SET_LANG_TO: Cambiar idioma a
LANG_USAGE: 'UTILIZACIÓN: /lang cambiar idioma'
CHOOSE_UNSUB: Elija la suscripción que desee eliminar
EXPORT_SUCCESS: Exportación completada
RESPONSE_TOO_LONG: El resultado es demasiado largo para mostrarlo.
2 changes: 2 additions & 0 deletions i18n/fa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ ACTIVE_FEED_COUNT_WITH_ERROR: تعداد فیدهای فعال با خطا
TOTAL_ACTIVE_FEED_COUNT: تعداد فیدهای فعال
CREATOR_ONLY: فقط سازنده ربات
ALLOW_LIST_NOT_INCLUDE: این ربات لیست مجاز را فعال کرده است و شما مسدود شده اید
EXPORT_SUCCESS: با موفقیت صادر شد
RESPONSE_TOO_LONG: نتیجه برای نمایش بیش از حد طولانی است.
2 changes: 2 additions & 0 deletions i18n/id.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ ACTIVE_FEED_COUNT_WITH_ERROR: Banyaknya feed aktif yang error
TOTAL_ACTIVE_FEED_COUNT: Banyaknya feed yang aktif
CREATOR_ONLY: Hanya pemilik bot
ALLOW_LIST_NOT_INCLUDE: Bot ini telah mengaktifkan daftar yang diijinkan dan anda diblok
EXPORT_SUCCESS: Ekspor selesai
RESPONSE_TOO_LONG: Hasilnya terlalu panjang untuk ditampilkan.
2 changes: 2 additions & 0 deletions i18n/it.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ CHOOSE_LANG: Scegli la lingua
SET_LANG_TO: Cambia lingua in
LANG_USAGE: 'UTILIZZO: /lang cambia lingua'
CHOOSE_UNSUB: Scegli l'iscrizione che desideri annullare
EXPORT_SUCCESS: Esportazione completata
RESPONSE_TOO_LONG: Il risultato è troppo lungo per essere visualizzato.
2 changes: 2 additions & 0 deletions i18n/ka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ CHOOSE_LANG: ენის არჩევა
SET_LANG_TO: ენის დაყენება
LANG_USAGE: 'გამოყენება: /lang ენის შეცვლა'
CHOOSE_UNSUB: აირჩიეთ გამოწერა რომლის გაუქმებაც გსურთ
EXPORT_SUCCESS: ექსპორტი დასრულდა
RESPONSE_TOO_LONG: შედეგი ზედმეტად გრძელია და ვერ გამოჩნდება.
2 changes: 2 additions & 0 deletions i18n/lt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ CHOOSE_LANG: Pasirinkti kalbą
SET_LANG_TO: Nustatyti kalbą
LANG_USAGE: 'NAUDOJIMAS: /lang keisti kalbą'
CHOOSE_UNSUB: Pasirinkite kanalą, kurio prenumeratą norite atšaukti
EXPORT_SUCCESS: Eksportas baigtas
RESPONSE_TOO_LONG: Rezultatas per ilgas, kad jį būtų galima parodyti.
2 changes: 2 additions & 0 deletions i18n/pt-br.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ CHOOSE_LANG: Escolha a língua
SET_LANG_TO: Configurar língua para
LANG_USAGE: 'USO: /lang alterar língua'
CHOOSE_UNSUB: Escolha a inscrição que vocês deseja remover
EXPORT_SUCCESS: Exportação concluída
RESPONSE_TOO_LONG: O resultado é longo demais para ser exibido.
2 changes: 2 additions & 0 deletions i18n/ru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ ACTIVE_FEED_COUNT_WITH_ERROR: Число активных каналов с ош
TOTAL_ACTIVE_FEED_COUNT: Число активных каналов
CREATOR_ONLY: Только для создателя бота
ALLOW_LIST_NOT_INCLUDE: У этого бота включён лист разрешенных и вы в него не входите
EXPORT_SUCCESS: Экспорт завершён
RESPONSE_TOO_LONG: Результат слишком длинный для отображения.
2 changes: 2 additions & 0 deletions i18n/zh-cn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ ACTIVE_FEED_COUNT_WITH_ERROR: 错误的活跃订阅源数
TOTAL_ACTIVE_FEED_COUNT: 总活跃订阅源数
CREATOR_ONLY: 只限 Bot 创建者使用
ALLOW_LIST_NOT_INCLUDE: 该 Bot 已启用白名单,你已经被禁用
EXPORT_SUCCESS: 已导出
RESPONSE_TOO_LONG: 结果过长,无法显示。
2 changes: 2 additions & 0 deletions i18n/zh-tw.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ ACTIVE_FEED_COUNT_WITH_ERROR: 錯誤的活躍訂閱源數
TOTAL_ACTIVE_FEED_COUNT: 總活躍訂閱源數
CREATOR_ONLY: 只限 Bot 創建者使用
ALLOW_LIST_NOT_INCLUDE: 該 Bot 已啟用白名單,妳已經被禁用
EXPORT_SUCCESS: 已匯出
RESPONSE_TOO_LONG: 結果過長,無法顯示。
30 changes: 10 additions & 20 deletions source/controlers/language.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import editResponse from '../utils/edit-response';
import { setLangById } from '../proxies/users';
import i18n from '../i18n';
import { MContext, TNextFn } from '../types/ctx';
Expand All @@ -20,19 +21,15 @@ export async function replyKeyboard(
callback_data: `CHANGE_LANG_${i}_${ctx.state.chat.id}`
};
});
await ctx.telegram.sendMessage(
ctx.chat.id,
i18n[ctx.state.lang]['CHOOSE_LANG'],
{
parse_mode: 'HTML',
link_preview_options: {
is_disabled: true
},
reply_markup: {
inline_keyboard: chunk(kbs, 5)
}
await editResponse(ctx, i18n[ctx.state.lang]['CHOOSE_LANG'], {
parse_mode: 'HTML',
link_preview_options: {
is_disabled: true
},
reply_markup: {
inline_keyboard: chunk(kbs, 5)
}
);
});
await next();
}

Expand All @@ -46,14 +43,7 @@ export async function changeLangCallback(
const lang = data[data.length - 2];
const id = data[data.length - 1];
await setLangById(parseInt(id), lang);
ctx.telegram.answerCbQuery(
cb.id,
i18n[lang]['SET_LANG_TO'] + ' ' + lang
);
await ctx.telegram.deleteMessage(
cb.message.chat.id,
cb.message.message_id
);
await editResponse(ctx, i18n[lang]['SET_LANG_TO'] + ' ' + lang);
await next();
}
}
64 changes: 30 additions & 34 deletions source/controlers/rss.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { limitText, MESSAGE_LIMIT } from '../utils/limit-text';
import editResponse from '../utils/edit-response';
import * as RSS from '../proxies/rss-feed';
import i18n from '../i18n';
import twoKeyReply from '../utils/two-key-reply';
Expand All @@ -8,51 +10,50 @@ import { decodeUrl, encodeUrl } from '../utils/urlencode';
import sanitize from '../utils/sanitize';
import escapeHtml from '../utils/escape-html';

function feedLink(label: string, feedUrl: string, feedTitle: string): string {
const href = escapeHtml(encodeUrl(feedUrl));
const budget = MESSAGE_LIMIT - label.length - 1;
return `${label} <a href="${href}">${sanitize(limitText(feedTitle, budget))}</a>`;
}

export async function sub(ctx: MContext, next: TNextFn): Promise<void> {
const { feedUrl, chat, lang } = ctx.state;
const feedTitle = ctx.state.feed.feed_title;
const ttl = Number.isNaN(ctx.state.feed.ttl) ? 0 : ctx.state.feed.ttl;
const userId = chat.id;
try {
await RSS.sub(userId, feedUrl, feedTitle, ttl);
await ctx.telegram.deleteMessage(ctx.chat.id, ctx.state.processMsgId);
ctx.state.processMsgId = null;
ctx.replyWithMarkdown(`
${i18n[lang]['SUB_SUCCESS']} [${ctx.state.feed.feed_title}](${encodeUrl(
ctx.state.feedUrl
)})`);
} catch (e) {
if (e instanceof errors.ControllableError) throw e;
throw errors.newCtrlErr('DB_ERROR', e);
}
await editResponse(
ctx,
feedLink(i18n[lang]['SUB_SUCCESS'], feedUrl, feedTitle),
{
parse_mode: 'HTML'
}
);
await next();
}

export async function unsub(ctx: MContext, next: TNextFn): Promise<void> {
const { feedUrl, chat, lang } = ctx.state;
const userId = chat.id;
const feed = await RSS.getFeedByUrl(feedUrl);
if (isNone(feed)) throw errors.newCtrlErr('DID_NOT_SUB');
try {
const feed = await RSS.getFeedByUrl(feedUrl);
if (isNone(feed)) throw errors.newCtrlErr('DID_NOT_SUB');
await RSS.unsub(userId, feed.value.feed_id);

await ctx.telegram.deleteMessage(ctx.chat.id, ctx.state.processMsgId);
ctx.state.processMsgId = null;
ctx.replyWithMarkdown(
`
${i18n[lang]['UNSUB_SUCCESS']} [${feed.value.feed_title}](${encodeUrl(
ctx.state.feedUrl
)})`,
{
reply_markup: {
remove_keyboard: true
}
}
);
const deleted = await RSS.unsub(userId, feed.value.feed_id);
if (!deleted) throw errors.newCtrlErr('DID_NOT_SUB');
} catch (e) {
if (e instanceof errors.ControllableError) throw e;
throw errors.newCtrlErr('DB_ERROR', e);
}
await editResponse(
ctx,
feedLink(i18n[lang]['UNSUB_SUCCESS'], feedUrl, feed.value.feed_title),
{ parse_mode: 'HTML' }
);
await next();
}

Expand Down Expand Up @@ -115,14 +116,10 @@ export async function unsubAll(ctx: MContext, next: TNextFn): Promise<void> {
const userId = ctx.state.chat.id;
const lang = ctx.state.lang;
await RSS.unsubAll(userId);
await ctx.telegram.sendMessage(
ctx.chat.id,
i18n[lang]['UNSUB_ALL_SUCCESS'],
{
parse_mode: 'HTML',
link_preview_options: { is_disabled: true }
}
);
await editResponse(ctx, i18n[lang]['UNSUB_ALL_SUCCESS'], {
parse_mode: 'HTML',
link_preview_options: { is_disabled: true }
});
await next();
}

Expand Down Expand Up @@ -170,6 +167,7 @@ export async function getUrlById(
const { text } = ctx.message;
const feed_id = text.match(/^\[(\d+)] (.+)/)[1];
const feed = await RSS.getFeedById(parseInt(feed_id));
if (!feed) throw errors.newCtrlErr('DID_NOT_SUB');
ctx.state.feedUrl = decodeUrl(feed.url);
await next();
}
Expand All @@ -190,9 +188,7 @@ export async function getActiveFeedWithErrorCount(
}: ${count} ${i18n[ctx.state.lang]['TOTAL_ACTIVE_FEED_COUNT']}: ${
feedsWithErrorCount.length
}`;
ctx.reply(heath);
await ctx.telegram.deleteMessage(ctx.chat.id, ctx.state.processMsgId);
ctx.state.processMsgId = null;
await editResponse(ctx, heath);
await next();
}

Expand Down
44 changes: 16 additions & 28 deletions source/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import editResponse from './utils/edit-response';
import { Telegraf } from 'telegraf';
import { telegrafThrottler } from 'telegraf-throttler';
import { fork } from 'child_process';
Expand Down Expand Up @@ -35,7 +36,7 @@ const {
import getUrl from './middlewares/get-url';
import getUrlByTitle from './middlewares/get-url-by-title';
import getFileLink from './middlewares/get-file-link';
import sendError from './middlewares/send-error';
import sendError, { handleErrors, processing } from './middlewares/send-error';
import testUrl from './middlewares/test-url';
import isAdmin from './middlewares/is-admin';
import onlyPrivateChat from './middlewares/only-private-chat';
Expand Down Expand Up @@ -89,7 +90,7 @@ bot.command('start', sendError, async (ctx) => {
builder.push(i18n[lang]['USB_ALL_USAGE']);
builder.push(i18n[lang]['LANG_USAGE']);
if (view_all) builder.push(i18n[lang]['VIEW_ALL_USAGE']);
await ctx.replyWithMarkdown(builder.join('\n'));
await editResponse(ctx, builder.join('\n'), { parse_mode: 'Markdown' });
});

bot.command('help', sendError, async (ctx) => {
Expand All @@ -106,12 +107,12 @@ bot.command('help', sendError, async (ctx) => {
builder.push(
`[https://github.com/fengkx/NodeRSSBot/blob/master/README.md](https://github.com/fengkx/NodeRSSBot/blob/master/README.md)`
);
await ctx.replyWithMarkdown(builder.join('\n'));
await editResponse(ctx, builder.join('\n'), { parse_mode: 'Markdown' });
});

bot.command('sub', sendError, isAdmin, getUrl, testUrl, sub);

bot.command('unsub', sendError, isAdmin, getUrl, unsub);
bot.command('unsub', handleErrors, isAdmin, getUrl, processing, unsub);

bot.command('unsubthis', sendError, isAdmin, getUrlByTitle, unsub);

Expand Down Expand Up @@ -191,7 +192,7 @@ bot.command(
getActiveFeedWithErrorCount
);

bot.action(/^CHANGE_LANG[\w_]+/, changeLangCallback);
bot.action(/^CHANGE_LANG[\w_]+/, sendError, changeLangCallback);

bot.hears(
/(((https?:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(?:www\.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w\-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[.!/\\\w]*))?)/gm,
Expand All @@ -210,24 +211,19 @@ bot.hears(
subMultiUrl
);

bot.hears(/^\[(\d+)] (.+)/, sendError, isAdmin, getUrlById, unsub);

bot.action(
'UNSUB_ALL_YES',
sendError,
bot.hears(
/^\[(\d+)] (.+)/,
handleErrors,
(ctx, next) => processing(ctx, next, { removeKeyboard: true }),
isAdmin,
unsubAll,
async (ctx: MContext, next) => {
const cb = ctx.callbackQuery;
ctx.telegram.answerCbQuery(cb.id);
await next();
}
getUrlById,
unsub
);

bot.action('UNSUB_ALL_NO', async (ctx: MContext, next) => {
const cb = ctx.callbackQuery;
ctx.telegram.answerCbQuery(cb.id, i18n[lang]['CANCEL']);
await ctx.telegram.deleteMessage(cb.message.chat.id, cb.message.message_id);
bot.action('UNSUB_ALL_YES', sendError, isAdmin, unsubAll);

bot.action('UNSUB_ALL_NO', sendError, async (ctx: MContext, next) => {
await editResponse(ctx, i18n[ctx.state.lang]['CANCEL']);
await next();
});

Expand All @@ -239,10 +235,6 @@ bot.action(
const cb = ctx.callbackQuery;
if ('data' in cb) {
ctx.state.viewallPage = parseInt(cb.data.split('_')[1]);
await ctx.telegram.deleteMessage(
cb.message.chat.id,
cb.message.message_id
);
await next();
}
},
Expand All @@ -259,10 +251,6 @@ bot.action(
const splitStr = cb.data.split('_');
if (splitStr[1] === 'RAW') ctx.state.showRaw = true;
ctx.state.rssPage = parseInt(splitStr[splitStr.length - 1]);
await ctx.telegram.deleteMessage(
cb.message.chat.id,
cb.message.message_id
);
await next();
}
},
Expand Down
Loading
Loading