From c97a360b23de26db3b3737a7c73dca9cd5978c98 Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Sat, 13 Feb 2021 21:45:10 -0500 Subject: [PATCH] Removes tweak and replaces it with a tag for QoL and Atomic prs (#56890) --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- html/changelog.css | 3 ++- .../github_webhook_processor.php | 16 +++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f204eb0a723..01414359438 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,7 @@ add: Added new things add: Added more things del: Removed old things -tweak: tweaked a few things +qol: made something easier to use balance: rebalanced something fix: fixed a few things soundadd: added a new sound thingy diff --git a/html/changelog.css b/html/changelog.css index da32a5a5575..b56b6d6f42d 100644 --- a/html/changelog.css +++ b/html/changelog.css @@ -12,6 +12,7 @@ a img {border:none;} .bugfix {background-image:url(bug-minus.png)} .wip {background-image:url(hard-hat-exclamation.png)} .tweak {background-image:url(wrench-screwdriver.png)} +.qol {background-image:url(wrench-screwdriver.png)} .soundadd {background-image:url(music-plus.png)} .sounddel {background-image:url(music-minus.png)} .rscdel {background-image:url(cross-circle.png)} @@ -29,7 +30,7 @@ a img {border:none;} .sansserif {font-family:Tahoma,sans-serif;font-size:12px;} .commit {margin-bottom:20px;font-size:100%;font-weight:normal;} .changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;} -.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;} +.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;} .author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;} .drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;} .hidden {display:none;} diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index becd4b32ab6..b4609c3a03d 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -573,15 +573,16 @@ function get_pr_code_friendliness($payload, $oldbalance = null){ 'Refactor' => 10, 'Code Improvement' => 2, 'Grammar and Formatting' => 1, + 'Quality of Life' => 1, 'Priority: High' => 15, 'Priority: CRITICAL' => 20, 'Unit Tests' => 6, 'Logging' => 1, 'Feedback' => 2, 'Performance' => 12, + 'Atomic' => 2, 'Feature' => -10, 'Balance/Rebalance' => -8, - 'Tweak' => -2, 'Sound' => 1, 'Sprites' => 1, 'GBP: Reset' => $startingPRBalance - $oldbalance, @@ -602,8 +603,7 @@ function get_pr_code_friendliness($payload, $oldbalance = null){ } } - $affecting = abs($maxNegative) >= $maxPositive ? $maxNegative : $maxPositive; - return $affecting; + return $maxNegative + $maxPositive; } function is_maintainer($payload, $author){ @@ -768,12 +768,10 @@ function checkchangelog($payload, $compile = true) { $currentchangelogblock[] = array('type' => 'bugfix', 'body' => $item); } break; - case 'rsctweak': - case 'tweaks': - case 'tweak': - if($item != 'tweaked a few things') { - $tags[] = 'Tweak'; - $currentchangelogblock[] = array('type' => 'tweak', 'body' => $item); + case 'qol': + if($item != 'made something easier to use') { + $tags[] = 'Quality of Life'; + $currentchangelogblock[] = array('type' => 'qol', 'body' => $item); } break; case 'soundadd':