mirror of
https://github.com/flarum/framework.git
synced 2024-11-24 09:19:45 +08:00
Change "renamed" post type to more descriptive "discussionRenamed"
This commit is contained in:
parent
89eca757e6
commit
49c3fa09e6
|
@ -6,12 +6,12 @@ import HasItemLists from 'flarum/mixins/has-item-lists';
|
||||||
var precompileTemplate = Ember.Handlebars.compile;
|
var precompileTemplate = Ember.Handlebars.compile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Component for a `renamed`-typed post.
|
Component for a `discussionRenamed`-typed post.
|
||||||
*/
|
*/
|
||||||
export default Ember.Component.extend(FadeIn, HasItemLists, {
|
export default Ember.Component.extend(FadeIn, HasItemLists, {
|
||||||
layoutName: 'components/discussion/post-renamed',
|
layoutName: 'components/discussion/post-discussion-renamed',
|
||||||
tagName: 'article',
|
tagName: 'article',
|
||||||
classNames: ['post', 'post-renamed', 'post-activity'],
|
classNames: ['post', 'post-discussion-renamed', 'post-activity'],
|
||||||
itemLists: ['controls'],
|
itemLists: ['controls'],
|
||||||
|
|
||||||
// The stream-content component instansiates this component and sets the
|
// The stream-content component instansiates this component and sets the
|
|
@ -267,7 +267,7 @@
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
}
|
}
|
||||||
.post-renamed {
|
.post-discussion-renamed {
|
||||||
& .old-title, & .new-title {
|
& .old-title, & .new-title {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
|
|
@ -121,7 +121,7 @@ class CoreServiceProvider extends ServiceProvider
|
||||||
public function registerPostTypes()
|
public function registerPostTypes()
|
||||||
{
|
{
|
||||||
Post::addType('comment', 'Flarum\Core\Models\CommentPost');
|
Post::addType('comment', 'Flarum\Core\Models\CommentPost');
|
||||||
Post::addType('renamed', 'Flarum\Core\Models\RenamedPost');
|
Post::addType('discussionRenamed', 'Flarum\Core\Models\DiscussionRenamedPost');
|
||||||
|
|
||||||
CommentPost::setFormatter($this->app['flarum.formatter']);
|
CommentPost::setFormatter($this->app['flarum.formatter']);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?php namespace Flarum\Core\Handlers\Events;
|
<?php namespace Flarum\Core\Handlers\Events;
|
||||||
|
|
||||||
use Flarum\Core\Events\DiscussionWasRenamed;
|
use Flarum\Core\Events\DiscussionWasRenamed;
|
||||||
use Flarum\Core\Models\RenamedPost;
|
|
||||||
use Flarum\Core\Models\Notification;
|
use Flarum\Core\Models\Notification;
|
||||||
|
use Flarum\Core\Models\DiscussionRenamedPost;
|
||||||
|
|
||||||
class DiscussionRenamedNotifier
|
class DiscussionRenamedNotifier
|
||||||
{
|
{
|
||||||
|
@ -19,16 +19,18 @@ class DiscussionRenamedNotifier
|
||||||
|
|
||||||
public function whenDiscussionWasRenamed(DiscussionWasRenamed $event)
|
public function whenDiscussionWasRenamed(DiscussionWasRenamed $event)
|
||||||
{
|
{
|
||||||
$post = $this->createRenamedPost($event);
|
$post = $this->createPost($event);
|
||||||
|
|
||||||
$event->discussion->postWasAdded($post);
|
$event->discussion->postWasAdded($post);
|
||||||
|
|
||||||
$this->createRenamedNotification($event, $post);
|
if ($event->discussion->start_user_id !== $event->user->id) {
|
||||||
|
$this->sendNotification($event, $post);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function createRenamedPost(DiscussionWasRenamed $event)
|
protected function createPost(DiscussionWasRenamed $event)
|
||||||
{
|
{
|
||||||
$post = RenamedPost::reply(
|
$post = DiscussionRenamedPost::reply(
|
||||||
$event->discussion->id,
|
$event->discussion->id,
|
||||||
$event->user->id,
|
$event->user->id,
|
||||||
$event->oldTitle,
|
$event->oldTitle,
|
||||||
|
@ -40,11 +42,8 @@ class DiscussionRenamedNotifier
|
||||||
return $post;
|
return $post;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function createRenamedNotification(DiscussionWasRenamed $event, RenamedPost $post)
|
protected function sendNotification(DiscussionWasRenamed $event, DiscussionRenamedPost $post)
|
||||||
{
|
{
|
||||||
if ($event->discussion->start_user_id === $event->user->id) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$notification = Notification::notify(
|
$notification = Notification::notify(
|
||||||
$event->discussion->start_user_id,
|
$event->discussion->start_user_id,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php namespace Flarum\Core\Models;
|
<?php namespace Flarum\Core\Models;
|
||||||
|
|
||||||
class RenamedPost extends Post
|
class DiscussionRenamedPost extends Post
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Create a new instance in reply to a discussion.
|
* Create a new instance in reply to a discussion.
|
||||||
|
@ -19,7 +19,7 @@ class RenamedPost extends Post
|
||||||
$post->time = time();
|
$post->time = time();
|
||||||
$post->discussion_id = $discussionId;
|
$post->discussion_id = $discussionId;
|
||||||
$post->user_id = $userId;
|
$post->user_id = $userId;
|
||||||
$post->type = 'renamed';
|
$post->type = 'discussionRenamed';
|
||||||
|
|
||||||
return $post;
|
return $post;
|
||||||
}
|
}
|
|
@ -64,7 +64,7 @@ class DiscussionsTableSeeder extends Seeder
|
||||||
'discussion_id' => $discussion->id,
|
'discussion_id' => $discussion->id,
|
||||||
'time' => $startTime = date_add($startTime, date_interval_create_from_date_string('1 second')),
|
'time' => $startTime = date_add($startTime, date_interval_create_from_date_string('1 second')),
|
||||||
'user_id' => rand(1, $users),
|
'user_id' => rand(1, $users),
|
||||||
'type' => 'renamed',
|
'type' => 'discussionRenamed',
|
||||||
'content' => json_encode(array($faker->realText(rand(20, 40)), $discussion->title))
|
'content' => json_encode(array($faker->realText(rand(20, 40)), $discussion->title))
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user