Skip to content

fix: handle a caller who left before the webhook reply, show the real retry count - #58

Merged
Rushaway merged 3 commits into
masterfrom
fix/audit-followup
Nov 3, 2026
Merged

Rushaway merged 3 commits into
masterfrom
fix/audit-followup

Conversation

@Rushaway

@Rushaway Rushaway commented Nov 1, 2026

Copy link
Copy Markdown
Member

Fixes #57.

Stacked on #56, this plugin's translation PR: merge #56 first. GitHub then retargets this PR to master; refresh it by merging master (overlapping lines: keep this branch's side).

Changes

  • OnWebHookExecuted returns early when the caller is gone, with one log line (userid, HTTP status, reason). No chat message, no cooldown or cookie update, and no retry, because SendWebHook needs the caller to build the embed.
  • "CallAdmin Resending" now takes the max retry count as {2} (#format {1:d},{2:d}), updated in all 7 languages. The code passes g_cvWebhookRetry.IntValue.
  • No phrase added (1 phrase changed).

Checks

  • Builds with spcomp 1.12 and the CI dependencies, no new warnings.
  • smtranslate check --languages en,fr,ru,es,de,pt,chi: 0 errors, 0 warnings.

Rushaway and others added 2 commits November 1, 2026 00:50
Move the hard-coded chat, reply, menu and HUD messages into a phrase file
with en, fr, ru, es, de, pt and chi (srcdslab/.github#5).

Co-Authored-By: WareZ57 <7504466+WareZ57@users.noreply.github.com>
… retry count

Translation audit follow-up (srcdslab/.github#6).

Co-Authored-By: WareZ57 <7504466+WareZ57@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings November 1, 2026 10:22

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

No active review issues block approval of the disconnected-caller handling and retry-limit messaging updates.

No open issues 🎉

What changed in this PR

Addresses #57 on top of the translation work in #56 by safely handling webhook replies after the caller disconnects and displaying the configured retry limit.

Changes:

  • Logs and returns when the caller has left, skipping chat notifications, cooldown updates, and retries.
  • Passes the configured retry limit to the resend phrase in all seven languages.
  • Bumps the plugin version to 2.3.4.
File Description
addons/​sourcemod/​translations/​CallAdmin.phrases.txt Replaces the hard-coded retry limit with a second parameter in all seven languages.
addons/​sourcemod/​scripting/​CallAdmin.sp Adds the disconnected-caller guard, passes the retry limit, and updates the version.

Review effort: Balanced

Base automatically changed from feat/translations to master November 1, 2026 11:33
@Rushaway
Rushaway merged commit b584715 into master Nov 3, 2026
8 checks passed
@Rushaway
Rushaway deleted the fix/audit-followup branch November 3, 2026 07:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Webhook callback errors when the caller left, and the retry count is hard-coded

2 participants