From 81cb67e87ca825f66a4442027307c07fa08adb5a Mon Sep 17 00:00:00 2001
From: Daniel Klabbers <daniel@klabbers.email>
Date: Mon, 14 May 2018 11:52:01 +0200
Subject: [PATCH] fixed the created_at issue from the policy caused by the
 setStartPost setting created_at to null

---
 src/Discussion/Command/StartDiscussion.php | 14 +++++++++++---
 src/Discussion/Discussion.php              |  7 ++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Discussion/Command/StartDiscussion.php b/src/Discussion/Command/StartDiscussion.php
index 3b564c0f1..adb99a34e 100644
--- a/src/Discussion/Command/StartDiscussion.php
+++ b/src/Discussion/Command/StartDiscussion.php
@@ -30,10 +30,18 @@ class StartDiscussion
     public $data;
 
     /**
-     * @param User $actor The user authoring the discussion.
-     * @param array $data The discussion attributes.
+     * The current ip address of the actor.
+     *
+     * @var string
      */
-    public function __construct(User $actor, array $data, $ipAddress)
+    public $ipAddress;
+
+    /**
+     * @param User   $actor The user authoring the discussion.
+     * @param array  $data  The discussion attributes.
+     * @param string $ipAddress The current ip address of the actor.
+     */
+    public function __construct(User $actor, array $data, string $ipAddress)
     {
         $this->actor = $actor;
         $this->data = $data;
diff --git a/src/Discussion/Discussion.php b/src/Discussion/Discussion.php
index 021c4e72d..de44636a1 100644
--- a/src/Discussion/Discussion.php
+++ b/src/Discussion/Discussion.php
@@ -11,6 +11,7 @@
 
 namespace Flarum\Discussion;
 
+use Carbon\Carbon;
 use Flarum\Database\AbstractModel;
 use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Discussion\Event\Deleted;
@@ -138,7 +139,7 @@ class Discussion extends AbstractModel
         $discussion = new static;
 
         $discussion->title = $title;
-        $discussion->created_at = time();
+        $discussion->created_at = Carbon::now();
         $discussion->user_id = $user->id;
 
         $discussion->setRelation('startUser', $user);
@@ -209,7 +210,7 @@ class Discussion extends AbstractModel
      */
     public function setStartPost(Post $post)
     {
-        $this->created_at = $post->time;
+        $this->created_at = $post->created_at;
         $this->user_id = $post->user_id;
         $this->first_post_id = $post->id;
 
@@ -224,7 +225,7 @@ class Discussion extends AbstractModel
      */
     public function setLastPost(Post $post)
     {
-        $this->last_posted_at = $post->time;
+        $this->last_posted_at = $post->created_at;
         $this->last_posted_user_id = $post->user_id;
         $this->last_post_id = $post->id;
         $this->last_post_number = $post->number;