cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-19 22:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Webhook: Prevent connection errors to game servers from blocking discord announces (#87179)

Browse Source 
Just a guess, but i think basil being down is why this isn't working.
This commit is contained in:
Kyle Spier-Swenson
2024-10-14 01:50:56 -07:00
committed by lessthanthree
parent ba9e75455d
commit 6d293d078b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/WebhookProcessor/github_webhook_processor.php
View File

@@ -396,13 +396,13 @@ function handle_pr($payload) {
$repo_name = $payload['repository']['name'];
if (in_array($repo_name, $game_announce_whitelist)) {
game_announce($action, $payload, $pr_flags);
}
if (!is_blacklisted($discord_announce_blacklist, $repo_name)) {
discord_announce($action, $payload, $pr_flags);
}
if (in_array($repo_name, $game_announce_whitelist)) {
game_announce($action, $payload, $pr_flags);
}
}
function filter_announce_targets($targets, $owner, $repo, $action, $pr_flags) {
@@ -491,10 +491,15 @@ function game_announce($action, $payload, $pr_flags) {
$msg = '?announce='.urlencode($msg).'&payload='.urlencode(json_encode($game_payload));
foreach ($game_servers as $serverid => $server) {
$server_message = $msg;
if (isset($server['comskey']))
$server_message .= '&key='.urlencode($server['comskey']);
game_server_send($server['address'], $server['port'], $server_message);
try {
$server_message = $msg;
if (isset($server['comskey']))
$server_message .= '&key='.urlencode($server['comskey']);
game_server_send($server['address'], $server['port'], $server_message);
} catch (exception $e) {
log_error('Error on line ' . $e->getLine() . ': ' . $e->getMessage());
continue;
}
}
}