mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'next-back'

Browse Source
This commit is contained in:
Toby Zerner
2017-12-28 12:19:56 +10:30
parent a05e8c817e a822ab8310
commit aee72d712b
8 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php
View File

@@ -9,8 +9,8 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Flarum\Core\Group;
use Flarum\Database\Migration; use Flarum\Database\Migration;
use Flarum\Group\Group;
return Migration::addPermissions([ return Migration::addPermissions([
'discussion.startWithoutApproval' => Group::MEMBER_ID, 'discussion.startWithoutApproval' => Group::MEMBER_ID,

4
extensions/approval/src/Access/TagPolicy.php
View File

@@ -11,9 +11,9 @@
namespace Flarum\Approval\Access; namespace Flarum\Approval\Access;
use Flarum\Core\Access\AbstractPolicy;
use Flarum\Core\User;
use Flarum\Tags\Tag; use Flarum\Tags\Tag;
use Flarum\User\AbstractPolicy;
use Flarum\User\User;
class TagPolicy extends AbstractPolicy class TagPolicy extends AbstractPolicy
{ {

4
extensions/approval/src/Event/PostWasApproved.php
View File

@@ -11,8 +11,8 @@
namespace Flarum\Approval\Event; namespace Flarum\Approval\Event;
use Flarum\Core\Post; use Flarum\Post\Post;
use Flarum\Core\User; use Flarum\User\User;
class PostWasApproved class PostWasApproved
{ {

8
extensions/approval/src/Listener/AddClientAssets.php
View File

@@ -11,7 +11,7 @@
namespace Flarum\Approval\Listener; namespace Flarum\Approval\Listener;
use Flarum\Event\ConfigureWebApp; use Flarum\Frontend\Event\Rendering;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class AddClientAssets class AddClientAssets
@@ -21,13 +21,13 @@ class AddClientAssets
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(ConfigureWebApp::class, [$this, 'addAssets']); $events->listen(Rendering::class, [$this, 'addAssets']);
} }
/** /**
* @param ConfigureClientView $event * @param Rendering $event
*/ */
public function addAssets(ConfigureWebApp $event) public function addAssets(Rendering $event)
{ {
if ($event->isForum()) { if ($event->isForum()) {
$event->addAssets([ $event->addAssets([

15
extensions/approval/src/Listener/AddPostApprovalAttributes.php
View File

@@ -11,10 +11,9 @@
namespace Flarum\Approval\Listener; namespace Flarum\Approval\Listener;
use Flarum\Api\Serializer\DiscussionBasicSerializer; use Flarum\Api\Event\Serializing;
use Flarum\Api\Serializer\PostBasicSerializer; use Flarum\Api\Serializer\BasicDiscussionSerializer;
use Flarum\Api\Serializer\PostSerializer; use Flarum\Api\Serializer\PostSerializer;
use Flarum\Event\PrepareApiAttributes;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class AddPostApprovalAttributes class AddPostApprovalAttributes
@@ -24,16 +23,16 @@ class AddPostApprovalAttributes
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(PrepareApiAttributes::class, [$this, 'addApiAttributes']); $events->listen(Serializing::class, [$this, 'addApiAttributes']);
} }
/** /**
* @param PrepareApiAttributes $event * @param Serializing $event
*/ */
public function addApiAttributes(PrepareApiAttributes $event) public function addApiAttributes(Serializing $event)
{ {
if ($event->isSerializer(DiscussionBasicSerializer::class) if ($event->isSerializer(BasicDiscussionSerializer::class)
|| $event->isSerializer(PostBasicSerializer::class)) { || $event->isSerializer(PostSerializer::class)) {
$event->attributes['isApproved'] = (bool) $event->model->is_approved; $event->attributes['isApproved'] = (bool) $event->model->is_approved;
} }

20
extensions/approval/src/Listener/ApproveContent.php
View File

@@ -12,8 +12,8 @@
namespace Flarum\Approval\Listener; namespace Flarum\Approval\Listener;
use Flarum\Approval\Event\PostWasApproved; use Flarum\Approval\Event\PostWasApproved;
use Flarum\Core\Access\AssertPermissionTrait; use Flarum\Post\Event\Saving;
use Flarum\Event\PostWillBeSaved; use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class ApproveContent class ApproveContent
@@ -25,14 +25,14 @@ class ApproveContent
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(PostWillBeSaved::class, [$this, 'approvePost']); $events->listen(Saving::class, [$this, 'approvePost']);
$events->listen(PostWasApproved::class, [$this, 'approveDiscussion']); $events->listen(PostWasApproved::class, [$this, 'approveDiscussion']);
} }
/** /**
* @param PostWillBeSaved $event * @param Saving $event
*/ */
public function approvePost(PostWillBeSaved $event) public function approvePost(Saving $event)
{ {
$attributes = $event->data['attributes']; $attributes = $event->data['attributes'];
$post = $event->post; $post = $event->post;
@@ -58,13 +58,15 @@ class ApproveContent
public function approveDiscussion(PostWasApproved $event) public function approveDiscussion(PostWasApproved $event)
{ {
$post = $event->post; $post = $event->post;
$discussion = $post->discussion;
$post->discussion->refreshCommentsCount(); $discussion->refreshCommentsCount();
$post->discussion->refreshLastPost(); $discussion->refreshLastPost();
if ($post->number == 1) { if ($post->number == 1) {
$post->discussion->is_approved = true; $discussion->is_approved = true;
} }
$post->discussion->save();
$discussion->save();
} }
} }

2
extensions/approval/src/Listener/HideUnapprovedContent.php
View File

@@ -11,7 +11,7 @@
namespace Flarum\Approval\Listener; namespace Flarum\Approval\Listener;
use Flarum\Core\Discussion; use Flarum\Discussion\Discussion;
use Flarum\Event\ScopeHiddenDiscussionVisibility; use Flarum\Event\ScopeHiddenDiscussionVisibility;
use Flarum\Event\ScopeModelVisibility; use Flarum\Event\ScopeModelVisibility;
use Flarum\Event\ScopePostVisibility; use Flarum\Event\ScopePostVisibility;

10
extensions/approval/src/Listener/UnapproveNewContent.php
View File

@@ -11,10 +11,10 @@
namespace Flarum\Approval\Listener; namespace Flarum\Approval\Listener;
use Flarum\Core\Post;
use Flarum\Event\ConfigureModelDefaultAttributes; use Flarum\Event\ConfigureModelDefaultAttributes;
use Flarum\Event\PostWillBeSaved;
use Flarum\Flags\Flag; use Flarum\Flags\Flag;
use Flarum\Post\Event\Saving;
use Flarum\Post\Post;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class UnapproveNewContent class UnapproveNewContent
@@ -25,7 +25,7 @@ class UnapproveNewContent
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(ConfigureModelDefaultAttributes::class, [$this, 'approveByDefault']); $events->listen(ConfigureModelDefaultAttributes::class, [$this, 'approveByDefault']);
$events->listen(PostWillBeSaved::class, [$this, 'unapproveNewPosts']); $events->listen(Saving::class, [$this, 'unapproveNewPosts']);
} }
/** /**
@@ -39,9 +39,9 @@ class UnapproveNewContent
} }
/** /**
* @param PostWillBeSaved $event * @param Saving $event
*/ */
public function unapproveNewPosts(PostWillBeSaved $event) public function unapproveNewPosts(Saving $event)
{ {
$post = $event->post; $post = $event->post;