From 6670605b7c3483dc17c5ae1d67e744b32272c1c5 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 24 Aug 2018 20:43:52 +0930
Subject: [PATCH] Rename discussion.startUser

---
 framework/core/js/src/common/models/Discussion.js         | 2 +-
 framework/core/js/src/forum/components/DiscussionList.js  | 2 +-
 .../core/js/src/forum/components/DiscussionListItem.js    | 8 ++++----
 framework/core/js/src/forum/components/TerminalPost.js    | 2 +-
 .../src/Api/Controller/CreateDiscussionController.php     | 2 +-
 .../core/src/Api/Controller/ListDiscussionsController.php | 2 +-
 .../core/src/Api/Controller/ShowDiscussionController.php  | 2 +-
 .../core/src/Api/Serializer/BasicDiscussionSerializer.php | 2 +-
 framework/core/src/Discussion/Discussion.php              | 6 +++---
 framework/core/src/Discussion/DiscussionRenamedLogger.php | 2 +-
 framework/core/src/User/UserMetadataUpdater.php           | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/framework/core/js/src/common/models/Discussion.js b/framework/core/js/src/common/models/Discussion.js
index 7634e47d9..7fa357e6b 100644
--- a/framework/core/js/src/common/models/Discussion.js
+++ b/framework/core/js/src/common/models/Discussion.js
@@ -10,7 +10,7 @@ Object.assign(Discussion.prototype, {
   slug: Model.attribute('slug'),
 
   startTime: Model.attribute('startTime', Model.transformDate),
-  startUser: Model.hasOne('startUser'),
+  user: Model.hasOne('user'),
   firstPost: Model.hasOne('firstPost'),
 
   lastTime: Model.attribute('lastTime', Model.transformDate),
diff --git a/framework/core/js/src/forum/components/DiscussionList.js b/framework/core/js/src/forum/components/DiscussionList.js
index 72fc707e0..48e1e88ea 100644
--- a/framework/core/js/src/forum/components/DiscussionList.js
+++ b/framework/core/js/src/forum/components/DiscussionList.js
@@ -87,7 +87,7 @@ export default class DiscussionList extends Component {
    * @api
    */
   requestParams() {
-    const params = {include: ['startUser', 'lastUser'], filter: {}};
+    const params = {include: ['user', 'lastUser'], filter: {}};
 
     params.sort = this.sortMap()[this.props.params.sort];
 
diff --git a/framework/core/js/src/forum/components/DiscussionListItem.js b/framework/core/js/src/forum/components/DiscussionListItem.js
index 1f4f663bf..39a9d7282 100644
--- a/framework/core/js/src/forum/components/DiscussionListItem.js
+++ b/framework/core/js/src/forum/components/DiscussionListItem.js
@@ -58,7 +58,7 @@ export default class DiscussionListItem extends Component {
     if (retain) return retain;
 
     const discussion = this.props.discussion;
-    const startUser = discussion.startUser();
+    const user = discussion.user();
     const isUnread = discussion.isUnread();
     const isRead = discussion.isRead();
     const showUnread = !this.showRepliesCount() && isUnread;
@@ -93,14 +93,14 @@ export default class DiscussionListItem extends Component {
         </a>
 
         <div className={'DiscussionListItem-content Slidable-content' + (isUnread ? ' unread' : '') + (isRead ? ' read' : '')}>
-          <a href={startUser ? app.route.user(startUser) : '#'}
+          <a href={user ? app.route.user(user) : '#'}
             className="DiscussionListItem-author"
-            title={extractText(app.translator.trans('core.forum.discussion_list.started_text', {user: startUser, ago: humanTime(discussion.startTime())}))}
+            title={extractText(app.translator.trans('core.forum.discussion_list.started_text', {user: user, ago: humanTime(discussion.startTime())}))}
             config={function(element) {
               $(element).tooltip({placement: 'right'});
               m.route.apply(this, arguments);
             }}>
-            {avatar(startUser, {title: ''})}
+            {avatar(user, {title: ''})}
           </a>
 
           <ul className="DiscussionListItem-badges badges">
diff --git a/framework/core/js/src/forum/components/TerminalPost.js b/framework/core/js/src/forum/components/TerminalPost.js
index 0ce2735d4..d9ce8236a 100644
--- a/framework/core/js/src/forum/components/TerminalPost.js
+++ b/framework/core/js/src/forum/components/TerminalPost.js
@@ -15,7 +15,7 @@ export default class TerminalPost extends Component {
     const discussion = this.props.discussion;
     const lastPost = this.props.lastPost && discussion.repliesCount();
 
-    const user = discussion[lastPost ? 'lastUser' : 'startUser']();
+    const user = discussion[lastPost ? 'lastUser' : 'user']();
     const time = discussion[lastPost ? 'lastTime' : 'startTime']();
 
     return (
diff --git a/framework/core/src/Api/Controller/CreateDiscussionController.php b/framework/core/src/Api/Controller/CreateDiscussionController.php
index 2451b8cc9..7e857ff71 100644
--- a/framework/core/src/Api/Controller/CreateDiscussionController.php
+++ b/framework/core/src/Api/Controller/CreateDiscussionController.php
@@ -31,7 +31,7 @@ class CreateDiscussionController extends AbstractCreateController
      */
     public $include = [
         'posts',
-        'startUser',
+        'user',
         'lastUser',
         'firstPost',
         'lastPost'
diff --git a/framework/core/src/Api/Controller/ListDiscussionsController.php b/framework/core/src/Api/Controller/ListDiscussionsController.php
index a30e37223..7338793fe 100644
--- a/framework/core/src/Api/Controller/ListDiscussionsController.php
+++ b/framework/core/src/Api/Controller/ListDiscussionsController.php
@@ -30,7 +30,7 @@ class ListDiscussionsController extends AbstractListController
      * {@inheritdoc}
      */
     public $include = [
-        'startUser',
+        'user',
         'lastUser',
         'mostRelevantPost',
         'mostRelevantPost.user'
diff --git a/framework/core/src/Api/Controller/ShowDiscussionController.php b/framework/core/src/Api/Controller/ShowDiscussionController.php
index 545fdfbcc..2b0e05e07 100644
--- a/framework/core/src/Api/Controller/ShowDiscussionController.php
+++ b/framework/core/src/Api/Controller/ShowDiscussionController.php
@@ -52,7 +52,7 @@ class ShowDiscussionController extends AbstractShowController
      * {@inheritdoc}
      */
     public $optionalInclude = [
-        'startUser',
+        'user',
         'lastUser',
         'firstPost',
         'lastPost'
diff --git a/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php b/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
index cb3ad2fe1..389b87cd3 100644
--- a/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
+++ b/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
@@ -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);
     }
diff --git a/framework/core/src/Discussion/Discussion.php b/framework/core/src/Discussion/Discussion.php
index 7eea9f561..4c1aff4e3 100644
--- a/framework/core/src/Discussion/Discussion.php
+++ b/framework/core/src/Discussion/Discussion.php
@@ -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');
     }
diff --git a/framework/core/src/Discussion/DiscussionRenamedLogger.php b/framework/core/src/Discussion/DiscussionRenamedLogger.php
index ae04e5830..8c014794e 100644
--- a/framework/core/src/Discussion/DiscussionRenamedLogger.php
+++ b/framework/core/src/Discussion/DiscussionRenamedLogger.php
@@ -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);
             }
diff --git a/framework/core/src/User/UserMetadataUpdater.php b/framework/core/src/User/UserMetadataUpdater.php
index 1297ea6bf..16367ee1b 100644
--- a/framework/core/src/User/UserMetadataUpdater.php
+++ b/framework/core/src/User/UserMetadataUpdater.php
@@ -75,7 +75,7 @@ class UserMetadataUpdater
 
     private function updateDiscussionsCount(Discussion $discussion)
     {
-        $user = $discussion->startUser;
+        $user = $discussion->user;
 
         if ($user && $user->exists) {
             $user->refreshDiscussionsCount()->save();