Merge pull request #283 from erqan/replied_promoted_post

show replied promoted post and don't show the sent indicator with pro…

js/twister_actions.js

@@ -29,18 +29,35 @@ function requestRepliedBefore(postLi)
     var reply_k = originalPost.attr('data-replied-to-id');
 
     if( reply_n != undefined && reply_k != undefined ) {
-        dhtget( reply_n, "post" + reply_k, "s",
-            function(postLi, postFromJson) {
-                if (postFromJson) {
-                    postLi.find('textarea').textcomplete('destroy'); // FIXME maybe we need to reset position instead (but curently it's cheaper)
-                    var newStreamPost = postToElem(postFromJson, "related");
-                    newStreamPost.hide();
-                    postLi.before(newStreamPost);
-                    newStreamPost.slideDown("fast");
-                    $.MAL.relatedPostLoaded();
-                    requestRepliedBefore(newStreamPost);
-                }
-            }, postLi);
+        if (reply_n[0] !== '!') {
+            dhtget(reply_n, "post" + reply_k, "s",
+                function (postLi, postFromJson) {
+                    if (postFromJson) {
+                        postLi.find('textarea').textcomplete('destroy'); // FIXME maybe we need to reset position instead (but curently it's cheaper)
+                        var newStreamPost = postToElem(postFromJson, "related");
+                        newStreamPost.hide();
+                        postLi.before(newStreamPost);
+                        newStreamPost.slideDown("fast");
+                        $.MAL.relatedPostLoaded();
+                        requestRepliedBefore(newStreamPost);
+                    }
+                }, postLi);
+        } else {
+            //replied to a promoted post... try to get it..
+            var params = [1, parseInt(reply_k)];
+            twisterRpc("getspamposts", params,
+                function (postLi, postFromJson) {
+                    if (postFromJson) {
+                        postLi.find('textarea').textcomplete('destroy'); // FIXME maybe we need to reset position instead (but curently it's cheaper)
+                        var newStreamPost = postToElem(postFromJson[0], "related", 1);
+                        newStreamPost.hide();
+                        postLi.before(newStreamPost);
+                        newStreamPost.slideDown("fast");
+                        $.MAL.relatedPostLoaded();
+                        requestRepliedBefore(newStreamPost);
+                    }
+                }, postLi, function(arg,ret) {console.log(ret)});
+        }
     }
 }
 

js/twister_formatpost.js

@@ -108,7 +108,6 @@ function postToElem( post, kind, promoted ) {
     postInfoName.text(n).attr('href', $.MAL.userUrl(n));
     getFullname( n, postInfoName );
     //elem.find('.post-info-tag').text("@" + n);
-    setPostInfoSent(n,k,elem.find('.post-info-sent'));
     getAvatar( n, elem.find('.avatar') );
     elem.find('.post-info-time').text(timeGmtToText(t)).attr('title', timeSincePost(t));
 
@@ -143,7 +142,10 @@ function postToElem( post, kind, promoted ) {
 
     if (typeof(promoted) !== 'undefined' && promoted) {
         elem.find('.post-propagate').remove();
+        postData.attr('data-promoted', 1);
+        postData.attr('data-screen-name', '!' + n);
     } else {
+        setPostInfoSent(n,k,elem.find('.post-info-sent'));
         if ($.Options.filterLang.val !== 'disable' && $.Options.filterLangSimulate.val) {
             // FIXME it's must be stuff from template actually
             if (typeof(post['langFilter']) !== 'undefined') {