fixed comment urls

Author: Nickstr

app/controllers/ForumController.php

@@ -28,7 +28,7 @@ public function getIndex()
     public function getThread()
     {
         $thread   = App::make('slugModel');
-        $comments = $this->comments->getThreadCommentsPaginated($thread, 5);
+        $comments = $this->comments->getThreadCommentsPaginated($thread, Comment::PER_PAGE);
 
         $this->view('forum.thread', compact('thread', 'comments'));
     }
@@ -167,4 +167,21 @@ public function postEditComment($commentId)
 
         return $this->redirectAction('ForumController@getThread', [$comment->parent->slug->slug]);
     }
+
+    public function getComment($thread, $commentId)
+    {
+        // Holy shit worst code ever made..
+        // LYLAS!
+
+        $perPage = Comment::PER_PAGE;
+        $comment = Comment::find($commentId);
+        $before = Comment::where('parent_id', '=', $comment->parent_id)->where('created_at', '<', $comment->created_at)->count();
+
+        $page = round($before / $perPage, 0, PHP_ROUND_HALF_DOWN) + 1;
+
+        $url = action('ForumController@getThread', [$thread]);
+
+        return Redirect::to($url . '?page=' . $page . '#comment-' . $commentId);
+
+    }
 }

app/domain/Lio/Comments/Comment.php

@@ -22,6 +22,8 @@ class Comment extends EloquentBaseModel implements SlugInterface
     const TYPE_PASTE   = 1;
     const TYPE_ARTICLE = 2;
 
+    const PER_PAGE = 5;
+
     public function owner()
     {
         return $this->morphTo('owner');
@@ -88,6 +90,7 @@ public function getSlugString()
             return $this->getForumPostSlugString();
         }
     }
+
     //
 
     private function getForumPostSlugString()

app/domain/Lio/Comments/CommentPresenter.php

@@ -21,12 +21,8 @@ public function commentUrl()
 
         if ( ! $slug) return '';
 
-        if( Input::has('page')) {
-            $pagination = '?page=' . Input::get('page');
-        }
-
-        $url = action('ForumController@getThread', [$slug->slug]);
-        return $url . $pagination . "#comment-{$this->id}";
+        $url = action('ForumController@getComment', [$slug->slug, $this->id]);
+        return $url;
     }
 
     public function child_count_label()

app/routes.php

@@ -36,6 +36,8 @@
 
 // forum
 Route::get('forum', 'ForumController@getIndex');
+Route::get('forum/{slug}/comment/{commentId}', 'ForumController@getComment');
+
 Route::get('forum/create-thread', ['before' => 'auth', 'uses' => 'ForumController@getCreateThread']);
 Route::post('forum/create-thread', ['before' => 'auth', 'uses' => 'ForumController@postCreateThread']);
 Route::get('forum/edit-thread/{threadId}', ['before' => 'auth', 'uses' => 'ForumController@getEditThread']);
@@ -45,6 +47,8 @@
 Route::get('forum/{slug}', ['before' => 'handle_slug', 'uses' => 'ForumController@getThread']);
 Route::post('forum/{slug}', ['before' => 'auth|handle_slug', 'uses' => 'ForumController@postThread']);
 
+
+
 // admin
 Route::group(['before' => 'auth', 'prefix' => 'admin'], function() {
 

public/javascripts/forums.js

@@ -8,12 +8,16 @@ function limitTagCheckboxes()
 
 function moveSidebar()
 {
-    $( "window" ).bind( "resize", function() {
-        if (document.width < '800') {
-            $('.sidebar').insertAfter('section.content');
+    $( window ).bind( "resize", function() {
+        if (document.width < 800) {
+            $('.sidebar').insertAfter('.content');
         }
     });
+
+    if (document.width < 800) {
+            $('.sidebar').insertAfter('.content');
+        }
 }
 
 limitTagCheckboxes();
-moveSidebar();
+// moveSidebar();