more refactoring of the forum system

Author: Shawn McCool

app/Controllers/ForumController.php

@@ -22,40 +22,28 @@ public function getIndex()
         $this->view('forum.index', compact('threads'));
     }
 
-    public function getCategory($categorySlug)
+    public function getThread()
     {
-        $category = $this->categories->requireCategoryBySlug($categorySlug);
-        $threads  = $this->comments->getForumThreadsByCategoryPaginated($category);
-
-        $this->view('forum.category', compact('category', 'threads'));
-    }
-
-    public function getThread($categorySlug)
-    {
-        $thread = App::make('slugModel');
-        $category = $thread->owner;
+        $thread   = App::make('slugModel');
         $comments = $this->comments->getThreadCommentsPaginated($thread);
 
-        $this->view('forum.thread', compact('thread', 'category', 'comments'));
+        $this->view('forum.thread', compact('thread', 'comments'));
     }
 
-    public function postThread($categorySlug)
+    public function postThread()
     {
         $thread = App::make('slugModel');
 
-        $category = $this->categories->requireCategoryBySlug($categorySlug);
-
         $form = $this->categories->getReplyForm();
 
         if ( ! $form->isValid()) {
             return $this->redirectBack(['errors' => $form->getErrors()]);
         }
 
         $comment = $this->comments->getNew([
-            'body'          => Input::get('body'),
-            'author_id'     => Auth::user()->id,
-            'parent_id'     => $thread->id,
-            'type'          => Comment::TYPE_FORUM,
+            'body'      => Input::get('body'),
+            'author_id' => Auth::user()->id,
+            'type'      => Comment::TYPE_FORUM,
         ]);
 
         if ( ! $comment->isValid()) {
@@ -64,18 +52,16 @@ public function postThread($categorySlug)
 
         $thread->children()->save($comment);
 
-        return $this->redirectAction('Controllers\ForumController@getThread', [$categorySlug, $thread->slug->slug]);
+        return $this->redirectAction('Controllers\ForumController@getThread', [$thread->slug->slug]);
     }
 
     public function getCreateThread()
     {
         $this->view('forum.createthread');
     }
 
-    public function postCreateThread($categorySlug)
+    public function postCreateThread()
     {
-        $category = $this->categories->requireCategoryBySlug($categorySlug);
-
         $form = $this->categories->getThreadForm();
 
         if ( ! $form->isValid()) {
@@ -86,18 +72,17 @@ public function postCreateThread($categorySlug)
             'title'         => Input::get('title'),
             'body'          => Input::get('body'),
             'author_id'     => Auth::user()->id,
-            'category_slug' => $category->slug,
             'type'          => Comment::TYPE_FORUM,
         ]);
 
         if ( ! $comment->isValid()) {
             return $this->redirectBack(['errors' => $comment->getErrors()]);
         }
 
-        $category->rootThreads()->save($comment);
+        $this->comments->save($comment);
 
         $commentSlug = $comment->slug()->first()->slug;
 
-        return $this->redirectAction('Controllers\ForumController@getThread', [$categorySlug, $commentSlug]);
+        return $this->redirectAction('Controllers\ForumController@getThread', [$commentSlug]);
     }
 }

app/domain/Lio/Comments/Comment.php

@@ -69,7 +69,7 @@ public function slug()
 
     public function getSlugString()
     {
-        if ($this->owner_type == 'Lio\Forum\ForumCategory') {
+        if ($this->type == static::TYPE_FORUM && is_null($this->parent_id)) {
             return $this->getForumPostSlugString();
         }
     }

app/domain/Lio/Comments/CommentPresenter.php

@@ -6,12 +6,11 @@ class CommentPresenter extends BasePresenter
 {
     public function forumThreadUrl()
     {
-        $comment = $this->resource;
+        $slug = $this->resource->slug;
 
-        $commentSlug = $comment->slug->slug;
-        $forumSlug   = $comment->category_slug;
+        if ( ! $slug) return '';
 
-        return action('Controllers\ForumController@getThread', [$forumSlug, $commentSlug]);
+        return action('Controllers\ForumController@getThread', [$slug->slug]);
     }
 
     public function child_count_label()

app/routes.php

@@ -36,11 +36,10 @@
 
 // forum
 Route::get('forum', 'Controllers\ForumController@getIndex');
-Route::get('forum/{forumCategory}', 'Controllers\ForumController@getCategory');
 Route::get('forum/create-thread', ['before' => 'auth', 'uses' => 'Controllers\ForumController@getCreateThread']);
 Route::post('forum/create-thread', ['before' => 'auth', 'uses' => 'Controllers\ForumController@postCreateThread']);
-Route::get('forum/{forumCategory}/{slug}', ['before' => 'handle_slug', 'uses' => 'Controllers\ForumController@getThread']);
-Route::post('forum/{forumCategory}/{slug}', ['before' => 'auth|handle_slug', 'uses' => 'Controllers\ForumController@postThread']);
+Route::get('forum/{slug}', ['before' => 'handle_slug', 'uses' => 'Controllers\ForumController@getThread']);
+Route::post('forum/{slug}', ['before' => 'auth|handle_slug', 'uses' => 'Controllers\ForumController@postThread']);
 
 // admin
 Route::group(['before' => 'auth', 'prefix' => 'admin'], function() {

app/views/forum/_small_summary.blade.php renamed to app/views/forum/_home_summary.blade.php

@@ -1 +1,4 @@
-_thread_summary.blade.php
+<div>
+    <a href="{{ $thread->forumThreadUrl }}">{{ $thread->title }}</a>
+    <a href="{{ $thread->author->profileUrl }}">{{ $thread->author->name }}</a>
+</div>

app/views/forum/_thread_summary.blade.php

@@ -1,8 +1,6 @@
 
 <div class="row">
     <div class="small-12 columns">
-        <h2>Category {{ $category->title }}</h2>
-
         {{ Form::open() }}
 
             <fieldset>

app/views/forum/createthread.blade.php

@@ -1,9 +1,3 @@
-<h1><a href="{{ $category->categoryIndexUrl }}">Forum Category {{ $category->title }}</a></h1>
-
-<p>{{ $category->description }}</p>
-
-<hr/>
-
 <ul>
     @foreach($comments as $comment)
         <li>

app/views/forum/thread.blade.php

@@ -17,14 +17,14 @@
 
 <secion class="hero-section dark">
     <div class="description">
-        <h1>Forum Posts</h1>
+        <h1>Forum Threads</h1>
         <p class="lead">
             Discuss development related topics, ask for, and provide help.
         </p>
     </div>
     <div class="posts">
         @foreach($threads as $thread)
-            @include('forum._small_summary')
+            @include('forum._home_summary')
         @endforeach
     </div>
 </section>