fix(douyu): 修复多 alias 待确认绑定并补充协议文档
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Sequence
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from typing import Any
|
||||
|
||||
@@ -284,41 +285,129 @@ def role_change_available_at(
|
||||
return None
|
||||
|
||||
|
||||
def binding_pending_decision(
|
||||
info: dict | None,
|
||||
*,
|
||||
baseline_role_name: str = "",
|
||||
baseline_is_bound_act: bool = False,
|
||||
baseline_info: dict | None = None,
|
||||
actionable_aliases: Sequence[str] = (),
|
||||
) -> dict[str, Any]:
|
||||
"""解释一个绑定候选是否可进入确认阶段。
|
||||
|
||||
角色名不是唯一事实:用户可能换绑到同名角色。判断还要对比扫码前后的
|
||||
活动绑定状态,尤其是活动 alias 从 ``bindAct=1`` 转为
|
||||
``bindAct=0 + needBindAct=1`` 的待确认转换。活动 alias 上已经存在的
|
||||
同名 pending 也不是“旧角色残留”,它仍然可以调用确认接口。
|
||||
"""
|
||||
result: dict[str, Any] = {
|
||||
"alias": str((info or {}).get("act_alias") or ""),
|
||||
"role_name": "",
|
||||
"is_bound_act": False,
|
||||
"is_bound_role": False,
|
||||
"need_bind_act": False,
|
||||
"need_bind_role": False,
|
||||
"baseline_alias": str((baseline_info or {}).get("act_alias") or ""),
|
||||
"baseline_role_name": str(baseline_role_name or "").strip(),
|
||||
"baseline_is_bound_act": bool(baseline_is_bound_act),
|
||||
"baseline_is_pending": False,
|
||||
"same_alias": False,
|
||||
"role_changed": False,
|
||||
"actionable_alias": False,
|
||||
"confirmable": False,
|
||||
"reason": "no_candidate",
|
||||
}
|
||||
if not isinstance(info, dict):
|
||||
return result
|
||||
snapshot = binding_snapshot(info)
|
||||
role_name = snapshot["role_name"]
|
||||
alias = str(info.get("act_alias") or "")
|
||||
aliases = {str(value or "").strip() for value in actionable_aliases}
|
||||
baseline_alias = str((baseline_info or {}).get("act_alias") or "")
|
||||
result.update(
|
||||
{
|
||||
"alias": alias,
|
||||
"role_name": role_name,
|
||||
"is_bound_act": bool(snapshot["is_bound_act"]),
|
||||
"is_bound_role": bool(snapshot["is_bound_role"]),
|
||||
"need_bind_act": bool(snapshot["need_bind_act"]),
|
||||
"need_bind_role": bool(snapshot["need_bind_role"]),
|
||||
"same_alias": bool(alias and alias == baseline_alias),
|
||||
"actionable_alias": bool(alias and alias in aliases),
|
||||
}
|
||||
)
|
||||
if not role_name:
|
||||
result["reason"] = "no_role"
|
||||
return result
|
||||
baseline = baseline_role_name.strip()
|
||||
if not baseline:
|
||||
if result["actionable_alias"] and snapshot["need_bind_act"]:
|
||||
result.update(
|
||||
{
|
||||
"confirmable": True,
|
||||
"reason": "existing_actionable_pending",
|
||||
}
|
||||
)
|
||||
return result
|
||||
result.update({"confirmable": True, "reason": "first_role_without_baseline"})
|
||||
return result
|
||||
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):
|
||||
result["reason"] = "same_role_without_baseline_info"
|
||||
return result
|
||||
|
||||
baseline_snapshot = binding_snapshot(baseline_info)
|
||||
result["baseline_is_pending"] = bool(
|
||||
baseline_snapshot["role_name"]
|
||||
and not baseline_snapshot["is_bound_act"]
|
||||
and baseline_snapshot["need_bind_act"]
|
||||
)
|
||||
if (
|
||||
result["same_alias"]
|
||||
and baseline_snapshot["is_bound_act"]
|
||||
and snapshot["need_bind_act"]
|
||||
):
|
||||
result.update(
|
||||
{
|
||||
"confirmable": True,
|
||||
"reason": "same_alias_after_bound_transition",
|
||||
}
|
||||
)
|
||||
return result
|
||||
if result["actionable_alias"] and snapshot["need_bind_act"]:
|
||||
result.update(
|
||||
{
|
||||
"confirmable": True,
|
||||
"reason": "existing_actionable_pending",
|
||||
}
|
||||
)
|
||||
return result
|
||||
result["reason"] = "same_role_stale"
|
||||
return result
|
||||
|
||||
|
||||
def is_pending_binding_role(
|
||||
info: dict | None,
|
||||
*,
|
||||
baseline_role_name: str = "",
|
||||
baseline_is_bound_act: bool = False,
|
||||
baseline_info: dict | None = None,
|
||||
actionable_aliases: Sequence[str] = (),
|
||||
) -> bool:
|
||||
"""是否出现了本次扫码产生的可确认角色。
|
||||
|
||||
角色名不是唯一事实:用户可能换绑到同名角色。判断还要对比扫码前后的
|
||||
活动绑定状态,尤其是活动 alias 从 ``bindAct=1`` 转为
|
||||
``bindAct=0 + needBindAct=1`` 的待确认转换。
|
||||
"""
|
||||
if not isinstance(info, dict):
|
||||
return False
|
||||
snapshot = binding_snapshot(info)
|
||||
role_name = snapshot["role_name"]
|
||||
if not role_name:
|
||||
return False
|
||||
baseline = baseline_role_name.strip()
|
||||
if not baseline:
|
||||
return True
|
||||
if role_name.casefold() != baseline.casefold():
|
||||
return True
|
||||
if snapshot["is_bound_act"]:
|
||||
return False
|
||||
if not isinstance(baseline_info, dict):
|
||||
return False
|
||||
|
||||
baseline_snapshot = binding_snapshot(baseline_info)
|
||||
same_alias = str(info.get("act_alias") or "") == str(
|
||||
baseline_info.get("act_alias") or ""
|
||||
)
|
||||
"""兼容布尔调用;详细原因统一由 :func:`binding_pending_decision` 给出。"""
|
||||
return bool(
|
||||
same_alias and baseline_snapshot["is_bound_act"] and snapshot["need_bind_act"]
|
||||
binding_pending_decision(
|
||||
info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=actionable_aliases,
|
||||
)["confirmable"]
|
||||
)
|
||||
|
||||
|
||||
@@ -340,11 +429,19 @@ def pending_binding_role_from_result(result: dict[str, Any] | None) -> str:
|
||||
baseline_info = result.get("before_bind_info")
|
||||
# 没有完整 before_bind_info 时无法证明同名角色发生过状态转换。
|
||||
# 此时宁可先不展示,也不能把账号历史角色误报成本次绑定结果。
|
||||
action_aliases = [
|
||||
str(value or "").strip()
|
||||
for value in (result.get("action_act_aliases") or [])
|
||||
if str(value or "").strip()
|
||||
]
|
||||
if not action_aliases and result.get("act_alias"):
|
||||
action_aliases = [str(result["act_alias"])]
|
||||
if is_pending_binding_role(
|
||||
result,
|
||||
baseline_role_name=baseline,
|
||||
baseline_is_bound_act=bool(result.get("baseline_is_bound_act")),
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=action_aliases,
|
||||
):
|
||||
return role_name
|
||||
return ""
|
||||
|
||||
Reference in New Issue
Block a user