fix sitemap

extend.php

@@ -14,7 +14,7 @@
 use Flarum\Extend;
 use Webbinaro\AdvCalendar\Api\Controllers as ControllersAlias;
 use Illuminate\Events\Dispatcher;
-use Webbinaro\AdvCalendar\Integrations\EventResource;
+use Webbinaro\AdvCalendar\Integrations\EventResourceRegister;
 use Webbinaro\AdvCalendar\Integrations\SitemapsResource;
 use Webbinaro\AdvCalendar\Listeners;
 
@@ -48,7 +48,7 @@
         $events->subscribe(Listeners\AdvEventListener::class);
     }),
 
-    new \FoF\Sitemap\Extend\RegisterResource(EventResource::class),
+    new EventResourceRegister(),
 
 ];
 

js/src/admin/index.js

@@ -4,8 +4,8 @@ import PermissionGrid from 'flarum/components/PermissionGrid';
 import BasicsPage from 'flarum/components/BasicsPage';
 
 
-app.initializers.add('webbinaro/adv-extras', () => {
-  console.log('[webbinaro/adv-extras] Hello, admin!');
+app.initializers.add('webbinaro/flarum-calendar', () => {
+  console.log('[webbinaro/flarum-calendar] Hello, admin!');
   extend(PermissionGrid.prototype, 'moderateItems', items => {
     items.add(
       'webbinaro-calendar',
@@ -30,7 +30,7 @@ app.initializers.add('webbinaro/adv-extras', () => {
     );
   });
 
-  app.extensionSettings['webbinaro/adv-extras'] = () =>
+  app.extensionSettings['flarum-calendar'] = () =>
     app.modal.show(
       new SettingsModal({
         title: app.translator.trans('flarum-calendar.admin.title'),

src/Integrations/EventResourceRegister.php

@@ -0,0 +1,35 @@
+<?php
+
+
+namespace Webbinaro\AdvCalendar\Integrations;
+
+use Flarum\Extend\ExtenderInterface;
+use Flarum\Extension\Extension;
+use FoF\Sitemap\Resources\Resource;
+use Illuminate\Contracts\Container\Container;
+use InvalidArgumentException;
+
+/**
+ * Class EventResourceRegister
+ * @package Webbinaro\AdvCalendar\Integrations
+ * Purely a copy and workaround of the reigster function form fof/sitemaps
+ * until https://github.com/FriendsOfFlarum/sitemap/pull/15 is fixed
+ */
+class EventResourceRegister implements ExtenderInterface
+{
+
+    public function extend(Container $container, Extension $extension = null)
+    {
+        $container->extend('fof.sitemap.resources', function (array $resources) use ($container) {
+            $resource = $container->make(EventResource::class);
+
+            if ($resource instanceof Resource) {
+                $resources[] = $resource;
+            } else {
+                throw new InvalidArgumentException("{EventResource::class} has to extend ".Resource::class);
+            }
+
+            return $resources;
+        });
+    }
+}