embr

[embrj/master.git] / ajax / updateTimeline.php

diff --git a/ajax/updateTimeline.php b/ajax/updateTimeline.php
index 94a81ab..397a200 100644 (file)
--- a/ajax/updateTimeline.php
+++ b/ajax/updateTimeline.php
@@ -1,64 +1,49 @@
-<?php\r
-       if(!isset($_SESSION)){\r
-               session_start();\r
-       }\r
-       function getTimeline(){\r
-               include ('../lib/twitese.php');\r
-               include('timeline_format.php');\r
-               $t = getTwitter();\r
-               if ( isset($_GET['since_id']) ) {\r
-\r
-                       $statuses = $t->friendsTimeline(false, $_GET['since_id']);\r
-                       $retweetes = $t->retweeted_to_me(false, false, $_GET['since_id']);\r
-                       if(count($retweetes) > 0){\r
-                               $statuses = sort_timeline($statuses, $retweetes);\r
-                       }\r
-\r
-                       $count = count($statuses);\r
-                       $html = "";\r
-                       if ($count <= 0) {\r
-                               echo "empty";\r
-                       }else{\r
-                               foreach ($statuses as $status) {\r
-                                       if($status->id < $_GET['since_id']){\r
-                                               break;\r
-                                       }\r
-                                       if(($status->user->screen_name == $t->username || $t->username == $status->retweeted_status->user->screen_name) && (strpos($status->source, "api") !== false || strpos($status->source, "rabr") !== false)){\r
-                                               $count -= 1;\r
-                                               continue;\r
-                                       }\r
-                                       if(isset($status->retweeted_status)){\r
-                                               $html .= format_retweet($status);\r
-                                       }else{\r
-                                               $html .= format_timeline($status, $t->username);\r
-                                       }\r
-                               }\r
-                               if($count == 1){\r
-                                       $tweetCounter = "$count unread tweet";\r
-                               }else{\r
-                                       $tweetCounter = "$count unread tweets";\r
-                               }\r
-                               $html .= '<div class="new">'.$tweetCounter.'</div>';\r
-                               echo $html;\r
-                       }\r
-               } else {\r
-                       echo 'error';\r
-               }\r
-       }\r
-\r
-       // force exit timeout script\r
-       //$deadline = time() + MAX_EXECUTION_TIME;\r
-       /*\r
-       function checkTimeout(){\r
-               if(time() < $GLOBALS['timeline']){\r
-                       return;\r
-               }\r
-               echo "error";\r
-               exit;\r
-       }\r
-       register_tick_function("checkTimeout");\r
-       declare(ticks = 1){\r
-        */\r
-       getTimeline();\r
-       //}\r
-?>\r
+<?php
+       if(!isset($_SESSION)){
+               session_start();
+       }
+       include ('../lib/twitese.php');
+       include('../lib/timeline_format.php');
+       $t = getTwitter();
+       if ( isset($_GET['since_id']) ) {
+               $statuses = $t->homeTimeline(false, $_GET['since_id']);
+               $count = count($statuses);
+               $html = "";
+               if ($count <= 0) {
+                       echo "empty";
+               }
+               else
+               {
+                       foreach ($statuses as $status)
+                       {
+                               if($status->id_str < $_GET['since_id'])
+                               {
+                                       break;
+                               }
+                               
+                               if(($status->user->screen_name == $t->username ) && (strpos($status->source, "api") !== false || strpos($status->source, "embr") !== false)){
+                                       $count -= 1;
+                                       continue;
+                               }
+                               elseif ( isset($status->retweeted_status) )
+                               {
+                                       if ( ($t->username == $status->retweeted_status->user->screen_name) && (strpos($status->source, "api") != false || strpos($status->source, "embr") !== false) )
+                                       {
+                                               $count -= 1;
+                                               continue;
+                                       }
+                               }
+                               if(isset($status->retweeted_status)){
+                                       $html .= format_retweet($status);
+                               }else{
+                                       $html .= format_timeline($status, $t->username);
+                               }
+                       }
+                       $tweetCounter = "<span class=\"tweetcount\">$count</span> unread tweet(s)";
+                       $html .= '<div class="new">'.$tweetCounter.'</div>';
+                       echo $html;
+               }
+       } else {
+               echo 'error';
+       }
+?>