Revert "Force posting to matrix to use IPv4 resolution"
This might not be required afterall
This reverts commit 881449a170
.
This commit is contained in:
parent
881449a170
commit
6342fe28b2
@ -45,18 +45,12 @@ class Echomail extends Matrix
|
||||
|
||||
$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,
|
||||
]);
|
||||
|
||||
// Set topic if it is different:
|
||||
$subject = $matrix
|
||||
$subject = Http::withToken(config('matrix.as_token'))
|
||||
->get(sprintf('https://%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
|
||||
$topic = Http::withToken(config('matrix.as_token'))
|
||||
->put(sprintf('https://%s/_matrix/client/v3/rooms/%s/state/m.room.topic',config('matrix.server'),$room),[
|
||||
'topic'=>$x,
|
||||
]);
|
||||
@ -67,7 +61,7 @@ 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),[
|
||||
'msgtype'=>'m.text',
|
||||
@ -87,7 +81,7 @@ 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
|
||||
$msg = Http::withToken(config('matrix.as_token'))
|
||||
->post(sprintf('https://%s/_matrix/client/v3/register',config('matrix.server')),[
|
||||
'type'=>'m.login.application_service',
|
||||
'username'=>$username,
|
||||
@ -100,7 +94,7 @@ 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),[
|
||||
'user_id'=>$user,
|
||||
@ -112,7 +106,7 @@ 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),[
|
||||
'user_id'=>$user,
|
||||
|
@ -7,7 +7,6 @@
|
||||
"require": {
|
||||
"php": "^8.2|8.3",
|
||||
"ext-bz2": "*",
|
||||
"ext-curl": "*",
|
||||
"ext-pcntl": "*",
|
||||
"ext-sockets": "*",
|
||||
"ext-zip": "*",
|
||||
|
Loading…
Reference in New Issue
Block a user