Merge branch 'linuxserver:master' into Introduce-bitShake

Author: odin568

.github/workflows/linter.yml

@@ -15,7 +15,7 @@
       runs-on: ubuntu-latest
       steps:
         - name: Checkout
-          uses: actions/checkout@v5
+          uses: actions/checkout@v6
 
         - name: PHP syntax checker 8.2
           uses: prestashop/github-action-php-lint/8.2@master
@@ -25,7 +25,7 @@
   #    runs-on: ubuntu-latest
   #    steps:
   #      - name: Checkout
-  #        uses: actions/checkout@v5
+  #        uses: actions/checkout@v6
   #        
   #      - name: PHP Mess Detector
   #        uses: php-actions/phpmd@v1
@@ -40,7 +40,7 @@
       runs-on: ubuntu-latest
       steps:
         - name: Checkout
-          uses: actions/checkout@v5
+          uses: actions/checkout@v6
 
         - name: PHP Code Sniffer
           uses: php-actions/phpcs@v1
@@ -59,12 +59,12 @@
   #    runs-on: ubuntu-latest
   #    steps:
   #      - name: Checkout
-  #        uses: actions/checkout@v5
+  #        uses: actions/checkout@v6
   #        with:
   #          path: src
   #
   #      - name: Checkout Heimdall repo for dependencies
-  #        uses: actions/checkout@v5
+  #        uses: actions/checkout@v6
   #        with:
   #          repository: linuxserver/Heimdall
   #          path: ./heimdall-src

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup node env
         uses: actions/setup-node@v6

.github/workflows/prchecks.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup node env
         uses: actions/setup-node@v6

.github/workflows/svgo.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Optimize SVGs
         uses: ericcornelissen/svgo-action@v4
         id: svgo

FreshRSS/livestats.blade.php

@@ -1,7 +1,7 @@
 <ul class="livestats">
     @if ($unread > 0)
         <li>
-            <span class="title" style="color:orange;">{!! $unread !!} Unread</span>
+            <span class="title">Unread</span><strong>{!! $unread !!}</strong>
         </li>
     @endif
 </ul>

N8n/N8n.php

@@ -2,6 +2,57 @@
 
 namespace App\SupportedApps\N8n;
 
-class N8n extends \App\SupportedApps
+// use Barryvdh\Debugbar\Facades\Debugbar;
+// Debugbar::info($data);
+
+class N8n extends \App\SupportedApps implements \App\EnhancedApps
 {
+    public $config;
+
+    public function __construct()
+    {
+    }
+
+    public function test()
+    {
+        $attrs = $this->getAttrs();
+        $test = parent::appTest($this->url("workflows"), $attrs);
+        echo $test->status;
+    }
+
+    public function livestats()
+    {
+        $status = "active";
+        $data = [];
+        $attrs = $this->getAttrs();
+
+        // Fetch workflows
+        $workflowsResponse = parent::execute($this->url("workflows"), $attrs);
+        $workflows = json_decode($workflowsResponse->getBody());
+
+        $data["workflows"] = count($workflows->data);
+
+        // Fetch active workflows
+        $activeResponse = parent::execute($this->url("workflows?active=true"), $attrs);
+        $active = json_decode($activeResponse->getBody());
+
+        $data["active"] = count($active->data);
+
+        return parent::getLiveStats($status, $data);
+    }
+
+    public function url($endpoint)
+    {
+        $api_url = parent::normaliseurl($this->config->url) . "api/v1/" . $endpoint;
+        return $api_url;
+    }
+    private function getAttrs()
+    {
+        return [
+            "headers" => [
+                "Accept" => "application/json",
+                "X-N8N-API-KEY" => $this->config->password
+            ],
+        ];
+    }
 }

N8n/app.json

@@ -4,7 +4,7 @@
   "website": "https://n8n.io",
   "license": "Apache License 2.0",
   "description": "n8n is an extendable workflow automation tool. With a fair-code distribution model, n8n will always have visible source code, be available to self-host, and allow you to add your own custom functions, logic and apps. n8n's node-based approach makes it highly versatile, enabling you to connect anything to everything.",
-  "enhanced": false,
+  "enhanced": true,
   "tile_background": "light",
   "icon": "n8n.svg"
 }

N8n/config.blade.php

@@ -0,0 +1,25 @@
+<h2>{{ __('app.apps.config') }} ({{ __('app.optional') }}) @include('items.enable')</h2>
+<div class="items">
+    <div class="input">
+        <label>{{ strtoupper(__('app.url')) }}</label>
+        {!! Form::text('config[override_url]',
+            isset($item) ? $item->getconfig()->override_url : null,
+            ['placeholder' => __('app.apps.override'),
+            'id' => 'override_url',
+            'class' => 'form-control'
+        ]) !!}
+    </div>
+
+    <div class="input">
+        <label>{{ __('app.apps.apikey') }}(<a href="https://docs.n8n.io/api/authentication/#create-an-api-key" target="_blank">help?</a>)</label>
+        {!! Form::input('password', 'config[password]', '',
+            ['placeholder' => __('app.apps.apikey'),
+            'data-config' => 'password',
+            'class' => 'form-control config-item'
+        ]) !!}
+    </div>
+
+    <div class="input">
+        <button style="margin-top: 32px;" class="btn test" id="test_config">Test</button>
+    </div>
+</div>

N8n/livestats.blade.php

@@ -0,0 +1,10 @@
+<ul class="livestats">
+    <li>
+        <span class="title">Workflows</span>
+        <strong>{!! $workflows !!}</strong>
+    </li>
+    <li>
+        <span class="title">Active</span>
+        <strong>{!! $active !!}</strong>
+    </li>
+</ul>

OpenCCU/OpenCCU.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\SupportedApps\OpenCCU;
+
+class OpenCCU extends \App\SupportedApps
+{
+}