File tree Expand file tree Collapse file tree 3 files changed +32
-16
lines changed
core/components/modai/src Expand file tree Collapse file tree 3 files changed +32
-16
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ class modAIOnToolRegister extends Event
6
6
{
7
7
public function run ()
8
8
{
9
- $ this ->modx ->event ->output ([
9
+ $ this ->modx ->event ->output (json_encode ( [
10
10
\modAI \Tools \GetWeather::class,
11
11
12
12
\modAI \Tools \GetCategories::class,
@@ -21,6 +21,6 @@ public function run()
21
21
\modAI \Tools \CreateResource::class,
22
22
\modAI \Tools \GetResources::class,
23
23
\modAI \Tools \GetResourceDetail::class,
24
- ]);
24
+ ])) ;
25
25
}
26
26
}
Original file line number Diff line number Diff line change @@ -18,17 +18,25 @@ public function process()
18
18
19
19
$ registeredContextProviders = $ this ->modx ->invokeEvent ('modAIOnContextProviderRegister ' );
20
20
foreach ($ registeredContextProviders as $ registeredContextProvider ) {
21
- if (is_array ($ registeredContextProvider )) {
22
- foreach ($ registeredContextProvider as $ contextProvider ) {
23
- if ($ this ->validateClassName ($ contextProvider , $ query )) {
24
- $ classes [] = $ contextProvider ;
25
- }
21
+ $ contextProviders = $ registeredContextProvider ;
22
+
23
+ if (!is_array ($ contextProviders )) {
24
+ $ maybeJSON = json_decode ($ registeredContextProvider , true );
25
+ if (is_array ($ maybeJSON )) {
26
+ $ contextProviders = $ maybeJSON ;
27
+ } else {
28
+ $ contextProviders = [$ registeredContextProvider ];
26
29
}
30
+ }
31
+
32
+ if (!is_array ($ contextProviders )) {
27
33
continue ;
28
34
}
29
35
30
- if ($ this ->validateClassName ($ registeredContextProvider , $ query )) {
31
- $ classes [] = $ registeredContextProvider ;
36
+ foreach ($ contextProviders as $ contextProvider ) {
37
+ if ($ this ->validateClassName ($ contextProvider , $ query )) {
38
+ $ classes [] = $ contextProvider ;
39
+ }
32
40
}
33
41
}
34
42
Original file line number Diff line number Diff line change @@ -18,17 +18,25 @@ public function process()
18
18
19
19
$ registeredTools = $ this ->modx ->invokeEvent ('modAIOnToolRegister ' );
20
20
foreach ($ registeredTools as $ registeredTool ) {
21
- if (is_array ($ registeredTool )) {
22
- foreach ($ registeredTool as $ tool ) {
23
- if ($ this ->validateClassName ($ tool , $ query )) {
24
- $ classes [] = $ tool ;
25
- }
21
+ $ tools = $ registeredTool ;
22
+
23
+ if (!is_array ($ tools )) {
24
+ $ maybeJSON = json_decode ($ registeredTool , true );
25
+ if (is_array ($ maybeJSON )) {
26
+ $ tools = $ maybeJSON ;
27
+ } else {
28
+ $ tools = [$ registeredTool ];
26
29
}
30
+ }
31
+
32
+ if (!is_array ($ tools )) {
27
33
continue ;
28
34
}
29
35
30
- if ($ this ->validateClassName ($ registeredTool , $ query )) {
31
- $ classes [] = $ registeredTool ;
36
+ foreach ($ tools as $ tool ) {
37
+ if ($ this ->validateClassName ($ tool , $ query )) {
38
+ $ classes [] = $ tool ;
39
+ }
32
40
}
33
41
}
34
42
You can’t perform that action at this time.
0 commit comments