Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/Http/Controllers/ControlMessageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,14 @@ protected function resolveConnectionMessage($connectionInfo, $user)
{
$deferred = new Deferred();

$connectionMessageResolver = config('expose-server.messages.resolve_connection_message')($connectionInfo, $user);
$resolveConnectionMessage = config('expose-server.messages.resolve_connection_message');
if(is_string($resolveConnectionMessage) && class_exists($resolveConnectionMessage)) {
$connectionMessageResolver = (new $resolveConnectionMessage())($connectionInfo, $user);
} else if($resolveConnectionMessage instanceof \Closure) {
$connectionMessageResolver = $resolveConnectionMessage($connectionInfo, $user);
} else {
$connectionMessageResolver = $resolveConnectionMessage;
}

if ($connectionMessageResolver instanceof PromiseInterface) {
$connectionMessageResolver->then(function ($connectionMessage) use ($connectionInfo, $deferred) {
Expand Down
15 changes: 15 additions & 0 deletions app/Support/Messages/ResolveConnectionMessage.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

declare(strict_types=1);

namespace Expose\Server\Support\Messages;

use Expose\Server\Connections\ControlConnection;

class ResolveConnectionMessage
{
public function __invoke(ControlConnection $connectionInfo, array|null $user)
{
return config('expose-server.messages.message_of_the_day');
}
}
4 changes: 1 addition & 3 deletions config/expose-server.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,7 @@
|
*/
'messages' => [
'resolve_connection_message' => function ($connectionInfo, $user) {
return config('expose-server.messages.message_of_the_day');
},
'resolve_connection_message' => \Expose\Server\Support\Messages\ResolveConnectionMessage::class,

'message_of_the_day' => 'Thank you for using expose.',

Expand Down