rsshub 1.0.0-master.ff3a9ce → 1.0.0-master.ff3ea5a

package/lib/routes/twitter/api/web-api/utils.ts

@@ -248,7 +248,9 @@ export const paginationTweets = async (endpoint: string, userId: number | undefi
             return instructions.instructions;
         }
 
-        const instructions = data?.user?.result?.timeline_v2?.timeline?.instructions;
+        const userResult = data?.user?.result;
+        const timeline = userResult?.timeline?.timeline || userResult?.timeline?.timeline_v2 || userResult?.timeline_v2?.timeline;
+        const instructions = timeline?.instructions;
         if (!instructions) {
             logger.debug(`twitter debug: instructions not found in data: ${JSON.stringify(data)}`);
         }
@@ -297,11 +299,31 @@ export function gatherLegacyFromData(entries: any[], filterNested?: string[], us
                         continue;
                     }
                     t.legacy.user = t.core?.user_result?.result?.legacy || t.core?.user_results?.result?.legacy;
+                    // Add name and screen_name from core to maintain compatibility
+                    if (t.legacy.user && t.core?.user_results?.result?.core) {
+                        const coreUser = t.core.user_results.result.core;
+                        if (coreUser.name) {
+                            t.legacy.user.name = coreUser.name;
+                        }
+                        if (coreUser.screen_name) {
+                            t.legacy.user.screen_name = coreUser.screen_name;
+                        }
+                    }
                     t.legacy.id_str = t.rest_id; // avoid falling back to conversation_id_str elsewhere
                     const quote = t.quoted_status_result?.result?.tweet || t.quoted_status_result?.result;
                     if (quote) {
                         t.legacy.quoted_status = quote.legacy;
                         t.legacy.quoted_status.user = quote.core.user_result?.result?.legacy || quote.core.user_results?.result?.legacy;
+                        // Add name and screen_name from core for quoted status user
+                        if (t.legacy.quoted_status.user && quote.core?.user_results?.result?.core) {
+                            const quoteCoreUser = quote.core.user_results.result.core;
+                            if (quoteCoreUser.name) {
+                                t.legacy.quoted_status.user.name = quoteCoreUser.name;
+                            }
+                            if (quoteCoreUser.screen_name) {
+                                t.legacy.quoted_status.user.screen_name = quoteCoreUser.screen_name;
+                            }
+                        }
                     }
                     if (t.note_tweet) {
                         const tmp = t.note_tweet.note_tweet_results.result;

package/lib/routes/twitter/utils.ts

@@ -254,7 +254,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
                 }
                 quote += formatMedia(quoteData);
                 picsPrefix += generatePicsPrefix(quoteData);
-                quoteInTitle += showEmojiForRetweetAndReply ? ' 💬 ' : (showSymbolForRetweetAndReply ? ' RT ' : '');
+                quoteInTitle += showEmojiForRetweetAndReply ? ' 💬 ' : showSymbolForRetweetAndReply ? ' RT ' : '';
                 quoteInTitle += `${author.name}: ${formatText(quoteData)}`;
 
                 if (readable) {
@@ -280,21 +280,21 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         // Make title
         let title = '';
         if (showAuthorInTitle) {
-            title += originalItem.user.name + ': ';
+            title += originalItem.user?.name + ': ';
         }
         const isRetweet = originalItem !== item;
         const isQuote = item.is_quote_status;
         if (!isRetweet && (!isQuote || showRetweetTextInTitle)) {
             if (item.in_reply_to_screen_name) {
-                title += showEmojiForRetweetAndReply ? '↩️ ' : (showSymbolForRetweetAndReply ? 'Re ' : '');
+                title += showEmojiForRetweetAndReply ? '↩️ ' : showSymbolForRetweetAndReply ? 'Re ' : '';
             }
             title += replaceBreak(originalItem.full_text);
         }
         if (isRetweet) {
-            title += showEmojiForRetweetAndReply ? '🔁 ' : (showSymbolForRetweetAndReply ? 'RT ' : '');
+            title += showEmojiForRetweetAndReply ? '🔁 ' : showSymbolForRetweetAndReply ? 'RT ' : '';
             title += item.user.name + ': ';
             if (item.in_reply_to_screen_name) {
-                title += showEmojiForRetweetAndReply ? ' ↩️ ' : (showSymbolForRetweetAndReply ? ' Re ' : '');
+                title += showEmojiForRetweetAndReply ? ' ↩️ ' : showSymbolForRetweetAndReply ? ' Re ' : '';
             }
             title += replaceBreak(item.full_text);
         }
@@ -304,7 +304,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         }
 
         if (showAuthorAsTitleOnly) {
-            title = originalItem.user.name;
+            title = originalItem.user?.name;
         }
 
         // Make description
@@ -316,12 +316,12 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
             if (showAuthorInDesc) {
                 if (readable) {
                     description += '<small>';
-                    description += `<a href='https://x.com/${originalItem.user.screen_name}' target='_blank' rel='noopener noreferrer'>`;
+                    description += `<a href='https://x.com/${originalItem.user?.screen_name}' target='_blank' rel='noopener noreferrer'>`;
                 }
                 if (authorNameBold) {
                     description += `<strong>`;
                 }
-                description += originalItem.user.name;
+                description += originalItem.user?.name;
                 if (authorNameBold) {
                     description += `</strong>`;
                 }
@@ -330,16 +330,16 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
                 }
                 description += '&ensp;';
             }
-            description += showEmojiForRetweetAndReply ? '🔁' : (showSymbolForRetweetAndReply ? 'RT' : '');
+            description += showEmojiForRetweetAndReply ? '🔁' : showSymbolForRetweetAndReply ? 'RT' : '';
             if (!showAuthorInDesc) {
                 description += '&ensp;';
                 if (readable) {
-                    description += `<a href='https://x.com/${item.user.screen_name}' target='_blank' rel='noopener noreferrer'>`;
+                    description += `<a href='https://x.com/${item.user?.screen_name}' target='_blank' rel='noopener noreferrer'>`;
                 }
                 if (authorNameBold) {
                     description += `<strong>`;
                 }
-                description += item.user.name;
+                description += item.user?.name;
                 if (authorNameBold) {
                     description += `</strong>`;
                 }
@@ -354,7 +354,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         }
         if (showAuthorInDesc) {
             if (readable) {
-                description += `<a href='https://x.com/${item.user.screen_name}' target='_blank' rel='noopener noreferrer'>`;
+                description += `<a href='https://x.com/${item.user?.screen_name}' target='_blank' rel='noopener noreferrer'>`;
             }
 
             if (showAuthorAvatarInDesc) {
@@ -363,7 +363,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
             if (authorNameBold) {
                 description += `<strong>`;
             }
-            description += item.user.name;
+            description += item.user?.name;
             if (authorNameBold) {
                 description += `</strong>`;
             }
@@ -373,7 +373,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
             description += `:&ensp;`;
         }
         if (item.in_reply_to_screen_name) {
-            description += showEmojiForRetweetAndReply ? '↩️ ' : (showSymbolForRetweetAndReply ? 'Re ' : '');
+            description += showEmojiForRetweetAndReply ? '↩️ ' : showSymbolForRetweetAndReply ? 'Re ' : '';
         }
 
         description += item.full_text;
@@ -393,16 +393,16 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
         }
 
         const link =
-            originalItem.user.screen_name && (originalItem.id_str || originalItem.conversation_id_str)
-                ? `https://x.com/${originalItem.user.screen_name}/status/${originalItem.id_str || originalItem.conversation_id_str}`
-                : `https://x.com/${item.user.screen_name}/status/${item.id_str || item.conversation_id_str}`;
+            originalItem.user?.screen_name && (originalItem.id_str || originalItem.conversation_id_str)
+                ? `https://x.com/${originalItem.user?.screen_name}/status/${originalItem.id_str || originalItem.conversation_id_str}`
+                : `https://x.com/${item.user?.screen_name}/status/${item.id_str || item.conversation_id_str}`;
         return {
             title,
             author: [
                 {
-                    name: originalItem.user.name,
-                    url: `https://x.com/${originalItem.user.screen_name}`,
-                    avatar: originalItem.user.profile_image_url_https,
+                    name: originalItem.user?.name,
+                    url: `https://x.com/${originalItem.user?.screen_name}`,
+                    avatar: originalItem.user?.profile_image_url_https,
                 },
             ],
             description,
@@ -414,7 +414,7 @@ const ProcessFeed = (ctx, { data = [] }, params = {}) => {
                 (isRetweet && {
                     links: [
                         {
-                            url: `https://x.com/${item.user?.screen_name}/status/${item.conversation_id_str}`,
+                            url: `https://x.com/${item.user?.screen_name || userScreenName}/status/${item.conversation_id_str}`,
                             type: 'repost',
                         },
                     ],

package/lib/routes/udn/breaking-news.ts

@@ -83,7 +83,7 @@ async function handler(ctx) {
                     description += body.html();
                 }
 
-                if (data.publisher.name === '轉角國際 udn Global') {
+                if (data.publisher.name.includes('轉角國際 udn Global')) {
                     // 轉角24小時
                     description = $('.story_body_content')
                         .html()
@@ -94,7 +94,7 @@ async function handler(ctx) {
 
                 return {
                     title: item.title,
-                    author: data.author.name,
+                    author: [{ name: $('.article-content__author').text().match('中央社')?.at(0) }, { name: data.publisher.name.match('轉角國際 udn Global')?.at(0) }, data.author].filter((e) => Boolean(e.name)),
                     description,
                     pubDate: timezone(parseDate(item.time.date, 'YYYY-MM-DD HH:mm'), +8),
                     category: [data.articleSection, vip ? $('.article-head li.breadcrumb__item:last > b').text() : $("meta[name='subsection']").attr('content'), ...data.keywords.split(',')],

package/lib/routes/uestc/auto.ts

@@ -31,7 +31,7 @@ export const route: Route = {
 };
 
 async function handler() {
-    const browser = await puppeteer({ stealth: true });
+    const browser = await puppeteer();
     const page = await browser.newPage();
     await page.setRequestInterception(true);
     page.on('request', (request) => {

package/lib/routes/uestc/cqe.ts

@@ -51,7 +51,7 @@ async function handler(ctx) {
         throw new InvalidParameterError('type not supported');
     }
 
-    const browser = await puppeteer({ stealth: true });
+    const browser = await puppeteer();
     const page = await browser.newPage();
     await page.setRequestInterception(true);
     page.on('request', (request) => {

package/lib/routes/uestc/scse.ts

@@ -45,7 +45,7 @@ export const route: Route = {
 };
 
 async function handler() {
-    const browser = await puppeteer({ stealth: true });
+    const browser = await puppeteer();
     const page = await browser.newPage();
     await page.setRequestInterception(true);
     page.on('request', (request) => {

package/lib/routes/uestc/sice.ts

@@ -32,7 +32,7 @@ export const route: Route = {
 };
 
 async function handler() {
-    const browser = await puppeteer({ stealth: true });
+    const browser = await puppeteer();
     const page = await browser.newPage();
     await page.setRequestInterception(true);
     page.on('request', (request) => {

package/lib/routes/uestc/sise.ts

@@ -66,7 +66,7 @@ async function handler(ctx) {
         throw new InvalidParameterError('type not supported');
     }
 
-    const browser = await puppeteer({ stealth: true });
+    const browser = await puppeteer();
     const page = await browser.newPage();
     await page.setRequestInterception(true);
     page.on('request', (request) => {

package/lib/routes/upc/jwc.ts

@@ -6,46 +6,24 @@ import { parseDate } from '@/utils/parse-date';
 import cache from '@/utils/cache';
 import timezone from '@/utils/timezone';
 
-const typeDict = {
-    tzgg: '', // 默认为所有通知
-    '18519': '教学·运行-', // 教学·运行
-    '18520': '学业·学籍-', // 学业·学籍
-    '18521': '教学·研究-', // 教学·研究
-    '18522': '课程·教材-', // 课程·教材
-    '18523': '实践·教学-', // 实践·教学
-    '18524': '创新·创业-', // 创新·创业
-    yywwz: '语言·文字-', // 语言·文字
-    jxwjy: '继续·教育-', // 继续·教育
-    bkwzs: '本科·招生-', // 本科·招生
-};
-
-// module.exports = async (ctx) => {
 const handler = async (ctx) => {
     // 从 URL 参数中获取通知分类
     const { type = 'tzgg' } = ctx.req.param();
-    // console.log(type);
     const baseUrl = 'https://jwc.upc.edu.cn';
     const { data: response } = await got(`${baseUrl}/${type}/list.htm`);
-    // console.log(`${baseUrl}/${typeDict[type]}/list.htm`);
     const $ = load(response);
-    // const listItems = $('ul.news_list').find('li');
-    // console.log(`List item count: ${listItems.length}`);
-    // const list = $('ul.news_list')  只会得到第一个li
     const list = $('ul.news_list')
         .find('li')
         // 使用“toArray()”方法将选择的所有 DOM 元素以数组的形式返回。
         .toArray()
         // 使用“map()”方法遍历数组，并从每个元素中解析需要的数据。
         .map((item) => {
-            // console.log(item);
             item = $(item);
             const a = item.find('a').first();
             let linkStr = a.attr('href');
-            // 若链接不是以http开头，则加上前缀
-            if (a.attr('href').startsWith('http://')) {
-                // 改为https访问
-                linkStr.replace('http://', 'https://');
-            } else {
+            // 改为https访问并补全站内链接
+            linkStr = linkStr.replace('http://', 'https://');
+            if (!a.attr('href').startsWith('https://')) {
                 linkStr = `${baseUrl}${a.attr('href')}`;
             }
             return {
@@ -58,33 +36,41 @@ const handler = async (ctx) => {
     const items = await Promise.all(
         list.map((item) =>
             cache.tryGet(item.link, async () => {
-                const { data: response } = await got(item.link);
-                const $ = load(response);
-                // 选择类名为“comment-body”的第一个元素
-                item.description = $('.read').first().html();
-                // item.pubDate = $('.arti_update').html() === null ? '' : $('.arti_update').html().slice(5, 15);
-                // item.publisher = $('.arti_publisher').html();
-                item.author = $('.arti_publisher').html();
-                // console.log($('.arti_update').html().slice(5, 15));
-                // 上面每个列表项的每个属性都在此重用，
-                // 并增加了一个新属性“description”
+                try {
+                    const { data: response } = await got(item.link);
+                    const $ = load(response);
+
+                    if (item.link.includes('news.upc.edu.cn')) {
+                        item.description = $('.v_news_content').html();
+                        item.author = $('.nr-zz h2').html();
+                    } else if (item.link.includes('app.upc.edu.cn')) {
+                        const scriptContent = $('body script').first().html();
+                        let dataObj = null;
+                        if (scriptContent) {
+                            const match = scriptContent.match(/data\s*:\s*function\s*\(\)\s*{\s*return\s*{[^}]*data\s*:\s*({[\s\S]*?})/);
+                            if (match && match[1]) {
+                                const dataStr = match[1];
+                                dataObj = JSON.parse(dataStr);
+                            }
+                        }
+                        item.description = dataObj.content;
+                        item.author = dataObj.author;
+                    } else {
+                        // 选择类名为“comment-body”的第一个元素
+                        item.description = $('.read').first().html() || '无法获取正文内容，请手动访问';
+                        item.author = $('.arti_publisher').html();
+                    }
+                } catch {
+                    item.description = '正文内容获取失败';
+                }
                 return item;
             })
         )
     );
 
-    /*     ctx.state.data = {
-        // 源标题
-        title: `${typeDict[type]}教务处通知-中国石油大学（华东）`,
-        // 源链接
-        link: `https://jwc.upc.edu.cn/tzgg/list.htm`,
-        // 源文章
-        item: items,
-    }; */
-
     return {
         // 源标题
-        title: `${typeDict[type]}教务处通知-中国石油大学（华东）`,
+        title: `${$('title').text()}-教务处通知-中国石油大学（华东）`,
         // 源链接
         link: `${baseUrl}/${type}/list.htm`,
         // 源文章
@@ -111,7 +97,7 @@ export const route: Route = {
             target: '/jwc/:type?',
         },
     ],
-    name: '教务处通知公告',
+    name: '教务处',
     maintainers: ['sddzhyc'],
     description: `| 所有通知 | 教学·运行 | 学业·学籍 | 教学·研究 | 课程·教材 | 实践·教学 | 创新·创业 | 语言·文字 | 继续·教育 | 本科·招生 |
 | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

package/lib/routes/uptimerobot/rss.ts

@@ -97,7 +97,7 @@ async function handler(ctx) {
 
     const monitors = {};
 
-    const items = rss.items.reverse().map((item) => {
+    const items = rss.items.toReversed().map((item) => {
         const titleMatch = item.title.match(titleRegex);
         if (!titleMatch) {
             throw new InvalidParameterError('Unexpected title, please open an issue.');

package/lib/routes/visionias/daily-news-summary.ts

@@ -0,0 +1,65 @@
+import { Data, Route, DataItem } from '@/types';
+import { baseUrl } from './utils';
+
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+
+export const route: Route = {
+    path: '/dailySummary',
+    example: '/visionias/dailySummary',
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['visionias.in/current-affairs/upsc-daily-news-summary'],
+            target: '/dailySummary',
+        },
+    ],
+    name: 'Daily News Summary',
+    maintainers: ['Rjnishant530'],
+    handler,
+};
+
+async function handler(): Promise<Data> {
+    const response = await ofetch(`${baseUrl}/current-affairs/upsc-daily-news-summary`);
+
+    const items = processNews(response);
+
+    return {
+        title: 'Daily News Summary | Vision IAS',
+        link: `${baseUrl}/current-affairs/upsc-daily-news-summary`,
+        description:
+            'Get concise and efficient summaries of key articles from prominent newspapers. Our daily news digest ensures quick reading and easy understanding, helping you stay informed about important events and developments without spending hours going through full articles. Perfect for focused and timely updates.',
+        language: 'en',
+        item: items,
+        image: `${baseUrl}/current-affairs/images/news-today-logo.svg`,
+        icon: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
+        logo: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
+        allowEmpty: true,
+    };
+}
+
+function processNews(page) {
+    const $ = load(page);
+    const items = $(`#quiz-start div[x-data="{ isExpanded: false }"]`)
+        .toArray()
+        .map((item) => {
+            const title = $(item).find('a>h5').text().trim();
+            const content = $(item).find('a>div').html() ?? '';
+            const link = $(item).find('div>p>a').attr('href') || '';
+            return {
+                title,
+                link,
+                guid: link,
+                description: content,
+            } as DataItem;
+        });
+
+    return items;
+}

package/lib/routes/visionias/monthly-magazine.ts

@@ -0,0 +1,68 @@
+import { Data, Route } from '@/types';
+import { baseUrl, extractNews } from './utils';
+
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+
+export const route: Route = {
+    path: '/monthlyMagazine',
+    example: '/visionias/monthlyMagazine',
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['visionias.in/current-affairs/monthly-magazine'],
+            target: '/monthlyMagazine',
+        },
+    ],
+    name: 'Monthly Magazine',
+    maintainers: ['Rjnishant530'],
+    handler,
+};
+
+async function handler(): Promise<Data> {
+    const response = await ofetch(`${baseUrl}/current-affairs/monthly-magazine`);
+
+    const items = await processNews(response);
+
+    return {
+        title: 'Monthly Magazine | Vision IAS',
+        link: `${baseUrl}/current-affairs/monthly-magazine`,
+        description:
+            'Monthly Magazine from Vision IAS provides a comprehensive overview of current affairs, covering significant events and developments across various sectors. It is designed to help aspirants stay updated with the latest happenings, enhancing their preparation for competitive exams.',
+        language: 'en',
+        item: items,
+        image: `${baseUrl}/current-affairs/images/news-today-logo.svg`,
+        icon: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
+        logo: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
+        allowEmpty: true,
+    };
+}
+
+async function processNews(page) {
+    const $ = load(page);
+    const divItems = $(`#monthly-table-of-content>div`).toArray();
+    const linkItems = divItems.flatMap((item) => {
+        const maintitle = $(item).find('button>div:nth-child(2) div.text-left').text().trim();
+        return $(item)
+            .find('div>ul>li')
+            .toArray()
+            .map((li) => {
+                const itemTitle = $(li).find('a').text().trim();
+                const link = $(li).find('a').attr('href')?.trim() || '';
+                return {
+                    title: `${itemTitle} - ${maintitle}`,
+                    link: link.includes('https://') ? link : `${baseUrl}${link}`,
+                };
+            });
+    });
+    const newsPromises = await Promise.allSettled(linkItems.map((item) => extractNews(item, 'main > div > div.flex.flex-col> div.flex.flex-col.w-full.mt-10')));
+
+    return newsPromises.flatMap((news) => (news.status === 'fulfilled' ? (Array.isArray(news.value) ? news.value : [news.value]) : [{ title: 'Error Parse News' }]));
+}

package/lib/routes/visionias/news-today.ts

@@ -65,8 +65,8 @@ async function handler(ctx): Promise<Data> {
         language: 'en',
         item: items,
         image: `${baseUrl}/current-affairs/images/news-today-logo.svg`,
-        icon: `${baseUrl}/current-affairs/favicon.ico`,
-        logo: `${baseUrl}/current-affairs/favicon.ico`,
+        icon: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
+        logo: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
         allowEmpty: true,
     };
 }
@@ -86,15 +86,5 @@ async function processCurrentNews(currentUrl) {
             };
         });
     const newsPromises = await Promise.allSettled(items.map((item) => extractNews(item, 'main > div > div.mt-6 > div.flex > div.flex.mt-6')));
-    const finalItems: any = [];
-    for (const news of newsPromises) {
-        if (news.status === 'fulfilled') {
-            finalItems.push(...(Array.isArray(news.value) ? news.value : [news.value]));
-        } else {
-            finalItems.push({
-                title: 'Error Parse News',
-            });
-        }
-    }
-    return finalItems;
+    return newsPromises.flatMap((news) => (news.status === 'fulfilled' ? (Array.isArray(news.value) ? news.value : [news.value]) : [{ title: 'Error Parse News' }]));
 }

package/lib/routes/visionias/utils.ts

@@ -29,7 +29,7 @@ export async function extractNews(item, selector) {
         if (shortArticles.length !== 0) {
             const items = shortArticles.toArray().map((element) => {
                 const mainDiv = $$(element);
-                const title = mainDiv.find('a > div > h1').text().trim();
+                const title = mainDiv.find('a > div > h2').text().trim();
                 const id = mainDiv.find('a').attr('href');
                 const htmlContent = extractArticle(mainDiv.html());
                 const innerTags = mainDiv
@@ -37,7 +37,7 @@ export async function extractNews(item, selector) {
                     ?.nextAll('li')
                     .toArray()
                     .map((tag) => $$(tag).text());
-                const description = art(path.join(__dirname, `templates/description.art`), {
+                const description = art(path.join(__dirname, 'templates/description.art'), {
                     heading: title,
                     articleContent: htmlContent,
                 });
@@ -71,13 +71,13 @@ export async function extractNews(item, selector) {
                 const mainDiv = $$(element);
                 const title = mainDiv.find('a > div > h2').text().trim();
                 const htmlContent = extractArticle(mainDiv.html(), 'div.ck-content');
-                const description = art(path.join(__dirname, `templates/description-sub.art`), {
+                const description = art(path.join(__dirname, 'templates/description-sub.art'), {
                     heading: title,
                     articleContent: htmlContent,
                 });
                 return { description };
             });
-            const description = art(path.join(__dirname, `templates/description.art`), {
+            const description = art(path.join(__dirname, 'templates/description.art'), {
                 heading,
                 subItems: items,
             });
@@ -94,7 +94,7 @@ export async function extractNews(item, selector) {
     });
 }
 
-function extractArticle(articleDiv, selectorString: string = '#article-content') {
+function extractArticle(articleDiv, selectorString: string = 'div.ck-content') {
     const $ = load(articleDiv, null, false);
     const articleDiv$ = $(articleDiv);
     const articleContent = articleDiv$.find(String(selectorString));

package/lib/routes/visionias/weekly-focus.ts

@@ -49,8 +49,8 @@ async function handler(ctx): Promise<Data> {
         language: 'en',
         item: itemsPromise.map((item) => (item.status === 'fulfilled' ? item.value : { title: 'Error Parse News' })),
         image: `${baseUrl}/current-affairs/images/weekly-focus-logo.svg`,
-        icon: `${baseUrl}/current-affairs/favicon.ico`,
-        logo: `${baseUrl}/current-affairs/favicon.ico`,
+        icon: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
+        logo: `https://cdn.visionias.in/new-system-assets/images/home_page/home/vision-logo-footer.png`,
         allowEmpty: true,
     };
 }