UnblockReview: don't put decline reason when accepting

- if someone accepts while leaving the default decline reason, blank it
- if a reason is completely blank, add a signature

fixes #238

Author: NovemLinguae

DraftCleaner/main.js

@@ -70,7 +70,7 @@ const { DraftCleaner } = require( './modules/DraftCleaner.js' );
 		const wgServer = mw.config.get( 'wgServer' );
 		const wgScriptPath = mw.config.get( 'wgScriptPath' );
 		const baseURL = wgServer + wgScriptPath + '/';
-		// https://stackoverflow.com/a/12464290/3480193
+		// @copyright devside, CC BY-SA 4.0, https://stackoverflow.com/a/12464290/3480193
 		$( `<form action="${ baseURL }index.php?title=${ titleEncoded }&action=submit" method="POST"/>` )
 			.append( $( '<input type="hidden" name="wpTextbox1">' ).val( wikicode ) )
 			.append( $( '<input type="hidden" name="wpSummary">' ).val( editSummary ) )

UnblockReview/main.js

@@ -79,12 +79,11 @@ Many additional bugs fixed.
 				return;
 			}
 
-			const title = mw.config.get( 'wgPageName' );
-			const wikitext = await getWikitext( title );
-
 			// change wikitext
 			// eslint-disable-next-line no-undef
 			const unblockReview = new UnblockReview();
+			const title = mw.config.get( 'wgPageName' );
+			const wikitext = await getWikitext( title );
 			const acceptDeclineReason = reasonArea.value;
 			let wikitext2;
 			try {

UnblockReview/modules/UnblockReview.js

@@ -28,10 +28,22 @@ export class UnblockReview {
 			initialText = this.getLeftHalfOfUnblockTemplate( wikitext, paramsAndReason );
 		}
 
-		if ( !acceptDeclineReason.trim() ) {
-			acceptDeclineReason = DEFAULT_DECLINE_REASON + ' ' + this.SIGNATURE;
-		} else if ( !this.hasSignature( acceptDeclineReason ) ) {
-			acceptDeclineReason = acceptDeclineReason + ' ' + this.SIGNATURE;
+		// if reason is blank, use the default decline reason
+		if ( !acceptDeclineReason.trim() && acceptOrDecline === 'decline' ) {
+			acceptDeclineReason = DEFAULT_DECLINE_REASON;
+		}
+
+		// if someone accepts using the default decline reason, blank it.
+		// we can't combine this line with the above because the default decline reason can also be entered by the user, and this is common because it's the default reason in the HTML form.
+		if ( acceptOrDecline === 'accept' && acceptDeclineReason === DEFAULT_DECLINE_REASON ) {
+			acceptDeclineReason = '';
+		}
+
+		// add signature if not present, including if the reason is blank
+		if ( acceptDeclineReason && !this.hasSignature( acceptDeclineReason ) ) {
+			acceptDeclineReason += ' ' + this.SIGNATURE;
+		} else if ( !acceptDeclineReason ) {
+			acceptDeclineReason = this.SIGNATURE;
 		}
 
 		// eslint-disable-next-line no-useless-concat

UnblockReview/tests/UnblockReview.test.js

@@ -255,4 +255,26 @@ Seem’st thou thrive if he did banish thee, arm against thy quarrel.`;
 `{{unblock reviewed|decline=Please use your other account. ~~~~|1=I was blocked a few days ago for... <span style="font-family:'Courier New', monospace;">[[User:Test]]</span>}}`;
 		expect( unblockReview.processAcceptOrDecline( wikitext, paramsAndReason, acceptDeclineReason, DEFAULT_DECLINE_REASON, acceptOrDecline ) ).toBe( expected );
 	} );
+
+	test( 'Add {{subst:Decline reason here}} when declining with a blank reason', () => {
+		const wikitext =
+`{{unblock|1=I was blocked a few days ago for... <span style="font-family:'Courier New', monospace;">[[User:Test]]</span>}}`;
+		const paramsAndReason = `I was blocked a few days ago for...`;
+		const acceptDeclineReason = ``;
+		const acceptOrDecline = `decline`;
+		const expected =
+`{{unblock reviewed|decline={{subst:Decline reason here}} ~~~~|1=I was blocked a few days ago for... <span style="font-family:'Courier New', monospace;">[[User:Test]]</span>}}`;
+		expect( unblockReview.processAcceptOrDecline( wikitext, paramsAndReason, acceptDeclineReason, DEFAULT_DECLINE_REASON, acceptOrDecline ) ).toBe( expected );
+	} );
+
+	test( `Don't add {{subst:Decline reason here}} when accepting with a blank reason`, () => {
+		const wikitext =
+`{{unblock|1=I was blocked a few days ago for... <span style="font-family:'Courier New', monospace;">[[User:Test]]</span>}}`;
+		const paramsAndReason = `I was blocked a few days ago for...`;
+		const acceptDeclineReason = ``;
+		const acceptOrDecline = `accept`;
+		const expected =
+`{{unblock reviewed|accept=~~~~|1=I was blocked a few days ago for... <span style="font-family:'Courier New', monospace;">[[User:Test]]</span>}}`;
+		expect( unblockReview.processAcceptOrDecline( wikitext, paramsAndReason, acceptDeclineReason, DEFAULT_DECLINE_REASON, acceptOrDecline ) ).toBe( expected );
+	} );
 } );