use dep inj rather than resolve

extend.php

@@ -19,8 +19,6 @@
 use Flarum\Settings\Event\Saving;
 use FoF\GeoIP\Api\GeoIP;
 use FoF\GeoIP\Api\Serializer\IPInfoSerializer;
-use FoF\GeoIP\Model\IPInfo;
-use FoF\GeoIP\Repositories\GeoIPRepository;
 
 return [
     (new Extend\Frontend('forum'))
@@ -33,12 +31,8 @@
             $document->payload['fof-geoip.services'] = array_keys(GeoIP::$services);
         }),
 
-    (new Extend\Model(Post::class))->relationship('ip_info', function (Post $model) {
-        return $model->hasOne(IPInfo::class, 'address', 'ip_address')
-        ->withDefault(function ($instance, $submodel) {
-            return resolve(GeoIPRepository::class)->retrieveForPost($submodel);
-        });
-    }),
+    (new Extend\Model(Post::class))
+        ->relationship('ip_info', Model\IPInfoRelationship::class),
 
     new Extend\Locales(__DIR__.'/resources/locale'),
 

src/Model/IPInfoRelationship.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace FoF\GeoIP\Model;
+
+use Flarum\Post\Post;
+use FoF\GeoIP\Repositories\GeoIPRepository;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+class IPInfoRelationship
+{
+    protected $geoIP;
+
+    public function __construct(GeoIPRepository $geoIP)
+    {
+        $this->geoIP = $geoIP;
+    }
+
+    public function __invoke(Post $post): HasOne
+    {
+        return $post->hasOne(IPInfo::class, 'address', 'ip_address')
+            ->withDefault(function (IPInfo $instance, Post $submodel) {
+                return $this->geoIP->retrieveForPost($submodel);
+            });
+    }
+}