From 9b52fbd8bbed07924768f03078cd0f2bb3f0bf73 Mon Sep 17 00:00:00 2001
From: Jayden Bailey <jaydenkieran@gmail.com>
Date: Tue, 11 Sep 2018 19:25:53 +0100
Subject: [PATCH] Adjust formatting of user block messages

---
 i18n/en.json             |  2 +-
 src/MediawikiDiscord.php | 30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 81d1f1c..c21fb3b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,7 @@
 	"onUploadComplete_NewVersion": "$1 uploaded new version of file $2",
 	"onFileDeleteComplete": "$1 deleted file $2",
 	"onLocalUserCreated": "$1 registered",
-	"onBlockIpComplete": "$1 blocked user $2",
+	"onBlockIpComplete": "$1 blocked user $2 until $3",
 	"onUnblockUserComplete": "$1 unblocked user $2",
 	"onUserGroupsChanged": "$1 changed rights of user $1.",
 
diff --git a/src/MediawikiDiscord.php b/src/MediawikiDiscord.php
index b57329d..1ef91cd 100644
--- a/src/MediawikiDiscord.php
+++ b/src/MediawikiDiscord.php
@@ -323,36 +323,38 @@ final class MediawikiDiscordHooks
 		{
 			return;
 		}
-		
-		$message = MediawikiDiscord::translate('onBlockIpComplete', MediawikiDiscord::getUserText($user), 
-																	MediawikiDiscord::getUserText($block->getTarget()));
-																	
-		if (empty($block->mReason) == false) 
-		{
-			$message .= sprintf(" `%s`", 
-						$block->mReason);
-		}
-			
+
 		if (($expires = strtotime($block->mExpiry))) 
 		{
-			$message .= sprintf(" `%s`", 
-						date('Y-m-d H:i:s', $expires));
+			$expiryMsg = sprintf(" `%s`", 
+						date('d F Y H:i', $expires));
 		} 
 		else 
 		{
 			if ($block->mExpiry == "infinity") 
 			{
-				$message .= sprintf(" (`%s`)", 
+				$expiryMsg = sprintf(" (`%s`)", 
 							MediawikiDiscord::translate('infiniteblock'));	
 			}
 			else
 			{
-				$message .= sprintf(" (%s `%s`)", 
+				$expiryMsg = sprintf(" (%s `%s`)", 
 							MediawikiDiscord::translate('blocklist-expiry'), 
 							$block->mExpiry );
 			}			
 		}
 		
+		$message = MediawikiDiscord::translate('onBlockIpComplete', MediawikiDiscord::getUserText($user),
+																	MediawikiDiscord::getUserText($block->getTarget()),
+																	$expiryMsg
+																);
+
+		if (empty($block->mReason) == false) 
+		{
+			$message .= sprintf(": `%s`", 
+						$block->mReason);
+		}
+		
 	    (new DiscordNotification($message))->Send();	
 	}