whoops

.dockerignore

@@ -0,0 +1,35 @@
+/.phpunit.cache
+/node_modules
+/public/build
+/public/hot
+/public/storage
+/storage/*.key
+/storage/app/public
+/storage/debugbar
+/storage/ssr
+/storage/clockwork
+/storage/logs
+/storage/pail
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+/vendor
+.env.backup
+/.idea/sonarlint
+.phpstorm.meta.php
+_ide_helper_models.php
+_ide_helper.php
+.php-cs-fixer.cache
+.husky
+/.vscode
+**/.DS_Store
+/public/page-cache
+.phpunit.database.checksum
+.phpunit.cache
+rr
+.rr.yaml
+frankenphp
+.config
+.data

.gitignore

@@ -16,3 +16,6 @@ yarn-error.log
 /.fleet
 /.idea
 horizon.log
+**/.DS_Store
+.config
+.data

app/Console/Commands/ProcessMap.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
-use Intervention\Image\ImageManagerStatic as Image;
+use Intervention\Image\Laravel\Facades\Image;
 
 class ProcessMap extends Command
 {

app/Jobs/BuildMap.php

@@ -12,7 +12,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\File as FileFacade;
 use Illuminate\Support\Str;
-use Intervention\Image\ImageManagerStatic as Image;
+use Intervention\Image\Laravel\Facades\Image;
 use Spatie\ImageOptimizer\OptimizerChainFactory;
 use ZipArchive;
 

app/Jobs/RecordPlayerConnection.php

@@ -39,7 +39,7 @@ public function handle()
     {
         $geoRecord = null;
         try {
-            $geoReader = new Reader(storage_path('app').'/GeoLite2-Country/GeoLite2-Country.mmdb');
+            $geoReader = new Reader(storage_path('app').'/GeoLite2/GeoLite2-Country.mmdb');
             $geoRecord = $geoReader->country($this->data['ip']);
         } catch (\Exception|TypeError $e) {
             // pass

app/Jobs/UpdateGeoLite.php

@@ -7,7 +7,6 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use tronovav\GeoIP2Update\Client;
 
 class UpdateGeoLite implements ShouldQueue
 {

composer.json

@@ -1,98 +1,97 @@
 {
-  "name": "goonstation/api",
-  "type": "project",
-  "description": "The Goonstation API",
-  "license": "MIT",
-  "require": {
-    "php": "^8.0.2",
-    "awobaz/compoships": "^2.2",
-    "aws/aws-sdk-php": "^3.283",
-    "binarytorch/larecipe": "^2.6",
-    "dedoc/scramble": "^0.9.0",
-    "geoip2/geoip2": "~2.0",
-    "glhd/gretel": "^1.7",
-    "guzzlehttp/guzzle": "^7.2",
-    "inertiajs/inertia-laravel": "2.x-dev",
-    "intervention/image-laravel": "*",
-    "laravel/framework": "^11.0",
-    "laravel/horizon": "^5.17",
-    "laravel/jetstream": "^5.0",
-    "laravel/octane": "^2.3",
-    "laravel/pulse": "^1.0",
-    "laravel/sanctum": "^4.0",
-    "laravel/socialite": "^5.9",
-    "laravel/telescope": "^5.0",
-    "laravel/tinker": "^2.7",
-    "league/csv": "^9.8",
-    "mxl/laravel-job": "^1.4",
-    "norkunas/youtube-dl-php": "dev-master",
-    "pion/laravel-chunk-upload": "^1.5",
-    "sentry/sentry-laravel": "^4.5",
-    "socialiteproviders/discord": "^4.2",
-    "spatie/image-optimizer": "^1.7",
-    "symfony/css-selector": "^6.3",
-    "symfony/panther": "^2.1",
-    "tightenco/ziggy": "^1.0",
-    "tronovav/geoip2-update": "^2.3",
-    "tucker-eric/eloquentfilter": "^3.1"
-  },
-  "require-dev": {
-    "barryvdh/laravel-ide-helper": "^3.2",
-    "fakerphp/faker": "^1.9.1",
-    "friendsofphp/php-cs-fixer": "^3.40",
-    "larastan/larastan": "^3.0",
-    "laravel/pint": "^1.0",
-    "laravel/sail": "^1.0.1",
-    "mockery/mockery": "^1.4.4",
-    "nunomaduro/collision": "^8.1",
-    "phpunit/phpunit": "^10.0",
-    "spatie/laravel-ignition": "^2.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "App\\": "app/",
-      "Database\\Factories\\": "database/factories/",
-      "Database\\Seeders\\": "database/seeders/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Tests\\": "tests/"
-    }
-  },
-  "scripts": {
-    "post-autoload-dump": [
-      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-      "@php artisan package:discover --ansi",
-      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-    ],
-    "post-update-cmd": [
-      "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
-    ],
-    "post-root-package-install": [
-      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-    ],
-    "post-create-project-cmd": [
-      "@php artisan key:generate --ansi"
-    ],
-    "analyse": "./vendor/bin/phpstan analyse"
-  },
-  "extra": {
-    "laravel": {
-      "dont-discover": [
-        "laravel/telescope"
-      ]
-    }
-  },
-  "config": {
-    "optimize-autoloader": true,
-    "preferred-install": "dist",
-    "sort-packages": true,
-    "allow-plugins": {
-      "pestphp/pest-plugin": true,
-      "php-http/discovery": true
-    }
-  },
-  "minimum-stability": "stable",
-  "prefer-stable": true
+    "name": "goonstation/api",
+    "type": "project",
+    "description": "The Goonstation API",
+    "license": "MIT",
+    "require": {
+        "php": "^8.0.2",
+        "awobaz/compoships": "^2.2",
+        "aws/aws-sdk-php": "^3.283",
+        "binarytorch/larecipe": "^2.6",
+        "dedoc/scramble": "^0.11.27",
+        "geoip2/geoip2": "^3.1",
+        "glhd/gretel": "^1.7",
+        "guzzlehttp/guzzle": "^7.2",
+        "inertiajs/inertia-laravel": "2.x-dev",
+        "intervention/image-laravel": "*",
+        "laravel/framework": "^11.0",
+        "laravel/horizon": "^5.17",
+        "laravel/jetstream": "^5.0",
+        "laravel/octane": "^2.3",
+        "laravel/pulse": "^1.0",
+        "laravel/sanctum": "^4.0",
+        "laravel/socialite": "^5.9",
+        "laravel/telescope": "^5.0",
+        "laravel/tinker": "^2.7",
+        "league/csv": "^9.8",
+        "mxl/laravel-job": "^1.4",
+        "norkunas/youtube-dl-php": "dev-master",
+        "pion/laravel-chunk-upload": "^1.5",
+        "sentry/sentry-laravel": "^4.5",
+        "socialiteproviders/discord": "^4.2",
+        "spatie/image-optimizer": "^1.7",
+        "symfony/css-selector": "^7.1",
+        "symfony/panther": "^2.1",
+        "tightenco/ziggy": "^2.4",
+        "tucker-eric/eloquentfilter": "^3.1"
+    },
+    "require-dev": {
+        "barryvdh/laravel-ide-helper": "^3.2",
+        "fakerphp/faker": "^1.9.1",
+        "friendsofphp/php-cs-fixer": "^3.40",
+        "larastan/larastan": "^3.0",
+        "laravel/pint": "^1.0",
+        "laravel/sail": "^1.0.1",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^8.1",
+        "phpunit/phpunit": "^11.0",
+        "spatie/laravel-ignition": "^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi",
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-update-cmd": [
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ],
+        "analyse": "./vendor/bin/phpstan analyse"
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": [
+                "laravel/telescope"
+            ]
+        }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true,
+            "php-http/discovery": true
+        }
+    },
+    "minimum-stability": "stable",
+    "prefer-stable": true
 }