Removed hardcoded icculus username.

icculus · Nov 10, 2012 · b143188 · b143188
1 parent 9afc6ac
commit b143188
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/cachetweets.php b/cachetweets.php
@@ -60,7 +60,7 @@
     /* If method is set change API call made. Test is called by default. */
     $content = $connection->get('account/verify_credentials');
 
-    $data = $connection->get('statuses/user_timeline', array('screen_name' => 'icculus', 'count' => '2000', 'include_entities' => 'true', 'include_rts' => 'true', 'since_id' => $maxtweet));
+    $data = $connection->get('statuses/user_timeline', array('screen_name' => TWITTER_USERNAME, 'count' => '2000', 'include_entities' => 'true', 'include_rts' => 'true', 'since_id' => $maxtweet));
 }
 
 
@@ -79,7 +79,7 @@
         }
     }
 
-    //if ($tweet->user->screen_name != "icculus") { print ("tweet $id is probably a retweet: '{$tweet->text}'\n"); continue; }
+    //if ($tweet->user->screen_name != TWITTER_USERNAME) { print ("tweet $id is probably a retweet: '{$tweet->text}'\n"); continue; }
 
     $id = $tweet->id_str;
     $cachefname = "$cachedir/$id";

diff --git a/index.php b/index.php
@@ -20,10 +20,13 @@
     }
 }
 
+$uname = TWITTER_USERNAME;
+$baseurl = "http://twitter.icculus.org/$uname";
+
 header('Content-Type: text/html; charset=UTF-8');
 print("<html><head>");
-print("<link rel='alternate' type='application/rss+xml' title='Twitter / icculus' href='http://icculus.org/~icculus/tweets/rss.php' />");
-print("<title>Twitter / icculus</title></head><body>\n");
+print("<link rel='alternate' type='application/rss+xml' title='Twitter / $uname' href='$baseurl/rss/' />");
+print("<title>Twitter / $uname</title></head><body>\n");
 
 foreach ($data as $tweet)
 {
@@ -32,11 +35,7 @@
     print($tweet->html);
 }
 
-if (0)
-{
-    print("<pre>\n\n\n\n");
-    print_r($data);
-}
-
 print("\n</body></html>\n\n");
 
+?>
+
diff --git a/rss/index.php b/rss/index.php
@@ -35,17 +35,19 @@ function xml_entities($str)
 
 header('Content-Type: text/xml; charset=UTF-8');
 
+$uname = TWITTER_USERNAME;
+
 print( <<<EOS
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
 <channel>
-  <title>Twitter / icculus</title>
-  <link>https://twitter.com/icculus</link>
-  <tagline>Tweets from @icculus</tagline>
+  <title>Twitter / $uname</title>
+  <link>https://twitter.com/$uname</link>
+  <tagline>Tweets from @$uname</tagline>
   <image>
     <url>https://twitter.com/images/resources/twitter-bird-light-bgs.png</url>
-    <title>Twitter / icculus</title>
-    <link>https://twitter.com/icculus</link>
+    <title>Twitter / $uname</title>
+    <link>https://twitter.com/$uname</link>
   </image>
 
 EOS
@@ -62,7 +64,7 @@ function xml_entities($str)
 
     print( <<<EOS
   <item>
-    <guid>tag:icculus.org/TwitterIcculusRssBridge/icculus/status/$origid</guid>
+    <guid>tag:twitter.icculus.org/$uname/status/$origid</guid>
     <title>$text</title>
     <link>{$tweet->embed->url}</link>
     <summary>$text</summary>