xiaoxue_admin
/
RSSHub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: qweather route example inaccuracy. (#17805) 

* fix: qweather route example inaccuracy.

qweather route example inaccuracy

* fix(qweather): throw on config not found

---------
This commit is contained in:
Yuhang 2024-12-06 00:52:06 +08:00 committed by GitHub
parent db98160eed
commit ce2b89a642
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/routes/qweather/3days.ts
View File

@ -35,19 +35,20 @@ export const route: Route = {
name: '近三天天气',
maintainers: ['Rein-Ou', 'la3rence'],
handler,
description: `需自行注册获取 api 的 key，并在环境变量 HEFENG\_KEY 中进行配置，获取订阅近三天天气预报`,
description: '获取订阅近三天天气预报',
};
async function handler(ctx) {
if (!config.hefeng.key) {
throw new ConfigNotFoundError('QWeather RSS is disabled due to the lack of <a href="https://docs.rsshub.app/zh/install/config#%E5%92%8C%E9%A3%8E%E5%A4%A9%E6%B0%94">relevant config</a>');
}
const id = await cache.tryGet(ctx.req.param('location') + '_id', async () => {
const id = await cache.tryGet('qweather:' + ctx.req.param('location') + ':id', async () => {
const response = await got(`${CIRY_LOOKUP_API}?location=${ctx.req.param('location')}&key=${config.hefeng.key}`);
return response.data.location[0].id;
});
const weatherData = await cache.tryGet(
ctx.req.param('location'),
'qweather:' + ctx.req.param('location'),
async () => {
const response = await got(`${WEATHER_API}?key=${config.hefeng.key}&location=${id}`);
return response.data;

21
lib/routes/qweather/now.ts
View File

@ -8,17 +8,20 @@ import { art } from '@/utils/render';
import path from 'node:path';
import { parseDate } from '@/utils/parse-date';
import { config } from '@/config';
import ConfigNotFoundError from '@/errors/types/config-not-found';
const rootUrl = 'https://devapi.qweather.com/v7/weather/now?';
export const route: Route = {
path: '/now/:location',
categories: ['forecast'],
example: '/qweather/广州',
example: '/qweather/now/广州',
parameters: { location: 'N' },
features: {
requireConfig: [
{
name: 'HEFENG_KEY',
description: '',
description: '访问 `https://www.qweather.com/` 注册开发 API Key。',
},
],
requirePuppeteer: false,
@ -30,21 +33,21 @@ export const route: Route = {
name: '实时天气',
maintainers: ['Rein-Ou'],
handler,
description: `需自行注册获取 api 的 key，每小时更新一次数据`,
};
async function handler(ctx) {
const id = await cache.tryGet(ctx.req.param('location') + '_id', async () => {
if (!config.hefeng.key) {
throw new ConfigNotFoundError('QWeather RSS is disabled due to the lack of <a href="https://docs.rsshub.app/zh/install/config#%E5%92%8C%E9%A3%8E%E5%A4%A9%E6%B0%94">relevant config</a>');
}
const id = await cache.tryGet('qweather:' + ctx.req.param('location') + ':id', async () => {
const response = await got(`https://geoapi.qweather.com/v2/city/lookup?location=${ctx.req.param('location')}&key=${config.hefeng.key}`);
const data = [];
for (const i in response.data.location) {
data.push(response.data.location[i]);
}
const data = response.data.location.map((loc) => loc);
return data[0].id;
});
const requestUrl = rootUrl + 'key=' + config.hefeng.key + '&location=' + id;
const responseData = await cache.tryGet(
ctx.req.param('location') + '_now',
'qweather:' + ctx.req.param('location') + ':now',
async () => {
const response = await got(requestUrl);
return response.data;