fix(douyu): 支持同名角色重新绑定
This commit is contained in:
@@ -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