change twitt log

diff --git a/deefuzzer.py b/deefuzzer.py
index 4d065b902ad283bebfc3f2e508f9d499095fdddd..8ca68b3e896fad3c047f458b2d45181dc1c4307f 100755 (executable)
--- a/deefuzzer.py
+++ b/deefuzzer.py
@@ -276,11 +276,14 @@ class Station(Thread):
             self.twitter_pass = self.station['twitter']['pass']
             if self.twitter_mode == '1':
                 self.twitter = Twitter(self.twitter_user, self.twitter_pass)
-        self.tinyurl = tinyurl.create_one(self.channel.url + '/m3u/' + self.m3u.split(os.sep)[-1])
+            self.twitter_tags = self.station['twitter']['tags'].split(' ')
+            self.tinyurl = tinyurl.create_one(self.channel.url + '/m3u/' + self.m3u.split(os.sep)[-1])
 
     def update_twitter(self):
         if self.twitter_mode == '1':
-            message = '%s #%s #%s' % (self.song.replace('_', ' '), self.artist.replace(' ', ''),  self.short_name)
+            message = 'now playing: %s #%s #%s' % (self.song.replace('_', ' '), self.artist.replace(' ', ''), self.short_name
+            tags = ' #' + self.twitter_tags.join(' #')
+            message = message + tags
             self.twitter.post(message[:113] + ' ' + self.tinyurl)
 
     def update_rss(self, media_list, rss_file, sub_title):