Remove tag voting

Analysis has shown that this system doesn't actually accomplish
anything. Users do not vote on tags often enough to actually get any tag
removed, so why even bother?

Non-critical database change with this commit

classes/torrents.class.php

@@ -464,9 +464,6 @@ class Torrents {
     G::$DB->query("
       DELETE FROM torrents_tags
       WHERE GroupID = '$GroupID'");
-    G::$DB->query("
-      DELETE FROM torrents_tags_votes
-      WHERE GroupID = '$GroupID'");
     G::$DB->query("
       DELETE FROM bookmarks_torrents
       WHERE GroupID = '$GroupID'");

gazelle.sql

@@ -1235,25 +1235,13 @@ CREATE TABLE `torrents_screenshots` (
 CREATE TABLE `torrents_tags` (
   `TagID` int(10) NOT NULL DEFAULT '0',
   `GroupID` int(10) NOT NULL DEFAULT '0',
-  `PositiveVotes` int(6) NOT NULL DEFAULT '1',
-  `NegativeVotes` int(6) NOT NULL DEFAULT '1',
   `UserID` int(10) DEFAULT NULL,
   PRIMARY KEY (`TagID`,`GroupID`),
   KEY `TagID` (`TagID`),
   KEY `GroupID` (`GroupID`),
-  KEY `PositiveVotes` (`PositiveVotes`),
-  KEY `NegativeVotes` (`NegativeVotes`),
   KEY `UserID` (`UserID`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `torrents_tags_votes` (
-  `GroupID` int(10) NOT NULL,
-  `TagID` int(10) NOT NULL,
-  `UserID` int(10) NOT NULL,
-  `Way` enum('up','down') NOT NULL DEFAULT 'up',
-  PRIMARY KEY (`GroupID`,`TagID`,`UserID`,`Way`)
-) ENGINE=InnoDB CHARSET=utf8;
-
 CREATE TABLE `u2f` (
   `UserID` int(10) NOT NULL,
   `KeyHandle` varchar(255) NOT NULL,

sections/ajax/top10/tags.php

@@ -3,10 +3,10 @@
 
 // error out on invalid requests (before caching)
 if (isset($_GET['details'])) {
-  if (in_array($_GET['details'],array('ut','ur','v'))) {
+  if (in_array($_GET['details'], ['ut','ur'])) {
     $Details = $_GET['details'];
   } else {
-    print json_encode(array('status' => 'failure'));
+    print json_encode(['status' => 'failure']);
     die();
   }
 } else {
@@ -15,7 +15,7 @@ if (isset($_GET['details'])) {
 
 // defaults to 10 (duh)
 $Limit = isset($_GET['limit']) ? intval($_GET['limit']) : 10;
-$Limit = in_array($Limit, array(10, 100, 250)) ? $Limit : 10;
+$Limit = in_array($Limit, [10, 100, 250]) ? $Limit : 10;
 $OuterResults = [];
 
 if ($Details == 'all' || $Details == 'ut') {
@@ -24,9 +24,7 @@ if ($Details == 'all' || $Details == 'ut') {
       SELECT
         t.ID,
         t.Name,
-        COUNT(tt.GroupID) AS Uses,
-        SUM(tt.PositiveVotes - 1) AS PosVotes,
-        SUM(tt.NegativeVotes - 1) AS NegVotes
+        COUNT(tt.GroupID) AS Uses
       FROM tags AS t
         JOIN torrents_tags AS tt ON tt.TagID = t.ID
       GROUP BY tt.TagID
@@ -59,50 +57,24 @@ if ($Details == 'all' || $Details == 'ur') {
   $OuterResults[] = generate_tag_json('Most Used Request Tags', 'ur', $TopRequestTags, $Limit);
 }
 
-if ($Details == 'all' || $Details == 'v') {
-  if (!$TopVotedTags = $Cache->get_value("topvotedtag_$Limit")) {
-    $DB->query("
-      SELECT
-        t.ID,
-        t.Name,
-        COUNT(tt.GroupID) AS Uses,
-        SUM(tt.PositiveVotes - 1) AS PosVotes,
-        SUM(tt.NegativeVotes - 1) AS NegVotes
-      FROM tags AS t
-        JOIN torrents_tags AS tt ON tt.TagID = t.ID
-      GROUP BY tt.TagID
-      ORDER BY PosVotes DESC
-      LIMIT $Limit");
-    $TopVotedTags = $DB->to_array();
-    $Cache->cache_value("topvotedtag_$Limit", $TopVotedTags, 3600 * 12);
-  }
-
-  $OuterResults[] = generate_tag_json('Most Highly Voted Tags', 'v', $TopVotedTags, $Limit);
-}
-
-print
-  json_encode(
-    array(
-      'status' => 'success',
-      'response' => $OuterResults
-    )
-  );
+print json_encode([
+  'status' => 'success',
+  'response' => $OuterResults
+]);
 
 function generate_tag_json($Caption, $Tag, $Details, $Limit) {
   $results = [];
   foreach ($Details as $Detail) {
-    $results[] = array(
+    $results[] = [
       'name' => $Detail['Name'],
-      'uses' => (int)$Detail['Uses'],
-      'posVotes' => (int)$Detail['PosVotes'],
-      'negVotes' => (int)$Detail['NegVotes']
-    );
+      'uses' => (int)$Detail['Uses']
+    ];
   }
 
-  return array(
+  return [
     'caption' => $Caption,
     'tag' => $Tag,
     'limit' => (int)$Limit,
     'results' => $results
-    );
+  ];
 }

sections/reportsv2/report.php

@@ -35,7 +35,7 @@ if (!isset($_GET['id']) || !is_number($_GET['id'])) {
   list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameJP, $GroupYear,
     $GroupStudio, $GroupSeries, $GroupCatalogueNumber, $GroupCategoryID,
     $GroupDLSite, $GroupTime, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
-    $TagPositiveVotes, $TagNegativeVotes, $Screenshots, $GroupFlags) = array_values($GroupDetails);
+    $Screenshots, $GroupFlags) = array_values($GroupDetails);
 
   $DisplayName = $GroupName;
   $AltName = $GroupName; // Goes in the alt text of the image

sections/schedule/every/delete_tags.php

@@ -1,8 +0,0 @@
-<?
-//------------- Delete unpopular tags -----------------------------------//
-
-$DB->query("
-  DELETE FROM torrents_tags
-  WHERE NegativeVotes > 1
-    AND NegativeVotes > PositiveVotes");
-?>

sections/top10/tags.php

@@ -1,7 +1,7 @@
 <?
 // error out on invalid requests (before caching)
 if (isset($_GET['details'])) {
-  if (in_array($_GET['details'],array('ut','ur','v'))) {
+  if (in_array($_GET['details'], ['ut','ur'])) {
     $Details = $_GET['details'];
   } else {
     error(404);
@@ -22,7 +22,7 @@ View::show_header('Top 10 Tags');
 
 // defaults to 10 (duh)
 $Limit = isset($_GET['limit']) ? intval($_GET['limit']) : 10;
-$Limit = in_array($Limit, array(10,100,250)) ? $Limit : 10;
+$Limit = in_array($Limit, [10,100,250]) ? $Limit : 10;
 
 if ($Details == 'all' || $Details == 'ut') {
   if (!$TopUsedTags = $Cache->get_value('topusedtag_'.$Limit)) {
@@ -30,9 +30,7 @@ if ($Details == 'all' || $Details == 'ut') {
       SELECT
         t.ID,
         t.Name,
-        COUNT(tt.GroupID) AS Uses,
-        SUM(tt.PositiveVotes-1) AS PosVotes,
-        SUM(tt.NegativeVotes-1) AS NegVotes
+        COUNT(tt.GroupID) AS Uses
       FROM tags AS t
         JOIN torrents_tags AS tt ON tt.TagID=t.ID
       GROUP BY tt.TagID
@@ -51,8 +49,7 @@ if ($Details == 'all' || $Details == 'ur') {
       SELECT
         t.ID,
         t.Name,
-        COUNT(r.RequestID) AS Uses,
-        '',''
+        COUNT(r.RequestID) AS Uses
       FROM tags AS t
         JOIN requests_tags AS r ON r.TagID=t.ID
       GROUP BY r.TagID
@@ -62,28 +59,7 @@ if ($Details == 'all' || $Details == 'ur') {
     $Cache->cache_value('toprequesttag_'.$Limit, $TopRequestTags, 3600 * 12);
   }
 
-  generate_tag_table('Most Used Request Tags', 'ur', $TopRequestTags, $Limit, false, true);
-}
-
-if ($Details == 'all' || $Details == 'v') {
-  if (!$TopVotedTags = $Cache->get_value('topvotedtag_'.$Limit)) {
-    $DB->query("
-      SELECT
-        t.ID,
-        t.Name,
-        COUNT(tt.GroupID) AS Uses,
-        SUM(tt.PositiveVotes-1) AS PosVotes,
-        SUM(tt.NegativeVotes-1) AS NegVotes
-      FROM tags AS t
-        JOIN torrents_tags AS tt ON tt.TagID=t.ID
-      GROUP BY tt.TagID
-      ORDER BY PosVotes DESC
-      LIMIT $Limit");
-    $TopVotedTags = $DB->to_array();
-    $Cache->cache_value('topvotedtag_'.$Limit, $TopVotedTags, 3600 * 12);
-  }
-
-  generate_tag_table('Most Highly Voted Tags', 'v', $TopVotedTags, $Limit);
+  generate_tag_table('Most Used Request Tags', 'ur', $TopRequestTags, $Limit, true);
 }
 
 echo '</div>';
@@ -91,7 +67,7 @@ View::show_footer();
 exit;
 
 // generate a table based on data from most recent query to $DB
-function generate_tag_table($Caption, $Tag, $Details, $Limit, $ShowVotes = true, $RequestsTable = false) {
+function generate_tag_table($Caption, $Tag, $Details, $Limit, $RequestsTable = false) {
   if ($RequestsTable) {
     $URLString = 'requests.php?tags=';
   } else {
@@ -123,11 +99,7 @@ function generate_tag_table($Caption, $Tag, $Details, $Limit, $ShowVotes = true,
   <tr class="colhead">
     <td class="center">Rank</td>
     <td>Tag</td>
-    <td style="text-align: right;">Uses</td>
-<?  if ($ShowVotes) {  ?>
-    <td style="text-align: right;">Pos. votes</td>
-    <td style="text-align: right;">Neg. votes</td>
-<?  }  ?>
+    <td class="center">Uses</td>
   </tr>
 <?
   // in the unlikely event that query finds 0 rows...
@@ -154,10 +126,6 @@ function generate_tag_table($Caption, $Tag, $Details, $Limit, $ShowVotes = true,
     <td class="center"><?=$Rank?></td>
     <td><a class="<?=$Class?>" href="<?=$URLString?><?=$Detail['Name']?>"><?=$DisplayName?></a></td>
     <td class="number_column"><?=number_format($Detail['Uses'])?></td>
-<?    if ($ShowVotes) { ?>
-    <td class="number_column"><?=number_format($Detail['PosVotes'])?></td>
-    <td class="number_column"><?=number_format($Detail['NegVotes'])?></td>
-<?    } ?>
   </tr>
 <?
   }

sections/torrents/add_tag.php

@@ -34,32 +34,14 @@ foreach ($Tags as $TagName) {
         INSERT INTO tags (Name, UserID)
         VALUES ('$TagName', $UserID)");
       $TagID = $DB->inserted_id();
-    } else {
-      $DB->query("
-        SELECT TagID
-        FROM torrents_tags_votes
-        WHERE GroupID = '$GroupID'
-          AND TagID = '$TagID'
-          AND UserID = '$UserID'");
-      if ($DB->has_results()) { // User has already voted on this tag, and is trying hax to make the rating go up
-        header('Location: '.$_SERVER['HTTP_REFERER']);
-        die();
-      }
     }
 
     $DB->query("
       INSERT INTO torrents_tags
-        (TagID, GroupID, PositiveVotes, UserID)
-      VALUES
-        ('$TagID', '$GroupID', '3', '$UserID')
-      ON DUPLICATE KEY UPDATE
-        PositiveVotes = PositiveVotes + 2");
-
-    $DB->query("
-      INSERT INTO torrents_tags_votes
-        (GroupID, TagID, UserID, Way)
+        (TagID, GroupID, UserID)
       VALUES
-        ('$GroupID', '$TagID', '$UserID', 'up')");
+        ('$TagID', '$GroupID', '$UserID')
+      ON DUPLICATE KEY UPDATE TagID=TagID");
 
     $DB->query("
       INSERT INTO group_log

sections/torrents/delete_tag.php

@@ -22,10 +22,6 @@ if (list($TagName) = $DB->next_record()) {
       ('$GroupID',".$LoggedUser['ID'].",'".sqltime()."','".db_string('Tag "'.$TagName.'" removed from group')."')");
 }
 
-$DB->query("
-  DELETE FROM torrents_tags_votes
-  WHERE GroupID = '$GroupID'
-    AND TagID = '$TagID'");
 $DB->query("
   DELETE FROM torrents_tags
   WHERE GroupID = '$GroupID'

sections/torrents/details.php

@@ -22,7 +22,7 @@ $TorrentList = $TorrentCache[1];
 list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP, $GroupYear,
   $GroupStudio, $GroupSeries, $GroupCatalogueNumber, $GroupPages, $GroupCategoryID,
   $GroupDLsiteID, $GroupTime, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
-  $TagPositiveVotes, $TagNegativeVotes, $Screenshots, $GroupFlags) = array_values($TorrentDetails);
+  $Screenshots, $GroupFlags) = array_values($TorrentDetails);
 
 if (!$GroupName) {
   if (!$GroupNameRJ) {
@@ -78,28 +78,15 @@ if ($GroupPages) {
 if ($GroupDLsiteID) {
   $DisplayName .= " [$GroupDLsiteID]";
 }
-/*
-if ($GroupVanityHouse) {
-  $DisplayName .= ' [Vanity House]';
-  $AltName .= ' [Vanity House]';
-}
-*/
-/*if ($GroupCategoryID == 1) {
-  $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']';
-  $AltName .= ' ['.$ReleaseTypes[$ReleaseType].']';
-}*/
 
 $Tags = [];
 if ($TorrentTags != '') {
   $TorrentTags = explode('|', $TorrentTags);
   $TorrentTagIDs = explode('|', $TorrentTagIDs);
   $TorrentTagUserIDs = explode('|', $TorrentTagUserIDs);
-  $TagPositiveVotes = explode('|', $TagPositiveVotes);
-  $TagNegativeVotes = explode('|', $TagNegativeVotes);
 
   foreach ($TorrentTags as $TagKey => $TagName) {
     $Tags[$TagKey]['name'] = $TagName;
-    $Tags[$TagKey]['score'] = ($TagPositiveVotes[$TagKey] - $TagNegativeVotes[$TagKey]);
     $Tags[$TagKey]['id'] = $TorrentTagIDs[$TagKey];
     $Tags[$TagKey]['userid'] = $TorrentTagUserIDs[$TagKey];
 
@@ -111,13 +98,6 @@ if ($TorrentTags != '') {
   uasort($Tags, 'compare');
 }
 
-/*if (check_perms('site_debug')) {
-  print_r($TorrentTags);
-  print_r($Tags);
-  print_r($TorrentTagUserIDs);
-  die();
-}*/
-
 $CoverArt = $Cache->get_value("torrents_cover_art_$GroupID");
 if (!$CoverArt) {
   $DB->query("
@@ -326,9 +306,6 @@ if (count($Tags) > 0) {
         <li>
           <a href="torrents.php?taglist=<?=$Tag['name']?>" style="float: left; display: block;" class="<?=display_str($Tag['class'])?>" ><?=display_str($Tag['display'])?></a>
           <div style="float: right; display: block; letter-spacing: -1px;" class="edit_tags_votes">
-          <a href="torrents.php?action=vote_tag&amp;way=up&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Vote this tag up" class="brackets tooltip vote_tag_up">&and;</a>
-          <?=$Tag['score']?>
-          <a href="torrents.php?action=vote_tag&amp;way=down&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Vote this tag down" class="brackets tooltip vote_tag_down">&or;</a>
 <?    if (check_perms('users_warn')) { ?>
           <a href="user.php?id=<?=$Tag['userid']?>" title="View the profile of the user that added this tag" class="brackets tooltip view_tag_user">U</a>
 <?    } ?>
@@ -336,7 +313,7 @@ if (count($Tags) > 0) {
           <span class="remove remove_tag"><a href="torrents.php?action=delete_tag&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets tooltip" title="Remove tag">X</a></span>
 <?    } ?>
           </div>
-          <br style="clear: both;" />
+          <br>
         </li>
 <?
   }

sections/torrents/functions.php

@@ -34,9 +34,7 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProp
         g.Time,
         GROUP_CONCAT(DISTINCT tags.Name SEPARATOR '|'),
         GROUP_CONCAT(DISTINCT tags.ID SEPARATOR '|'),
-        GROUP_CONCAT(tt.UserID SEPARATOR '|'),
-        GROUP_CONCAT(tt.PositiveVotes SEPARATOR '|'),
-        GROUP_CONCAT(tt.NegativeVotes SEPARATOR '|')
+        GROUP_CONCAT(tt.UserID SEPARATOR '|')
       FROM torrents_group AS g
         LEFT JOIN torrents_tags AS tt ON tt.GroupID = g.ID
         LEFT JOIN tags ON tags.ID = tt.TagID";

sections/torrents/index.php

@@ -139,12 +139,6 @@ if (!empty($_REQUEST['action'])) {
       include(SERVER_ROOT.'/sections/torrents/takemasspm.php');
       break;
 
-    case 'vote_tag':
-      enforce_login();
-      authorize();
-      include(SERVER_ROOT.'/sections/torrents/vote_tag.php');
-      break;
-
     case 'add_tag':
       enforce_login();
       include(SERVER_ROOT.'/sections/torrents/add_tag.php');

sections/torrents/vote_tag.php

@@ -1,40 +0,0 @@
-<?
-$UserID = $LoggedUser['ID'];
-$TagID = db_string($_GET['tagid']);
-$GroupID = db_string($_GET['groupid']);
-$Way = db_string($_GET['way']);
-
-if (!is_number($TagID) || !is_number($GroupID)) {
-  error(404);
-}
-if (!in_array($Way, array('up', 'down'))) {
-  error(404);
-}
-
-$DB->query("
-  SELECT TagID
-  FROM torrents_tags_votes
-  WHERE TagID = '$TagID'
-    AND GroupID = '$GroupID'
-    AND UserID = '$UserID'
-    AND Way = '$Way'");
-if (!$DB->has_results()) {
-  if ($Way == 'down') {
-    $Change = 'NegativeVotes = NegativeVotes + 1';
-  } else {
-    $Change = 'PositiveVotes = PositiveVotes + 2';
-  }
-  $DB->query("
-    UPDATE torrents_tags
-    SET $Change
-    WHERE TagID = '$TagID'
-      AND GroupID = '$GroupID'");
-  $DB->query("
-    INSERT INTO torrents_tags_votes
-      (GroupID, TagID, UserID, Way)
-    VALUES
-      ('$GroupID', '$TagID', '$UserID', '$Way')");
-  $Cache->delete_value("torrents_details_$GroupID"); // Delete torrent group cache
-}
-header('Location: '.$_SERVER['HTTP_REFERER']);
-?>

sections/upload/upload_handle.php

@@ -529,11 +529,10 @@ if (!$Properties['GroupID']) {
 
       $DB->query("
         INSERT INTO torrents_tags
-          (TagID, GroupID, UserID, PositiveVotes)
+          (TagID, GroupID, UserID)
         VALUES
-          ($TagID, $GroupID, $LoggedUser[ID], 10)
-        ON DUPLICATE KEY UPDATE
-          PositiveVotes = PositiveVotes + 1;
+          ($TagID, $GroupID, $LoggedUser[ID])
+        ON DUPLICATE KEY UPDATE TagID=TagID
       ");
     }
   }
@@ -718,34 +717,7 @@ send_irc('PRIVMSG '.BOT_ANNOUNCE_CHAN.' '.html_entity_decode($Announce, ENT_QUOT
 $Debug->set_flag('upload: announced on irc');
 
 // Manage notifications
-/*
-$UsedFormatBitrates = [];
-
-if (!$IsNewGroup) {
-  // maybe there are torrents in the same release as the new torrent. Let's find out (for notifications)
-  $GroupInfo = get_group_info($GroupID, true, 0, false);
-
-  $ThisMedia = display_str($Properties['Media']);
-
-  $ThisRemastered = display_str($Properties['Remastered']);
-  $ThisRemasterYear = display_str($Properties['RemasterYear']);
-  $ThisRemasterTitle = display_str($Properties['RemasterTitle']);
-  $ThisRemasterRecordLabel = display_str($Properties['RemasterRecordLabel']);
-  $ThisRemasterCatalogueNumber = display_str($Properties['RemasterCatalogueNumber']);
-
-  foreach ($GroupInfo[1] as $TorrentInfo) {
-    if (($TorrentInfo['Media'] == $ThisMedia)
-      && ($TorrentInfo['Remastered'] == $ThisRemastered)
-      && ($TorrentInfo['RemasterYear'] == (int)$ThisRemasterYear)
-      && ($TorrentInfo['RemasterTitle'] == $ThisRemasterTitle)
-      && ($TorrentInfo['RemasterRecordLabel'] == $ThisRemasterRecordLabel)
-      && ($TorrentInfo['RemasterCatalogueNumber'] == $ThisRemasterCatalogueNumber)
-      && ($TorrentInfo['ID'] != $TorrentID)) {
-      $UsedFormatBitrates[] = array('format' => $TorrentInfo['Format'], 'bitrate' => $TorrentInfo['Encoding']);
-    }
-  }
-}
-*/
+
 // For RSS
 $Item = $Feed->item($Title, Text::strip_bbcode($Body), 'torrents.php?action=download&authkey=[[AUTHKEY]]&torrent_pass=[[PASSKEY]]&id='.$TorrentID, $LoggedUser['Username'], 'torrents.php?id='.$GroupID, trim($Properties['TagList']));
 

static/styles/global.css

@@ -695,14 +695,6 @@ tr.torrent .bookmark>a:after {
   margin-bottom: 10px;
 }
 
-.vote_tag_up, .vote_artist_up, .vote_album_up {
-  font-weight: bolder;
-}
-
-.vote_tag_down, .vote_artist_down, .vote_album_down {
-  font-weight: bolder;
-}
-
 .noborder {
   border: none;
 }

static/styles/kuro/style.css

@@ -918,14 +918,6 @@ tr.torrent .bookmark > a:after { color:#999; }
   font-weight: normal;
 }
 
-.vote_tag_up, .vote_artist_up, .vote_album_up, .small_upvote, .small_upvoted {
-  color: green;
-}
-
-.vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
-  color: red;
-}
-
 /* workaround for calendar display issue */
 div.sidebar #event_div {
   margin-left: -232px;

static/styles/oppai/style.css

@@ -975,14 +975,6 @@ div[class~=tooltipster-content] > a {
   font-weight: normal;
 }
 
-.vote_tag_up, .vote_artist_up, .vote_album_up, .small_upvote, .small_upvoted {
-  color: green;
-}
-
-.vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
-  color: red;
-}
-
 /* get rid of extraneous padding in the Top Contributors box */
 #request_top_contrib {
   border: none;