Changeset 38977 for websites

Timestamp:

08/19/11 01:39:28 (21 months ago)

Author:

NeoCat

Message:

Merge remote-tracking branch 'wa-/pic.twitter.com'

Location:

websites/twicli

Files:

• plugins/lists.js (modified) (2 diffs)
• plugins/thumbnail.js (modified) (1 diff)
• twicli.js (modified) (13 diffs)

websites/twicli/plugins/lists.js

@@ -112 +112 @@
         xds.load_for_tab(twitterAPI + 'lists/statuses.json?seq=' + (seq++)
                         + '&owner_screen_name=' + last_list[0] + '&slug=' + last_list[1]
-                        + '&include_rts=true&per_page=' + max_count_u, twlShowListStatus);
+                        + '&include_entities=true&include_rts=true&per_page=' + max_count_u,
+                        twlShowListStatus);
         return false;
 }
@@ -127 +128 @@
         xds.load_for_tab(twitterAPI + 'lists/statuses.json?seq=' + (seq++)
                         + '&owner_screen_name=' + last_list[0] + '&slug=' + last_list[1]
-                        + '&include_rts=true&per_page=' + max_count_u
+                        + '&include_entities=true&include_rts=true&per_page=' + max_count_u
                         + '&max_id=' + tw[tw.length-1].id, twlShowListStatus);
         }

websites/twicli/plugins/thumbnail.js

@@ -1 +1 @@
 registerPlugin({
-        newMessageElement: function(elem) {
+        newMessageElement: function(elem, tw) {
+                if (tw.entities && tw.entities.media) {
+                        for (var i = 0; i < tw.entities.media.length; i++) {
+                                if (tw.entities.media[i].type == "photo") {
+                                        addThumbnail(elem,
+                                                tw.entities.media[i].media_url + ":thumb",
+                                                tw.entities.media[i].media_url + ":large");
+                                }
+                        }
+                }
                 var status = null;
                 for(var i = 0; i < elem.childNodes.length; i++) {

websites/twicli/twicli.js

@@ -616 +616 @@
                 }
                 if (cascade) return;
-                reply_ele = xds.load_default(twitterAPI + 'statuses/show/'+id+'.json?suppress_response_codes=true', dispReply2, reply_ele);
+                reply_ele = xds.load_default(twitterAPI + 'statuses/show/'+id+'.json?include_entities=true&suppress_response_codes=true', dispReply2, reply_ele);
                 return;
         }
@@ -761 +761 @@
         update_ele = xds.load_default(twitterAPI + 'statuses/home_timeline.json' +
                                                 '?count=' + (since_id ? 200 : max_count) +
-                                                '&suppress_response_codes=true'
+                                                '&include_entities=true&suppress_response_codes=true'
                                                 + (!no_since_id && since_id ? '&since_id='+since_id : ''), twShow, update_ele);
         resetUpdateTimer();
@@ -1004 +1004 @@
                                                 '?count=' + (since_id_reply ? 200 : max_count_u) +
                                                 (since_id_reply ? '&since_id='+since_id_reply : '') +
-                                                '&suppress_response_codes=true', twReplies, reply_ele2);
+                                                '&indclude_entities=true&suppress_response_codes=true',
+                                                twReplies, reply_ele2);
                 update_reply_counter = 4;
 }
@@ -1120 +1121 @@
                                         (fav_mode == 2 ? 'statuses/friends.json' : 'statuses/followers.json') +
                                         '?screen_name=' + last_user + '&cursor=' + tw.next_cursor +
-                                        '&suppress_response_codes=true', twUsers);
+                                        '&include_entities=true&suppress_response_codes=true', twUsers);
                 };
         }
@@ -1255 +1256 @@
         update_ele2 = xds.load_default(twitterAPI + 'statuses/home_timeline.json' +
                                 '?count=200&page=' + (nr_page++) +
-                                '&suppress_response_codes=true', twOld, update_ele2);
+                                '&include_entities=true&suppress_response_codes=true', twOld, update_ele2);
 }
 function getOldReply() {
         update_ele2 = xds.load_default(twitterAPI + 'statuses/mentions.json' +
                                 '?count=' + max_count_u + '&page=' + (nr_page_re++) +
-                                '&suppress_response_codes=true', twOldReply, update_ele2);
+                                '&include_entities=true&suppress_response_codes=true', twOldReply, update_ele2);
 }
 function getNextFuncCommon() {
@@ -1266 +1267 @@
                 xds.load_for_tab(twitterAPI + 'statuses/user_timeline.json' +
                                         '?count=' + max_count_u + '&page=' + (++cur_page) + '&screen_name=' + last_user +
-                                        '&include_rts=true&suppress_response_codes=true', twShow2);
+                                        '&include_rts=true&include_entities=true&suppress_response_codes=true', twShow2);
         else if (selected_menu.id == "user" && fav_mode == 1)
                 xds.load_for_tab(twitterAPI + 'favorites/' + last_user + '.json' +
@@ -1274 +1275 @@
                 xds.load_for_tab(twitterAPI + 'statuses/following_timeline.json' +
                                         '?count = ' + max_count_u + '&max_id=' + max_id + '&suppress_response_codes=true' +
-                                        '&screen_name=' + last_user, twShow2);
+                                        '&include_entities=true&screen_name=' + last_user, twShow2);
         }
 }
@@ -1354 +1355 @@
                 xds.load_for_tab(twitterAPI + 'statuses/user_timeline.json' +
                         '?count=' + max_count_u + '&screen_name=' + user + 
-                        '&include_rts=true&suppress_response_codes=true', twShow2);
+                        '&include_rts=true&include_entities=true&suppress_response_codes=true', twShow2);
         } else {
                 users_log = [];
@@ -1360 +1361 @@
                 for (var i = 0; i < users.length; i++)
                         xds.load_for_tab(twitterAPI + 'statuses/user_timeline.json?screen_name=' + users[i] +
-                                                 '&include_rts=true&suppress_response_codes=true&count=' + max_count_u, twShow3);
+                                                 '&include_rts=true&include_entities=true&suppress_response_codes=true&count=' + max_count_u, twShow3);
         }
 }
@@ -1369 +1370 @@
         xds.load_for_tab(twitterAPI + 'statuses/user_timeline.json' +
                 '?count=' + max_count_u + '&screen_name=' + last_user + 
-                '&include_rts=true&suppress_response_codes=true', twShow2);
+                '&include_rts=true&include_entities=true&suppress_response_codes=true', twShow2);
 }
 function switchFav() {
@@ -1383 +1384 @@
         $("tw2c").innerHTML = "";
         xds.load_for_tab(twitterAPI + 'statuses/friends.json?screen_name=' + last_user + 
-                                                                                '&cursor=-1&suppress_response_codes=true', twUsers);
+                                                                                '&cursor=-1&include_entities=true&suppress_response_codes=true', twUsers);
 }
 function switchFollowingTL() {
@@ -1390 +1391 @@
         $("tw2c").innerHTML = "";
         xds.load_for_tab(twitterAPI + 'statuses/following_timeline.json?screen_name=' + last_user + 
-                                                                                '&cursor=-1&suppress_response_codes=true', twShow2);
+                                                                                '&cursor=-1&include_entities=true&suppress_response_codes=true', twShow2);
 }
 function switchFollower() {
@@ -1397 +1398 @@
         $("tw2c").innerHTML = "";
         xds.load_for_tab(twitterAPI + 'statuses/followers.json' +
-                        '?screen_name=' + last_user + '&cursor=-1&suppress_response_codes=true', twUsers);
+                        '?screen_name=' + last_user + '&cursor=-1&include_entities=true&suppress_response_codes=true', twUsers);
 }
 function switchDirect() {