diff --git a/GanjooRazor/Pages/GanjoorPage.cshtml.cs b/GanjooRazor/Pages/GanjoorPage.cshtml.cs
index 385294be..018cfbb7 100644
--- a/GanjooRazor/Pages/GanjoorPage.cshtml.cs
+++ b/GanjooRazor/Pages/GanjoorPage.cshtml.cs
@@ -213,6 +213,23 @@ namespace GanjooRazor.Pages
             });
         }
 
+        /// <summary>
+        /// like / dislike / clear rating for a comment (AJAX, called from rateComment() in bk.js)
+        /// </summary>
+        public Task<IActionResult> OnPostRateCommentAsync(int id, short value)
+        {
+            return WithSecureClientAsync(async secureClient =>
+            {
+                var response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/poem/comment/{id}/rate?value={value}", null);
+                if (!response.IsSuccessStatusCode)
+                {
+                    return new BadRequestObjectResult(await ReadErrorMessageAsync(response));
+                }
+                var result = JsonConvert.DeserializeObject<GanjoorCommentRatingResultViewModel>(await response.Content.ReadAsStringAsync());
+                return new JsonResult(result);
+            });
+        }
+
         /// <summary>
         /// Poets (for this page's own #hdr2 author dropdown - same pattern as Search/Simi/etc.)
         /// </summary>
diff --git a/GanjooRazor/Pages/Map.cshtml b/GanjooRazor/Pages/Map.cshtml
index bf4227ef..66dd1fc5 100644
--- a/GanjooRazor/Pages/Map.cshtml
+++ b/GanjooRazor/Pages/Map.cshtml
@@ -23,7 +23,7 @@
             font-family: 'Vazirmatn'
         }
     </style>
-    <script src="/js/bk.js?version=81"></script>
+    <script src="/js/bk.js?version=83"></script>
     <script src="~/js/jquery-1.10.2.min.js"></script>
     <script src="~/js/leaflet.js"></script>
     <script src="~/js/leaflet-providers.js"></script>
diff --git a/GanjooRazor/Pages/Misc/Photos.cshtml b/GanjooRazor/Pages/Misc/Photos.cshtml
index 7598abd9..56c69f1e 100644
--- a/GanjooRazor/Pages/Misc/Photos.cshtml
+++ b/GanjooRazor/Pages/Misc/Photos.cshtml
@@ -15,7 +15,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=81"></script>
+    <script src="/js/bk.js?version=83"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Partials/GanjoorPage/_CommentPartial.cshtml b/GanjooRazor/Pages/Partials/GanjoorPage/_CommentPartial.cshtml
index 083116f5..0ad67210 100644
--- a/GanjooRazor/Pages/Partials/GanjoorPage/_CommentPartial.cshtml
+++ b/GanjooRazor/Pages/Partials/GanjoorPage/_CommentPartial.cshtml
@@ -44,6 +44,16 @@ else
             }
 
             <a role="button" title="پاسخگویی به این حاشیه" onclick="replyComment(@Model.Comment.Id, @(Model.LoggedIn ? "true" : "false"), '@Model.DivSuffix')"><i class="notranslate pageicons">reply</i></a>
+            @if (!Model.Comment.MyComment)
+            {
+                <a role="button" title="پسندیدن" id="like-btn-@Model.Comment.Id@Model.DivSuffix" class="cursor-pointer@(Model.Comment.CurrentUserRatingValue == 1 ? " green-color" : "")" onclick="rateComment(@Model.Comment.Id, 1, @(Model.LoggedIn ? "true" : "false"), '@Model.DivSuffix')"><i class="notranslate pageicons">thumb_up</i></a>
+            }
+            <small id="like-count-@Model.Comment.Id@Model.DivSuffix">@Model.Comment.LikeCount.ToPersianNumbers()</small>
+            @if (!Model.Comment.MyComment)
+            {
+                <a role="button" title="نپسندیدن" id="dislike-btn-@Model.Comment.Id@Model.DivSuffix" class="cursor-pointer@(Model.Comment.CurrentUserRatingValue == -1 ? " red-color" : "")" onclick="rateComment(@Model.Comment.Id, -1, @(Model.LoggedIn ? "true" : "false"), '@Model.DivSuffix')"><i class="notranslate pageicons">thumb_down</i></a>
+            }
+            <small id="dislike-count-@Model.Comment.Id@Model.DivSuffix">@Model.Comment.DislikeCount.ToPersianNumbers()</small>
             <a href="/ReportComment/?CommentId=@Model.Comment.Id" title="گزارش حاشیهٔ نامناسب" onclick="wpopen(this.href); return false"><i class="notranslate pageicons">flag</i></a>
             <a role="button" onclick="copyCommentUrl(@Model.Comment.Id)"><i class="notranslate pageicons">link</i></a>
             @if (Model.LoggedIn)
diff --git a/GanjooRazor/Pages/Recitations/AudioClip.cshtml b/GanjooRazor/Pages/Recitations/AudioClip.cshtml
index 0db410de..3b48dbfb 100644
--- a/GanjooRazor/Pages/Recitations/AudioClip.cshtml
+++ b/GanjooRazor/Pages/Recitations/AudioClip.cshtml
@@ -150,7 +150,7 @@
         </p>
 
         <script src="~/lib/jquery/dist/jquery.min.js"></script>
-        <script src="~/js/bk.js?version=81"></script>
+        <script src="~/js/bk.js?version=83"></script>
         <script src="~/js/jplayersupport.js"></script>
         <script src="~/js/vaabd.js?version=10"></script>
         <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml b/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
index fbb9143d..3fc51aca 100644
--- a/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
+++ b/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
@@ -238,7 +238,7 @@
 
 
 
-                <script src="~/js/bk.js?version=81"></script>
+                <script src="~/js/bk.js?version=83"></script>
                 <script src="~/js/jplayersupport.js"></script>
                 <script src="~/js/vaabd.js?version=10"></script>
                 <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index 63f751c3..c3c01f62 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -35,7 +35,7 @@
         });
     </script>
 
-    <script src="/js/bk.js?version=81"></script>
+    <script src="/js/bk.js?version=83"></script>
     <script>
         function editBanner(bannerId) {
             var url = '?handler=Edit';
diff --git a/GanjooRazor/Pages/Shared/_Layout.cshtml b/GanjooRazor/Pages/Shared/_Layout.cshtml
index 24ec7e74..3ff5edc1 100644
--- a/GanjooRazor/Pages/Shared/_Layout.cshtml
+++ b/GanjooRazor/Pages/Shared/_Layout.cshtml
@@ -34,7 +34,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=81"></script>
+    <script src="/js/bk.js?version=83"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
index 4e8a5a9b..b2e2cb06 100644
--- a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
@@ -32,7 +32,7 @@
         });
     </script>
     <script src="/lib/diff.js"></script>
-    <script src="/js/bk.js?version=81"></script>
+    <script src="/js/bk.js?version=83"></script>
     <script>
         function compareCorrectionBlocks(originalElemenyId, editedElementId, resultElementId) {
             var a = document.getElementById(originalElemenyId);
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index d1c8cf81..9f047602 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -504,6 +504,54 @@ function switchBookmarkInternal(poemId, coupletIndex, divSuffix) {
     });
 }
 
+function rateComment(commentId, value, loggedIn, divSuffix) {
+    if (!loggedIn) {
+        alert('برای رأی دادن به حاشیه‌ها لازم است با نام کاربری خود وارد گنجور شوید.');
+        return;
+    }
+
+    var likeBtn = document.getElementById('like-btn-' + commentId + divSuffix);
+    var dislikeBtn = document.getElementById('dislike-btn-' + commentId + divSuffix);
+
+    // clicking the already-active button clears the rating instead of re-sending the same value
+    var newValue = value;
+    if (value == 1 && likeBtn.classList.contains('green-color')) newValue = 0;
+    if (value == -1 && dislikeBtn.classList.contains('red-color')) newValue = 0;
+
+    $.ajax({
+        type: "POST",
+        url: '?handler=RateComment',
+        data: {
+            id: commentId,
+            value: newValue
+        },
+        error: function (err) {
+            alert('خطا در ثبت رأی: ' + err.responseText);
+        },
+        success: function (result) {
+            _applyCommentRatingResult(commentId, divSuffix, result);
+            if (divSuffix != '') {
+                _applyCommentRatingResult(commentId, '', result);
+            }
+        },
+    });
+}
+
+function _applyCommentRatingResult(commentId, divSuffix, result) {
+    var likeBtn = document.getElementById('like-btn-' + commentId + divSuffix);
+    var dislikeBtn = document.getElementById('dislike-btn-' + commentId + divSuffix);
+    var likeCount = document.getElementById('like-count-' + commentId + divSuffix);
+    var dislikeCount = document.getElementById('dislike-count-' + commentId + divSuffix);
+
+    if (likeCount != null) likeCount.innerText = toPersianNumber(result.likeCount);
+    if (dislikeCount != null) dislikeCount.innerText = toPersianNumber(result.dislikeCount);
+
+    if (likeBtn != null) likeBtn.classList.remove('green-color');
+    if (dislikeBtn != null) dislikeBtn.classList.remove('red-color');
+    if (result.currentUserRatingValue == 1 && likeBtn != null) likeBtn.classList.add('green-color');
+    if (result.currentUserRatingValue == -1 && dislikeBtn != null) dislikeBtn.classList.add('red-color');
+}
+
 function checkIfBookmarked(poemId) {
     if (document.getElementById('bookmark-icon') == null) return;
     setTimeout(function () {
@@ -1787,6 +1835,11 @@ function persianToEnglishNumber(str) {
     return str.replace(/[۰-۹]/g, d => persianDigits.indexOf(d));
 }
 
+function toPersianNumber(n) {
+    const persianDigits = '۰۱۲۳۴۵۶۷۸۹';
+    return String(n).replace(/[0-9]/g, d => persianDigits[d]);
+}
+
 function plotChart(tableId, maxCols = 9) {
 
 
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CommentRating.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CommentRating.cs
index 0700afca..6148119b 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CommentRating.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-CommentRating.cs
@@ -35,6 +35,11 @@ namespace RMuseum.Services.Implementation
                     return new RServiceResult<GanjoorCommentRatingResultViewModel>(null, "comment == null");
                 }
 
+                if (comment.UserId != null && comment.UserId == userId)
+                {
+                    return new RServiceResult<GanjoorCommentRatingResultViewModel>(null, "امکان رأی دادن به حاشیهٔ خودتان وجود ندارد.");
+                }
+
                 var oldRating = await _context.GanjoorCommentReactions.Where(c => c.GanjoorCommentId == commentId && c.UserId == userId).SingleOrDefaultAsync();
                 if (value == 0 && oldRating == null)
                 {