1
0
mirror of https://github.com/flarum/core.git synced 2025-08-16 21:34:08 +02:00

Rename discussion.startUser

This commit is contained in:
Toby Zerner
2018-08-24 20:43:52 +09:30
parent e241518506
commit 8ecb67d49d
11 changed files with 16 additions and 16 deletions

View File

@@ -31,7 +31,7 @@ class CreateDiscussionController extends AbstractCreateController
*/
public $include = [
'posts',
'startUser',
'user',
'lastUser',
'firstPost',
'lastPost'

View File

@@ -30,7 +30,7 @@ class ListDiscussionsController extends AbstractListController
* {@inheritdoc}
*/
public $include = [
'startUser',
'user',
'lastUser',
'mostRelevantPost',
'mostRelevantPost.user'

View File

@@ -52,7 +52,7 @@ class ShowDiscussionController extends AbstractShowController
* {@inheritdoc}
*/
public $optionalInclude = [
'startUser',
'user',
'lastUser',
'firstPost',
'lastPost'

View File

@@ -44,7 +44,7 @@ class BasicDiscussionSerializer extends AbstractSerializer
/**
* @return \Tobscure\JsonApi\Relationship
*/
protected function startUser($discussion)
protected function user($discussion)
{
return $this->hasOne($discussion, BasicUserSerializer::class);
}

View File

@@ -47,7 +47,7 @@ use Flarum\Util\Str;
* @property \Illuminate\Database\Eloquent\Collection $comments
* @property \Illuminate\Database\Eloquent\Collection $participants
* @property Post|null $firstPost
* @property User|null $startUser
* @property User|null $user
* @property Post|null $lastPost
* @property User|null $lastUser
* @property \Illuminate\Database\Eloquent\Collection $readers
@@ -123,7 +123,7 @@ class Discussion extends AbstractModel
$discussion->created_at = Carbon::now();
$discussion->user_id = $user->id;
$discussion->setRelation('startUser', $user);
$discussion->setRelation('user', $user);
$discussion->raise(new Started($discussion));
@@ -339,7 +339,7 @@ class Discussion extends AbstractModel
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function startUser()
public function user()
{
return $this->belongsTo(User::class, 'user_id');
}

View File

@@ -58,7 +58,7 @@ class DiscussionRenamedLogger
$blueprint = new DiscussionRenamedBlueprint($post);
if ($post->exists) {
$this->notifications->sync($blueprint, [$event->discussion->startUser]);
$this->notifications->sync($blueprint, [$event->discussion->user]);
} else {
$this->notifications->delete($blueprint);
}

View File

@@ -75,7 +75,7 @@ class UserMetadataUpdater
private function updateDiscussionsCount(Discussion $discussion)
{
$user = $discussion->startUser;
$user = $discussion->user;
if ($user && $user->exists) {
$user->refreshDiscussionsCount()->save();