Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a0d9596b2e | ||
|
|
45749e5d34 | ||
|
|
703d2a3e04 | ||
|
|
c575bebfdb | ||
|
|
a98ff3a1ff | ||
|
|
bfd3c4eb93 | ||
|
|
a8516a8ce8 | ||
|
|
f72d953483 | ||
|
|
1fe10b8c0a | ||
|
|
aede5d794c | ||
|
|
15437461da | ||
|
|
4bb900745f | ||
|
|
697f4eeed8 | ||
|
|
a1a3fd065d | ||
|
|
b5bd6e88a6 | ||
|
|
be79e862d6 | ||
|
|
f62dfa6a19 |
@@ -1,3 +0,0 @@
|
|||||||
|
|
||||||
# Don't index SpecStory auto-save files, but allow explicit context inclusion via @ references
|
|
||||||
.specstory/**
|
|
||||||
@@ -28,7 +28,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GGITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
- name: Extract metadata (tags, labels) for Docker
|
||||||
id: meta
|
id: meta
|
||||||
|
|||||||
+1
-2
@@ -12,5 +12,4 @@ dev-dist
|
|||||||
*.tsbuildinfo
|
*.tsbuildinfo
|
||||||
wrangler.toml
|
wrangler.toml
|
||||||
imports.app.d.ts
|
imports.app.d.ts
|
||||||
package-lock.json
|
package-lock.json
|
||||||
.specstory/
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM node:20.12.2-alpine AS builder
|
FROM node:20.12.2-alpine as builder
|
||||||
WORKDIR /usr/src
|
WORKDIR /usr/src
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN corepack enable
|
RUN corepack enable
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
# NewsNow
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
[English](./README.md) | [简体中文](README.zh-CN.md) | 日本語
|
[English](./README.md) | [简体中文](README.zh-CN.md) | 日本語
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
# NewsNow
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
English | [简体中文](README.zh-CN.md) | [日本語](README.ja-JP.md)
|
English | [简体中文](README.zh-CN.md) | [日本語](README.ja-JP.md)
|
||||||
|
|||||||
+4
-2
@@ -1,3 +1,7 @@
|
|||||||
|
# NewsNow
|
||||||
|
|
||||||
|
<a href="https://hellogithub.com/repository/c2978695e74a423189e9ca2543ab3b36" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=c2978695e74a423189e9ca2543ab3b36&claim_uid=SMJiFwlsKCkWf89&theme=small" alt="Featured|HelloGitHub" /></a>
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
[English](./README.md) | 简体中文 | [日本語](README.ja-JP.md)
|
[English](./README.md) | 简体中文 | [日本語](README.ja-JP.md)
|
||||||
@@ -110,5 +114,3 @@ pnpm dev
|
|||||||
如果本项目对你有所帮助,可以给小猫买点零食。如果需要定制或者其他帮助,请通过下列方式联系备注。
|
如果本项目对你有所帮助,可以给小猫买点零食。如果需要定制或者其他帮助,请通过下列方式联系备注。
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
<a href="https://hellogithub.com/repository/c2978695e74a423189e9ca2543ab3b36" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=c2978695e74a423189e9ca2543ab3b36&claim_uid=SMJiFwlsKCkWf89&theme=small" alt="Featured|HelloGitHub" /></a>
|
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
services:
|
|
||||||
newsnow:
|
|
||||||
build: .
|
|
||||||
ports:
|
|
||||||
- '4444:4444'
|
|
||||||
volumes:
|
|
||||||
- newsnow_data:/usr/app/.data
|
|
||||||
environment:
|
|
||||||
- G_CLIENT_ID=
|
|
||||||
- G_CLIENT_SECRET=
|
|
||||||
- JWT_SECRET=
|
|
||||||
- INIT_TABLE=true
|
|
||||||
- ENABLE_CACHE=true
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
newsnow_data:
|
|
||||||
name: newsnow_data
|
|
||||||
+3
-9
@@ -1,21 +1,15 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
newsnow:
|
newsnow:
|
||||||
image: ghcr.io/ourongxing/newsnow:latest
|
image: ghcr.io/ourongxing/newsnow:latest
|
||||||
container_name: newsnow
|
container_name: newsnow
|
||||||
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- '4444:4444'
|
- '4444:4444'
|
||||||
volumes:
|
|
||||||
- newsnow_data:/usr/app/.data
|
|
||||||
environment:
|
environment:
|
||||||
- HOST=0.0.0.0
|
|
||||||
- PORT=4444
|
|
||||||
- NODE_ENV=production
|
|
||||||
- G_CLIENT_ID=
|
- G_CLIENT_ID=
|
||||||
- G_CLIENT_SECRET=
|
- G_CLIENT_SECRET=
|
||||||
- JWT_SECRET=
|
- JWT_SECRET=
|
||||||
- INIT_TABLE=true
|
- INIT_TABLE=true
|
||||||
- ENABLE_CACHE=true
|
- ENABLE_CACHE=true
|
||||||
|
|
||||||
volumes:
|
|
||||||
newsnow_data:
|
|
||||||
name: newsnow_data
|
|
||||||
|
|||||||
+14
-1
@@ -1,5 +1,5 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="zh-CN" class="dark">
|
<html lang="zh-CN">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
@@ -49,6 +49,19 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
function safeParseString(str) {
|
||||||
|
try {
|
||||||
|
return JSON.parse(str)
|
||||||
|
} catch {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const theme = safeParseString(localStorage.getItem("color-scheme")) || "dark"
|
||||||
|
const isDark = window.matchMedia("(prefers-color-scheme: dark)").matches
|
||||||
|
if (theme !== "light") {
|
||||||
|
document.documentElement.classList.add("dark")
|
||||||
|
}
|
||||||
|
|
||||||
const query = new URLSearchParams(window.location.search)
|
const query = new URLSearchParams(window.location.search)
|
||||||
if (query.has("login") && query.has("user") && query.has("jwt")) {
|
if (query.has("login") && query.has("user") && query.has("jwt")) {
|
||||||
localStorage.setItem("user", query.get("user"))
|
localStorage.setItem("user", query.get("user"))
|
||||||
|
|||||||
+1
-11
@@ -17,11 +17,6 @@ const nitroOption: Parameters<typeof viteNitro>[0] = {
|
|||||||
connector: "better-sqlite3",
|
connector: "better-sqlite3",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
devDatabase: {
|
|
||||||
default: {
|
|
||||||
connector: "better-sqlite3",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
imports: {
|
imports: {
|
||||||
dirs: ["server/utils", "shared"],
|
dirs: ["server/utils", "shared"],
|
||||||
},
|
},
|
||||||
@@ -43,11 +38,6 @@ if (process.env.VERCEL) {
|
|||||||
// }
|
// }
|
||||||
} else if (process.env.CF_PAGES) {
|
} else if (process.env.CF_PAGES) {
|
||||||
nitroOption.preset = "cloudflare-pages"
|
nitroOption.preset = "cloudflare-pages"
|
||||||
nitroOption.unenv = {
|
|
||||||
alias: {
|
|
||||||
"safer-buffer": "node:buffer",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
nitroOption.database = {
|
nitroOption.database = {
|
||||||
default: {
|
default: {
|
||||||
connector: "cloudflare-d1",
|
connector: "cloudflare-d1",
|
||||||
@@ -67,4 +57,4 @@ if (process.env.VERCEL) {
|
|||||||
|
|
||||||
export default function () {
|
export default function () {
|
||||||
return viteNitro(nitroOption)
|
return viteNitro(nitroOption)
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-9
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name": "newsnow",
|
"name": "newsnow",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "0.0.34",
|
"version": "0.0.28",
|
||||||
"private": true,
|
"private": true,
|
||||||
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
|
"packageManager": "pnpm@10.5.2",
|
||||||
"author": {
|
"author": {
|
||||||
"url": "https://github.com/ourongxing/",
|
"url": "https://github.com/ourongxing/",
|
||||||
"email": "[email protected]",
|
"email": "[email protected]",
|
||||||
@@ -30,12 +30,11 @@
|
|||||||
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
|
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
|
||||||
"@formkit/auto-animate": "^0.8.2",
|
"@formkit/auto-animate": "^0.8.2",
|
||||||
"@iconify-json/si": "^1.2.3",
|
"@iconify-json/si": "^1.2.3",
|
||||||
"@modelcontextprotocol/sdk": "^1.11.0",
|
|
||||||
"@tanstack/react-query-devtools": "^5.66.11",
|
"@tanstack/react-query-devtools": "^5.66.11",
|
||||||
"@tanstack/react-router": "^1.112.0",
|
"@tanstack/react-router": "^1.112.0",
|
||||||
"@unocss/reset": "^66.0.0",
|
"@unocss/reset": "^66.0.0",
|
||||||
"ahooks": "^3.8.4",
|
"ahooks": "^3.8.4",
|
||||||
"better-sqlite3": "^11.10.0",
|
"better-sqlite3": "^11.8.1",
|
||||||
"cheerio": "^1.0.0",
|
"cheerio": "^1.0.0",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"cmdk": "^1.0.4",
|
"cmdk": "^1.0.4",
|
||||||
@@ -55,7 +54,6 @@
|
|||||||
"overlayscrollbars": "^2.11.1",
|
"overlayscrollbars": "^2.11.1",
|
||||||
"pnpm": "^10.5.2",
|
"pnpm": "^10.5.2",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"react-device-detect": "^2.2.3",
|
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^19.0.0",
|
||||||
"react-use": "^17.6.0",
|
"react-use": "^17.6.0",
|
||||||
"uncrypto": "^0.1.3",
|
"uncrypto": "^0.1.3",
|
||||||
@@ -101,7 +99,7 @@
|
|||||||
"vitest": "^3.0.7",
|
"vitest": "^3.0.7",
|
||||||
"workbox-build": "^7.3.0",
|
"workbox-build": "^7.3.0",
|
||||||
"workbox-window": "^7.3.0",
|
"workbox-window": "^7.3.0",
|
||||||
"wrangler": "4.14.1"
|
"wrangler": "^3.111.0"
|
||||||
},
|
},
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"patchedDependencies": {
|
"patchedDependencies": {
|
||||||
@@ -111,18 +109,16 @@
|
|||||||
"@napi-rs/pinyin",
|
"@napi-rs/pinyin",
|
||||||
"@parcel/watcher",
|
"@parcel/watcher",
|
||||||
"@swc/core",
|
"@swc/core",
|
||||||
"esbuild",
|
|
||||||
"better-sqlite3",
|
"better-sqlite3",
|
||||||
|
"esbuild",
|
||||||
"sharp",
|
"sharp",
|
||||||
"simple-git-hooks",
|
"simple-git-hooks",
|
||||||
"unrs-resolver",
|
|
||||||
"workerd"
|
"workerd"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"cross-spawn": ">=7.0.6",
|
"cross-spawn": ">=7.0.6",
|
||||||
"dayjs": "1.11.13",
|
"dayjs": "1.11.13",
|
||||||
"nitropack": "npm:[email protected]",
|
|
||||||
"picomatch": "^4.0.2",
|
"picomatch": "^4.0.2",
|
||||||
"react": "^19",
|
"react": "^19",
|
||||||
"db0": "^0.3.1",
|
"db0": "^0.3.1",
|
||||||
|
|||||||
Generated
+3038
-4831
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
@@ -1,30 +0,0 @@
|
|||||||
import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"
|
|
||||||
import { getServer } from "#/mcp/server"
|
|
||||||
|
|
||||||
export default defineEventHandler(async (event) => {
|
|
||||||
const req = event.node.req
|
|
||||||
const res = event.node.res
|
|
||||||
const server = getServer()
|
|
||||||
try {
|
|
||||||
const transport: StreamableHTTPServerTransport = new StreamableHTTPServerTransport({ sessionIdGenerator: undefined })
|
|
||||||
transport.onerror = console.error.bind(console)
|
|
||||||
await server.connect(transport)
|
|
||||||
await transport.handleRequest(req, res, await readBody(event))
|
|
||||||
res.on("close", () => {
|
|
||||||
// console.log("Request closed")
|
|
||||||
transport.close()
|
|
||||||
server.close()
|
|
||||||
})
|
|
||||||
return res
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e)
|
|
||||||
return {
|
|
||||||
jsonrpc: "2.0",
|
|
||||||
error: {
|
|
||||||
code: -32603,
|
|
||||||
message: "Internal server error",
|
|
||||||
},
|
|
||||||
id: null,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@@ -82,4 +82,4 @@ export async function getCacheTable() {
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error("failed to init database ", e)
|
logger.error("failed to init database ", e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,4 +66,4 @@ export class UserTable {
|
|||||||
if (!state.success) throw new Error(`delete user ${key} failed`)
|
if (!state.success) throw new Error(`delete user ${key} failed`)
|
||||||
logger.success(`delete user ${key}`)
|
logger.success(`delete user ${key}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
-1
@@ -22,7 +22,6 @@ declare module 'glob:./sources/{*.ts,**/index.ts}' {
|
|||||||
export const kaopu: typeof import('./sources/kaopu')
|
export const kaopu: typeof import('./sources/kaopu')
|
||||||
export const kuaishou: typeof import('./sources/kuaishou')
|
export const kuaishou: typeof import('./sources/kuaishou')
|
||||||
export const linuxdo: typeof import('./sources/linuxdo')
|
export const linuxdo: typeof import('./sources/linuxdo')
|
||||||
export const mktnews: typeof import('./sources/mktnews')
|
|
||||||
export const nowcoder: typeof import('./sources/nowcoder')
|
export const nowcoder: typeof import('./sources/nowcoder')
|
||||||
export const pcbeta: typeof import('./sources/pcbeta')
|
export const pcbeta: typeof import('./sources/pcbeta')
|
||||||
export const producthunt: typeof import('./sources/producthunt')
|
export const producthunt: typeof import('./sources/producthunt')
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
import sources from "../../shared/sources.json"
|
|
||||||
|
|
||||||
export const description = Object.entries(sources).filter(([_, source]) => {
|
|
||||||
if (source.redirect) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}).map(([id, source]) => {
|
|
||||||
return source.title ? `${source.name}-${source.title} id is ${id}` : `${source.name} id is ${id}`
|
|
||||||
}).join(";")
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
import { z } from "zod"
|
|
||||||
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"
|
|
||||||
import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"
|
|
||||||
import packageJSON from "../../package.json"
|
|
||||||
import { description } from "./desc.js"
|
|
||||||
|
|
||||||
export function getServer() {
|
|
||||||
const server = new McpServer(
|
|
||||||
{
|
|
||||||
name: "NewsNow",
|
|
||||||
version: packageJSON.version,
|
|
||||||
},
|
|
||||||
{ capabilities: { logging: {} } },
|
|
||||||
)
|
|
||||||
|
|
||||||
server.tool(
|
|
||||||
"get_hotest_latest_news",
|
|
||||||
`get hotest or latest news from source by {id}, return {count: 10} news.`,
|
|
||||||
{
|
|
||||||
id: z.string().describe(`source id. e.g. ${description}`),
|
|
||||||
count: z.any().default(10).describe("count of news to return."),
|
|
||||||
},
|
|
||||||
async ({ id, count }): Promise<CallToolResult> => {
|
|
||||||
let n = Number(count)
|
|
||||||
if (Number.isNaN(n) || n < 1) {
|
|
||||||
n = 10
|
|
||||||
}
|
|
||||||
|
|
||||||
const res: SourceResponse = await $fetch(`/api/s?id=${id}`)
|
|
||||||
return {
|
|
||||||
content: res.items.slice(0, count).map((item) => {
|
|
||||||
return {
|
|
||||||
text: `[${item.title}](${item.url})`,
|
|
||||||
type: "text",
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
server.server.onerror = console.error.bind(console)
|
|
||||||
|
|
||||||
return server
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,7 @@ export default defineEventHandler(async (event) => {
|
|||||||
if (!url.pathname.startsWith("/api")) return
|
if (!url.pathname.startsWith("/api")) return
|
||||||
if (["JWT_SECRET", "G_CLIENT_ID", "G_CLIENT_SECRET"].find(k => !process.env[k])) {
|
if (["JWT_SECRET", "G_CLIENT_ID", "G_CLIENT_SECRET"].find(k => !process.env[k])) {
|
||||||
event.context.disabledLogin = true
|
event.context.disabledLogin = true
|
||||||
if (["/api/s", "/api/proxy", "/api/latest", "/api/mcp"].every(p => !url.pathname.startsWith(p)))
|
if (["/api/s", "/api/proxy", "/api/latest"].every(p => !url.pathname.startsWith(p)))
|
||||||
throw createError({ statusCode: 506, message: "Server not configured, disable login" })
|
throw createError({ statusCode: 506, message: "Server not configured, disable login" })
|
||||||
} else {
|
} else {
|
||||||
if (["/api/s", "/api/me"].find(p => url.pathname.startsWith(p))) {
|
if (["/api/s", "/api/me"].find(p => url.pathname.startsWith(p))) {
|
||||||
|
|||||||
@@ -1,3 +1,29 @@
|
|||||||
|
interface NewApiVideoItem {
|
||||||
|
id: string;
|
||||||
|
title: string;
|
||||||
|
desc: string;
|
||||||
|
cover: string;
|
||||||
|
author: string;
|
||||||
|
timestamp: number; // 注意这是毫秒时间戳
|
||||||
|
hot: number;
|
||||||
|
url: string;
|
||||||
|
mobileUrl: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface NewApiResponse {
|
||||||
|
code: number;
|
||||||
|
name: string;
|
||||||
|
title: string;
|
||||||
|
type: string;
|
||||||
|
description: string;
|
||||||
|
parameData: any; // 可以根据需要细化
|
||||||
|
link: string;
|
||||||
|
total: number;
|
||||||
|
updateTime: string;
|
||||||
|
fromCache: boolean;
|
||||||
|
data: NewApiVideoItem[]; // 核心数据在这里
|
||||||
|
}
|
||||||
|
|
||||||
interface WapRes {
|
interface WapRes {
|
||||||
code: number
|
code: number
|
||||||
exp_str: string
|
exp_str: string
|
||||||
@@ -120,18 +146,56 @@ const hotVideo = defineSource(async () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const ranking = defineSource(async () => {
|
const ranking = defineSource(async () => {
|
||||||
const url = "https://api.bilibili.com/x/web-interface/ranking/v2"
|
// 1. 使用新接口的 URL
|
||||||
const res: HotVideoRes = await myFetch(url)
|
const newUrl = "https://api-hot.chgr.cc/bilibili?limit=20"; // <--- 替换成新接口的实际地址
|
||||||
|
// 假设 myFetch 可以正确获取并解析新接口的 JSON
|
||||||
|
const newRes: NewApiResponse = await myFetch(newUrl);
|
||||||
|
|
||||||
return res.data.list.map(video => ({
|
// 2. 数据转换适配层:将 NewApiResponse 转换为符合 HotVideoRes['data']['list'] 结构的数组
|
||||||
|
// 注意:我们只需要构建 map 函数需要的部分即可,不需要严格创建完整的 HotVideoRes
|
||||||
|
const adaptedList = newRes.data.map(newItem => {
|
||||||
|
// 创建一个符合 map 函数内部访问 video 对象结构的临时对象
|
||||||
|
return {
|
||||||
|
bvid: newItem.id,
|
||||||
|
title: newItem.title,
|
||||||
|
pubdate: Math.floor(newItem.timestamp / 1000), // 将毫秒转为秒 (整数)
|
||||||
|
owner: {
|
||||||
|
name: newItem.author,
|
||||||
|
// 如果 map 中需要其他 owner 字段,需提供默认值
|
||||||
|
mid: 0,
|
||||||
|
face: '',
|
||||||
|
},
|
||||||
|
stat: {
|
||||||
|
view: newItem.hot, // 使用 hot 作为观看数 (近似值)
|
||||||
|
like: 0, // <--- 新接口没有点赞数,这里设置为 0
|
||||||
|
// 如果 map 中需要其他 stat 字段,需提供默认值
|
||||||
|
danmaku: 0, reply: 0, favorite: 0, coin: 0, share: 0, now_rank: 0, his_rank: 0, dislike: 0,
|
||||||
|
},
|
||||||
|
desc: newItem.desc,
|
||||||
|
pic: newItem.cover,
|
||||||
|
// --- 以下字段如果 map 中没有用到,可以不映射 ---
|
||||||
|
aid: 0, videos: 1, tid: 0, tname: 'N/A', copyright: 1, ctime: Math.floor(newItem.timestamp / 1000),
|
||||||
|
state: 0, duration: 0, dynamic: '', cid: 0, dimension: { width: 0, height: 0, rotate: 0 },
|
||||||
|
short_link: newItem.url, short_link_v2: newItem.url, rcmd_reason: { content: '', corner_mark: 0 },
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// 3. 使用转换后的 adaptedList 进行 map 操作,这部分代码保持不变
|
||||||
|
// map 函数现在操作的是我们手动适配过的对象数组
|
||||||
|
return adaptedList.map(video => ({
|
||||||
id: video.bvid,
|
id: video.bvid,
|
||||||
title: video.title,
|
title: video.title,
|
||||||
url: `https://www.bilibili.com/video/${video.bvid}`,
|
url: `https://www.bilibili.com/video/${video.bvid}`, // 保持原来的 URL 拼接方式
|
||||||
pubDate: video.pubdate * 1000,
|
// 或者,如果你想用新接口提供的 URL:
|
||||||
|
// url: video.short_link, // short_link 在适配层映射自 newItem.url
|
||||||
|
pubDate: video.pubdate * 1000, // 将秒转换回毫秒
|
||||||
extra: {
|
extra: {
|
||||||
|
// 注意:因为 like 设置为 0,这里的点赞数会显示为 0
|
||||||
info: `${video.owner.name} · ${formatNumber(video.stat.view)}观看 · ${formatNumber(video.stat.like)}点赞`,
|
info: `${video.owner.name} · ${formatNumber(video.stat.view)}观看 · ${formatNumber(video.stat.like)}点赞`,
|
||||||
|
// 如果不想显示点赞数,可以修改 info 的格式:
|
||||||
|
// info: `${video.owner.name} · ${formatNumber(video.stat.view)}观看`,
|
||||||
hover: video.desc,
|
hover: video.desc,
|
||||||
icon: proxyPicture(video.pic),
|
icon: proxyPicture(video.pic), // pic 来源于 newItem.cover
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
})
|
})
|
||||||
|
|||||||
+16
-33
@@ -1,37 +1,20 @@
|
|||||||
interface HotItem {
|
interface Res {
|
||||||
id: string
|
data: {
|
||||||
title: string
|
title: string
|
||||||
url: string
|
hot: string
|
||||||
mobileUrl: string
|
url: string
|
||||||
|
mobil_url: string
|
||||||
|
}[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export default defineSource(async () => {
|
export default defineSource(async () => {
|
||||||
// 获取虎扑新热榜页面的HTML内容
|
const r: Res = await myFetch(`https://api.vvhan.com/api/hotlist/huPu`)
|
||||||
const html = await myFetch(`https://bbs.hupu.com/topic-daily-hot`)
|
return r.data.map((k) => {
|
||||||
|
return {
|
||||||
// 正则表达式匹配新的热榜项结构
|
id: k.url,
|
||||||
const regex = /<li class="bbs-sl-web-post-body">[\s\S]*?<a href="(\/[^"]+?\.html)"[^>]*?class="p-title"[^>]*>([^<]+)<\/a>/g
|
title: k.title,
|
||||||
|
url: k.url,
|
||||||
const result: HotItem[] = []
|
mobileUrl: k.mobil_url,
|
||||||
let match
|
}
|
||||||
|
})
|
||||||
// 将赋值操作移到循环内部,修复no-cond-assign警告
|
|
||||||
while (true) {
|
|
||||||
match = regex.exec(html)
|
|
||||||
if (!match) break
|
|
||||||
|
|
||||||
const [, path, title] = match
|
|
||||||
|
|
||||||
// 构建完整URL
|
|
||||||
const url = `https://bbs.hupu.com${path}`
|
|
||||||
|
|
||||||
result.push({
|
|
||||||
id: path,
|
|
||||||
title: title.trim(),
|
|
||||||
url,
|
|
||||||
mobileUrl: url,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return result
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
interface Report {
|
|
||||||
id: string
|
|
||||||
type: number
|
|
||||||
time: string
|
|
||||||
important: number
|
|
||||||
data: {
|
|
||||||
content: string
|
|
||||||
pic: string
|
|
||||||
title: string
|
|
||||||
}
|
|
||||||
remark: string[]
|
|
||||||
hot: boolean
|
|
||||||
hot_start: string
|
|
||||||
hot_end: string
|
|
||||||
classify: {
|
|
||||||
id: number
|
|
||||||
pid: number
|
|
||||||
name: string
|
|
||||||
parent: string
|
|
||||||
}[]
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Res {
|
|
||||||
data: {
|
|
||||||
id: number
|
|
||||||
name: string
|
|
||||||
pid: number
|
|
||||||
child: {
|
|
||||||
id: number
|
|
||||||
name: string
|
|
||||||
pid: number
|
|
||||||
flash_list: Report[]
|
|
||||||
}[]
|
|
||||||
}[]
|
|
||||||
}
|
|
||||||
|
|
||||||
const flash = defineSource(async () => {
|
|
||||||
const res: Res = await myFetch("https://api.mktnews.net/api/flash/host")
|
|
||||||
|
|
||||||
const categories = ["policy", "AI", "financial"] as const
|
|
||||||
const typeMap = { policy: "Policy", AI: "AI", financial: "Financial" } as const
|
|
||||||
|
|
||||||
const allReports = categories.flatMap((category) => {
|
|
||||||
const flash_list = res.data.find(item => item.name === category)?.child[0]?.flash_list || []
|
|
||||||
return flash_list.map(item => ({ ...item, type: typeMap[category] }))
|
|
||||||
})
|
|
||||||
|
|
||||||
return allReports
|
|
||||||
.sort((a, b) => b.time.localeCompare(a.time))
|
|
||||||
.map(item => ({
|
|
||||||
id: item.id,
|
|
||||||
title: item.data.title || item.data.content,
|
|
||||||
pubDate: item.time,
|
|
||||||
extra: { info: item.type },
|
|
||||||
url: `https://mktnews.net/flashDetail.html?id=${item.id}`,
|
|
||||||
}))
|
|
||||||
})
|
|
||||||
|
|
||||||
export default defineSource({
|
|
||||||
"mktnews": flash,
|
|
||||||
"mktnews-flash": flash,
|
|
||||||
})
|
|
||||||
@@ -52,7 +52,7 @@ const news = defineSource(async () => {
|
|||||||
|
|
||||||
const res: NewsRes = await myFetch(apiUrl)
|
const res: NewsRes = await myFetch(apiUrl)
|
||||||
return res.data.items
|
return res.data.items
|
||||||
.filter(k => k.resource_type !== "theme" && k.resource_type !== "ad" && k.resource.type !== "live" && k.resource.uri)
|
.filter(k => k.resource_type !== "ad" && k.resource.type !== "live" && k.resource.uri)
|
||||||
.map(({ resource: h }) => {
|
.map(({ resource: h }) => {
|
||||||
return {
|
return {
|
||||||
id: h.id,
|
id: h.id,
|
||||||
|
|||||||
+34
-130
@@ -1,144 +1,48 @@
|
|||||||
export interface Root {
|
interface Res {
|
||||||
ok: number
|
ok: number // 1 is ok
|
||||||
data: Data
|
data: {
|
||||||
}
|
realtime:
|
||||||
|
{
|
||||||
export interface Data {
|
num: number // 看上去是个 id
|
||||||
mapi: any[]
|
emoticon: string
|
||||||
cards: Card[]
|
icon?: string // 热,新 icon url
|
||||||
cardlistInfo: CardlistInfo
|
icon_width: number
|
||||||
scheme: string
|
icon_height: number
|
||||||
showAppTips: number
|
is_ad?: number // 1
|
||||||
}
|
note: string
|
||||||
|
small_icon_desc: string
|
||||||
export interface Card {
|
icon_desc?: string // 如果是 荐 ,就是广告
|
||||||
card_group: CardGroup[]
|
topic_flag: number
|
||||||
card_type: number
|
icon_desc_color: string
|
||||||
show_type: number
|
flag: number
|
||||||
itemid?: string
|
word_scheme: string
|
||||||
title?: string
|
small_icon_desc_color: string
|
||||||
}
|
realpos: number
|
||||||
|
label_name: string
|
||||||
export interface CardGroup {
|
word: string // 热搜词
|
||||||
actionlog?: Actionlog
|
rank: number
|
||||||
card_type: number
|
}[]
|
||||||
pic?: string
|
}
|
||||||
itemid?: string
|
|
||||||
icon?: string
|
|
||||||
icon_width?: number
|
|
||||||
icon_height?: number
|
|
||||||
desc?: string
|
|
||||||
scheme: string
|
|
||||||
desc_extr: any
|
|
||||||
promotion?: Promotion
|
|
||||||
display_arrow?: number
|
|
||||||
show_type?: number
|
|
||||||
title?: string
|
|
||||||
is_show_arrow?: number
|
|
||||||
left_tag_img?: string
|
|
||||||
sub_title?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Actionlog {
|
|
||||||
luicode: string
|
|
||||||
lfid: string
|
|
||||||
uicode: string
|
|
||||||
act_code: number
|
|
||||||
act_type: number
|
|
||||||
fid: string
|
|
||||||
ext: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Promotion {
|
|
||||||
monitor_url: MonitorUrl[]
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface MonitorUrl {
|
|
||||||
third_party_click: string
|
|
||||||
third_party_show: string
|
|
||||||
type: string
|
|
||||||
monitor_name?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CardlistInfo {
|
|
||||||
select_id: string
|
|
||||||
title_top: string
|
|
||||||
show_style: number
|
|
||||||
starttime: number
|
|
||||||
can_shared: number
|
|
||||||
v_p: string
|
|
||||||
containerid: string
|
|
||||||
page_type: string
|
|
||||||
nick: string
|
|
||||||
cardlist_head_cards: CardlistHeadCard[]
|
|
||||||
enable_load_imge_scrolling: number
|
|
||||||
page_title: string
|
|
||||||
search_request_id: string
|
|
||||||
load_more_threshold: number
|
|
||||||
pagesize: number
|
|
||||||
page_common_ext: string
|
|
||||||
cardlist_menus: any[]
|
|
||||||
total: number
|
|
||||||
headbg_animation: string
|
|
||||||
page_size: number
|
|
||||||
page: any
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CardlistHeadCard {
|
|
||||||
title_top?: string
|
|
||||||
show_menu: boolean
|
|
||||||
head_type_name: string
|
|
||||||
head_type: number
|
|
||||||
head_data?: HeadData
|
|
||||||
channel_list?: ChannelList[]
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface HeadData {
|
|
||||||
cover_url: string
|
|
||||||
show_navi_mask: boolean
|
|
||||||
show_title: boolean
|
|
||||||
data_type: number
|
|
||||||
scheme: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ChannelList {
|
|
||||||
actionlog: Actionlog2
|
|
||||||
scheme: string
|
|
||||||
containerid: string
|
|
||||||
name: string
|
|
||||||
default_add: number
|
|
||||||
id: number
|
|
||||||
must_show: number
|
|
||||||
replaced_name?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Actionlog2 {
|
|
||||||
luicode: string
|
|
||||||
lfid: string
|
|
||||||
uicode: string
|
|
||||||
act_code: number
|
|
||||||
act_type: number
|
|
||||||
fid: string
|
|
||||||
ext: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default defineSource(async () => {
|
export default defineSource(async () => {
|
||||||
const url = "https://m.weibo.cn/api/container/getIndex?containerid=106003type%3D25%26t%3D3%26disable_hot%3D1%26filter_type%3Drealtimehot"
|
const url = "https://weibo.com/ajax/side/hotSearch"
|
||||||
const res: Root = await myFetch(url)
|
const res: Res = await myFetch(url)
|
||||||
return res.data.cards[0].card_group
|
return res.data.realtime
|
||||||
.filter((k, i) => i !== 0 && k.desc && !k.actionlog?.ext.includes("ads_word"))
|
.filter(k => !k.is_ad)
|
||||||
.map((k) => {
|
.map((k) => {
|
||||||
|
const keyword = k.word_scheme ? k.word_scheme : `#${k.word}#`
|
||||||
return {
|
return {
|
||||||
id: k.desc!,
|
id: k.word,
|
||||||
title: k.desc!,
|
title: k.word,
|
||||||
extra: {
|
extra: {
|
||||||
icon: k.icon && {
|
icon: k.icon && {
|
||||||
url: proxyPicture(k.icon),
|
url: proxyPicture(k.icon),
|
||||||
scale: 1.5,
|
scale: 1.5,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
url: `https://s.weibo.com/weibo?q=${encodeURIComponent(`#${k.desc}#`)}`,
|
url: `https://s.weibo.com/weibo?q=${encodeURIComponent(keyword)}`,
|
||||||
mobileUrl: k.scheme,
|
mobileUrl: `https://m.weibo.cn/search?containerid=231522type%3D1%26q%3D${encodeURIComponent(keyword)}&_T_WM=16922097837&v_p=42`,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
+19
-34
@@ -1,53 +1,38 @@
|
|||||||
interface Res {
|
interface Res {
|
||||||
data: {
|
data: {
|
||||||
type: "hot_list_feed"
|
card_label?: {
|
||||||
style_type: "1"
|
icon: string
|
||||||
feed_specific: {
|
night_icon: string
|
||||||
answer_count: 411
|
|
||||||
}
|
}
|
||||||
target: {
|
target: {
|
||||||
title_area: {
|
id: number
|
||||||
text: string
|
title: string
|
||||||
}
|
url: string
|
||||||
excerpt_area: {
|
created: number
|
||||||
text: string
|
answer_count: number
|
||||||
}
|
follower_count: number
|
||||||
image_area: {
|
bound_topic_ids: number[]
|
||||||
url: string
|
comment_count: number
|
||||||
}
|
is_following: boolean
|
||||||
metrics_area: {
|
excerpt: string
|
||||||
text: string
|
|
||||||
font_color: string
|
|
||||||
background: string
|
|
||||||
weight: string
|
|
||||||
}
|
|
||||||
label_area: {
|
|
||||||
type: "trend"
|
|
||||||
trend: number
|
|
||||||
night_color: string
|
|
||||||
normal_color: string
|
|
||||||
}
|
|
||||||
link: {
|
|
||||||
url: string
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}[]
|
}[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export default defineSource({
|
export default defineSource({
|
||||||
zhihu: async () => {
|
zhihu: async () => {
|
||||||
const url = "https://www.zhihu.com/api/v3/feed/topstory/hot-list-web?limit=20&desktop=true"
|
const url = "https://www.zhihu.com/api/v3/feed/topstory/hot-lists/total?limit=20&desktop=true"
|
||||||
const res: Res = await myFetch(url)
|
const res: Res = await myFetch(url)
|
||||||
return res.data
|
return res.data
|
||||||
.map((k) => {
|
.map((k) => {
|
||||||
|
const urlId = k.target.url?.match(/(\d+)$/)?.[1]
|
||||||
return {
|
return {
|
||||||
id: k.target.link.url.match(/(\d+)$/)?.[1] ?? k.target.link.url,
|
id: k.target.id,
|
||||||
title: k.target.title_area.text,
|
title: k.target.title,
|
||||||
extra: {
|
extra: {
|
||||||
info: k.target.metrics_area.text,
|
icon: k.card_label?.night_icon && proxyPicture(k.card_label.night_icon),
|
||||||
hover: k.target.excerpt_area.text,
|
|
||||||
},
|
},
|
||||||
url: k.target.link.url,
|
url: `https://www.zhihu.com/question/${urlId || k.target.id}`,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
+9
-5
@@ -4,10 +4,9 @@
|
|||||||
"weibo": "weibo-shishiresou",
|
"weibo": "weibo-shishiresou",
|
||||||
"zaobao": "lianhezaobao",
|
"zaobao": "lianhezaobao",
|
||||||
"coolapk": "kuan-jinrizuire",
|
"coolapk": "kuan-jinrizuire",
|
||||||
"mktnews-flash": "MKTNews-kuaixun",
|
"wallstreetcn-quick": "huaerjiejianwen-shishikuaixun",
|
||||||
"wallstreetcn-quick": "huaerjiejianwen-kuaixun",
|
"wallstreetcn-news": "huaerjiejianwen-zuixinzixun",
|
||||||
"wallstreetcn-news": "huaerjiejianwen-zuixin",
|
"wallstreetcn-hot": "huaerjiejianwen-zuirewenzhang",
|
||||||
"wallstreetcn-hot": "huaerjiejianwen-zuire",
|
|
||||||
"36kr-quick": "36ke-kuaixun",
|
"36kr-quick": "36ke-kuaixun",
|
||||||
"douyin": "douyin",
|
"douyin": "douyin",
|
||||||
"hupu": "hupu-zhugandaoretie",
|
"hupu": "hupu-zhugandaoretie",
|
||||||
@@ -17,7 +16,8 @@
|
|||||||
"thepaper": "pengpaixinwen-rebang",
|
"thepaper": "pengpaixinwen-rebang",
|
||||||
"sputniknewscn": "weixingtongxunshe",
|
"sputniknewscn": "weixingtongxunshe",
|
||||||
"cankaoxiaoxi": "cankaoxiaoxi",
|
"cankaoxiaoxi": "cankaoxiaoxi",
|
||||||
"pcbeta-windows11": "yuanjingluntan-Win11",
|
"pcbeta-windows11": "yuanjingluntan-Windows 11",
|
||||||
|
"pcbeta-windows": "yuanjingluntan-Windows ziyuan",
|
||||||
"cls-telegraph": "cailianshe-dianbao",
|
"cls-telegraph": "cailianshe-dianbao",
|
||||||
"cls-depth": "cailianshe-shendu",
|
"cls-depth": "cailianshe-shendu",
|
||||||
"cls-hot": "cailianshe-remen",
|
"cls-hot": "cailianshe-remen",
|
||||||
@@ -36,6 +36,10 @@
|
|||||||
"kaopu": "kaopuxinwen",
|
"kaopu": "kaopuxinwen",
|
||||||
"jin10": "jinshishuju",
|
"jin10": "jinshishuju",
|
||||||
"baidu": "baiduresou",
|
"baidu": "baiduresou",
|
||||||
|
"linuxdo-latest": "LINUX DO-zuixin",
|
||||||
|
"linuxdo-hot": "LINUX DO-jinrizuire",
|
||||||
|
"ghxi": "guoheboke",
|
||||||
|
"smzdm": "shenmezhidemai",
|
||||||
"nowcoder": "niuke",
|
"nowcoder": "niuke",
|
||||||
"sspai": "shaoshupai",
|
"sspai": "shaoshupai",
|
||||||
"juejin": "xitujuejin",
|
"juejin": "xitujuejin",
|
||||||
|
|||||||
+116
-155
@@ -13,6 +13,81 @@ const Time = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const originSources = {
|
export const originSources = {
|
||||||
|
"bilibili": {
|
||||||
|
name: "哔哩哔哩",
|
||||||
|
color: "blue",
|
||||||
|
home: "https://www.bilibili.com",
|
||||||
|
sub: {
|
||||||
|
"hot-search": {
|
||||||
|
title: "热搜",
|
||||||
|
column: "china",
|
||||||
|
type: "hottest",
|
||||||
|
},
|
||||||
|
"ranking": {
|
||||||
|
title: "排行榜",
|
||||||
|
column: "china",
|
||||||
|
disable: "cf",
|
||||||
|
type: "hottest",
|
||||||
|
interval: Time.Common,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"linuxdo": {
|
||||||
|
name: "LINUX DO",
|
||||||
|
column: "tech",
|
||||||
|
color: "slate",
|
||||||
|
home: "https://linux.do/",
|
||||||
|
disable: "cf",
|
||||||
|
sub: {
|
||||||
|
latest: {
|
||||||
|
title: "最新",
|
||||||
|
home: "https://linux.do/latest",
|
||||||
|
},
|
||||||
|
hot: {
|
||||||
|
title: "今日最热",
|
||||||
|
type: "hottest",
|
||||||
|
interval: Time.Common,
|
||||||
|
home: "https://linux.do/hot",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"github": {
|
||||||
|
name: "Github",
|
||||||
|
color: "gray",
|
||||||
|
home: "https://github.com/",
|
||||||
|
column: "tech",
|
||||||
|
sub: {
|
||||||
|
"trending-today": {
|
||||||
|
title: "Today",
|
||||||
|
type: "hottest",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"douyin": {
|
||||||
|
name: "抖音",
|
||||||
|
type: "hottest",
|
||||||
|
column: "china",
|
||||||
|
color: "gray",
|
||||||
|
home: "https://www.douyin.com",
|
||||||
|
},
|
||||||
|
"kuaishou": {
|
||||||
|
name: "快手",
|
||||||
|
type: "hottest",
|
||||||
|
column: "china",
|
||||||
|
color: "orange",
|
||||||
|
// cloudflare pages cannot access
|
||||||
|
disable: "cf",
|
||||||
|
home: "https://www.kuaishou.com",
|
||||||
|
},
|
||||||
|
"weibo": {
|
||||||
|
name: "微博",
|
||||||
|
title: "实时热搜",
|
||||||
|
type: "hottest",
|
||||||
|
column: "china",
|
||||||
|
color: "red",
|
||||||
|
interval: Time.Realtime,
|
||||||
|
home: "https://weibo.com",
|
||||||
|
},
|
||||||
"v2ex": {
|
"v2ex": {
|
||||||
name: "V2EX",
|
name: "V2EX",
|
||||||
color: "slate",
|
color: "slate",
|
||||||
@@ -31,14 +106,27 @@ export const originSources = {
|
|||||||
color: "blue",
|
color: "blue",
|
||||||
home: "https://www.zhihu.com",
|
home: "https://www.zhihu.com",
|
||||||
},
|
},
|
||||||
"weibo": {
|
"juejin": {
|
||||||
name: "微博",
|
name: "稀土掘金",
|
||||||
title: "实时热搜",
|
column: "tech",
|
||||||
|
color: "blue",
|
||||||
type: "hottest",
|
type: "hottest",
|
||||||
|
home: "https://juejin.cn",
|
||||||
|
},
|
||||||
|
"baidu": {
|
||||||
|
name: "百度热搜",
|
||||||
column: "china",
|
column: "china",
|
||||||
|
color: "blue",
|
||||||
|
type: "hottest",
|
||||||
|
home: "https://www.baidu.com",
|
||||||
|
},
|
||||||
|
"hupu": {
|
||||||
|
name: "虎扑",
|
||||||
|
home: "https://hupu.com",
|
||||||
|
column: "china",
|
||||||
|
title: "主干道热帖",
|
||||||
|
type: "hottest",
|
||||||
color: "red",
|
color: "red",
|
||||||
interval: Time.Realtime,
|
|
||||||
home: "https://weibo.com",
|
|
||||||
},
|
},
|
||||||
"zaobao": {
|
"zaobao": {
|
||||||
name: "联合早报",
|
name: "联合早报",
|
||||||
@@ -57,18 +145,6 @@ export const originSources = {
|
|||||||
title: "今日最热",
|
title: "今日最热",
|
||||||
home: "https://coolapk.com",
|
home: "https://coolapk.com",
|
||||||
},
|
},
|
||||||
"mktnews": {
|
|
||||||
name: "MKTNews",
|
|
||||||
column: "finance",
|
|
||||||
home: "https://mktnews.net",
|
|
||||||
color: "indigo",
|
|
||||||
interval: Time.Realtime,
|
|
||||||
sub: {
|
|
||||||
flash: {
|
|
||||||
title: "快讯",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"wallstreetcn": {
|
"wallstreetcn": {
|
||||||
name: "华尔街见闻",
|
name: "华尔街见闻",
|
||||||
color: "blue",
|
color: "blue",
|
||||||
@@ -78,14 +154,14 @@ export const originSources = {
|
|||||||
quick: {
|
quick: {
|
||||||
type: "realtime",
|
type: "realtime",
|
||||||
interval: Time.Fast,
|
interval: Time.Fast,
|
||||||
title: "快讯",
|
title: "实时快讯",
|
||||||
},
|
},
|
||||||
news: {
|
news: {
|
||||||
title: "最新",
|
title: "最新资讯",
|
||||||
interval: Time.Common,
|
interval: Time.Common,
|
||||||
},
|
},
|
||||||
hot: {
|
hot: {
|
||||||
title: "最热",
|
title: "最热文章",
|
||||||
type: "hottest",
|
type: "hottest",
|
||||||
interval: Time.Common,
|
interval: Time.Common,
|
||||||
},
|
},
|
||||||
@@ -105,21 +181,6 @@ export const originSources = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"douyin": {
|
|
||||||
name: "抖音",
|
|
||||||
type: "hottest",
|
|
||||||
column: "china",
|
|
||||||
color: "gray",
|
|
||||||
home: "https://www.douyin.com",
|
|
||||||
},
|
|
||||||
"hupu": {
|
|
||||||
name: "虎扑",
|
|
||||||
home: "https://hupu.com",
|
|
||||||
column: "china",
|
|
||||||
title: "主干道热帖",
|
|
||||||
type: "hottest",
|
|
||||||
color: "red",
|
|
||||||
},
|
|
||||||
"tieba": {
|
"tieba": {
|
||||||
name: "百度贴吧",
|
name: "百度贴吧",
|
||||||
title: "热议",
|
title: "热议",
|
||||||
@@ -171,7 +232,7 @@ export const originSources = {
|
|||||||
home: "https://bbs.pcbeta.com",
|
home: "https://bbs.pcbeta.com",
|
||||||
sub: {
|
sub: {
|
||||||
windows11: {
|
windows11: {
|
||||||
title: "Win11",
|
title: "Windows 11",
|
||||||
type: "realtime",
|
type: "realtime",
|
||||||
interval: Time.Fast,
|
interval: Time.Fast,
|
||||||
},
|
},
|
||||||
@@ -179,7 +240,6 @@ export const originSources = {
|
|||||||
title: "Windows 资源",
|
title: "Windows 资源",
|
||||||
type: "realtime",
|
type: "realtime",
|
||||||
interval: Time.Fast,
|
interval: Time.Fast,
|
||||||
disable: true,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -263,52 +323,6 @@ export const originSources = {
|
|||||||
type: "hottest",
|
type: "hottest",
|
||||||
home: "https://www.producthunt.com/",
|
home: "https://www.producthunt.com/",
|
||||||
},
|
},
|
||||||
"github": {
|
|
||||||
name: "Github",
|
|
||||||
color: "gray",
|
|
||||||
home: "https://github.com/",
|
|
||||||
column: "tech",
|
|
||||||
sub: {
|
|
||||||
"trending-today": {
|
|
||||||
title: "Today",
|
|
||||||
type: "hottest",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"bilibili": {
|
|
||||||
name: "哔哩哔哩",
|
|
||||||
color: "blue",
|
|
||||||
home: "https://www.bilibili.com",
|
|
||||||
sub: {
|
|
||||||
"hot-search": {
|
|
||||||
title: "热搜",
|
|
||||||
column: "china",
|
|
||||||
type: "hottest",
|
|
||||||
},
|
|
||||||
"hot-video": {
|
|
||||||
title: "热门视频",
|
|
||||||
disable: "cf",
|
|
||||||
column: "china",
|
|
||||||
type: "hottest",
|
|
||||||
},
|
|
||||||
"ranking": {
|
|
||||||
title: "排行榜",
|
|
||||||
column: "china",
|
|
||||||
disable: "cf",
|
|
||||||
type: "hottest",
|
|
||||||
interval: Time.Common,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"kuaishou": {
|
|
||||||
name: "快手",
|
|
||||||
type: "hottest",
|
|
||||||
column: "china",
|
|
||||||
color: "orange",
|
|
||||||
// cloudflare pages cannot access
|
|
||||||
disable: "cf",
|
|
||||||
home: "https://www.kuaishou.com",
|
|
||||||
},
|
|
||||||
"kaopu": {
|
"kaopu": {
|
||||||
name: "靠谱新闻",
|
name: "靠谱新闻",
|
||||||
column: "world",
|
column: "world",
|
||||||
@@ -324,46 +338,11 @@ export const originSources = {
|
|||||||
type: "realtime",
|
type: "realtime",
|
||||||
home: "https://www.jin10.com",
|
home: "https://www.jin10.com",
|
||||||
},
|
},
|
||||||
"baidu": {
|
|
||||||
name: "百度热搜",
|
|
||||||
column: "china",
|
|
||||||
color: "blue",
|
|
||||||
type: "hottest",
|
|
||||||
home: "https://www.baidu.com",
|
|
||||||
},
|
|
||||||
"linuxdo": {
|
|
||||||
name: "LINUX DO",
|
|
||||||
column: "tech",
|
|
||||||
color: "slate",
|
|
||||||
home: "https://linux.do/",
|
|
||||||
disable: true,
|
|
||||||
sub: {
|
|
||||||
latest: {
|
|
||||||
title: "最新",
|
|
||||||
home: "https://linux.do/latest",
|
|
||||||
},
|
|
||||||
hot: {
|
|
||||||
title: "今日最热",
|
|
||||||
type: "hottest",
|
|
||||||
interval: Time.Common,
|
|
||||||
home: "https://linux.do/hot",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"ghxi": {
|
"ghxi": {
|
||||||
name: "果核剥壳",
|
name: "果核剥壳",
|
||||||
column: "china",
|
column: "china",
|
||||||
color: "yellow",
|
color: "yellow",
|
||||||
home: "https://www.ghxi.com/",
|
home: "https://www.ghxi.com/",
|
||||||
disable: true,
|
|
||||||
},
|
|
||||||
"smzdm": {
|
|
||||||
name: "什么值得买",
|
|
||||||
column: "china",
|
|
||||||
color: "red",
|
|
||||||
type: "hottest",
|
|
||||||
home: "https://www.smzdm.com",
|
|
||||||
disable: true,
|
|
||||||
},
|
},
|
||||||
"nowcoder": {
|
"nowcoder": {
|
||||||
name: "牛客",
|
name: "牛客",
|
||||||
@@ -379,13 +358,6 @@ export const originSources = {
|
|||||||
type: "hottest",
|
type: "hottest",
|
||||||
home: "https://sspai.com",
|
home: "https://sspai.com",
|
||||||
},
|
},
|
||||||
"juejin": {
|
|
||||||
name: "稀土掘金",
|
|
||||||
column: "tech",
|
|
||||||
color: "blue",
|
|
||||||
type: "hottest",
|
|
||||||
home: "https://juejin.cn",
|
|
||||||
},
|
|
||||||
"ifeng": {
|
"ifeng": {
|
||||||
name: "凤凰网",
|
name: "凤凰网",
|
||||||
column: "china",
|
column: "china",
|
||||||
@@ -432,40 +404,29 @@ export function genSources() {
|
|||||||
if (source.sub && Object.keys(source.sub).length) {
|
if (source.sub && Object.keys(source.sub).length) {
|
||||||
Object.entries(source.sub).forEach(([subId, subSource], i) => {
|
Object.entries(source.sub).forEach(([subId, subSource], i) => {
|
||||||
if (i === 0) {
|
if (i === 0) {
|
||||||
_.push([
|
_.push([id, {
|
||||||
id,
|
redirect: `${id}-${subId}`,
|
||||||
{
|
...parent,
|
||||||
redirect: `${id}-${subId}`,
|
...subSource,
|
||||||
...parent,
|
}] as [any, Source])
|
||||||
...subSource,
|
|
||||||
},
|
|
||||||
] as [any, Source])
|
|
||||||
}
|
}
|
||||||
_.push([`${id}-${subId}`, { ...parent, ...subSource }] as [
|
_.push([`${id}-${subId}`, { ...parent, ...subSource }] as [any, Source])
|
||||||
any,
|
|
||||||
Source,
|
|
||||||
])
|
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
_.push([
|
_.push([id, {
|
||||||
id,
|
title: source.title,
|
||||||
{
|
...parent,
|
||||||
title: source.title,
|
}])
|
||||||
...parent,
|
|
||||||
},
|
|
||||||
])
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
return typeSafeObjectFromEntries(
|
return typeSafeObjectFromEntries(_.filter(([_, v]) => {
|
||||||
_.filter(([_, v]) => {
|
if (v.disable === "cf" && process.env.CF_PAGES) {
|
||||||
if (v.disable === "cf" && process.env.CF_PAGES) {
|
return false
|
||||||
return false
|
} else if (v.disable === true) {
|
||||||
} else if (v.disable === true) {
|
return false
|
||||||
return false
|
} else {
|
||||||
} else {
|
return true
|
||||||
return true
|
}
|
||||||
}
|
}))
|
||||||
}),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|||||||
+41
-33
@@ -51,23 +51,6 @@
|
|||||||
"color": "green",
|
"color": "green",
|
||||||
"interval": 600000
|
"interval": 600000
|
||||||
},
|
},
|
||||||
"mktnews": {
|
|
||||||
"redirect": "mktnews-flash",
|
|
||||||
"name": "MKTNews",
|
|
||||||
"column": "finance",
|
|
||||||
"home": "https://mktnews.net",
|
|
||||||
"color": "indigo",
|
|
||||||
"interval": 120000,
|
|
||||||
"title": "快讯"
|
|
||||||
},
|
|
||||||
"mktnews-flash": {
|
|
||||||
"name": "MKTNews",
|
|
||||||
"column": "finance",
|
|
||||||
"home": "https://mktnews.net",
|
|
||||||
"color": "indigo",
|
|
||||||
"interval": 120000,
|
|
||||||
"title": "快讯"
|
|
||||||
},
|
|
||||||
"wallstreetcn": {
|
"wallstreetcn": {
|
||||||
"redirect": "wallstreetcn-quick",
|
"redirect": "wallstreetcn-quick",
|
||||||
"name": "华尔街见闻",
|
"name": "华尔街见闻",
|
||||||
@@ -76,7 +59,7 @@
|
|||||||
"home": "https://wallstreetcn.com/",
|
"home": "https://wallstreetcn.com/",
|
||||||
"color": "blue",
|
"color": "blue",
|
||||||
"interval": 300000,
|
"interval": 300000,
|
||||||
"title": "快讯"
|
"title": "实时快讯"
|
||||||
},
|
},
|
||||||
"wallstreetcn-quick": {
|
"wallstreetcn-quick": {
|
||||||
"name": "华尔街见闻",
|
"name": "华尔街见闻",
|
||||||
@@ -85,7 +68,7 @@
|
|||||||
"home": "https://wallstreetcn.com/",
|
"home": "https://wallstreetcn.com/",
|
||||||
"color": "blue",
|
"color": "blue",
|
||||||
"interval": 300000,
|
"interval": 300000,
|
||||||
"title": "快讯"
|
"title": "实时快讯"
|
||||||
},
|
},
|
||||||
"wallstreetcn-news": {
|
"wallstreetcn-news": {
|
||||||
"name": "华尔街见闻",
|
"name": "华尔街见闻",
|
||||||
@@ -93,7 +76,7 @@
|
|||||||
"home": "https://wallstreetcn.com/",
|
"home": "https://wallstreetcn.com/",
|
||||||
"color": "blue",
|
"color": "blue",
|
||||||
"interval": 1800000,
|
"interval": 1800000,
|
||||||
"title": "最新"
|
"title": "最新资讯"
|
||||||
},
|
},
|
||||||
"wallstreetcn-hot": {
|
"wallstreetcn-hot": {
|
||||||
"name": "华尔街见闻",
|
"name": "华尔街见闻",
|
||||||
@@ -102,7 +85,7 @@
|
|||||||
"home": "https://wallstreetcn.com/",
|
"home": "https://wallstreetcn.com/",
|
||||||
"color": "blue",
|
"color": "blue",
|
||||||
"interval": 1800000,
|
"interval": 1800000,
|
||||||
"title": "最热"
|
"title": "最热文章"
|
||||||
},
|
},
|
||||||
"36kr": {
|
"36kr": {
|
||||||
"redirect": "36kr-quick",
|
"redirect": "36kr-quick",
|
||||||
@@ -198,7 +181,7 @@
|
|||||||
"home": "https://bbs.pcbeta.com",
|
"home": "https://bbs.pcbeta.com",
|
||||||
"color": "blue",
|
"color": "blue",
|
||||||
"interval": 300000,
|
"interval": 300000,
|
||||||
"title": "Win11"
|
"title": "Windows 11"
|
||||||
},
|
},
|
||||||
"pcbeta-windows11": {
|
"pcbeta-windows11": {
|
||||||
"name": "远景论坛",
|
"name": "远景论坛",
|
||||||
@@ -207,7 +190,16 @@
|
|||||||
"home": "https://bbs.pcbeta.com",
|
"home": "https://bbs.pcbeta.com",
|
||||||
"color": "blue",
|
"color": "blue",
|
||||||
"interval": 300000,
|
"interval": 300000,
|
||||||
"title": "Win11"
|
"title": "Windows 11"
|
||||||
|
},
|
||||||
|
"pcbeta-windows": {
|
||||||
|
"name": "远景论坛",
|
||||||
|
"type": "realtime",
|
||||||
|
"column": "tech",
|
||||||
|
"home": "https://bbs.pcbeta.com",
|
||||||
|
"color": "blue",
|
||||||
|
"interval": 300000,
|
||||||
|
"title": "Windows 资源"
|
||||||
},
|
},
|
||||||
"cls": {
|
"cls": {
|
||||||
"redirect": "cls-telegraph",
|
"redirect": "cls-telegraph",
|
||||||
@@ -361,16 +353,6 @@
|
|||||||
"interval": 600000,
|
"interval": 600000,
|
||||||
"title": "热搜"
|
"title": "热搜"
|
||||||
},
|
},
|
||||||
"bilibili-hot-video": {
|
|
||||||
"name": "哔哩哔哩",
|
|
||||||
"type": "hottest",
|
|
||||||
"disable": "cf",
|
|
||||||
"column": "china",
|
|
||||||
"home": "https://www.bilibili.com",
|
|
||||||
"color": "blue",
|
|
||||||
"interval": 600000,
|
|
||||||
"title": "热门视频"
|
|
||||||
},
|
|
||||||
"bilibili-ranking": {
|
"bilibili-ranking": {
|
||||||
"name": "哔哩哔哩",
|
"name": "哔哩哔哩",
|
||||||
"type": "hottest",
|
"type": "hottest",
|
||||||
@@ -414,6 +396,25 @@
|
|||||||
"color": "blue",
|
"color": "blue",
|
||||||
"interval": 600000
|
"interval": 600000
|
||||||
},
|
},
|
||||||
|
"linuxdo": {
|
||||||
|
"redirect": "linuxdo-latest",
|
||||||
|
"name": "LINUX DO",
|
||||||
|
"disable": "cf",
|
||||||
|
"column": "tech",
|
||||||
|
"home": "https://linux.do/latest",
|
||||||
|
"color": "slate",
|
||||||
|
"interval": 600000,
|
||||||
|
"title": "最新"
|
||||||
|
},
|
||||||
|
"linuxdo-latest": {
|
||||||
|
"name": "LINUX DO",
|
||||||
|
"disable": "cf",
|
||||||
|
"column": "tech",
|
||||||
|
"home": "https://linux.do/latest",
|
||||||
|
"color": "slate",
|
||||||
|
"interval": 600000,
|
||||||
|
"title": "最新"
|
||||||
|
},
|
||||||
"linuxdo-hot": {
|
"linuxdo-hot": {
|
||||||
"name": "LINUX DO",
|
"name": "LINUX DO",
|
||||||
"type": "hottest",
|
"type": "hottest",
|
||||||
@@ -424,6 +425,13 @@
|
|||||||
"interval": 1800000,
|
"interval": 1800000,
|
||||||
"title": "今日最热"
|
"title": "今日最热"
|
||||||
},
|
},
|
||||||
|
"ghxi": {
|
||||||
|
"name": "果核剥壳",
|
||||||
|
"column": "china",
|
||||||
|
"home": "https://www.ghxi.com/",
|
||||||
|
"color": "yellow",
|
||||||
|
"interval": 600000
|
||||||
|
},
|
||||||
"nowcoder": {
|
"nowcoder": {
|
||||||
"name": "牛客",
|
"name": "牛客",
|
||||||
"type": "hottest",
|
"type": "hottest",
|
||||||
|
|||||||
@@ -236,11 +236,11 @@ function NewsListHot({ items }: { items: NewsItem[] }) {
|
|||||||
key={item.id}
|
key={item.id}
|
||||||
title={item.extra?.hover}
|
title={item.extra?.hover}
|
||||||
className={$(
|
className={$(
|
||||||
"flex gap-2 items-start items-stretch relative cursor-pointer [&_*]:cursor-pointer transition-all",
|
"flex gap-2 items-center items-stretch relative cursor-pointer [&_*]:cursor-pointer transition-all",
|
||||||
"hover:bg-neutral-400/10 rounded-md pr-1 visited:(text-neutral-400)",
|
"hover:bg-neutral-400/10 rounded-md pr-1 visited:(text-neutral-400)",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<span className={$("bg-neutral-400/10 min-w-6 flex justify-center items-center rounded-md text-sm h-6 flex-shrink-0")}>
|
<span className={$("bg-neutral-400/10 min-w-6 flex justify-center items-center rounded-md text-sm")}>
|
||||||
{i + 1}
|
{i + 1}
|
||||||
</span>
|
</span>
|
||||||
{!!item.extra?.diff && <DiffNumber diff={item.extra.diff} />}
|
{!!item.extra?.diff && <DiffNumber diff={item.extra.diff} />}
|
||||||
|
|||||||
@@ -8,10 +8,8 @@ import { useThrottleFn } from "ahooks"
|
|||||||
import { useAutoAnimate } from "@formkit/auto-animate/react"
|
import { useAutoAnimate } from "@formkit/auto-animate/react"
|
||||||
import { motion } from "framer-motion"
|
import { motion } from "framer-motion"
|
||||||
import { useWindowSize } from "react-use"
|
import { useWindowSize } from "react-use"
|
||||||
import { isMobile } from "react-device-detect"
|
|
||||||
import { DndContext } from "../common/dnd"
|
import { DndContext } from "../common/dnd"
|
||||||
import { useSortable } from "../common/dnd/useSortable"
|
import { useSortable } from "../common/dnd/useSortable"
|
||||||
import { OverlayScrollbar } from "../common/overlay-scrollbar"
|
|
||||||
import type { ItemsProps } from "./card"
|
import type { ItemsProps } from "./card"
|
||||||
import { CardWrapper } from "./card"
|
import { CardWrapper } from "./card"
|
||||||
import { currentSourcesAtom } from "~/atoms"
|
import { currentSourcesAtom } from "~/atoms"
|
||||||
@@ -28,76 +26,58 @@ export function Dnd() {
|
|||||||
return Math.min(width - 32, WIDTH)
|
return Math.min(width - 32, WIDTH)
|
||||||
}, [width])
|
}, [width])
|
||||||
|
|
||||||
if (!items.length) return null
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DndWrapper items={items} setItems={setItems} isSingleColumn={isMobile}>
|
<DndWrapper items={items} setItems={setItems}>
|
||||||
<OverlayScrollbar defer className="overflow-x-auto">
|
<motion.ol
|
||||||
<motion.ol
|
className="grid w-full gap-6"
|
||||||
className={isMobile
|
ref={parent}
|
||||||
? "flex px-2 gap-6 pb-4 scroll-smooth"
|
style={{
|
||||||
: "grid w-full gap-6"}
|
gridTemplateColumns: `repeat(auto-fill, minmax(${minWidth}px, 1fr))`,
|
||||||
ref={parent}
|
}}
|
||||||
style={isMobile
|
initial="hidden"
|
||||||
? {
|
animate="visible"
|
||||||
// 横向滚动布局
|
variants={{
|
||||||
}
|
hidden: {
|
||||||
: {
|
opacity: 0,
|
||||||
gridTemplateColumns: `repeat(auto-fill, minmax(${minWidth}px, 1fr))`,
|
},
|
||||||
}}
|
visible: {
|
||||||
initial="hidden"
|
opacity: 1,
|
||||||
animate="visible"
|
transition: {
|
||||||
variants={{
|
delayChildren: 0.1,
|
||||||
hidden: {
|
staggerChildren: 0.1,
|
||||||
opacity: 0,
|
|
||||||
},
|
},
|
||||||
visible: {
|
},
|
||||||
opacity: 1,
|
}}
|
||||||
transition: {
|
>
|
||||||
delayChildren: 0.1,
|
{items.map(id => (
|
||||||
staggerChildren: 0.1,
|
<motion.li
|
||||||
|
key={id}
|
||||||
|
transition={{
|
||||||
|
type: "tween",
|
||||||
|
duration: AnimationDuration / 1000,
|
||||||
|
}}
|
||||||
|
variants={{
|
||||||
|
hidden: {
|
||||||
|
y: 20,
|
||||||
|
opacity: 0,
|
||||||
},
|
},
|
||||||
},
|
visible: {
|
||||||
}}
|
y: 0,
|
||||||
>
|
opacity: 1,
|
||||||
{items.map((id, index) => (
|
},
|
||||||
<motion.li
|
}}
|
||||||
key={id}
|
>
|
||||||
className={$(isMobile && "flex-shrink-0", isMobile && index === items.length - 1 && "mr-2")}
|
<SortableCardWrapper id={id} />
|
||||||
style={isMobile ? { width: `${width - 16 > WIDTH ? WIDTH : width - 16}px` } : undefined}
|
</motion.li>
|
||||||
transition={{
|
))}
|
||||||
type: "tween",
|
</motion.ol>
|
||||||
duration: AnimationDuration / 1000,
|
|
||||||
}}
|
|
||||||
variants={{
|
|
||||||
hidden: {
|
|
||||||
y: 20,
|
|
||||||
opacity: 0,
|
|
||||||
},
|
|
||||||
visible: {
|
|
||||||
y: 0,
|
|
||||||
opacity: 1,
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<SortableCardWrapper id={id} />
|
|
||||||
</motion.li>
|
|
||||||
))}
|
|
||||||
</motion.ol>
|
|
||||||
</OverlayScrollbar>
|
|
||||||
{isMobile && (
|
|
||||||
<div className="flex justify-center">
|
|
||||||
<span className="text-sm text-gray-500 text-center">左右滑动查看更多</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</DndWrapper>
|
</DndWrapper>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function DndWrapper({ items, setItems, isSingleColumn, children }: PropsWithChildren<{
|
function DndWrapper({ items, setItems, children }: PropsWithChildren<{
|
||||||
items: SourceID[]
|
items: SourceID[]
|
||||||
setItems: (items: SourceID[]) => void
|
setItems: (items: SourceID[]) => void
|
||||||
isSingleColumn: boolean
|
|
||||||
}>) {
|
}>) {
|
||||||
const onDropTargetChange = useCallback(({ location, source }: BaseEventPayload<ElementDragType>) => {
|
const onDropTargetChange = useCallback(({ location, source }: BaseEventPayload<ElementDragType>) => {
|
||||||
const traget = location.current.dropTargets[0]
|
const traget = location.current.dropTargets[0]
|
||||||
@@ -111,10 +91,10 @@ function DndWrapper({ items, setItems, isSingleColumn, children }: PropsWithChil
|
|||||||
startIndex: fromIndex,
|
startIndex: fromIndex,
|
||||||
indexOfTarget: toIndex,
|
indexOfTarget: toIndex,
|
||||||
closestEdgeOfTarget,
|
closestEdgeOfTarget,
|
||||||
axis: isSingleColumn ? "horizontal" : "vertical",
|
axis: "vertical",
|
||||||
})
|
})
|
||||||
setItems(update)
|
setItems(update)
|
||||||
}, [items, setItems, isSingleColumn])
|
}, [items, setItems])
|
||||||
// 避免动画干扰
|
// 避免动画干扰
|
||||||
const { run } = useThrottleFn(onDropTargetChange, {
|
const { run } = useThrottleFn(onDropTargetChange, {
|
||||||
leading: true,
|
leading: true,
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
[cmdk-list] {
|
[cmdk-list] {
|
||||||
--at-apply: px-3 flex flex-col gap-2 items-stretch max-h-[400px] h-[calc(100vh-100px)];
|
--at-apply: px-3 flex flex-col gap-2 items-stretch h-400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
[cmdk-group-heading] {
|
[cmdk-group-heading] {
|
||||||
|
|||||||
@@ -17,12 +17,6 @@ function GoTop() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function Github() {
|
|
||||||
return (
|
|
||||||
<button type="button" title="Github" className="i-ph:github-logo-duotone btn" onClick={() => window.open(Homepage)} />
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function Refresh() {
|
function Refresh() {
|
||||||
const currentSources = useAtomValue(currentSourcesAtom)
|
const currentSources = useAtomValue(currentSourcesAtom)
|
||||||
const { refresh } = useRefetch()
|
const { refresh } = useRefetch()
|
||||||
@@ -71,7 +65,6 @@ export function Header() {
|
|||||||
<span className="justify-self-end flex gap-2 items-center text-xl text-primary-600 dark:text-primary">
|
<span className="justify-self-end flex gap-2 items-center text-xl text-primary-600 dark:text-primary">
|
||||||
<GoTop />
|
<GoTop />
|
||||||
<Refresh />
|
<Refresh />
|
||||||
<Github />
|
|
||||||
<Menu />
|
<Menu />
|
||||||
</span>
|
</span>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
import { motion } from "framer-motion"
|
import { motion } from "framer-motion"
|
||||||
|
|
||||||
// function ThemeToggle() {
|
function ThemeToggle() {
|
||||||
// const { isDark, toggleDark } = useDark()
|
const { isDark, toggleDark } = useDark()
|
||||||
// return (
|
return (
|
||||||
// <li onClick={toggleDark} className="cursor-pointer [&_*]:cursor-pointer transition-all">
|
<li onClick={toggleDark} className="cursor-pointer [&_*]:cursor-pointer transition-all">
|
||||||
// <span className={$("inline-block", isDark ? "i-ph-moon-stars-duotone" : "i-ph-sun-dim-duotone")} />
|
<span className={$("inline-block", isDark ? "i-ph-moon-stars-duotone" : "i-ph-sun-dim-duotone")} />
|
||||||
// <span>
|
<span>
|
||||||
// {isDark ? "浅色模式" : "深色模式"}
|
{isDark ? "浅色模式" : "深色模式"}
|
||||||
// </span>
|
</span>
|
||||||
// </li>
|
</li>
|
||||||
// )
|
)
|
||||||
// }
|
}
|
||||||
|
|
||||||
export function Menu() {
|
export function Menu() {
|
||||||
const { loggedIn, login, logout, userInfo, enableLogin } = useLogin()
|
const { loggedIn, login, logout, userInfo, enableLogin } = useLogin()
|
||||||
@@ -64,7 +64,7 @@ export function Menu() {
|
|||||||
<span>Github 账号登录</span>
|
<span>Github 账号登录</span>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
{/* <ThemeToggle /> */}
|
<ThemeToggle />
|
||||||
<li onClick={() => window.open(Homepage)} className="cursor-pointer [&_*]:cursor-pointer transition-all">
|
<li onClick={() => window.open(Homepage)} className="cursor-pointer [&_*]:cursor-pointer transition-all">
|
||||||
<span className="i-ph:github-logo-duotone inline-block" />
|
<span className="i-ph:github-logo-duotone inline-block" />
|
||||||
<span>Star on Github </span>
|
<span>Star on Github </span>
|
||||||
@@ -75,7 +75,7 @@ export function Menu() {
|
|||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
alt="GitHub stars badge"
|
alt="GitHub stars badge"
|
||||||
src="https://img.shields.io/github/stars/ourongxing/newsnow?logo=github&style=flat&labelColor=%235e3c40&color=%23614447"
|
src="https://img.shields.io/github/stars/ourongxing/newsnow?logo=github"
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
<a
|
<a
|
||||||
@@ -83,7 +83,7 @@ export function Menu() {
|
|||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
alt="GitHub forks badge"
|
alt="GitHub forks badge"
|
||||||
src="https://img.shields.io/github/forks/ourongxing/newsnow?logo=github&style=flat&labelColor=%235e3c40&color=%23614447"
|
src="https://img.shields.io/github/forks/ourongxing/newsnow?logo=github"
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { Outlet, createRootRouteWithContext } from "@tanstack/react-router"
|
|||||||
import { TanStackRouterDevtools } from "@tanstack/router-devtools"
|
import { TanStackRouterDevtools } from "@tanstack/router-devtools"
|
||||||
import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
|
import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
|
||||||
import type { QueryClient } from "@tanstack/react-query"
|
import type { QueryClient } from "@tanstack/react-query"
|
||||||
import { isMobile } from "react-device-detect"
|
|
||||||
import { Header } from "~/components/header"
|
import { Header } from "~/components/header"
|
||||||
import { GlobalOverlayScrollbar } from "~/components/common/overlay-scrollbar"
|
import { GlobalOverlayScrollbar } from "~/components/common/overlay-scrollbar"
|
||||||
import { Footer } from "~/components/footer"
|
import { Footer } from "~/components/footer"
|
||||||
@@ -31,13 +30,11 @@ function RootComponent() {
|
|||||||
usePWA()
|
usePWA()
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<GlobalOverlayScrollbar
|
<GlobalOverlayScrollbar className={$([
|
||||||
className={$([
|
"h-full overflow-x-auto px-4",
|
||||||
!isMobile && "px-4",
|
"md:(px-10)",
|
||||||
"h-full overflow-x-auto",
|
"lg:(px-24)",
|
||||||
"md:(px-10)",
|
])}
|
||||||
"lg:(px-24)",
|
|
||||||
])}
|
|
||||||
>
|
>
|
||||||
<header
|
<header
|
||||||
className={$([
|
className={$([
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
"moduleResolution": "bundler",
|
"moduleResolution": "bundler",
|
||||||
"allowImportingTsExtensions": true,
|
"allowImportingTsExtensions": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"allowJs": true,
|
|
||||||
"noFallthroughCasesInSwitch": true,
|
"noFallthroughCasesInSwitch": true,
|
||||||
"noUnusedLocals": true,
|
"noUnusedLocals": true,
|
||||||
"noUnusedParameters": true,
|
"noUnusedParameters": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user