diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d52858c5357..0ed11975041 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -30,10 +30,8 @@ del: Removed old things qol: made something easier to use balance: rebalanced something fix: fixed a few things -soundadd: added a new sound thingy -sounddel: removed an old sound thingy -imageadd: added some icons and images -imagedel: deleted some icons and images +sound: added/modified/removed audio or sound effects +image: added/modified/removed some icons or images spellcheck: fixed a few typos code: changed some code refactor: refactored some code diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index ea99d905e99..b9e2c765708 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -708,17 +708,11 @@ function checkchangelog($payload) { $tags[] = 'Quality of Life'; } break; - case 'soundadd': - if($item != 'added a new sound thingy') { + case 'sound': + if($item != 'added/modified/removed audio or sound effects') { $tags[] = 'Sound'; } break; - case 'sounddel': - if($item != 'removed an old sound thingy') { - $tags[] = 'Sound'; - $tags[] = 'Removal'; - } - break; case 'add': case 'adds': case 'rscadd': @@ -733,17 +727,11 @@ function checkchangelog($payload) { $tags[] = 'Removal'; } break; - case 'imageadd': - if($item != 'added some icons and images') { + case 'image': + if($item != 'added/modified/removed some icons or images') { $tags[] = 'Sprites'; } break; - case 'imagedel': - if($item != 'deleted some icons and images') { - $tags[] = 'Sprites'; - $tags[] = 'Removal'; - } - break; case 'typo': case 'spellcheck': if($item != 'fixed a few typos') { diff --git a/tools/pull_request_hooks/changelogConfig.js b/tools/pull_request_hooks/changelogConfig.js index a607fd9a457..c4672c87907 100644 --- a/tools/pull_request_hooks/changelogConfig.js +++ b/tools/pull_request_hooks/changelogConfig.js @@ -40,30 +40,16 @@ export const CHANGELOG_ENTRIES = [ ], [ - ["soundadd"], + ["sound"], { - placeholders: ["added a new sound thingy"], + placeholders: ["added/modified/removed audio or sound effects"], }, ], [ - ["sounddel"], + ["image"], { - placeholders: ["removed an old sound thingy"], - }, - ], - - [ - ["imageadd"], - { - placeholders: ["added some icons and images"], - }, - ], - - [ - ["imagedel"], - { - placeholders: ["deleted some icons and images"], + placeholders: ["added/modified/removed some icons or images"], }, ],