From 13f087e0258381a6dd314bb5b4c7af5962766b54 Mon Sep 17 00:00:00 2001
From: saturn <saturn@glxl.net>
Date: Sat, 22 Jul 2023 00:29:28 -0500
Subject: [PATCH] Fix some bugs in previous commit.

---
 lw2-viewer.asd                |  2 +-
 src/data-viewers/comment.lisp |  2 +-
 src/interface-utils.lisp      | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lw2-viewer.asd b/lw2-viewer.asd
index a26dffbe..504a0853 100644
--- a/lw2-viewer.asd
+++ b/lw2-viewer.asd
@@ -12,7 +12,7 @@
                              (:file "context")
 			     (:file "html-reader")
 			     (:file "client-script" :depends-on ("html-reader"))
-			     (:file "interface-utils" :depends-on ("links" "html-reader" "context" "sites"))
+			     (:file "interface-utils" :depends-on ("links" "html-reader"))
 			     (:file "user-context")
 			     (:file "conditions" :depends-on ("utils" "html-reader"))
 			     (:file "schema-type" :depends-on ("utils" "backend-modules"))
diff --git a/src/data-viewers/comment.lisp b/src/data-viewers/comment.lisp
index b6bdf129..56804888 100644
--- a/src/data-viewers/comment.lisp
+++ b/src/data-viewers/comment.lisp
@@ -70,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)
+	      (vote-buttons base-score :with-buttons *enable-voting* :vote-count vote-count :af-score (and af af-base-score) :extended-score extended-score :ea-agreement-voting (typep *current-site* 'ea-forum-viewer-site))
 	      (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 3b3e9132..584017c0 100644
--- a/src/interface-utils.lisp
+++ b/src/interface-utils.lisp
@@ -1,8 +1,6 @@
 (uiop:define-package #:lw2.interface-utils
   (:use #:cl #:lw2.links #:lw2.html-reader)
   (:import-from #:lw2.utils #:hash-cond #:alist-bind)
-  (:import-from #:lw2.context #:*current-site*)
-  (:import-from #:lw2.sites #:ea-forum-viewer-site)
   (:export #:pretty-time #:pretty-time-js #:pretty-time-html
 	   #:pretty-number #:generate-post-auth-link #:clean-lw-link #:votes-to-tooltip #:vote-buttons))
 
@@ -61,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)
+(defun vote-buttons (base-score &key (with-buttons t) vote-count post-id af-score as-text extended-score ea-agreement-voting)
   (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>))
@@ -74,7 +72,7 @@
 	      (agreement agree disagree) extended-score
 	      ;; LW uses agreement, EAF uses agree and disagree
 	       (cond
-		 ((typep *current-site* 'ea-forum-viewer-site)
+		 (ea-agreement-voting
 		  (format nil #.(uiop:strcat "~D" #\HAIR_SPACE #\RATIO #\HAIR_SPACE "~D")
 			  (or agree 0)
 			  (or disagree 0)))
@@ -85,7 +83,7 @@
 	      (agreement-vote-count agree disagree) extended-score
 	      ;; LW uses agreement-vote-count
 	      (cond
-		((typep *current-site* 'ea-forum-viewer-site)
+		(ea-agreement-voting
 		 (format nil "Total points: ~D" (+ (or agree 0) (or disagree 0))))
 		(agreement-vote-count
 		 (votes-to-tooltip (or agreement-vote-count 0))))))
@@ -107,7 +105,7 @@
 	(progn
 	  (when base-score
 	    (voting "karma" (votes-to-tooltip vote-count) (text)))
-	  (when (or extended-score (typep *current-site* 'ea-forum-viewer-site))
+	  (when (or extended-score ea-agreement-voting)
 	    (voting "agreement"
 		    (extended-tooltip)
 		    (extended-text)))))))
-- 
2.11.4.GIT