Changeset 23

Timestamp:

02/25/07 23:03:18 (3 years ago)

Author:

eevee

Message:

Changed the thread view to use an iterator, which was a bit tricky and thus left out of the last commit. Really, I knew about it.
With that, lastpostid/lasttime have been changed to just mean the last post in the thread that majorly changed, NOT necessarily the one that will display last.
Added: Double-posting prevention. Identical second posts will be ignored; different second posts will be merged with the previous one.

Location:

veekun

Files:

• lib/Vee/Controller/Forum.pm (modified) (3 diffs)
• lib/Vee/Controller/Forum/Create.pm (modified) (2 diffs)
• site_options.yml (modified) (1 diff)
• templates/forum/common.tt (modified) (2 diffs)
• templates/forum/thread/view.tt (modified) (4 diffs)

veekun/lib/Vee/Controller/Forum.pm

@@ -85 +85 @@
         order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, lastpost.time DESC',
         prefetch => { firstpost => 'user', lastpost => 'user' },
-        offset => $skip,
-        rows => $perpage,
+        offset   => $skip,
+        rows     => $perpage,
     } );
     # TODO: ugly but for now I don't know the best way to clean it up
@@ -133 +133 @@
     my $perpage = $c->site_opts->{page_sizes}{posts};
     my $lastpage = ($skip + $perpage >= $thread->postct);
-    my @posts = $c->model('DBIC::Posts')->search(
+    my $posts_rs = $c->model('DBIC::Posts')->search(
         { 'me.threadid' => $id, ( $filter_user ? ( 'me.userid' => $filter_user->id ) : () ) },
         { prefetch => [ 'user', { 'lastedit', 'user' } ], order_by => 'me.time ASC', offset => $skip, rows => $perpage + 1 }
-    );  # TODO: iterate
+    );
     
     my $form = new Vee::Form(
@@ -148 +148 @@
     my $threadflags = '';  # TODO
 
-    $s->{page_title } = $thread->subject . ' - Forums';
+    $s->{page_title}  = $thread->subject . ' - Forums';
     $s->{page_header} = $thread->subject;
-    $s->{link_name  } = 'forum';
-    $s->{crumbs     } = [ '<a href="/forum">Forum Index</a>', '<a href="/forum/'.$thread->forum->id.'">'.$thread->forum->name.'</a>', qq'$threadflags<a href="/forum/thread/'.$thread->id.'">'.$thread->subject.'</a>' ];
+    $s->{link_name}   = 'forum';
+    $s->{crumbs}      = [ '<a href="/forum">Forum Index</a>', '<a href="/forum/'.$thread->forum->id.'">'.$thread->forum->name.'</a>', qq'$threadflags<a href="/forum/thread/'.$thread->id.'">'.$thread->subject.'</a>' ];
     if ($filter_user) { push @{ $s->{crumbs} }, '<a href="/user/'.$filter_user->id.'">'.$filter_user->name.'</a>\'s posts' }
-    $s->{extra_css  } = 'forum';
-    $s->{form       } = $form;
-    $s->{postbar_color} = sub { Vee::Utils::hsv2rgb(shift, 192, 192) }; # Remove after making global
+    $s->{extra_css}   = 'forum';
+    $s->{form}        = $form;
+
+    $s->{postbar_color}     = sub { Vee::Utils::hsv2rgb(shift, 192, 192) }; # Remove after making global
+    $s->{physical_lastpost} = $thread->search_related('posts', undef, { order_by => [ 'time DESC', 'id DESC' ] })->single;
 
     $s->{forum}       = $thread->forum;
     $s->{thread}      = $thread;
     $s->{page_islast} = $lastpage;
-    $s->{next_post}   = $lastpage ? undef : pop @posts;
-    $s->{posts}       = \@posts;
-#    $s->{can_post}    = !$sess->test_post($thread, $thread->forumid),
+    $s->{posts_rs}    = $posts_rs;
     $s->{skip}        = $skip;
     $s->{filter}      = $filter;

veekun/lib/Vee/Controller/Forum/Create.pm

@@ -8 +8 @@
 use Vee::Utils::Forum;
 
+use DateTime;
+
 =head1 NAME
 
@@ -61 +63 @@
     if (@bbcode_errors) {
         $c->vee_abort("Your post contains invalid bbcode.  Please go back and fix it.  Also, vee really needs better error messages; sorry about that.");
-    } 
+    }
+    $parsed_message = Vee::Utils::fix_newlines( $parsed_message );
 
     if ('preview' eq lc $c->req->params->{submit}) {
         $c->detach('post_preview');
     }
-   
-    # create the post
-    my $post = $c->model('DBIC')->schema->txn_do( sub {
-        my $post = $c->model('DBIC::Posts')->create({
-            threadid => $thread->id,
-            userid   => $c->user->obj->id,
-            time     => time,
-            format   => 'bbcode',
-            message  => Vee::Utils::fix_newlines( $parsed_message ),
-        });
-        # update thread's last-post stats
-        $thread->lastpostid( $post->id );
-        $thread->lasttime( time );
-        $thread->postct( $thread->postct + 1 );
-        $thread->update;
-        # update forum's last-post stats
-        $thread->forum->lastpostid( $post->id );
-        $thread->forum->postct( $thread->forum->postct + 1 );
-        $thread->forum->update;
-        # update user's postcount
-        $c->user->obj->postct( $c->user->postct + 1 );
-        $c->user->obj->update;
-        return $post;
-    } );
+
+    # check for daabaru-post
+    # TODO: apply this to thread creation too?  not as common..  and merge as well?
+    my $last_post = $c->model('DBIC::Posts')->search({
+        threadid => $thread->id,
+        time     => { '>=', time - $c->site_opts->{post_automerge_time} },
+    }, {
+        order_by => 'time DESC',
+    })->single;
+
+    my $post;
+    # only do merging/prevention if the last post is this user's
+    if ($last_post and $last_post->userid == $c->user->obj->id) {
+        if ($last_post->message eq $parsed_message) {
+            $c->vee_abort("You have already posted that message recently.");
+        }
+
+        # different post; edit the last one
+        # TODO: what about formats/options of both posts?  not a problem now, but later..
+        $post = $c->model('DBIC')->schema->txn_do( sub {
+            my $edit = $c->model('DBIC::Edits')->create({
+                postid     => $last_post->id,
+                userid     => $c->user->obj->id,
+                time       => time,
+                oldmessage => $last_post->message,
+            });
+            $last_post->message(
+                $last_post->message .
+                "\n[hr][i]Automerged:[/i]\n" .
+                $parsed_message
+            );
+            $last_post->lasteditid( $edit->id );
+            $last_post->update;
+
+            $thread->lastpostid( $last_post->id );
+            $thread->lasttime( time );
+            $thread->update
+
+            return $last_post;
+        } );
+    } else {
+        # create the post
+        $post = $c->model('DBIC')->schema->txn_do( sub {
+            my $post = $c->model('DBIC::Posts')->create({
+                threadid => $thread->id,
+                userid   => $c->user->obj->id,
+                time     => time,
+                format   => 'bbcode',
+                message  => $parsed_message,
+            });
+            # update thread's last-post stats
+            $thread->lastpostid( $post->id );
+            $thread->lasttime( time );
+            $thread->postct( $thread->postct + 1 );
+            $thread->update;
+            # update forum's last-post stats
+            $thread->forum->lastpostid( $post->id );
+            $thread->forum->postct( $thread->forum->postct + 1 );
+            $thread->forum->update;
+            # update user's postcount
+            $c->user->obj->postct( $c->user->postct + 1 );
+            $c->user->obj->update;
+            return $post;
+        } );
+    }
 
     # finito!

veekun/site_options.yml

@@ -70 +70 @@
 user_activity_timeout: 900
 
+# Number of seconds before a user can double-post on a thread
+post_automerge_time: 1800
+
 # URL for Subversion repository path to check for activity
 # Note that at the moment this *requires* anon access!

veekun/templates/forum/common.tt

@@ -147 +147 @@
 <td class="forum-count">[% thread.postct - 1 %]</td><td class="forum-count">[% thread.hitct %]</td>
 <td class="forum-postinfo">
-[%     IF thread.lastpostid == thread.firstpostid -%]
+[%     IF thread.postct <= 1 -%]
 -
 [%     ELSE %]
@@ -175 +175 @@
 
 [% BLOCK forums_each %][%# forum -%]
-[%#     last_post = sql.post_summary(forum.lastpost) %]
-[%#     last_name = last_post.user.name %]
-[%#     last_thread = sql.thread_info(last_post.threadid) -%]
 <tr><td class="forum-icon">
 [% UNLESS forum.accessibility == 'normal' %]<img src="/images/icons/[% forum.accessibility %].png" alt="[% forum.accessibility %]" title="[% forum.accessibility %]"/>[% END %]

veekun/templates/forum/thread/view.tt

@@ -6 +6 @@
 [% this_pagelist = pagelist(skip, c.site_opts.page_sizes.posts, thread.postct, c.uri('Forum', 'thread', thread.id), c.req.params); this_pagelist %]
 [% INCLUDE posts_start %]
-[% FOREACH p IN posts %]
-[%     IF !loop.first %]
-<div class="forum-postdiff">[% p.time - loop.prev.time | timespan %]</div>
+[% done_posts = 0 %]
+[% WHILE (p = posts_rs.next) %]
+[%     IF done_posts > 0 %]
+<div class="forum-postdiff">[% p.time - last_post_time | timespan %]</div>
 [%     END %]
 [%     INCLUDE posts_each post=p thread=thread forum=thread.forum show_deleted=0 %]
+[%     done_posts = done_posts + 1 %]
+[%     last_post_time = p.time %]
+[%     IF done_posts >= c.site_opts.page_sizes.posts; LAST; END %]
 [% END %]
 
-[% IF !posts.size %]
+[% IF NOT done_posts %]
 [%     IF filter %]
 <div class="warning"><a href="/users/[% filter.id %]">[% filter.name %]</a> has no posts on this thread.</div>
@@ -27 +31 @@
 
 [% IF page_islast %]
-<div class="forum-postdiff">[% time - posts.last.time | timespan %]<br/>since last post</div>
+<div class="forum-postdiff">[% time - last_post_time | timespan %]<br/>since last post</div>
 [% ELSE %]
-<div class="forum-postdiff">[% next_post.time - posts.last.time | timespan %]<br/>to first post on next page</div>
+<div class="forum-postdiff">[% posts_rs.next.time - last_post_time | timespan %]<br/>to first post on next page</div>
 [% END %]
 <form action="/forum/thread/[% thread.id %]" method="get" class="forum-filter">
@@ -47 +51 @@
 [% IF can_post(thread) %]
 <h1>Reply to this thread</h1>
-[%     IF thread.lastpost.time %]
-[%         age = time - thread.lastpost.time %]
+[%     IF physical_lastpost.time %]
+[%         age = time - physical_lastpost.time %]
 [%         IF age > 60 * 60 * 24 * 14 %]
 <div class="warning"> <p>The last post on this thread is more than two weeks old.</p> <p>It has most likely been long forgotten.  Please consider whether posting is that good an idea.</p> </div>
@@ -55 +59 @@
 [%         END %]
 [%     END %]
-[%     IF user AND thread.lastpost.userid AND thread.lastpost.userid == user.id %]
-<div class="warning"> <p>The last post on this thread is yours; if you reply again, your new post will be combined with the old one and the thread will be bumped.  If you like, you can manually <a href="/forum/post/[% thread.lastpost.id %]/edit">edit the last post</a> instead.</p> </div>
+[%     IF user AND physical_lastpost.userid AND physical_lastpost.userid == user.id %]
+<div class="warning"> <p>The last post on this thread is yours; if you reply again, your new post will be combined with the old one and the thread will be bumped.  If you like, you can manually <a href="/forum/post/[% physical_lastpost.id %]/edit">edit the last post</a> instead.</p> </div>
 [%     END %]
 <form class="forum-reply" action="[% uri('Forum::Create', 'post') %]" method="post">