Skip to content

fix: 修复用户手动开启自动签到时错误检查全局签到配置的问题 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghjcfrt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: 修复用户手动开启自动签到时错误检查全局签到配置的问题 #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions RoverSign/roversign_config/set_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,16 @@
async def get_signin_config():
from .roversign_config import RoverSignConfig

master = RoverSignConfig.get_config("SigninMaster").data
signin = RoverSignConfig.get_config("SchedSignin").data
return master or signin
# This switch controls whether users may manage their own Waves
# sign-in setting. It is distinct from SchedSignin, which controls
# the scheduler itself.
return RoverSignConfig.get_config("UserWavesSignin").data


async def get_pgr_signin_config():
from .roversign_config import RoverSignConfig

return RoverSignConfig.get_config("UserPGRSignin").data


async def get_bbs_signin_config():
Expand Down Expand Up @@ -88,7 +95,7 @@ async def set_pgr_config_func(ev: Event, pgr_uid: str = "0"):
else:
option = "off"

if not await get_signin_config():
if not await get_pgr_signin_config():
return "自动签到功能已禁用!\n"

pgr_user = await WavesUser.select_waves_user(
Expand Down