diff --git a/js/interface_common.js b/js/interface_common.js index 3ec2e51..58b0b33 100644 --- a/js/interface_common.js +++ b/js/interface_common.js @@ -185,15 +185,18 @@ function openHashtagModalFromSearchHandler(hashtag) $( "."+hashtagModalClass + " h3" ).text( "#" + hashtag ); } -function updateHashtagModal(postboard,hashtag) { +function updateHashtagModal(postboard,hashtag,timeoutArgs) { var $hashtagModalClass = $(".hashtag-modal"); if( !$hashtagModalClass.length || $hashtagModalClass.css("display") == 'none' ) return; var resource = $hashtagModalClass.attr("data-resource"); - requestHashtag(postboard,hashtag,resource); - setTimeout( function() {updateHashtagModal(postboard,hashtag);}, 5000); + requestHashtag(postboard,hashtag,resource,timeoutArgs); + // use extended timeout parameters on modal refresh (requires twister_core >= 0.9.14). + // our first query above should be faster (with default timeoutArgs of twisterd), + // then we may possibly collect more posts on our second try by waiting more. + setTimeout( function() {updateHashtagModal(postboard,hashtag,[10000,2000,3]);}, 5000); } function openMentionsModal(e) diff --git a/js/twister_actions.js b/js/twister_actions.js index 08bbb71..8fa780a 100644 --- a/js/twister_actions.js +++ b/js/twister_actions.js @@ -298,12 +298,12 @@ function clearHashtagProcessed() { _hashtagPendingPosts = []; } -function requestHashtag(postboard,hashtag,resource) { +function requestHashtag(postboard,hashtag,resource, timeoutArgs) { dhtget( hashtag, resource, "m", function(args, data) { processHashtag(args.postboard, args.hashtag, data); }, {postboard:postboard,hashtag:hashtag}, - [10000,2000,3]); // use extended timeout parameters (requires twister_core >= 0.9.14) + timeoutArgs); } function processHashtag(postboard, hashtag, data) {