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

fixed more attributes to match beta 8

Browse Source
This commit is contained in:
Daniel Klabbers
2018-05-14 13:49:52 +02:00
parent a9501ceae0
commit 3e3e1cbde5
22 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discussion/Discussion.php
View File

@@ -176,7 +176,7 @@ class Discussion extends AbstractModel
public function hide(User $actor = null)
{
if (! $this->hidden_at) {
$this->hidden_at = time();
$this->hidden_at = Carbon::now();
$this->hidden_user_id = $actor ? $actor->id : null;
$this->raise(new Hidden($this));

2
src/Discussion/DiscussionPolicy.php
View File

@@ -92,7 +92,7 @@ class DiscussionPolicy extends AbstractPolicy
// user, or the current user has permission to view hidden discussions.
if (! $actor->hasPermission('discussion.hide')) {
$query->where(function ($query) use ($actor) {
$query->whereNull('discussions.hide_time')
$query->whereNull('discussions.hidden_at')
->orWhere('user_id', $actor->id)
->orWhere(function ($query) use ($actor) {
$this->events->fire(

3
src/Discussion/UserState.php
View File

@@ -11,6 +11,7 @@
namespace Flarum\Discussion;
use Carbon\Carbon;
use Flarum\Database\AbstractModel;
use Flarum\Discussion\Event\UserRead;
use Flarum\Foundation\EventGeneratorTrait;
@@ -56,7 +57,7 @@ class UserState extends AbstractModel
{
if ($number > $this->last_read_at) {
$this->last_read_at = $number;
$this->last_read_at = time();
$this->last_read_at = Carbon::now();
$this->raise(new UserRead($this));
}