From aeed75d72f82b4d6631391e67680f6a3733120d8 Mon Sep 17 00:00:00 2001
From: tattle <66640614+dragomagol@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:10:26 -0700
Subject: [PATCH] Combined soundadd/sounddel and imageadd/imagedel (#74865)

## About The Pull Request
Combines
```
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
```
into "sound," and
```
imageadd: added some icons and images
imagedel: deleted some icons and images
```
into "image" in the changelog.

I don't think we need to have both; `sound` and `image` can represent
any kind of change to their respective medium.

---------

Co-authored-by: tattle <article.disaster@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md              |  6 ++---
 .../github_webhook_processor.php              | 20 ++++-------------
 tools/pull_request_hooks/changelogConfig.js   | 22 ++++---------------
 3 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 734c2ee248f..3c8e7d04fd6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,10 +20,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 c6c6e0f3061..3f3802c4625 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -705,17 +705,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':
@@ -730,17 +724,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"],
 		},
 	],