mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-05 07:57:46 +02:00
Code Issues Releases Wiki Activity

Implement hard deletion and rename soft delete to hide

Browse Source
This commit is contained in:
Toby Zerner
2015-02-12 14:35:24 +10:30
parent c33697654a
commit 36787bcf45
18 changed files with 90 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Flarum/Api/Actions/Discussions/Show.php
View File

@@ -12,7 +12,7 @@ class Show extends Base
/**
* The post repository.
*
*
* @var PostRepository
*/
protected $posts;
@@ -39,7 +39,7 @@ class Show extends Base
$discussion = Discussion::whereCanView()->findOrFail($this->param('id'));
if (in_array('posts', $include)) {
$relations = ['user', 'user.groups', 'editUser', 'deleteUser'];
$relations = ['user', 'user.groups', 'editUser', 'hideUser'];
$discussion->posts = $this->getPostsForDiscussion($this->posts, $discussion->id, $relations);
$include = array_merge($include, array_map(function ($relation) {

4
src/Flarum/Api/Actions/Posts/Index.php
View File

@@ -12,7 +12,7 @@ class Index extends Base
/**
* The post repository.
*
*
* @var PostRepository
*/
protected $posts;
@@ -35,7 +35,7 @@ class Index extends Base
protected function run()
{
$postIds = (array) $this->input('ids');
$include = ['user', 'user.groups', 'editUser', 'deleteUser'];
$include = ['user', 'user.groups', 'editUser', 'hideUser'];
if (count($postIds)) {
$posts = $this->posts->findMany($postIds, $include);

2
src/Flarum/Api/Actions/Posts/Show.php
View File

@@ -23,7 +23,7 @@ class Show extends Base
}
$include = $this->included(['discussion', 'replyTo']);
$relations = array_merge(['user', 'editUser', 'deleteUser'], $include);
$relations = array_merge(['user', 'editUser', 'hideUser'], $include);
$posts->load($relations);
// Finally, we can set up the post serializer and use it to create

20
src/Flarum/Api/Serializers/PostSerializer.php
View File

@@ -21,7 +21,7 @@ class PostSerializer extends PostBasicSerializer
* Default relations to include.
* @var array
*/
protected $include = ['user', 'editUser', 'deleteUser'];
protected $include = ['user', 'editUser', 'hideUser'];
/**
* Serialize attributes of a Post model for JSON output.
@@ -51,9 +51,9 @@ class PostSerializer extends PostBasicSerializer
$attributes['editTime'] = $post->edit_time->toRFC3339String();
}
if ($post->delete_time) {
if ($post->hide_time) {
$attributes['isHidden'] = true;
$attributes['deleteTime'] = $post->delete_time->toRFC3339String();
$attributes['hideTime'] = $post->hide_time->toRFC3339String();
}
$attributes += [
@@ -66,7 +66,7 @@ class PostSerializer extends PostBasicSerializer
/**
* Get a resource containing a post's user.
*
*
* @param Post $post
* @param array $relations
* @return Tobscure\JsonApi\Resource
@@ -78,7 +78,7 @@ class PostSerializer extends PostBasicSerializer
/**
* Get a resource containing a post's discussion.
*
*
* @param Post $post
* @param array $relations
* @return Tobscure\JsonApi\Resource
@@ -90,7 +90,7 @@ class PostSerializer extends PostBasicSerializer
/**
* Get a resource containing a post's edit user.
*
*
* @param Post $post
* @param array $relations
* @return Tobscure\JsonApi\Resource
@@ -101,14 +101,14 @@ class PostSerializer extends PostBasicSerializer
}
/**
* Get a resource containing a post's delete user.
*
* Get a resource containing a post's hide user.
*
* @param Post $post
* @param array $relations
* @return Tobscure\JsonApi\Resource
*/
public function includeDeleteUser(Post $post, $relations = [])
public function includeHideUser(Post $post, $relations = [])
{
return (new UserBasicSerializer($relations))->resource($post->deleteUser);
return (new UserBasicSerializer($relations))->resource($post->hideUser);
}
}

2
src/Flarum/Core/Discussions/Discussion.php
View File

@@ -111,7 +111,7 @@ class Discussion extends Entity
public function comments()
{
return $this->posts()->where('type', 'comment')->whereNull('delete_time');
return $this->posts()->where('type', 'comment')->whereNull('hide_time');
}
public function startPost()

12
src/Flarum/Core/Posts/CommentPost.php
View File

@@ -54,24 +54,24 @@ class CommentPost extends Post
public function hide($user)
{
if ($this->delete_time) {
if ($this->hide_time) {
return;
}
$this->delete_time = time();
$this->delete_user_id = $user->id;
$this->hide_time = time();
$this->hide_user_id = $user->id;
$this->raise(new Events\PostWasHidden($this));
}
public function restore($user)
{
if ($this->delete_time === null) {
if ($this->hide_time === null) {
return;
}
$this->delete_time = null;
$this->delete_user_id = null;
$this->hide_time = null;
$this->hide_user_id = null;
$this->raise(new Events\PostWasRestored($this));
}

18
src/Flarum/Core/Posts/Post.php
View File

@@ -23,8 +23,8 @@ class Post extends Entity
'user_id' => 'integer',
'edit_time' => 'date',
'edit_user_id' => 'integer',
'delete_time' => 'date',
'delete_user_id' => 'integer',
'hide_time' => 'date',
'hide_user_id' => 'integer',
];
public static function boot()
@@ -43,7 +43,7 @@ class Post extends Entity
});
static::check('view', function ($check, $user) {
$check->whereNull('delete_user_id')
$check->whereNull('hide_user_id')
->orWhereCan('edit');
});
@@ -55,8 +55,8 @@ class Post extends Entity
});
static::check('editOwn', function ($check, $user) {
$check->whereNull('delete_user_id')
->orWhere('delete_user_id', $user->id);
$check->whereNull('hide_user_id')
->orWhere('hide_user_id', $user->id);
});
static::deleted(function ($post) {
@@ -79,14 +79,14 @@ class Post extends Entity
return $this->belongsTo('Flarum\Core\Users\User', 'edit_user_id');
}
public function deleteUser()
public function hideUser()
{
return $this->belongsTo('Flarum\Core\Users\User', 'delete_user_id');
return $this->belongsTo('Flarum\Core\Users\User', 'hide_user_id');
}
public function getDates()
{
return ['time', 'edit_time', 'delete_time'];
return ['time', 'edit_time', 'hide_time'];
}
// Terminates the query and returns an array of matching IDs.
@@ -122,7 +122,7 @@ class Post extends Entity
return $instance;
}
}
return parent::newFromBuilder($attributes);
}
}

8
src/Flarum/Core/Support/Seeders/DiscussionTableSeeder.php
View File

@@ -67,9 +67,9 @@ class DiscussionTableSeeder extends Seeder
]);
} else {
$edited = rand(1, 20) == 1;
$deleted = rand(1, 100) == 1;
$hidden = rand(1, 100) == 1;
if ($deleted) {
if ($hidden) {
$discussion->comments_count--;
}
@@ -82,8 +82,8 @@ class DiscussionTableSeeder extends Seeder
'content' => $faker->realText(rand(50, 500)),
'edit_time' => $edited ? $startTime = date_add($startTime, date_interval_create_from_date_string('1 second')) : null,
'edit_user_id' => $edited ? rand(1, $users) : null,
'delete_time' => $deleted ? $startTime = date_add($startTime, date_interval_create_from_date_string('1 second')) : null,
'delete_user_id' => $deleted ? rand(1, $users) : null,
'hide_time' => $hidden ? $startTime = date_add($startTime, date_interval_create_from_date_string('1 second')) : null,
'hide_user_id' => $hidden ? rand(1, $users) : null,
]);
$posts[] = $post;

4
src/migrations/2014_01_14_231350_create_posts_table.php
View File

@@ -26,8 +26,8 @@ class CreatePostsTable extends Migration {
$table->dateTime('edit_time')->nullable();
$table->integer('edit_user_id')->unsigned()->nullable();
$table->dateTime('delete_time')->nullable();
$table->integer('delete_user_id')->unsigned()->nullable();
$table->dateTime('hide_time')->nullable();
$table->integer('hide_user_id')->unsigned()->nullable();
});
// add fulltext index to content (and title?)