--- twitter_pull.module	2010-01-06 23:25:46.000000000 -0500
+++ twitter_pull.module-new	2010-01-11 15:29:24.000000000 -0500
@@ -10,7 +10,7 @@ require_once (dirname(__FILE__) . '/twit
 
 define ('TWITTER_PULL_NUM_ITEMS', 5);
 define ('TWITTER_PULL_CACHE_LENGTH', 20); //-- cache for 20 minutes
-define ('TWITTER_PULL_EMPTY_MESSAGE', "No Tweets");
+define ('TWITTER_PULL_EMPTY_MESSAGE', "No Messages");
 
 define ('TWITTER_PULL_CACHE_TABLE', 'cache_pulled_tweets');
  
@@ -50,10 +50,10 @@ function twitter_pull_flush_caches() {
 * @param $themekey
 *     theme key name to use for theming the output of twitter API.
 */
-function twitter_pull_render ($twitkey, $title = NULL, $num_items = NULL, $themekey = NULL) {
+function twitter_pull_render ($twitkey, $title = NULL, $num_items = NULL, $themekey = NULL, $service = NULL) {
 
   //-- Set defaults if empty arguments were passed
-  $title = empty($title) ? t('Related Tweets') : $title;
+  $title = empty($title) ? t('Related Messages') : $title;
   $themekey = empty($themekey) ? 'twitter_pull_listing' : $themekey;
   $num_items = empty($num_items) ? twitter_pull_num_items() : $num_items;
 
@@ -69,7 +69,7 @@ function twitter_pull_render ($twitkey, 
     
     try {
       
-      $puller = new twitter_puller($twitkey, $themekey, $num_items);
+      $puller = new twitter_puller($twitkey, $themekey, $num_items, $service);
       $puller->get_items();
       $tweets = $puller->tweets;    
       
@@ -101,14 +101,14 @@ function twitter_pull_render ($twitkey, 
 /**
 * Automatically add links to hrefs and twitter usernames in a twitter message.
 */
-function twitter_pull_add_links($text) {
+function twitter_pull_add_links($tweet) {
   $pattern = '#http://(\S+)#ims';
   $repl = '<a href="http://$1">$1</a>';
-  $text = preg_replace($pattern, $repl, $text);
+  $text = preg_replace($pattern, $repl, $tweet->text);
   
   $pattern = '#@(\w+)#ims';
-  $repl = '@<a href="http://twitter.com/$1">$1</a>';
-  $text = preg_replace($pattern, $repl, $text);
+  $repl = '@<a href="'. $tweet->url_root .'$1">$1</a>';
+  $text = preg_replace($pattern, $repl, $tweet->text);
   
   return $text;
 }
@@ -147,4 +147,4 @@ function twitter_pull_menu() {
 function twitter_pull_test() {
   return twitter_pull_render('@inadarei');  
 }
-*/
\ No newline at end of file
+*/