MATRIX_SERVER configuration item is now a URL

This might not be required afterall
This reverts commit 881449a170.

app/Events/Matrix/Base.php

@@ -42,13 +42,13 @@ abstract class Base
 
 			case 'room':
 				$room_alias = Http::withToken(config('matrix.as_token'))
-					->get(sprintf('https://%s/_matrix/client/v3/rooms/%s/state/m.room.canonical_alias',config('matrix.server'),$this->room_id));
+					->get(sprintf('%s/_matrix/client/v3/rooms/%s/state/m.room.canonical_alias',config('matrix.server'),$this->room_id));
 
 				return $room_alias->json('alias',$this->room_id);
 
 			case 'topic':
 				$subject = Http::withToken(config('matrix.as_token'))
-					->get(sprintf('https://%s/_matrix/client/v3/rooms/%s/state/m.room.topic',config('matrix.server'),$this->room_id));
+					->get(sprintf('%s/_matrix/client/v3/rooms/%s/state/m.room.topic',config('matrix.server'),$this->room_id));
 
 				return $subject->json('topic','Message from Matrix');
 

app/Notifications/Matrix/Echomail.php

@@ -43,21 +43,15 @@ class Echomail extends Matrix
 			$this->o->fftn->point_id,
 		);
 
-		$user = sprintf('@%s:%s',$username,config('matrix.server'));
-
-		// @todo We need to force IP4 as running clrghouz in a container without a proper IPv6 address is problematic
-		$matrix = Http::withToken(config('matrix.as_token'))
-			->withOptions([
-				CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4,
-			]);
+		$user = sprintf('@%s:%s',$username,preg_replace('#^(http[s]?://)?([^:]+)(:[0-9]+)?$#','$2',config('matrix.server')));
 
 		// Set topic if it is different:
-		$subject = $matrix
-			->get(sprintf('https://%s/_matrix/client/v3/rooms/%s/state/m.room.topic',config('matrix.server'),$room));
+		$subject = Http::withToken(config('matrix.as_token'))
+			->get(sprintf('%s/_matrix/client/v3/rooms/%s/state/m.room.topic',config('matrix.server'),$room));
 
 		if (($x=preg_replace('/^RE:\s*/i','',$this->o->subject)) !== $subject->json('topic','Message from Matrix')) {
-			$topic = $matrix
-				->put(sprintf('https://%s/_matrix/client/v3/rooms/%s/state/m.room.topic',config('matrix.server'),$room),[
+			$topic = Http::withToken(config('matrix.as_token'))
+				->put(sprintf('%s/_matrix/client/v3/rooms/%s/state/m.room.topic',config('matrix.server'),$room),[
 					'topic'=>$x,
 				]);
 
@@ -67,9 +61,9 @@ class Echomail extends Matrix
 
 		$omsg = preg_replace("/\r---.*$/U",'',$this->o->msg);
 
-		$msg = $matrix
+		$msg = Http::withToken(config('matrix.as_token'))
 			->withQueryParameters(['user_id'=>$user])
-			->post(sprintf('https://%s/_matrix/client/v3/rooms/%s/send/m.room.message',config('matrix.server'),$room),[
+			->post(sprintf('%s/_matrix/client/v3/rooms/%s/send/m.room.message',config('matrix.server'),$room),[
 				'msgtype'=>'m.text',
 				'format'=>'org.matrix.custom.html',
 				'body'=>mb_convert_encoding(str_replace("\r","\n",$omsg),'UTF-8','IBM850'),
@@ -87,8 +81,8 @@ class Echomail extends Matrix
 				// If the user doesnt exist in matrix yet
 				if (str_starts_with($msg->json('error'),'Application service has not registered this user')) {
 					// Register user
-					$msg = $matrix
-						->post(sprintf('https://%s/_matrix/client/v3/register',config('matrix.server')),[
+					$msg = Http::withToken(config('matrix.as_token'))
+						->post(sprintf('%s/_matrix/client/v3/register',config('matrix.server')),[
 							'type'=>'m.login.application_service',
 							'username'=>$username,
 						]);
@@ -100,9 +94,9 @@ class Echomail extends Matrix
 
 					// @todo Test that the user has been invited
 					// Invite user
-					$msg = $matrix
+					$msg = Http::withToken(config('matrix.as_token'))
 						//->withQueryParameters(['user_id'=>$user])
-						->post(sprintf('https://%s/_matrix/client/v3/rooms/%s/invite',config('matrix.server'),$room),[
+						->post(sprintf('%s/_matrix/client/v3/rooms/%s/invite',config('matrix.server'),$room),[
 							'user_id'=>$user,
 						]);
 
@@ -112,9 +106,9 @@ class Echomail extends Matrix
 					}
 
 					// Join as user
-					$msg = $matrix
+					$msg = Http::withToken(config('matrix.as_token'))
 						->withQueryParameters(['user_id'=>$user])
-						->post(sprintf('https://%s/_matrix/client/v3/rooms/%s/join',config('matrix.server'),$room),[
+						->post(sprintf('%s/_matrix/client/v3/rooms/%s/join',config('matrix.server'),$room),[
 							'user_id'=>$user,
 						]);
 

composer.json

@@ -7,7 +7,6 @@
     "require": {
         "php": "^8.2|8.3",
         "ext-bz2": "*",
-        "ext-curl": "*",
         "ext-pcntl": "*",
         "ext-sockets": "*",
         "ext-zip": "*",