diff --git a/app/Application.php b/app/Application.php index f3465957..8f90355b 100644 --- a/app/Application.php +++ b/app/Application.php @@ -110,6 +110,13 @@ class Application extends Model { $apps = self::apps(); $app = $apps->where('appid', $appid)->first(); + + if ($app === null) { + // Try in db for Private App + $appModel = self::where('appid', $appid)->first(); + $app = json_decode($appModel->toJson()); + } + if ($app === null) { return null; } diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 1936f3ed..e30b01ce 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -17,6 +17,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Facades\URL; class ItemController extends Controller { @@ -376,7 +377,13 @@ class ItemController extends Controller } $output['colour'] = ($app->tile_background == 'light') ? '#fafbfc' : '#161b1f'; - $output['iconview'] = config('app.appsource').'icons/'.$app->icon; + if(strpos($app->icon, 'icons/') !== false) { + // Private apps have the icon locally + $output['iconview'] = URL::to('/').'/storage/'.$app->icon; + } else { + $output['iconview'] = config('app.appsource').'icons/'.$app->icon; + } + return json_encode($output); }