From 2e6eda3ed1783af12805fe30113ac0689bc798bf Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 11 Jan 2018 14:11:57 +1030 Subject: [PATCH 1/5] Update policy method name See flarum/core@ae2e07e94c673773814a410894e6b26364539a1a --- extensions/tags/src/Access/DiscussionPolicy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/tags/src/Access/DiscussionPolicy.php b/extensions/tags/src/Access/DiscussionPolicy.php index 65494b390..da78f201e 100755 --- a/extensions/tags/src/Access/DiscussionPolicy.php +++ b/extensions/tags/src/Access/DiscussionPolicy.php @@ -58,7 +58,7 @@ class DiscussionPolicy extends AbstractPolicy * @param Discussion $discussion * @return bool */ - public function after(User $actor, $ability, Discussion $discussion) + public function can(User $actor, $ability, Discussion $discussion) { // Wrap all discussion permission checks with some logic pertaining to // the discussion's tags. If the discussion has a tag that has been From 251d986bfbf262235b284a7e701c8178a8d5c7a2 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Mon, 15 Jan 2018 19:38:25 +0100 Subject: [PATCH 2/5] Update license year range to 2018 --- extensions/tags/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/tags/LICENSE b/extensions/tags/LICENSE index 1e346ea06..e6288c67a 100644 --- a/extensions/tags/LICENSE +++ b/extensions/tags/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2017 Toby Zerner +Copyright (c) 2014-2018 Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From dd9907a26b881a6cbe907a0f1c4a5bd6c8b5ac6a Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 16 Jan 2018 23:20:25 +0100 Subject: [PATCH 3/5] Adapt new bootstrap format, use Asset extender --- extensions/tags/bootstrap.php | 39 ++++++++++++------- .../tags/src/Listener/AddClientAssets.php | 24 ------------ 2 files changed, 24 insertions(+), 39 deletions(-) diff --git a/extensions/tags/bootstrap.php b/extensions/tags/bootstrap.php index 89cbb63cc..44187d3bb 100644 --- a/extensions/tags/bootstrap.php +++ b/extensions/tags/bootstrap.php @@ -9,23 +9,32 @@ * file that was distributed with this source code. */ +use Flarum\Extend; use Flarum\Tags\Access; use Flarum\Tags\Listener; use Illuminate\Contracts\Events\Dispatcher; -return function (Dispatcher $events) { - $events->subscribe(Listener\AddClientAssets::class); - $events->subscribe(Listener\AddDiscussionTagsRelationship::class); - $events->subscribe(Listener\AddForumTagsRelationship::class); - $events->subscribe(Listener\AddTagsApi::class); - $events->subscribe(Listener\CreatePostWhenTagsAreChanged::class); - $events->subscribe(Listener\FilterDiscussionListByTags::class); - $events->subscribe(Listener\FilterPostsQueryByTag::class); - $events->subscribe(Listener\SaveTagsToDatabase::class); - $events->subscribe(Listener\UpdateTagMetadata::class); +return [ + (new Extend\Assets('forum')) + ->defaultAssets(__DIR__) + ->bootstrapper('flarum/tags/main'), + (new Extend\Assets('admin')) + ->defaultAssets(__DIR__) + ->bootstrapper('flarum/tags/main'), + function (Dispatcher $events) { + $events->subscribe(Listener\AddClientAssets::class); + $events->subscribe(Listener\AddDiscussionTagsRelationship::class); + $events->subscribe(Listener\AddForumTagsRelationship::class); + $events->subscribe(Listener\AddTagsApi::class); + $events->subscribe(Listener\CreatePostWhenTagsAreChanged::class); + $events->subscribe(Listener\FilterDiscussionListByTags::class); + $events->subscribe(Listener\FilterPostsQueryByTag::class); + $events->subscribe(Listener\SaveTagsToDatabase::class); + $events->subscribe(Listener\UpdateTagMetadata::class); - $events->subscribe(Access\GlobalPolicy::class); - $events->subscribe(Access\DiscussionPolicy::class); - $events->subscribe(Access\TagPolicy::class); - $events->subscribe(Access\FlagPolicy::class); -}; + $events->subscribe(Access\GlobalPolicy::class); + $events->subscribe(Access\DiscussionPolicy::class); + $events->subscribe(Access\TagPolicy::class); + $events->subscribe(Access\FlagPolicy::class); + }, +]; diff --git a/extensions/tags/src/Listener/AddClientAssets.php b/extensions/tags/src/Listener/AddClientAssets.php index 3ebcfb9f5..4addd83b3 100755 --- a/extensions/tags/src/Listener/AddClientAssets.php +++ b/extensions/tags/src/Listener/AddClientAssets.php @@ -12,7 +12,6 @@ namespace Flarum\Tags\Listener; use Flarum\Event\ConfigureForumRoutes; -use Flarum\Frontend\Event\Rendering; use Illuminate\Contracts\Events\Dispatcher; class AddClientAssets @@ -22,32 +21,9 @@ class AddClientAssets */ public function subscribe(Dispatcher $events) { - $events->listen(Rendering::class, [$this, 'addAssets']); $events->listen(ConfigureForumRoutes::class, [$this, 'addRoutes']); } - /** - * @param Rendering $app - */ - public function addAssets(Rendering $app) - { - if ($app->isForum()) { - $app->addAssets([ - __DIR__.'/../../js/forum/dist/extension.js', - __DIR__.'/../../less/forum/extension.less' - ]); - $app->addBootstrapper('flarum/tags/main'); - } - - if ($app->isAdmin()) { - $app->addAssets([ - __DIR__.'/../../js/admin/dist/extension.js', - __DIR__.'/../../less/admin/extension.less' - ]); - $app->addBootstrapper('flarum/tags/main'); - } - } - /** * @param ConfigureForumRoutes $routes */ From ad07d7570fed59d59f517e2b37eeee58df21531e Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 17 Jan 2018 08:27:57 +0100 Subject: [PATCH 4/5] Fix order of imports --- extensions/tags/src/Listener/FilterDiscussionListByTags.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/tags/src/Listener/FilterDiscussionListByTags.php b/extensions/tags/src/Listener/FilterDiscussionListByTags.php index 5efef1765..59a081c43 100755 --- a/extensions/tags/src/Listener/FilterDiscussionListByTags.php +++ b/extensions/tags/src/Listener/FilterDiscussionListByTags.php @@ -11,8 +11,8 @@ namespace Flarum\Tags\Listener; -use Flarum\Event\ConfigureDiscussionGambits; use Flarum\Discussion\Event\Searching; +use Flarum\Event\ConfigureDiscussionGambits; use Flarum\Tags\Gambit\TagGambit; use Flarum\Tags\Tag; use Illuminate\Contracts\Events\Dispatcher; From b1ed9d4d1d5f2cea645898eb6c8737610c85ed67 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 21 Jan 2018 21:11:06 +0100 Subject: [PATCH 5/5] Extender: List all assets explicitly --- extensions/tags/bootstrap.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/tags/bootstrap.php b/extensions/tags/bootstrap.php index 44187d3bb..f5111f809 100644 --- a/extensions/tags/bootstrap.php +++ b/extensions/tags/bootstrap.php @@ -16,10 +16,12 @@ use Illuminate\Contracts\Events\Dispatcher; return [ (new Extend\Assets('forum')) - ->defaultAssets(__DIR__) + ->asset(__DIR__.'/js/forum/dist/extension.js') + ->asset(__DIR__.'/less/forum/extension.less') ->bootstrapper('flarum/tags/main'), (new Extend\Assets('admin')) - ->defaultAssets(__DIR__) + ->asset(__DIR__.'/js/admin/dist/extension.js') + ->asset(__DIR__.'/less/admin/extension.less') ->bootstrapper('flarum/tags/main'), function (Dispatcher $events) { $events->subscribe(Listener\AddClientAssets::class);