优化兑换结果图片
This commit is contained in:
@@ -1517,7 +1517,7 @@ class DouyuBatchRunner:
|
|||||||
display_role = role.get("role_name") or account.xpd_game_name or ""
|
display_role = role.get("role_name") or account.xpd_game_name or ""
|
||||||
channel = "微信" if (role.get("type") == "wx" or account.xpd_area_id == 1) else "手Q"
|
channel = "微信" if (role.get("type") == "wx" or account.xpd_area_id == 1) else "手Q"
|
||||||
result.update({
|
result.update({
|
||||||
"goods": goods_raw,
|
"goods": {**goods_raw, "commodityName": goods.name or ""},
|
||||||
"game_name": display_role,
|
"game_name": display_role,
|
||||||
"game_channel": channel,
|
"game_channel": channel,
|
||||||
"account_name": account.nickname or account.username or account.uid or f"#{account.id}",
|
"account_name": account.nickname or account.username or account.uid or f"#{account.id}",
|
||||||
|
|||||||
@@ -26,11 +26,13 @@ function goodsOf(task: DouyuTaskItem): {
|
|||||||
accountName: string;
|
accountName: string;
|
||||||
} {
|
} {
|
||||||
const goods = (task.result?.goods ?? null) as Record<string, unknown> | null;
|
const goods = (task.result?.goods ?? null) as Record<string, unknown> | null;
|
||||||
const name = rawString(goods, 'commodityName')
|
const name = (rawString(goods, 'commodityName')
|
||||||
|| rawString(goods, 'name')
|
|| rawString(goods, 'name')
|
||||||
|| rawString(goods, 'sGoodsName')
|
|| rawString(goods, 'sGoodsName')
|
||||||
|| task.message.replace(/^兑换[^::]*[::]?\s*/, '').trim()
|
|| task.message.replace(/^兑换[^::]*[::]?\s*/, '').trim()
|
||||||
|| rawString(task.result, 'commodity_id');
|
|| rawString(task.result, 'commodity_id'))
|
||||||
|
.replace(/[((]\d+\s*(?:点券|碎片|积分)[))]\s*$/, '')
|
||||||
|
.trim();
|
||||||
const pic = rawString(goods, 'webPic') || rawString(goods, 'pic') || rawString(goods, 'sGoodsPic');
|
const pic = rawString(goods, 'webPic') || rawString(goods, 'pic') || rawString(goods, 'sGoodsPic');
|
||||||
const roleName = rawString(task.result, 'game_name');
|
const roleName = rawString(task.result, 'game_name');
|
||||||
const channel = rawString(task.result, 'game_channel');
|
const channel = rawString(task.result, 'game_channel');
|
||||||
|
|||||||
Reference in New Issue
Block a user