From 8921eb20de34eb30477f41c77922165f92906268 Mon Sep 17 00:00:00 2001
From: saturn <saturn@glxl.net>
Date: Wed, 1 Mar 2023 22:45:06 -0600
Subject: [PATCH] Remove agree/disagree vote totals which no longer work due to
 API change.

---
 lw2.lisp                      |  5 ++---
 src/data-viewers/comment.lisp |  3 +--
 src/interface-utils.lisp      | 50 +++++++++++++++----------------------------
 src/lw2-login.lisp            |  2 +-
 4 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/lw2.lisp b/lw2.lisp
index 520e8de0..30a0c28c 100644
--- a/lw2.lisp
+++ b/lw2.lisp
@@ -1387,15 +1387,14 @@ signaled condition to *HTML-OUTPUT*."
 	      (let ((vote (safe-decode-json vote-json)))
 		(multiple-value-bind (current-vote result)
 		    (do-lw2-vote auth-token target-type target vote)
-		  (alist-bind (vote-count base-score af af-base-score extended-score all-votes) result
+		  (alist-bind (vote-count base-score af af-base-score extended-score) result
 			      (let ((vote-buttons (vote-buttons base-score
 								:as-text t
 								:af-score (and af af-base-score)
 								:vote-count (+ vote-count (if (member (cdr (assoc :karma current-vote)) '(nil "neutral") :test #'equal)
 											      0
 											      1))
-								:extended-score extended-score
-								:all-votes all-votes))
+								:extended-score extended-score))
 				    (out (make-hash-table)))
 				(loop for (axis . axis-vote) in current-vote
 				   do (setf (gethash axis out) (list* axis-vote (gethash axis vote-buttons))))
diff --git a/src/data-viewers/comment.lisp b/src/data-viewers/comment.lisp
index c1d79152..b6bdf129 100644
--- a/src/data-viewers/comment.lisp
+++ b/src/data-viewers/comment.lisp
@@ -20,7 +20,6 @@
    (af-base-score (or null fixnum))
    (vote-count (or null fixnum))
    (extended-score list)
-   (all-votes list :subfields (:vote-type :extended-vote-type))
    (page-url (or null string) :context-not :user-index) ; page-url sometimes causes "Cannot read property '_id' of undefined" error
    (parent-comment list :backend-type backend-lw2-tags-comments :context :index :subfields (:--id :user-id :post-id (:tag :--id :name :slug)))
    (parent-comment list :context :index :subfields (:--id :user-id :post-id))
@@ -71,7 +70,7 @@
 	          </a>)
 	      <a class="date" href=(comment-link post-id tag comment-id) data-js-date=js-time> (safe pretty-time) (safe (pretty-time-js))</a>
 	      (when replied <a class="replied" title="You have replied to this comment" href=(apply 'generate-item-link replied)></a>)
-	      (vote-buttons base-score :with-buttons *enable-voting* :vote-count vote-count :af-score (and af af-base-score) :extended-score extended-score :all-votes all-votes)
+	      (vote-buttons base-score :with-buttons *enable-voting* :vote-count vote-count :af-score (and af af-base-score) :extended-score extended-score)
 	      (when af <span class="alignment-forum">AF</span>)
 	      (when post-id
 	        <a class="permalink" href=("~A/~A/~A"
diff --git a/src/interface-utils.lisp b/src/interface-utils.lisp
index bba018cc..18e768fa 100644
--- a/src/interface-utils.lisp
+++ b/src/interface-utils.lisp
@@ -59,7 +59,7 @@
               (typecase votes (integer votes) (list (length votes))))
       ""))
 
-(defun vote-buttons (base-score &key (with-buttons t) vote-count post-id af-score as-text extended-score all-votes)
+(defun vote-buttons (base-score &key (with-buttons t) vote-count post-id af-score as-text extended-score)
   (labels ((button (vote-type)
 	     (when with-buttons
 	       <button type="button" class=("vote ~A" vote-type) data-vote-type=vote-type data-target-type=(if post-id "Post" "Comment") tabindex="-1" disabled autocomplete="off"></button>))
@@ -67,24 +67,10 @@
 	     (if (and af-score (/= af-score 0))
 		 (format nil "LW: ~A AF: ~A" base-score af-score)
 		 (pretty-number base-score "point")))
-	   (compute-score-counts ()
-	     (let ((score-counts (make-hash-table :test 'equal)))
-	       (loop for vote in all-votes
-		  for agreement = (cdr (assoc :agreement (cdr (assoc :extended-vote-type vote))))
-		  do (when agreement
-		       (incf (gethash agreement score-counts 0))))
-	       (values score-counts
-		       (+ (gethash "smallUpvote" score-counts 0) (gethash "bigUpvote" score-counts 0))
-		       (+ (gethash "smallDownvote" score-counts 0) (gethash "bigDownvote" score-counts 0)))))
-	   (extended-text (agree-count disagree-count)
-	     (format nil #.(uiop:strcat "~D" #\HAIR_SPACE #\RATIO #\HAIR_SPACE "~D") agree-count disagree-count))
-	   (extended-tooltip (score-counts agree-count disagree-count)
-	     (format nil "~D agree (~D strongly)~%~D disagree (~D strongly)~%Epistemic Status: ~D"
-		     agree-count
-		     (gethash "bigUpvote" score-counts 0)
-		     disagree-count
-		     (gethash "bigDownvote" score-counts 0)
-		     (cdr (assoc :agreement extended-score))))
+	   (extended-text ()
+	     (pretty-number (cdr (assoc :agreement extended-score))))
+	   (extended-tooltip ()
+	     (votes-to-tooltip (cdr (assoc :agreement-vote-count extended-score))))
 	   (voting (class tooltip text)
 	     <div class=(safe ("~A voting-controls" class))
 	          (with-html-stream-output (:stream stream)
@@ -95,17 +81,15 @@
 	       <span class="karma-value" title=tooltip>(safe text)</span>
 	       (button "downvote")
 	     </div>))
-    (multiple-value-bind (score-counts agree-count disagree-count)
-	(if extended-score (compute-score-counts))
-      (if as-text
-	  (hash-cond (make-hash-table)
-		     (base-score :karma (list (text) (votes-to-tooltip vote-count)))
-		     (extended-score :agreement (list (extended-text agree-count disagree-count)
-						      (extended-tooltip score-counts agree-count disagree-count))))
-	  (progn
-	    (when base-score
-	      (voting "karma" (votes-to-tooltip vote-count) (text)))
-	    (when extended-score
-	      (voting "agreement"
-		      (extended-tooltip score-counts agree-count disagree-count)
-		      (extended-text agree-count disagree-count))))))))
+    (if as-text
+	(hash-cond (make-hash-table)
+		   (base-score :karma (list (text) (votes-to-tooltip vote-count)))
+		   (extended-score :agreement (list (extended-text)
+						    (extended-tooltip))))
+	(progn
+	  (when base-score
+	    (voting "karma" (votes-to-tooltip vote-count) (text)))
+	  (when extended-score
+	    (voting "agreement"
+		    (extended-tooltip)
+		    (extended-text)))))))
diff --git a/src/lw2-login.lisp b/src/lw2-login.lisp
index 822cbc9b..7f4fd1bc 100644
--- a/src/lw2-login.lisp
+++ b/src/lw2-login.lisp
@@ -289,7 +289,7 @@ fields - The return values we want to get from the server after it completes our
 									  :vote-type karma-vote
 									  :extended-vote extended-vote)
 								   :key #'cdr)
-							'(:--id :base-score :af :af-base-score :vote-count :extended-score (:all-votes :vote-type :extended-vote-type)
+							'(:--id :base-score :af :af-base-score :vote-count :extended-score
 							  :current-user-vote :current-user-extended-vote))
 		       "variables" nil
 		       "operationName" mutation)))
-- 
2.11.4.GIT