Merge branch 'next-gen' of https://github.com/manuelcortez/twblue into next-gen

src/controller/buffersController.py

@@ -585,10 +585,10 @@ class baseBufferController(bufferController):
     url=urls_list.get_string()
    if hasattr(urls_list, "destroy"): urls_list.destroy()
   if url != '':
-   try:
-    sound.URLPlayer.play(url, self.session.settings["sound"]["volume"])
-   except:
-    log.error("Exception while executing audio method.")
+#   try:
+   sound.URLPlayer.play(url, self.session.settings["sound"]["volume"])
+#   except:
+#    log.error("Exception while executing audio method.")
 
 # @_tweets_exist
  def url(self, url='', announce=True, *args, **kwargs):

src/sessionmanager/session.py

@@ -353,7 +353,7 @@ class Session(object):
    self.logged = False
    self.twitter = twitter.twitter.twitter()
    self.login(False)
-#   pub.sendMessage("restart_streams", session=self.session_id)
+   pub.sendMessage("restart_streams", session=self.session_id)
   if self.reconnection_function_active == True:  return
   self.reconnection_function_active = True
   if not hasattr(self, "main_stream"):

src/twitter/buffers/indibidual.py

@@ -38,25 +38,29 @@ class timelinesStreamer(TwythonStreamer):
      data_ = self.session.check_quoted_status(data)
      data_ = self.session.check_long_tweet(data_)
      data = data_
-    except AttributeError:
+    except ValueError:
      pass
     if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s-timeline" % (i,)].append(data)
     else: self.session.db["%s-timeline" % (i,)].insert(0, data)
     pub.sendMessage("item-in-timeline", data= data, user= self.session.db["user_name"], who= i)
+    return
   for i in self.session.lists:
    try:
     i.users.index(data["user"]["id"])
     usr = data["in_reply_to_user_id"]
     if (usr != None and usr in self.friends) or data.has_key("retweeted_status"):
      data = self.session.check_quoted_status(data)
+     data = self.session.check_long_tweet(data)
      if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s" % (i.name,)].append(data)
      else: self.session.db["%s" % (i.name,)].insert(0, data)
      pub.sendMessage("item-in-list", data=data, user=self.session.db["user_name"], where=i.name)
     elif usr == None:
+     data = self.session.check_quoted_status(data)
+     data = self.session.check_long_tweet(data)
      if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s" % (i.name,)].append(data)
      else: self.session.db["%s" % (i.name,)].insert(0, data)
      pub.sendMessage("item-in-list", data=data, user=self.session.db["user_name"], where=i.name)
-   except ValueError:
+   except NameError:
     pass
 
  def set_friends(self, friends):

src/twitter/buffers/stream.py

@@ -127,8 +127,8 @@ class streamer(TwythonStreamer):
 
  def on_success(self, data):
   try:
-   if "delete" in data:
-    pub.sendMessage("tweet-deleted", data=data)
+#   if "delete" in data:
+#    pub.sendMessage("tweet-deleted", data=data)
    if "direct_message" in data:
     self.process_dm(data)
    elif "friends" in data: