修复#留影叙佳期 (#356)

This commit is contained in:
Ca(HCO₃)₂ 2024-01-24 19:14:04 +08:00 committed by GitHub
parent 08b2773a9f
commit 9615d572ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 20 deletions

View File

@ -1,5 +1,5 @@
import plugin from '../../../lib/plugins/plugin.js' import plugin from '../../../lib/plugins/plugin.js'
import gsCfg from '../model/gsCfg.js' import MysInfo from '../model/mys/mysInfo.js'
import fetch from 'node-fetch' import fetch from 'node-fetch'
export class takeBirthdayPhoto extends plugin { export class takeBirthdayPhoto extends plugin {
@ -22,26 +22,26 @@ export class takeBirthdayPhoto extends plugin {
} }
async birthdaystar(e) { async birthdaystar(e) {
const { user_id } = e let uid = await MysInfo.getUid(this.e)
if (!uid) return false
const userInfo = await this.getCookie(user_id) let ck = await MysInfo.checkUidBing(uid, this.e)
if (!userInfo) { if (!ck) {
e.reply(['请先绑定ck再使用本功能哦~', segment.button([ e.reply(['请先绑定ck再使用本功能哦~', segment.button([
{ text: "Cookie帮助", callback: "#Cookie帮助" }, { text: "Cookie帮助", callback: "#Cookie帮助" },
])], true) ])], true)
return true return true
} }
this.region = await this.getServer(userInfo.uid) this.region = await this.getServer(uid)
this.game_biz = this.region.includes('cn') ? 'hk4e_cn' : 'hk4e_global' this.game_biz = this.region.includes('cn') ? 'hk4e_cn' : 'hk4e_global'
const e_hk4e_token = await this.getEHK4EToken(userInfo.ck, userInfo.uid) const e_hk4e_token = await this.getEHK4EToken(ck.ck, uid)
if (!e_hk4e_token) { if (!e_hk4e_token) {
e.reply(['获取e-hk4e_token失败请刷新ck后再试~', this.button], true) e.reply(['获取e-hk4e_token失败请刷新ck后再试~', this.button], true)
return true return true
} }
const birthday_star_list = await this.getBirthdayStar(userInfo.uid, e_hk4e_token, userInfo.ck) const birthday_star_list = await this.getBirthdayStar(uid, e_hk4e_token, ck.ck)
if (!birthday_star_list) { if (!birthday_star_list) {
e.reply(['获取生日角色失败,请稍后再试~', this.button], true) e.reply(['获取生日角色失败,请稍后再试~', this.button], true)
return true return true
@ -56,7 +56,7 @@ export class takeBirthdayPhoto extends plugin {
for (const role of birthday_star_list) { for (const role of birthday_star_list) {
await e.reply(`正在获取${role.name}的图片,请稍等~`, true) await e.reply(`正在获取${role.name}的图片,请稍等~`, true)
await e.reply(segment.image(role.take_picture)) await e.reply(segment.image(role.take_picture))
const message = await this.getBirthdayStarImg(userInfo.uid, e_hk4e_token, userInfo.ck, role.role_id) const message = await this.getBirthdayStarImg(uid, e_hk4e_token, ck.ck, role.role_id)
if (message != 'success') { if (message != 'success') {
await e.reply([message, this.button]) await e.reply([message, this.button])
return true return true
@ -72,11 +72,6 @@ export class takeBirthdayPhoto extends plugin {
return true return true
} }
async getCookie (user_id) {
const userInfo = ((await gsCfg.getBingCk()).ckQQ)[user_id]
return userInfo
}
async getEHK4EToken(ck, uid) { async getEHK4EToken(ck, uid) {
const url = this.region.includes('cn') ? 'https://api-takumi.mihoyo.com/common/badge/v1/login/account' : 'https://api-os-takumi.mihoyo.com/common/badge/v1/login/account' const url = this.region.includes('cn') ? 'https://api-takumi.mihoyo.com/common/badge/v1/login/account' : 'https://api-os-takumi.mihoyo.com/common/badge/v1/login/account'
const headers = { const headers = {