rsshub 1.0.0-master.f9ec483 → 1.0.0-master.fa1dcc5

package/lib/routes/syosetu/templates/description.art

@@ -0,0 +1,73 @@
+{{  if novel.story }}
+<p>{{@ novel.story.replaceAll('\n', '<br>') }}</p>
+{{ /if }}
+
+<h2>作品情報</h2>
+<table>
+    <tr>
+        <td>状態</td>
+        <td>
+            {{ if novel.novel_type === 2 }}
+                短編
+            {{ else }}
+                {{ if novel.end === 0 }}
+                    完結済
+                {{ else }}
+                    連載中
+                {{ /if }}
+                （全{{ novel.general_all_no }}エピソード）
+            {{ /if }}
+        </td>
+    </tr>
+    {{ if genreText }}
+    <tr>
+        <td>ジャンル</td>
+        <td>{{ genreText }}</td>
+    </tr>
+    {{ /if }}
+    <tr>
+        <td>キーワード</td>
+        <td>{{ novel.keyword.replaceAll(' ', '、') }}</td>
+    </tr>
+    <tr>
+        <td>最終掲載</td>
+        <td>{{ novel.general_lastup }}</td>
+    </tr>
+    <tr>
+        <td>Nコード</td>
+        <td>{{ novel.ncode }}</td>
+    </tr>
+    <tr>
+        <td>読了時間</td>
+        <td>約{{ novel.time }}分（{{ novel.length }}文字）</td>
+    </tr>
+</table>
+<br>
+<table>
+    {{ if novel.weekly_unique }}
+    <tr>
+        <td>週別ユニークユーザ</td>
+        <td>{{ novel.weekly_unique < 100 ? '100未満' : novel.weekly_unique }}</td>
+    </tr>
+    {{ /if }}
+    <tr>
+        <td>総合ポイント</td>
+        <td>{{ novel.global_point }} pt</td>
+    </tr>
+    <tr>
+        <td>評価人数</td>
+        <td>{{ novel.all_hyoka_cnt }} 人</td>
+    </tr>
+    <tr>
+        <td>評価ポイント</td>
+        <td>{{ novel.all_point }} pt</td>
+    </tr>
+    <tr>
+        <td>ブックマーク</td>
+        <td>{{ novel.fav_novel_cnt }} 件</td>
+    </tr>
+</table>
+
+{{ if novel.sasie_cnt > 0 }}
+<p>挿絵数：{{ novel.sasie_cnt }}枚</p>
+{{ /if }}

package/lib/routes/syosetu/types/ranking-r18.ts

@@ -0,0 +1,60 @@
+import { R18Site } from 'narou';
+
+export enum SyosetuSub {
+    NOCTURNE = 'noc',
+    MOONLIGHT = 'mnlt',
+    MIDNIGHT = 'mid',
+    MOONLIGHT_BL = 'mnlt-bl',
+}
+
+export enum RankingPeriod {
+    DAILY = 'daily',
+    WEEKLY = 'weekly',
+    MONTHLY = 'monthly',
+    QUARTER = 'quarter',
+    YEARLY = 'yearly',
+}
+
+export enum NovelType {
+    TOTAL = 'total',
+    SHORT = 't',
+    ONGOING = 'r',
+    COMPLETE = 'er',
+}
+
+export const syosetuSubToNocgenre = {
+    [SyosetuSub.NOCTURNE]: R18Site.Nocturne,
+    [SyosetuSub.MOONLIGHT]: R18Site.MoonLight,
+    [SyosetuSub.MOONLIGHT_BL]: R18Site.MoonLightBL,
+    [SyosetuSub.MIDNIGHT]: R18Site.Midnight,
+} as const;
+
+export const syosetuSubToJapanese = {
+    [SyosetuSub.NOCTURNE]: 'ノクターン',
+    [SyosetuSub.MOONLIGHT]: 'ムーンライト',
+    [SyosetuSub.MOONLIGHT_BL]: 'ムーンライト BL',
+    [SyosetuSub.MIDNIGHT]: 'ミッドナイト',
+} as const;
+
+export const periodToOrder = {
+    [RankingPeriod.DAILY]: 'dailypoint',
+    [RankingPeriod.WEEKLY]: 'weeklypoint',
+    [RankingPeriod.MONTHLY]: 'monthlypoint',
+    [RankingPeriod.QUARTER]: 'quarterpoint',
+    [RankingPeriod.YEARLY]: 'yearlypoint',
+} as const;
+
+export const periodToJapanese = {
+    [RankingPeriod.DAILY]: '日間',
+    [RankingPeriod.WEEKLY]: '週間',
+    [RankingPeriod.MONTHLY]: '月間',
+    [RankingPeriod.QUARTER]: '四半期',
+    [RankingPeriod.YEARLY]: '年間',
+} as const;
+
+export const novelTypeToJapanese = {
+    [NovelType.TOTAL]: '総合',
+    [NovelType.SHORT]: '短編',
+    [NovelType.ONGOING]: '連載中',
+    [NovelType.COMPLETE]: '完結済',
+} as const;

package/lib/routes/syosetu/types/ranking.ts

@@ -0,0 +1,67 @@
+export enum RankingPeriod {
+    DAILY = 'daily',
+    WEEKLY = 'weekly',
+    MONTHLY = 'monthly',
+    QUARTER = 'quarter',
+    YEARLY = 'yearly',
+    TOTAL = 'total',
+}
+
+export enum NovelType {
+    TOTAL = 'total',
+    SHORT = 't',
+    ONGOING = 'r',
+    COMPLETE = 'er',
+}
+
+export enum RankingType {
+    LIST = 'list',
+    GENRE = 'genre',
+    ISEKAI = 'isekai',
+}
+
+export const periodToOrder = {
+    [RankingPeriod.DAILY]: 'dailypoint',
+    [RankingPeriod.WEEKLY]: 'weeklypoint',
+    [RankingPeriod.MONTHLY]: 'monthlypoint',
+    [RankingPeriod.QUARTER]: 'quarterpoint',
+    [RankingPeriod.YEARLY]: 'yearlypoint',
+    [RankingPeriod.TOTAL]: 'hyoka',
+} as const;
+
+export const periodToPointField = {
+    [RankingPeriod.DAILY]: 'pt',
+    [RankingPeriod.WEEKLY]: 'weekly_point',
+    [RankingPeriod.MONTHLY]: 'monthly_point',
+    [RankingPeriod.QUARTER]: 'quarter_point',
+    [RankingPeriod.YEARLY]: 'yearly_point',
+    [RankingPeriod.TOTAL]: 'global_point',
+} as const;
+
+export const periodToJapanese = {
+    [RankingPeriod.DAILY]: '日間',
+    [RankingPeriod.WEEKLY]: '週間',
+    [RankingPeriod.MONTHLY]: '月間',
+    [RankingPeriod.QUARTER]: '四半期',
+    [RankingPeriod.YEARLY]: '年間',
+    [RankingPeriod.TOTAL]: '累計',
+} as const;
+
+export const novelTypeToJapanese = {
+    [NovelType.TOTAL]: 'すべて',
+    [NovelType.SHORT]: '短編',
+    [NovelType.ONGOING]: '連載中',
+    [NovelType.COMPLETE]: '完結済',
+} as const;
+
+export enum IsekaiCategory {
+    RENAI = '1',
+    FANTASY = '2',
+    OTHER = 'o',
+}
+
+export const isekaiCategoryToJapanese = {
+    [IsekaiCategory.RENAI]: '〔恋愛〕',
+    [IsekaiCategory.FANTASY]: '〔ファンタジー〕',
+    [IsekaiCategory.OTHER]: '〔文芸・SF・その他〕',
+} as const;

package/lib/routes/syosetu/types/search.ts

@@ -0,0 +1,138 @@
+export enum SyosetuSub {
+    YOMOU = 'yomou',
+    NOCTURNE = 'noc',
+    MOONLIGHT = 'mnlt',
+    MIDNIGHT = 'mid',
+}
+
+export const syosetuSubToJapanese = {
+    [SyosetuSub.YOMOU]: '小説を読もう',
+    [SyosetuSub.NOCTURNE]: 'ノクターン',
+    [SyosetuSub.MOONLIGHT]: 'ムーンライト',
+    [SyosetuSub.MIDNIGHT]: 'ミッドナイト',
+} as const;
+
+export interface NarouSearchParams {
+    /**
+     * 作品種別の絞り込み Work Type Filter
+     *
+     * t 短編 Short
+     * r 連載中 Ongoing Series
+     * er 完結済連載作品 Completed Series
+     * re すべての連載作品 (連載中および完結済) Series and Completed Series
+     * ter 短編と完結済連載作品 Completed Works (Including Short and Series)
+     *
+     * tr 短編と連載中小説 Short and Ongoing Series
+     * all 全ての種別 (Default) All Types
+     *
+     * Note: While the official documentation describes 5 values, all 7 values above are functional.
+     */
+    type?: 't' | 'r' | 'er' | 're' | 'ter' | 'tr' | 'all';
+
+    /** 検索ワード Search Keywords */
+    word?: string;
+
+    /** 除外ワード Excluded Keywords */
+    notword?: string;
+
+    /**
+     * 検索範囲指定 Search Range Specifications
+     *
+     * - 読了時間 Reading Time
+     * - 文字数 Character Count
+     * - 総合ポイント Total Points
+     * - 最新掲載日（年月日）Latest Update Date (Year/Month/Day)
+     * - 初回掲載日（年月日）First Publication Date (Year/Month/Day)
+     */
+    mintime?: number;
+    maxtime?: number;
+    minlen?: number;
+    maxlen?: number;
+    min_globalpoint?: number;
+    max_globalpoint?: number;
+    minlastup?: string;
+    maxlastup?: string;
+    minfirstup?: string;
+    maxfirstup?: string;
+
+    /**
+     * 抽出条件の指定 Extraction Conditions
+     *
+     * - 挿絵のある作品 Works with Illustrations
+     * - 小説 PickUp！対象作品 Featured Novels
+     *
+     * 作品に含まれる要素：Elements Included in Works:
+     * - 残酷な描写あり Contains Cruel Content
+     * - ボーイズラブ Boys' Love
+     * - ガールズラブ Girls' Love
+     * - 異世界転生 Reincarnation in Another World
+     * - 異世界転移 Transportation to Another World
+     */
+    sasie?: string;
+    ispickup?: boolean;
+    iszankoku?: boolean;
+    isbl?: boolean;
+    isgl?: boolean;
+    istensei?: boolean;
+    istenni?: boolean;
+
+    /**
+     * 除外条件の指定 Exclusion Conditions
+     *
+     * - 長期連載停止中の作品 Works on Long-term Hiatus
+     *
+     * 作品に含まれる要素：Elements to Exclude:
+     * - 残酷な描写あり Cruel Content
+     * - ボーイズラブ Boys' Love
+     * - ガールズラブ Girls' Love
+     * - 異世界転生 Reincarnation in Another World
+     * - 異世界転移 Transportation to Another World
+     */
+    stop?: boolean;
+    notzankoku?: boolean;
+    notbl?: boolean;
+    notgl?: boolean;
+    nottensei?: boolean;
+    nottenni?: boolean;
+
+    /**
+     * ワード検索範囲指定 Word Search Scope
+     * すべてのチェックを解除した場合、すべての項目がワード検索の対象となります。
+     * If all boxes are unchecked, all items will become targets for word search.
+     *
+     * 作品タイトル Work Title
+     * あらすじ Synopsis
+     * キーワード Keywords
+     * 作者名 Author Name
+     */
+    title?: boolean;
+    ex?: boolean;
+    keyword?: boolean;
+    wname?: boolean;
+
+    /**
+     * 並び順 Sort Order
+     * - new: 新着更新順 (Default) Latest Updates
+     * - weekly: 週間ユニークアクセスが多い順 Most Weekly Unique Access
+     * - favnovelcnt: ブックマーク登録の多い順 Most Bookmarks
+     * - reviewcnt: レビューの多い順 Most Reviews
+     * - hyoka: 総合ポイントの高い順 Highest Total Points
+     * - dailypoint: 日間ポイントの高い順 Highest Daily Points
+     * - weeklypoint: 週間ポイントの高い順 Highest Weekly Points
+     * - monthlypoint: 月間ポイントの高い順 Highest Monthly Points
+     * - quarterpoint: 四半期ポイントの高い順 Highest Quarterly Points
+     * - yearlypoint: 年間ポイントの高い順 Highest Yearly Points
+     * - hyokacnt: 評価者数の多い順 Most Ratings
+     * - lengthdesc: 文字数の多い順 Most Characters
+     * - generalfirstup: 初回掲載順 First Publication Order
+     * - ncodedesc: N コード降順 Ncode Descending
+     * - old: 更新が古い順 Oldest Updates
+     */
+    order?: 'new' | 'weekly' | 'favnovelcnt' | 'reviewcnt' | 'hyoka' | 'dailypoint' | 'weeklypoint' | 'monthlypoint' | 'quarterpoint' | 'yearlypoint' | 'hyokacnt' | 'lengthdesc' | 'generalfirstup' | 'ncodedesc' | 'old';
+
+    /** ジャンル Genre */
+    genre?: string;
+
+    /** 掲載サイト指定 Site */
+    nocgenre?: number;
+}

package/lib/routes/syosetu/utils.ts

@@ -0,0 +1,50 @@
+import { DataItem } from '@/types';
+import cache from '@/utils/cache';
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
+import { config } from '@/config';
+import { NarouNovelFetch, NarouSearchResult, SearchBuilder, SearchBuilderR18 } from 'narou';
+
+export async function fetchNovelInfo(ncode: string): Promise<{ baseUrl: string; novel: NarouSearchResult }> {
+    const api = new NarouNovelFetch();
+    const [generalRes, r18Res] = await Promise.all([new SearchBuilder({ gzip: 5, of: 't-s-k-ga-nt-nu' }, api).ncode(ncode).execute(), new SearchBuilderR18({ gzip: 5, of: 't-s-k-ga-nt-nu' }, api).ncode(ncode).execute()]);
+
+    const isGeneral = generalRes.allcount !== 0;
+    const novelData = isGeneral ? generalRes : r18Res;
+    const baseUrl = isGeneral ? 'https://ncode.syosetu.com' : 'https://novel18.syosetu.com';
+
+    if (novelData.allcount === 0) {
+        throw new InvalidParameterError('Novel not found in both APIs');
+    }
+
+    return {
+        baseUrl,
+        novel: novelData.values[0] as NarouSearchResult,
+    };
+}
+
+export async function fetchChapterContent(chapterUrl: string, chapter?: number): Promise<DataItem> {
+    return (await cache.tryGet(chapterUrl, async () => {
+        const response = await ofetch(chapterUrl, {
+            headers: {
+                Cookie: 'over18=yes',
+                'User-Agent': config.ua,
+            },
+        });
+
+        const $ = load(response);
+
+        const title = `${chapter ? `#${chapter} ` : ''}${$('.p-novel__title').html() || ''}`;
+        const description = $('.p-novel__body').html() || '';
+        const pubDate = $('meta[name=WWWC]').attr('content');
+
+        return {
+            title,
+            description,
+            link: chapterUrl,
+            pubDate,
+            language: 'ja',
+        };
+    })) as DataItem;
+}

package/lib/routes/telegram/channel.ts

@@ -98,6 +98,36 @@ For backward compatibility reasons, invalid \`routeParams\` will be treated as \
                 optional: true,
                 description: 'Telegram API Authentication',
             },
+            {
+                name: 'TELEGRAM_API_ID',
+                optional: true,
+                description: 'Telegram API ID',
+            },
+            {
+                name: 'TELEGRAM_API_HASH',
+                optional: true,
+                description: 'Telegram API Hash',
+            },
+            {
+                name: 'TELEGRAM_MAX_CONCURRENT_DOWNLOADS',
+                optional: true,
+                description: 'Telegram Max Concurrent Downloads',
+            },
+            {
+                name: 'TELEGRAM_PROXY_HOST',
+                optional: true,
+                description: 'Telegram Proxy Host',
+            },
+            {
+                name: 'TELEGRAM_PROXY_PORT',
+                optional: true,
+                description: 'Telegram Proxy Port',
+            },
+            {
+                name: 'TELEGRAM_PROXY_SECRET',
+                optional: true,
+                description: 'Telegram Proxy Secret',
+            },
         ],
         requirePuppeteer: false,
         antiCrawler: false,
@@ -112,7 +142,7 @@ For backward compatibility reasons, invalid \`routeParams\` will be treated as \
         },
     ],
     name: 'Channel',
-    maintainers: ['DIYgod', 'Rongronggg9', 'pseudoyu'],
+    maintainers: ['DIYgod', 'Rongronggg9', 'synchrone', 'pseudoyu'],
     handler,
     description: `
   :::tip

package/lib/routes/telegram/scripts/get-telegram-session.mjs

@@ -1,11 +1,12 @@
 import { TelegramClient } from 'telegram';
 import { StringSession } from 'telegram/sessions/index.js';
 import readline from 'readline';
+import winston from 'winston';
 
 function userInput(question) {
     const rl = readline.createInterface({
         input: process.stdin,
-        output: process.stdout
+        output: process.stdout,
     });
     return new Promise((resolve) => {
         rl.question(question, (answer) => {
@@ -15,8 +16,17 @@ function userInput(question) {
     });
 }
 
+const logger = winston.createLogger({
+    level: 'info',
+    format: winston.format.combine(
+        winston.format.timestamp(),
+        winston.format.printf(({ level, message, timestamp }) => `${timestamp} ${level}: ${message}`)
+    ),
+    transports: [new winston.transports.Console()],
+});
+
 async function getSessionString() {
-    const apiId = parseInt(await userInput('Please enter your API ID: '));
+    const apiId = Number.parseInt(await userInput('Please enter your API ID: '));
     const apiHash = await userInput('Please enter your API Hash: ');
     const stringSession = new StringSession('');
     const client = new TelegramClient(stringSession, apiId, apiHash, {
@@ -26,16 +36,16 @@ async function getSessionString() {
         phoneNumber: async () => await userInput('Please enter your phone number: '),
         password: async () => await userInput('Please enter your password: '),
         phoneCode: async () => await userInput('Please enter the code you received: '),
-        onError: (err) => console.log(err),
+        onError: (err) => logger.error(err),
     });
 
-    console.log('You are now connected.');
+    logger.info('You are now connected.');
     const sessionString = client.session.save();
+    logger.info(`Your session string is: ${sessionString}`);
 
-    console.log('Your session string is:', sessionString);
     await client.disconnect();
     return sessionString;
 }
 
 // Run the function
-getSessionString().catch(console.error);
+getSessionString().catch((error) => logger.error(error));

package/lib/routes/telegram/stickerpack.ts

@@ -5,7 +5,7 @@ import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/stickerpack/:name',
-    categories: ['social-media', 'popular'],
+    categories: ['social-media'],
     view: ViewType.Pictures,
     example: '/telegram/stickerpack/DIYgod',
     parameters: { name: 'Sticker Pack name, available in the sharing URL' },

package/lib/routes/telegram/tglib/channel.ts

@@ -2,6 +2,8 @@ import InvalidParameterError from '@/errors/types/invalid-parameter';
 import { client, decodeMedia, getClient, getFilename, getMediaLink, streamDocument, streamThumbnail } from './client';
 import { returnBigInt as bigInt } from 'telegram/Helpers';
 import { HTMLParser } from 'telegram/extensions/html';
+import { DataItem } from '@/types';
+import type { Api } from 'telegram';
 
 function parseRange(range, length) {
     if (!range) {
@@ -111,24 +113,25 @@ async function getMedia(ctx) {
 }
 
 export default async function handler(ctx) {
+    const { username } = ctx.req.param();
     const client = await getClient();
 
-    const item = [];
-    const chat = await client.getInputEntity(ctx.req.param('username'));
+    const item: DataItem[] = [];
+    const chat = (await client.getInputEntity(username)) as Api.InputPeerChannel;
     const channelInfo = await client.getEntity(chat);
 
     if (channelInfo.className !== 'Channel') {
-        throw new Error(`${ctx.req.param('username')} is not a channel`);
+        throw new Error(`${username} is not a channel`);
     }
 
-    let attachments = [];
+    let attachments: string[] = [];
     const messages = await client.getMessages(chat, { limit: 50 });
 
     for (const message of messages) {
         if (message.media) {
             // messages that have no text are shown as if they're one post
             // because in TG only 1 attachment per message is possible
-            attachments.push(getMediaLink(ctx, chat, ctx.req.param('username'), message));
+            attachments.push(getMediaLink(ctx, chat, username, message));
         }
         if (message.text !== '') {
             let description = attachments.join('\n');
@@ -144,8 +147,8 @@ export default async function handler(ctx) {
                 title,
                 description,
                 pubDate: new Date(message.date * 1000).toUTCString(),
-                link: `https://t.me/s/${ctx.req.param('username')}/${message.id}`,
-                author: `${channelInfo.title} (@${ctx.req.param('username')})`,
+                link: `https://t.me/s/${username}/${message.id}`,
+                author: `${channelInfo.title} (@${username})`,
             });
         }
     }
@@ -153,10 +156,10 @@ export default async function handler(ctx) {
     return {
         title: channelInfo.title,
         language: null,
-        link: `https://t.me/${ctx.req.param('username')}`,
+        link: `https://t.me/${username}`,
         item,
         allowEmpty: ctx.req.param('id') === 'allow_empty',
-        description: `@${ctx.req.param('username')} on Telegram`,
+        description: `@${username} on Telegram`,
     };
 }
 

package/lib/routes/telegram/tglib/client.ts

@@ -23,14 +23,18 @@ export async function getClient(authParams?: UserAuthParams, session?: string) {
         autoReconnect: true,
         retryDelay: 3000,
         maxConcurrentDownloads: Number(config.telegram.maxConcurrentDownloads ?? 10),
+        proxy:
+            config.telegram.proxy?.host && config.telegram.proxy.port && config.telegram.proxy.secret
+                ? {
+                      ip: config.telegram.proxy.host,
+                      port: Number(config.telegram.proxy.port),
+                      MTProxy: true,
+                      secret: config.telegram.proxy.secret,
+                  }
+                : undefined,
     });
-    await client.start(
-        Object.assign(authParams ?? {}, {
-            onError: (err) => {
-                throw new Error('Cannot start TG: ' + err);
-            },
-        }) as any
-    );
+
+    await client.connect();
     return client;
 }
 
@@ -77,7 +81,7 @@ function ExpandInlineBytes(bytes) {
     return real;
 }
 
-function getMediaLink(ctx, channel, channelName, message) {
+function getMediaLink(ctx, channel: Api.InputPeerChannel, channelName: string, message: Api.Message) {
     const base = `${ctx.protocol}://${ctx.host}/telegram/channel/${channelName}`;
     const src = base + `${channel.channelId}_${message.id}`;
 
@@ -98,7 +102,7 @@ function getMediaLink(ctx, channel, channelName, message) {
         linkText += ` (${humanFileSize(x.document.size)})`;
         return `<a href="${src}" target="_blank"><img src="${src}?thumb" alt=""/><br/>${linkText}</a>`;
     }
-    return;
+    return '';
 }
 function getFilename(x) {
     if (x instanceof Api.MessageMediaDocument) {

package/lib/routes/test/index.ts

@@ -32,6 +32,10 @@ async function handler(ctx) {
     if (ctx.req.param('id') === 'invalid-parameter-error') {
         throw new InvalidParameterError('Test invalid parameter error');
     }
+    if (ctx.req.param('id') === 'redirect') {
+        ctx.set('redirect', '/test/1');
+        return;
+    }
     let item: DataItem[] = [];
     let image: string | null = null;
     switch (ctx.req.param('id')) {

package/lib/routes/theblockbeats/index.ts

@@ -3,7 +3,7 @@ import cache from '@/utils/cache';
 import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-import path from 'path';
+import path from 'node:path';
 import { art } from '@/utils/render';
 import { getCurrentPath } from '@/utils/helpers';