Added global user votes ignore list

5 files changed, 14 insertions, 5 deletions

diff --git a/lib/VNDB/DB/ULists.pm b/lib/VNDB/DB/ULists.pm
index 34bdc2aa..f57c5aa1 100644
--- a/lib/VNDB/DB/ULists.pm
+++ b/lib/VNDB/DB/ULists.pm
@@ -155,6 +155,7 @@ sub dbVoteGet {
     $o{uid} ? ( 'n.uid = ?' => $o{uid} ) : (),
     $o{vid} ? ( 'n.vid = ?' => $o{vid} ) : (),
     $o{hide} ? ( 'u.show_list = TRUE' => 1 ) : (),
+    $o{hide_ign} ? ( '(NOT u.ign_votes OR u.id = ?)' => $self->authInfo->{id}||0 ) : (),
   );
 
   my @select = (
@@ -186,16 +187,19 @@ sub dbVoteGet {
 }
 
 
-# Arguments: (uid|vid), id
+# Arguments: (uid|vid), id, use_ignore_list
 # Returns an arrayref with 10 elements containing the number of votes for index+1
 sub dbVoteStats {
-  my($self, $col, $id) = @_;
+  my($self, $col, $id, $ign) = @_;
+  my $u = $self->authInfo->{id};
   my $r = [ qw| 0 0 0 0 0 0 0 0 0 0 | ];
   $r->[$_->{vote}-1] = $_->{votes} for (@{$self->dbAll(q|
     SELECT vote, COUNT(vote) as votes
       FROM votes
+      !s
       !W
       GROUP BY vote|,
+    $ign ? 'JOIN users ON id = uid AND (NOT ign_votes'.($u?sprintf(' OR id = %d'.$u):'').')' : '',
     $col ? { '!s = ?' => [ $col, $id ] } : {},
   )});
   return $r;
diff --git a/lib/VNDB/DB/Users.pm b/lib/VNDB/DB/Users.pm
index e1f4c378..b2cd1a31 100644
--- a/lib/VNDB/DB/Users.pm
+++ b/lib/VNDB/DB/Users.pm
@@ -43,7 +43,7 @@ sub dbUserGet {
   );
 
   my @select = (
-    qw|id username mail rank salt c_votes c_changes show_nsfw show_list skin customcss ip c_tags|,
+    qw|id username mail rank salt c_votes c_changes show_nsfw show_list skin customcss ip c_tags ign_votes|,
     q|encode(passwd, 'hex') AS passwd|, q|extract('epoch' from registered) as registered|,
     $o{what} =~ /stats/ ? (
       '(SELECT COUNT(*) FROM rlists WHERE uid = u.id) AS releasecount',
@@ -74,7 +74,7 @@ sub dbUserEdit {
 
   my %h;
   defined $o{$_} && ($h{$_.' = ?'} = $o{$_})
-    for (qw| username mail rank show_nsfw show_list skin customcss salt |);
+    for (qw| username mail rank show_nsfw show_list skin customcss salt ign_votes |);
   $h{'passwd = decode(?, \'hex\')'} = $o{passwd}
     if defined $o{passwd};
 
diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm
index 2e8ac8ee..45d12e35 100644
--- a/lib/VNDB/Handler/Users.pm
+++ b/lib/VNDB/Handler/Users.pm
@@ -314,6 +314,7 @@ sub edit {
       $self->authCan('usermod') ? (
         { name => 'usrname', template => 'pname', minlength => 2, maxlength => 15 },
         { name => 'rank', enum => [ 1..$#{$self->{user_ranks}} ] },
+        { name => 'ign_votes', required => 0, default => 0 },
       ) : (),
       { name => 'mail', template => 'mail' },
       { name => 'usrpass',  required => 0, minlength => 4, maxlength => 64, template => 'asciiprint' },
@@ -335,6 +336,7 @@ sub edit {
       ($o{passwd}, $o{salt}) = $self->authPreparePass($frm->{usrpass}) if $frm->{usrpass};
       $o{show_list} = $frm->{flags_list} ? 1 : 0;
       $o{show_nsfw} = $frm->{flags_nsfw} ? 1 : 0;
+      $o{ign_votes} = $frm->{ign_votes} ? 1 : 0 if $self->authCan('usermod');
       $self->dbUserEdit($uid, %o);
       $self->dbSessionDel($uid) if $frm->{usrpass};
       return $self->resRedirect("/u$uid/edit?d=1", 'post') if $uid != $self->authInfo->{id} || !$frm->{usrpass};
@@ -347,6 +349,7 @@ sub edit {
   $frm->{$_} ||= $u->{$_} for(qw|rank mail skin customcss|);
   $frm->{flags_list} = $u->{show_list} if !defined $frm->{flags_list};
   $frm->{flags_nsfw} = $u->{show_nsfw} if !defined $frm->{flags_nsfw};
+  $frm->{ign_votes} = $u->{ign_votes} if !defined $frm->{ign_votes};
 
   # create the page
   my $title = $self->authInfo->{id} != $uid ? "Edit $u->{username}'s Account" : 'My Account';
@@ -366,6 +369,7 @@ sub edit {
       [ input  => short => 'usrname', name => 'Username' ],
       [ select => short => 'rank', name => 'Rank', options => [
         map [ $_, $self->{user_ranks}[$_][0] ], 1..$#{$self->{user_ranks}} ] ],
+      [ check  => short => 'ign_votes', name => 'Ignore votes in VN statistics' ],
     ) : (
       [ static => label => 'Username', content => $frm->{usrname} ],
     ),
diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm
index 0563c1dc..751fc5cc 100644
--- a/lib/VNDB/Handler/VNPage.pm
+++ b/lib/VNDB/Handler/VNPage.pm
@@ -463,7 +463,7 @@ sub _screenshots {
 sub _stats {
   my($self, $v) = @_;
 
-  my $stats = $self->dbVoteStats(vid => $v->{id});
+  my $stats = $self->dbVoteStats(vid => $v->{id}, 1);
   div class => 'mainbox';
    h1 'User stats';
    if(!grep $_ > 0, @$stats) {
diff --git a/lib/VNDB/Util/CommonHTML.pm b/lib/VNDB/Util/CommonHTML.pm
index 981edfe8..2446457d 100644
--- a/lib/VNDB/Util/CommonHTML.pm
+++ b/lib/VNDB/Util/CommonHTML.pm
@@ -464,6 +464,7 @@ sub htmlVoteStats {
      order => 'date DESC',
      what => $type eq 'v' ? 'user' : 'vn',
      hide => $type eq 'v',
+     hide_ign => $type eq 'v',
    );
    if(@$recent) {
      table class => 'recentvotes';