Merge branch 'glowingblue-gb/improvements'

composer.json

@@ -9,8 +9,8 @@
   "type": "flarum-extension",
   "license": "MIT",
   "require": {
-    "flarum/core": "^1.0",
-    "fof/sitemap": "^2.0"
+    "flarum/core": "^1.7.2",
+    "fof/sitemap": "*"
   },
   "authors": [
     {
@@ -27,6 +27,11 @@
       "name": "Andreas Hofmann",
       "email": "[email protected]",
       "role": "Developer"
+    },
+    {
+      "name": "Rafael Horvat",
+      "email": "[email protected]",
+      "role": "Developer"
     }
   ],
   "autoload": {

extend.php

@@ -11,42 +11,51 @@
 
 namespace Webbinaro\AdvCalendar;
 
+use Flarum\Api\Serializer\UserSerializer;
 use Flarum\Extend;
 use Webbinaro\AdvCalendar\Api\Controllers as ControllersAlias;
-use Illuminate\Events\Dispatcher;
 use Webbinaro\AdvCalendar\Integrations\EventResourceRegister;
-use Webbinaro\AdvCalendar\Integrations\SitemapsResource;
-use Webbinaro\AdvCalendar\Listeners;
 
 return [
     (new Extend\Frontend('forum'))
-        ->js(__DIR__.'/js/dist/forum.js')
-        ->css(__DIR__.'/resources/less/forum.less')
+        ->js(__DIR__ . '/js/dist/forum.js')
+        ->css(__DIR__ . '/resources/less/forum.less')
         ->route('/events', 'advevents')
         ->route(
             '/events/{id}[/{filter:[0-9]*}]',
             'advevent',
-            Content\Event::class),
+            Content\Event::class
+        ),
 
 
 
     (new Extend\Frontend('admin'))
-        ->js(__DIR__.'/js/dist/admin.js')
-        ->css(__DIR__.'/resources/less/admin.less'),
+        ->js(__DIR__ . '/js/dist/admin.js')
+        ->css(__DIR__ . '/resources/less/admin.less'),
 
     //API Routes
     (new Extend\Routes('api'))
-    	->get('/events','events.index', ControllersAlias\EventsListController::class)
-    	->get('/events/{id}','events.show', ControllersAlias\EventsShowController::class)
-    	->post('/events','events.create', ControllersAlias\EventsCreateController::class)
-        ->patch('/events/{id}','events.edit', ControllersAlias\EventsUpdateController::class)
-        ->delete('/events/{id}','events.delete', ControllersAlias\EventsDeleteController::class),
+        ->get('/events', 'events.index', ControllersAlias\EventsListController::class)
+        ->get('/events/{id}', 'events.show', ControllersAlias\EventsShowController::class)
+        ->post('/events', 'events.create', ControllersAlias\EventsCreateController::class)
+        ->patch('/events/{id}', 'events.edit', ControllersAlias\EventsUpdateController::class)
+        ->delete('/events/{id}', 'events.delete', ControllersAlias\EventsDeleteController::class),
 
     new Extend\Locales(__DIR__ . '/resources/locale'),
 
-    (new Extend\Event)
-        ->subscribe(Listeners\AdvEventListener::class),
-
     new EventResourceRegister(),
 
+    (new Extend\Settings)
+        ->serializeToForum('webbinaro-calendar.hide_host', 'webbinaro-calendar.hide_host', 'boolval', false),
+
+    (new Extend\ApiSerializer(UserSerializer::class))
+        ->attribute('canModerateEvents', function (UserSerializer $serializer) {
+            return $serializer->getActor()->can('event.moderate');
+        })
+        ->attribute('canStartEvents', function (UserSerializer $serializer) {
+            return $serializer->getActor()->can('event.create');
+        })
+        ->attribute('canViewEvents', function (UserSerializer $serializer) {
+            return $serializer->getActor()->can('event.view');
+        }),
 ];