Add updated matrix bot code

austinkregel · May 8, 2024 · f676201 · f676201
1 parent 3f3de17
commit f676201
Show file tree

Hide file tree

Showing 14 changed files with 485 additions and 302 deletions.
diff --git a/app/Http/Controllers/Spork/BankingController.php b/app/Http/Controllers/Spork/BankingController.php
@@ -15,7 +15,8 @@ public function __invoke()
             ->accounts()
             ->with('credential')->get();
 
-        return Inertia::render('Finance/Index', [
+
+        return Inertia::render('Banking/Index', [
             'title' => 'Banking ',
             'accounts' => $accounts,
             'transactions' => Transaction::whereIn('account_id', $accounts->pluck('account_id'))

diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
@@ -41,6 +41,7 @@ public function share(Request $request): array
             'navigation' => $navigation = (new ConditionService)->navigation(),
             'current_navigation' => $navigation->where('current', true)->first(),
             'conversations' => Thread::query()
+                ->with('messages')
                 ->orderByDesc('origin_server_ts')
                 ->paginate(
                     request('conversation_limit'),

diff --git a/app/Jobs/FetchResourcesFromCredentials.php b/app/Jobs/FetchResourcesFromCredentials.php
@@ -38,7 +38,10 @@ public function __construct(
      */
     public function handle(QueueingDispatcher $dispatcher)
     {
-        $credentials = Credential::all();
+        $credentials = Credential::query()
+            // Matrix credentials are handled in their own way.
+            ->where('service', '!=', 'matrix')
+            ->get();
 
         $jobs = $credentials->groupBy('user_id')
             ->map(fn (Collection $group) => $group->map(fn ($credential) => new FetchResourcesFromCredential($credential))->toArray())

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -130,16 +130,16 @@ services:
                 condition: service_healthy
             meilisearch:
                 condition: service_healthy
-#    matrix-bot:
-#        build:
-#            context: ./docker/matrix-bot
-#            dockerfile: Dockerfile
-#        volumes:
-#            - '.:/var/www/html'
-#        networks:
-#            - sail
-#        depends_on:
-#            - mariadb
+    matrix-bot:
+       build:
+           context: ./docker/matrix-bot
+           dockerfile: Dockerfile
+       volumes:
+           - '.:/var/www/html'
+       networks:
+           - sail
+       depends_on:
+           - mariadb
     laravel.websocket:
         image: austinkregel/reforged-websocket:latest
         build:

diff --git a/docker/matrix-bot/Dockerfile b/docker/matrix-bot/Dockerfile
@@ -4,4 +4,4 @@ RUN apt update && apt upgrade -y
 
 RUN apt install -y git libolm-dev libjs-olm
 
-CMD cd /var/www/html && npm i && npm upgrade @matrix-org/olm && node /var/www/html/docker/matrix-bot/index.cjs
+CMD cd /var/www/html && npm i && npm upgrade @matrix-org/olm && node /var/www/html/docker/matrix-bot/index.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ RUN apt update && apt upgrade -y

		RUN apt install -y git libolm-dev libjs-olm

		CMD cd /var/www/html && npm i && npm upgrade @matrix-org/olm && node /var/www/html/docker/matrix-bot/index.cjs
		CMD cd /var/www/html && npm i && npm upgrade @matrix-org/olm && node /var/www/html/docker/matrix-bot/index.js