Bump extension version

Resolves #12

README.md

@@ -49,6 +49,8 @@ This extension can be configured using the `LocalSettings.php` file in your Medi
 | `$wgDiscordDisabledHooks` | array | List of hooks to disable sending webhooks for (see [below](#hooks-used)) | `[]`
 | `$wgDiscordDisabledNS` | array | List of namespaces to disable sending webhooks for | `[]`
 | `$wgDiscordDisabledUsers` | array | List of users whose performed actions shouldn't send webhooks | `[]`
+| `$wgDiscordPrependTimestamp` | bool | Prepend a timestamp (in UTC) to all sent messages. The format can be changed by editing the MediaWiki message `discord-timestampformat` | `false`
+| `$wgDiscordUseFileGetContents` | bool | Use `file_get_contents` instead of cURL. Requires `allow_url_fopen` to be set to true in `php.ini`. Not recommended as cURL makes simultaneous calls instead. | `false`
 
 ## Hooks used
 - `PageContentSaveComplete` - New edits to pages and page creations

extension.json

@@ -4,7 +4,7 @@
 		"[https://github.com/jaydenkieran Jayden Bailey]"
 	],
 	"url": "https://github.com/jaydenkieran/mw-discord",
-	"version": "1.0.5",
+	"version": "1.0.7",
 	"descriptionmsg": "discord-desc",
 	"license-name": "MIT",
 	"manifest_version": 1,
@@ -17,7 +17,9 @@
 		"DiscordMaxChars": null,
 		"DiscordDisabledHooks": [],
 		"DiscordDisabledNS": [],
-		"DiscordDisabledUsers": []
+		"DiscordDisabledUsers": [],
+		"DiscordPrependTimestamp": false,
+		"DiscordUseFileGetContents": false
 	},
 	"AutoloadClasses": {
 		"DiscordHooks": "src/DiscordHooks.php",

i18n/en.json

@@ -1,4 +1,9 @@
 {
+	"@metadata": {
+		"authors": [
+			"Jayden Bailey"
+		]
+	},
 	"discord-desc": "Sends messages to a Discord channel when certain events occur",
 	"discord-userlinks": "$1 ($2|$3)",
 	"discord-revisionlinks": "($1) $2 $3",
@@ -23,5 +28,6 @@
 	"discord-uploadnewver": "new version of",
 	"discord-uploadcomplete": "$1 uploaded $2 $3 $4 ($5, $6x$7, $8)",
 	"discord-filedeletecomplete": "$1 deleted a version of file $2 $3",
-	"discord-fileundeletecomplete": "$1 restored some versions of file $2 $3"
+	"discord-fileundeletecomplete": "$1 restored some versions of file $2 $3",
+	"discord-timestampformat": "**H:i e:**"
 }

i18n/qqq.json

@@ -1,4 +1,9 @@
 {
+	"@metadata": {
+		"authors": [
+			"Jayden Bailey"
+		]
+	},
   "discord-desc": "The description used for the Discord extension",
   "discord-userlinks": "Used for display of the user links. Parameters\n* $1 - User page link\n* $2 - discord-talk\n* $3 - discord-contribs",
   "discord-revisionlinks": "Used for display of revision links. Parameters\n* $1 - discord-diff\n* $2 - discord-minor\n* $3 - discord-size",
@@ -23,5 +28,6 @@
 	"discord-uploadnewver": "Used as the text for $2 in discord-uploadcomplete",
   "discord-uploadcomplete": "Message sent to Discord when an upload is made. Parameters:\n$1 - discord-userlinks\n$2 - discord-uploadnewver\n$3 - File link\n$4 - Comment (always surrounded in tildes)\n$5 - Size (formatted as KB/MB/GB)\n$6 - File width\n$7 - File height\n$8 - File MIME type",
   "discord-filedeletecomplete": "Message sent to Discord when a file version is deleted (not an entire file). Parameters:\n$1 - discord-userlinks\n$2 - File link\n$3 - Comment (always surrounded in tildes)",
-  "discord-fileundeletecomplete": "Message sent to Discord when a file version is restored (not an entire file). Parameters:\n$1 - discord-userlinks\n$2 - File link\n$3 - Comment (always surrounded in tildes)"
+  "discord-fileundeletecomplete": "Message sent to Discord when a file version is restored (not an entire file). Parameters:\n$1 - discord-userlinks\n$2 - File link\n$3 - Comment (always surrounded in tildes)",
+  "discord-timestampformat": "The formatting used in the gmtime() function for displaying the time an event happened in UTC."
 }

src/Utils.php

@@ -46,7 +46,7 @@ class DiscordUtils {
 	 * Handles sending a webhook to Discord using cURL
 	 */
 	public static function handleDiscord ($msg) {
-		global $wgDiscordWebhookURL;
+		global $wgDiscordWebhookURL, $wgDiscordPrependTimestamp, $wgDiscordUseFileGetContents;
 
 		if ( !$wgDiscordWebhookURL ) {
 			// There's nothing in here, so we won't do anything
@@ -67,40 +67,66 @@ class DiscordUtils {
 		// Strip whitespace to just one space
 		$stripped = preg_replace('/\s+/', ' ', $msg);
 
+		if ( $wgDiscordPrependTimestamp ) {
+			// Add timestamp
+			$dateString = gmdate( wfMessage( 'discord-timestampformat' )->text() );
+			$stripped = $dateString . ' ' . $stripped;
+		}
+
 		DeferredUpdates::addCallableUpdate( function() use ( $stripped, $urls ) {
+			$user_agent = 'mw-discord/1.0 (github.com/jaydenkieran)';
 			$json_data = [ 'content' => "$stripped" ];
 			$json = json_encode($json_data);	
 
-			// Set up cURL multi handlers
-			$c_handlers = [];
-			$result = [];
-			$mh = curl_multi_init();
+			if ( $wgDiscordUseFileGetContents ) {
+				// They want to use file_get_contents
+				foreach ($urls as &$value) {
+					$contextOpts = [
+						'http' => [
+							'header' => 'Content-Type: application/x-www-form-urlencoded',
+							'method' => 'POST', // Send as a POST request
+							'user_agent' => $user_agent, // Add a unique user agent
+							'content' => $json, // Send the JSON in the POST request
+							'ignore_errors' => true // If the call fails, let's not do anything with it
+						]
+					];
 
-			foreach ($urls as &$value) {
-				$c_handlers[$value] = curl_init( $value );
-				curl_setopt( $c_handlers[$value], CURLOPT_POST, 1 ); // Send as a POST request
-				curl_setopt( $c_handlers[$value], CURLOPT_POSTFIELDS, $json ); // Send the JSON in the POST request
-				curl_setopt( $c_handlers[$value], CURLOPT_FOLLOWLOCATION, 1 );
-				curl_setopt( $c_handlers[$value], CURLOPT_HEADER, 0 );
-				curl_setopt( $c_handlers[$value], CURLOPT_RETURNTRANSFER, 1 );
-				curl_setopt( $c_handlers[$value], CURLOPT_CONNECTTIMEOUT, 10 ); // Add a timeout for connecting to the site
-				curl_setopt( $c_handlers[$value], CURLOPT_TIMEOUT, 20 ); // Do not allow cURL to run for a long time
-				curl_setopt( $c_handlers[$value], CURLOPT_USERAGENT, 'mw-discord/1.0 (github.com/jaydenkieran)' ); // Add a unique user agent
-				curl_multi_add_handle( $mh, $c_handlers[$value] );
+					$context = stream_context_create( $contextOpts );
+					$result = file_get_contents( $value, false, $context );
+				}
+			} else {
+				// By default, we use cURL	
+				// Set up cURL multi handlers
+				$c_handlers = [];
+				$result = [];
+				$mh = curl_multi_init();
+	
+				foreach ($urls as &$value) {
+					$c_handlers[$value] = curl_init( $value );
+					curl_setopt( $c_handlers[$value], CURLOPT_POST, 1 ); // Send as a POST request
+					curl_setopt( $c_handlers[$value], CURLOPT_POSTFIELDS, $json ); // Send the JSON in the POST request
+					curl_setopt( $c_handlers[$value], CURLOPT_FOLLOWLOCATION, 1 );
+					curl_setopt( $c_handlers[$value], CURLOPT_HEADER, 0 );
+					curl_setopt( $c_handlers[$value], CURLOPT_RETURNTRANSFER, 1 );
+					curl_setopt( $c_handlers[$value], CURLOPT_CONNECTTIMEOUT, 10 ); // Add a timeout for connecting to the site
+					curl_setopt( $c_handlers[$value], CURLOPT_TIMEOUT, 10 ); // Do not allow cURL to run for a long time
+					curl_setopt( $c_handlers[$value], CURLOPT_USERAGENT, $user_agent ); // Add a unique user agent
+					curl_multi_add_handle( $mh, $c_handlers[$value] );
+				}
+	
+				$running = null;
+				do {
+					curl_multi_exec($mh, $running);
+				} while ($running);
+	
+				// Remove all handlers and then close the multi handler
+				foreach($c_handlers as $k => $ch) {
+					$result[$k] = curl_multi_getcontent($ch);
+					curl_multi_remove_handle($mh, $ch);
+				}
+	
+				curl_multi_close($mh);
 			}
-
-			$running = null;
-			do {
-				curl_multi_exec($mh, $running);
-			} while ($running);
-
-			// Remove all handlers and then close the multi handler
-			foreach($c_handlers as $k => $ch) {
-				$result[$k] = curl_multi_getcontent($ch);
-				curl_multi_remove_handle($mh, $ch);
-			}
-
-			curl_multi_close($mh);
 		} );
 
 		return true;
@@ -120,9 +146,12 @@ class DiscordUtils {
 	 */
 	public static function createUserLinks ($user) {
 		if ( $user instanceof User ) {
-			$userPage = DiscordUtils::createMarkdownLink(	$user, $user->getUserPage()->getFullUrl( '', '', $proto = PROTO_HTTP ) );
+			$isAnon = $user->isAnon();
+			$contribs = Title::newFromText("Special:Contributions/" . $user);
+
+			$userPage = DiscordUtils::createMarkdownLink(	$user, ( $isAnon ? $contribs : $user->getUserPage() )->getFullUrl( '', '', $proto = PROTO_HTTP ) );
 			$userTalk = DiscordUtils::createMarkdownLink( wfMessage( 'discord-talk' )->text(), $user->getTalkPage()->getFullUrl( '', '', $proto = PROTO_HTTP ) );
-			$userContribs = DiscordUtils::createMarkdownLink( wfMessage( 'discord-contribs' )->text(), Title::newFromText("Special:Contributions/" . $user)->getFullURL( '', '', $proto = PROTO_HTTP ) );
+			$userContribs = DiscordUtils::createMarkdownLink( wfMessage( 'discord-contribs' )->text(), $contribs->getFullURL( '', '', $proto = PROTO_HTTP ) );
 			$text = wfMessage( 'discord-userlinks', $userPage, $userTalk, $userContribs )->text();	
 		} else {
 			// If it's a string, which can be likely (for example when range blocking a user)