diff --git a/couchpotato/core/notifications/twitter/main.py b/couchpotato/core/notifications/twitter/main.py index fd7d284..0d02191 100644 --- a/couchpotato/core/notifications/twitter/main.py +++ b/couchpotato/core/notifications/twitter/main.py @@ -34,13 +34,11 @@ class Twitter(Notification): def notify(self, message = '', data = None, listener = None): if not data: data = {} - log.debug('Data in notification is %s', data['identifier']) + api = Api(self.consumer_key, self.consumer_secret, self.conf('access_token_key'), self.conf('access_token_secret')) direct_message = self.conf('direct_message') direct_message_users = self.conf('screen_name') - - message = '%s%s' % (message,' - http://www.imdb.com/title/' + data['identifier'] if data['identifier'] else '') mention = self.conf('mention') mention_tag = None @@ -61,20 +59,11 @@ class Twitter(Notification): update_message = '[%s] %s' % (self.default_title, message) if len(update_message) > 140: if mention_tag: - if update_message.find(" - http://www.imdb.com/title/") < 141 and update_message.find(" - http://www.imdb.com/title/") > 0: - api.PostUpdate(update_message[:update_message.find(" - http://www.imdb.com/title/") - len(mention_tag)] + ('%s 1/2 ' % mention_tag)) - api.PostUpdate(update_message[update_message.find(" - http://www.imdb.com/title/") - len(mention_tag):] + ('%s 2/2 ' % mention_tag)) - else: - api.PostUpdate(update_message[:135 - len(mention_tag)] + ('%s 1/2 ' % mention_tag)) - api.PostUpdate(update_message[135 - len(mention_tag):] + ('%s 2/2 ' % mention_tag)) + api.PostUpdate(update_message[:135 - len(mention_tag)] + ('%s 1/2 ' % mention_tag)) + api.PostUpdate(update_message[135 - len(mention_tag):] + ('%s 2/2 ' % mention_tag)) else: - if update_message.find(" - http://www.imdb.com/title/") < 141 and update_message.find(" - http://www.imdb.com/title/") > 0: - api.PostUpdate(update_message[:update_message.find(" - http://www.imdb.com/title/")] + ' 1/2') - api.PostUpdate(update_message[update_message.find(" - http://www.imdb.com/title/"):] + ' 2/2') - else: - api.PostUpdate(update_message[:135] + ' 1/2') - api.PostUpdate(update_message[135:] + ' 2/2') - + api.PostUpdate(update_message[:135] + ' 1/2') + api.PostUpdate(update_message[135:] + ' 2/2') else: api.PostUpdate(update_message) except Exception as e: