Merge branch 'master' of https://github.com/isld/forward-to-the-past

server/server.py

@@ -36,15 +36,13 @@ class TwitterApi():
     api = tweepy.API(auth)
 
     def send(self, tweet):
-        response = self.tweet[27:]
+        self.api.update_status(status=tweet)
-        self.api.update_status(status=self.response)
 
     def get_tweets_by_tag(self, tag):
         tweets = ""
         feed = self.api.search(tag, count=20)
-        timestamp = int(time.time())
         for i in feed:
-            tweets = tweets + "0x7F0x7F0x7F0x7F" + str(timestamp) + "@" + i.user.screen_name + i.text + "\n"
+            tweets = tweets + i.user.screen_name + ": " + i.text + "\n"
         return tweets.encode('utf-8').strip()