fix(douyu): 修复多 alias 待确认绑定并补充协议文档
This commit is contained in:
@@ -29,10 +29,10 @@ from .account_binding import (
|
||||
SCOPE_ELITE,
|
||||
SCOPE_ESPORTS,
|
||||
SCOPE_PEACE,
|
||||
binding_pending_decision,
|
||||
binding_snapshot,
|
||||
derive_from_bind_info,
|
||||
is_bound_act,
|
||||
is_pending_binding_role,
|
||||
role_change_available_at,
|
||||
set_bind_status,
|
||||
)
|
||||
@@ -287,21 +287,25 @@ def resolve_elite_role(
|
||||
),
|
||||
None,
|
||||
)
|
||||
pending_info = next(
|
||||
(
|
||||
info
|
||||
for alias in ordered_aliases
|
||||
for info in candidates_info
|
||||
if str(info.get("act_alias") or "") == alias
|
||||
and is_pending_binding_role(
|
||||
pending_info = None
|
||||
pending_decision: dict[str, Any] | None = None
|
||||
for alias in ordered_aliases:
|
||||
for info in candidates_info:
|
||||
if str(info.get("act_alias") or "") != alias:
|
||||
continue
|
||||
decision = binding_pending_decision(
|
||||
info,
|
||||
baseline_role_name=str((bound_info or {}).get("role_name") or ""),
|
||||
baseline_is_bound_act=is_bound_act(bound_info),
|
||||
baseline_info=bound_info,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
),
|
||||
None,
|
||||
)
|
||||
if decision["confirmable"]:
|
||||
pending_info = info
|
||||
pending_decision = decision
|
||||
break
|
||||
if pending_info is not None:
|
||||
break
|
||||
if bound_info is not None:
|
||||
return _role_result(
|
||||
status=ROLE_BOUND,
|
||||
@@ -318,7 +322,7 @@ def resolve_elite_role(
|
||||
bind_infos=candidates_info,
|
||||
)
|
||||
if pending_info is not None:
|
||||
return _role_result(
|
||||
result = _role_result(
|
||||
status=ROLE_PENDING,
|
||||
bind_info=pending_info,
|
||||
candidates=candidates,
|
||||
@@ -326,6 +330,8 @@ def resolve_elite_role(
|
||||
errors=errors,
|
||||
bind_infos=candidates_info,
|
||||
)
|
||||
result["decision"] = pending_decision
|
||||
return result
|
||||
if errors and not candidates_info:
|
||||
return _role_result(
|
||||
status=ROLE_ERROR,
|
||||
|
||||
Reference in New Issue
Block a user