fix(douyu): 支持同名角色重新绑定
This commit is contained in:
@@ -295,10 +295,9 @@ def binding_pending_decision(
|
||||
) -> dict[str, Any]:
|
||||
"""解释一个绑定候选是否可进入确认阶段。
|
||||
|
||||
角色名不是唯一事实:用户可能换绑到同名角色。判断还要对比扫码前后的
|
||||
活动绑定状态,尤其是活动 alias 从 ``bindAct=1`` 转为
|
||||
``bindAct=0 + needBindAct=1`` 的待确认转换。活动 alias 上已经存在的
|
||||
同名 pending 也不是“旧角色残留”,它仍然可以调用确认接口。
|
||||
角色名不是唯一事实,也不能要求每次都必须换新角色。用户重新绑定同名角色
|
||||
时,判断还要对比扫码前后的活动绑定状态。活动 alias 只要仍要求
|
||||
``needBindAct=1``,即使当前 ``bindAct=1``,同名角色也可以进入确认流程。
|
||||
"""
|
||||
result: dict[str, Any] = {
|
||||
"alias": str((info or {}).get("act_alias") or ""),
|
||||
@@ -354,10 +353,10 @@ def binding_pending_decision(
|
||||
if role_name.casefold() != baseline.casefold():
|
||||
result.update({"confirmable": True, "reason": "role_changed"})
|
||||
return result
|
||||
if snapshot["is_bound_act"]:
|
||||
result["reason"] = "already_bound"
|
||||
return result
|
||||
if not isinstance(baseline_info, dict):
|
||||
if snapshot["is_bound_act"]:
|
||||
result["reason"] = "already_bound"
|
||||
return result
|
||||
result["reason"] = "same_role_without_baseline_info"
|
||||
return result
|
||||
|
||||
@@ -387,6 +386,9 @@ def binding_pending_decision(
|
||||
}
|
||||
)
|
||||
return result
|
||||
if snapshot["is_bound_act"]:
|
||||
result["reason"] = "already_bound"
|
||||
return result
|
||||
result["reason"] = "same_role_stale"
|
||||
return result
|
||||
|
||||
|
||||
@@ -290,23 +290,34 @@ def resolve_elite_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,
|
||||
)
|
||||
if decision["confirmable"]:
|
||||
pending_info = info
|
||||
pending_decision = decision
|
||||
break
|
||||
if pending_info is not None:
|
||||
break
|
||||
baseline_role = str((bound_info or {}).get("role_name") or "").strip()
|
||||
|
||||
def find_pending(*, changed_role_only: bool) -> tuple[dict | None, dict | None]:
|
||||
for alias in ordered_aliases:
|
||||
for info in candidates_info:
|
||||
if str(info.get("act_alias") or "") != alias:
|
||||
continue
|
||||
role_name = str(info.get("role_name") or "").strip()
|
||||
if (
|
||||
changed_role_only
|
||||
and baseline_role
|
||||
and role_name.casefold() == baseline_role.casefold()
|
||||
):
|
||||
continue
|
||||
decision = binding_pending_decision(
|
||||
info,
|
||||
baseline_role_name=baseline_role,
|
||||
baseline_is_bound_act=is_bound_act(bound_info),
|
||||
baseline_info=bound_info,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
if decision["confirmable"]:
|
||||
return info, decision
|
||||
return None, None
|
||||
|
||||
pending_info, pending_decision = find_pending(changed_role_only=True)
|
||||
if pending_info is None:
|
||||
pending_info, pending_decision = find_pending(changed_role_only=False)
|
||||
if bound_info is not None:
|
||||
return _role_result(
|
||||
status=ROLE_BOUND,
|
||||
|
||||
@@ -637,7 +637,22 @@ class BindMixin:
|
||||
“是否 pending”只调用 ``_is_pending_role``;二维码轮询、查询角色和换绑
|
||||
时间查询都从这里选候选,避免各自用角色名或 bindRole 再写一套判断。
|
||||
"""
|
||||
for info in self._ordered_bind_candidates(candidates, prefer_aliases):
|
||||
ordered = self._ordered_bind_candidates(candidates, prefer_aliases)
|
||||
baseline = baseline_role_name.strip().casefold()
|
||||
if baseline:
|
||||
for info in ordered:
|
||||
role_name = str(info.get("role_name") or "").strip()
|
||||
if not role_name or role_name.casefold() == baseline:
|
||||
continue
|
||||
if self._is_pending_role(
|
||||
info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=actionable_aliases,
|
||||
):
|
||||
return info
|
||||
for info in ordered:
|
||||
if self._is_pending_role(
|
||||
info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
|
||||
Reference in New Issue
Block a user