mirror of
https://github.com/hicccc77/WeFlow.git
synced 2026-06-09 07:36:46 +00:00
修复:足迹页面分段失效的问题;#972 #974 所提到的问题;数据库备份中目录错误的问题;
优化:足迹页面的索引扫描性能;导出页面的消息缓存逻辑
This commit is contained in:
@@ -14,6 +14,7 @@ export interface SnsLivePhoto {
|
||||
thumb: string
|
||||
md5?: string
|
||||
token?: string
|
||||
thumbToken?: string
|
||||
key?: string
|
||||
encIdx?: string
|
||||
}
|
||||
@@ -23,6 +24,7 @@ export interface SnsMedia {
|
||||
thumb: string
|
||||
md5?: string
|
||||
token?: string
|
||||
thumbToken?: string
|
||||
key?: string
|
||||
encIdx?: string
|
||||
livePhoto?: SnsLivePhoto
|
||||
@@ -126,12 +128,22 @@ const fixSnsUrl = (url: string, token?: string, isVideo: boolean = false) => {
|
||||
|
||||
let fixedUrl = url.replace('http://', 'https://')
|
||||
|
||||
// 只有非视频(即图片)才需要处理 /150 变 /0
|
||||
// 只有非视频(即图片)才需要处理路径末尾的尺寸标识(/150、/200等)变为 /0
|
||||
if (!isVideo) {
|
||||
fixedUrl = fixedUrl.replace(/\/150($|\?)/, '/0$1')
|
||||
const [pathPart, queryPart] = fixedUrl.split('?')
|
||||
const fixedPath = pathPart.replace(/\/\d+$/, '/0')
|
||||
fixedUrl = queryPart ? `${fixedPath}?${queryPart}` : fixedPath
|
||||
}
|
||||
|
||||
if (!token || fixedUrl.includes('token=')) return fixedUrl
|
||||
// 如果没有提供新token,直接返回
|
||||
if (!token) return fixedUrl
|
||||
|
||||
// 移除已有的token和idx参数
|
||||
const [pathPart, queryPart] = fixedUrl.split('?')
|
||||
if (queryPart) {
|
||||
const params = queryPart.split('&').filter(p => !p.startsWith('token=') && !p.startsWith('idx='))
|
||||
fixedUrl = params.length > 0 ? `${pathPart}?${params.join('&')}` : pathPart
|
||||
}
|
||||
|
||||
// 根据用户要求,视频链接组合方式为: BASE_URL + "?" + "token=" + token + "&idx=1" + 原有参数
|
||||
if (isVideo) {
|
||||
@@ -704,6 +716,7 @@ class SnsService {
|
||||
url: urlMatch ? urlMatch[1].trim() : '',
|
||||
thumb: thumbMatch ? thumbMatch[1].trim() : '',
|
||||
token: urlToken || thumbToken,
|
||||
thumbToken: thumbToken,
|
||||
key: urlKey || thumbKey,
|
||||
md5: urlMd5,
|
||||
encIdx: urlEncIdx || thumbEncIdx
|
||||
@@ -716,19 +729,24 @@ class SnsService {
|
||||
const lpUrlTag = lx.match(/<url([^>]*)>/i)
|
||||
const lpThumb = lx.match(/<thumb[^>]*>([^<]+)<\/thumb>/i)
|
||||
const lpThumbTag = lx.match(/<thumb([^>]*)>/i)
|
||||
let lpToken: string | undefined, lpKey: string | undefined, lpEncIdx: string | undefined
|
||||
let lpUrlToken: string | undefined, lpThumbToken: string | undefined
|
||||
let lpKey: string | undefined, lpEncIdx: string | undefined
|
||||
if (lpUrlTag?.[1]) {
|
||||
const a = lpUrlTag[1]
|
||||
lpToken = a.match(/token="([^"]+)"/i)?.[1]
|
||||
lpUrlToken = a.match(/token="([^"]+)"/i)?.[1]
|
||||
lpKey = a.match(/key="([^"]+)"/i)?.[1]
|
||||
lpEncIdx = a.match(/enc_idx="([^"]+)"/i)?.[1]
|
||||
}
|
||||
if (!lpToken && lpThumbTag?.[1]) lpToken = lpThumbTag[1].match(/token="([^"]+)"/i)?.[1]
|
||||
if (!lpKey && lpThumbTag?.[1]) lpKey = lpThumbTag[1].match(/key="([^"]+)"/i)?.[1]
|
||||
if (lpThumbTag?.[1]) {
|
||||
const a = lpThumbTag[1]
|
||||
lpThumbToken = a.match(/token="([^"]+)"/i)?.[1]
|
||||
if (!lpKey) lpKey = a.match(/key="([^"]+)"/i)?.[1]
|
||||
}
|
||||
item.livePhoto = {
|
||||
url: lpUrl ? lpUrl[1].trim() : '',
|
||||
thumb: lpThumb ? lpThumb[1].trim() : '',
|
||||
token: lpToken,
|
||||
token: lpUrlToken || lpThumbToken,
|
||||
thumbToken: lpThumbToken,
|
||||
key: lpKey,
|
||||
encIdx: lpEncIdx
|
||||
}
|
||||
@@ -1181,16 +1199,18 @@ class SnsService {
|
||||
|
||||
const fixedMedia = (post.media || []).map((m: any) => ({
|
||||
url: fixSnsUrl(m.url, m.token, isVideoPost),
|
||||
thumb: fixSnsUrl(m.thumb, m.token, false),
|
||||
thumb: fixSnsUrl(m.thumb, m.thumbToken || m.token, false),
|
||||
md5: m.md5,
|
||||
token: m.token,
|
||||
thumbToken: m.thumbToken,
|
||||
key: isVideoPost ? (videoKey || m.key) : m.key,
|
||||
encIdx: m.encIdx || m.enc_idx,
|
||||
livePhoto: m.livePhoto ? {
|
||||
...m.livePhoto,
|
||||
url: fixSnsUrl(m.livePhoto.url, m.livePhoto.token, true),
|
||||
thumb: fixSnsUrl(m.livePhoto.thumb, m.livePhoto.token, false),
|
||||
thumb: fixSnsUrl(m.livePhoto.thumb, m.livePhoto.thumbToken || m.livePhoto.token, false),
|
||||
token: m.livePhoto.token,
|
||||
thumbToken: m.livePhoto.thumbToken,
|
||||
key: videoKey || m.livePhoto.key || m.key,
|
||||
encIdx: m.livePhoto.encIdx || m.livePhoto.enc_idx
|
||||
} : undefined
|
||||
|
||||
Reference in New Issue
Block a user