allow live updates for unlikes and undislikes

diff --git a/js/main.js b/js/main.js
index 885e042aa34b5e0e8f9e11bbcbc141c5cf365aae..a5ce894601e312e8a422adc1e31fb716c093636d 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -357,9 +357,9 @@
        function dolike(ident,verb) {
                unpause();
                $('#like-rotator-' + ident.toString()).show();
-               $.get('like/' + ident.toString() + '?verb=' + verb );
-               if(timer) clearTimeout(timer);
-               timer = setTimeout(NavUpdate,3000);
+               $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+//             if(timer) clearTimeout(timer);
+//             timer = setTimeout(NavUpdate,3000);
                liking = 1;
        }
 

diff --git a/mod/like.php b/mod/like.php
index 8fe0cf7353b7169dabe2c9c00cfedd21fccc0ede..aaa85928c7c81059984e47bf55c9995480c1e9bf 100755 (executable)
--- a/mod/like.php
+++ b/mod/like.php
@@ -117,7 +117,7 @@ function like_content(&$a) {
                $like_item = $r[0];
 
                // Already voted, undo it
-               $r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+               $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
                        dbesc(datetime_convert()),
                        intval($like_item['id'])
                );

diff --git a/mod/network.php b/mod/network.php
index 5f009dacd1ffc5adfaa4804ed881263cebd236b6..3d8fa7c1443e4849280017246dcc0a68a1c38f74 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -616,7 +616,8 @@ function network_content(&$a, $update = 0) {
                if($update) {
                        $r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid`
                                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                               WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+                               WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
+                               (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
                                and `item`.`moderated` = 0 and `item`.`unseen` = 1
                                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                                $sql_extra3 $sql_extra $sql_nets ",

diff --git a/mod/profile.php b/mod/profile.php
index 24e03d6eac25589bf2bab80e391dfd508d8d6225..b142943c1e9121f2fb80a769d7c2f9cb0d7877f3 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -204,6 +204,8 @@ function profile_content(&$a, $update = 0) {
 
                $r = q("SELECT distinct(parent) AS `item_id`, `contact`.`uid` AS `contact-uid`
                        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
+                       (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
                        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
                        and `item`.`moderated` = 0 and `item`.`unseen` = 1
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0