Index: comms.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tapatio/comms.module,v
retrieving revision 1.1.4.14
diff -u -p -r1.1.4.14 comms.module
--- comms.module	9 Sep 2009 22:35:05 -0000	1.1.4.14
+++ comms.module	13 Sep 2009 01:59:26 -0000
@@ -2898,9 +2898,11 @@ function comms_add_twitter_tweets() {
         watchdog('comms_group', 'comms_cron() did not succeed: '. 
           $errors);
       }
-  else if (variable_get('comms_twitterfrommsgmaxid', 0) < 
-        $message['id']) {
-        variable_set('comms_twitterfrommsgmaxid', $message['id']);
+    else {
+      $tuser_object = user_load(array('name' => $message['user']));
+      if ($tuser_object->comms_twitterfrommsgmaxid < $message['id']) {
+        user_save($tuser_object,array('comms_twitterfrommsgmaxid' => $message['id']));
+        }
       }
     }//foreach
   }//if
@@ -3061,30 +3063,31 @@ function comms_get_twitter_tweets() {
 
   $tusers = comms_get_twitter_users();
 
-
   //if there are no twitter users don't even bother
   if (count($tusers) <= 0) {
     return $return;
   }
 
-  $maxmsgid = variable_get('comms_twitterfrommsgmaxid', 0);
 
   $twitter = _comms_twitterSearchAPI_load();  
-  //it seems like we can only search for at most 8 users at a time
-  //we will limit it to 6 just to be safe
-  $offset = 0;
-  while ($tusers6 = array_slice($tusers, $offset, 6)) {
 
+  //Run a separate twitter search for each user
+  foreach($tusers as $tuser) {
+	$tuser_object = user_load(array('name' => $tuser));
+    if($maxmsgid = $tuser_object->comms_twitterfrommsgmaxid) {}
+    else {
+      $maxmsgid = 0;
+    }
     $page=1;
     $break=0;
-    //There is a situation where we may have more then 100 tweets for these 6 users
+    //There is a situation where we may have more then 100 tweets for this user
     //since the last check
     while (!$break && $page<5) {
       try {
-        $messages = $twitter->getTweetsForUsers($tusers6, 'json', $maxmsgid, $page);
+        $messages = $twitter->getTweetsForUsers(array($tuser), 'json', $maxmsgid, $page);
       }catch (Exception $e) {
-        $message =  t("There was a problem trying to get the tweets associated with users: @users. Error Message: @mess", array( 
-          '@users' => implode(', ', $tusers6), '@mess' => $e->getMessage()));
+        $message =  t("There was a problem trying to get the tweets associated with user: @user. Error Message: @mess", array( 
+          '@user' => $tuser, '@mess' => $e->getMessage()));
 
         watchdog('comms_group', $message);
 
@@ -3100,8 +3103,8 @@ function comms_get_twitter_tweets() {
         $error_message_web = scraping_twitter_error_page($messages->getData());
         $error_message_json = json_decode($messages->getData(), 1);
 
-        $message =  t("There was a problem trying to get the tweets associated with users: @users.Error Message: @errorweb. Error Message: @errorjson.", array(
-          '@users' => implode(', ', $tusers6),
+        $message =  t("There was a problem trying to get the tweets associated with user: @user.Error Message: @errorweb. Error Message: @errorjson.", array(
+          '@user' => $tuser,
           '@errorweb' => $error_message_web,
           '@errorjson' => $error_message_json['error']));
 
@@ -3138,8 +3141,8 @@ function comms_get_twitter_tweets() {
           $break=1;
         }
 
-        $message = t('Got %count tweets for users: @users', array(
-          '%count' => count($return), '@users' => implode(', ', $tusers6)));
+        $message = t('Got %count tweets for user: @user', array(
+          '%count' => count($return), '@user' => $tuser));
         comms_add_twitter_api_call(-1, -1, 'twitterSearchAPI::from()', 0, 1, 
           $message); 
 
@@ -3147,10 +3150,10 @@ function comms_get_twitter_tweets() {
     }//while
 
     $offset+=6;
-  }//while
+  }//foreach
 
-  $message = t('Got %count tweets for users: @users', array(
-    '%count' => count($return), '@users' => implode(', ', $tusers)));
+  $message = t('Got %count tweets for user: @user', array(
+    '%count' => count($return), '@user' => $tuser));
   
   watchdog("comms_group", $message);
 
@@ -3242,7 +3245,7 @@ function comms_get_twitter_group_direct_
       }
       else {
         $message = t('Got %count tweets for users: @users', array(
-          '%count' => count($return), '@users' => implode(', ', $tusers)));
+          '%count' => count($return), '@users' => $tuser));
         watchdog("comms_group", $message);
         comms_add_twitter_api_call(-1, $gid, 'getMessages', 1, 1, $message); 
         return $return;