Changed how replies works in TWBlue

src/controller/buffersController.py

@@ -479,23 +479,23 @@ class baseBufferController(bufferController):
   tweet = self.get_right_tweet()
   screen_name = tweet["user"]["screen_name"]
   id = tweet["id"]
-  users = utils.get_all_mentioned(tweet, self.session.db)
-  message = messages.reply(self.session, _(u"Reply"), _(u"Reply to %s") % (screen_name,), "", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"], users=users)
+  users = utils.get_all_mentioned(tweet, self.session.db, field="screen_name")
+  ids = utils.get_all_mentioned(tweet, self.session.db, field="id_str")
+  message = messages.reply(self.session, _(u"Reply"), _(u"Reply to %s") % (screen_name,), "", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"], users=users, ids=ids)
   if message.message.get_response() == widgetUtils.OK:
    self.session.settings["mysc"]["twishort_enabled"] = message.message.long_tweet.GetValue()
    self.session.settings["mysc"]["mention_all"] = message.message.mentionAll.GetValue()
+   excluded_ids = message.get_ids()
    text = message.message.get_text()
-   if message.message.mentionAll.GetValue() == False:
-    text = u"@{0} {1}".format(screen_name, text)
    if len(text) > 140 and message.message.get("long_tweet") == True:
     if message.image == None:
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text)
     else:
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text, 1)
    if message.image == None:
-    call_threaded(self.session.api_call, call_name="update_status", _sound="reply_send.ogg", in_reply_to_status_id=id, status=text, auto_populate_reply_metadata=message.message.mentionAll.GetValue())
+    call_threaded(self.session.api_call, call_name="update_status", _sound="reply_send.ogg", in_reply_to_status_id=id, status=text, auto_populate_reply_metadata=True, exclude_reply_user_ids=excluded_ids)
    else:
-    call_threaded(self.session.api_call, call_name="update_status_with_media", _sound="reply_send.ogg", in_reply_to_status_id=id, status=text, media=message.file, auto_populate_reply_metadata=message.message.mentionAll.GetValue())
+    call_threaded(self.session.api_call, call_name="update_status_with_media", _sound="reply_send.ogg", in_reply_to_status_id=id, status=text, media=message.file, auto_populate_reply_metadata=True, exclude_reply_user_ids=excluded_ids)
   if hasattr(message.message, "destroy"): message.message.destroy()
 
  @_tweets_exist

src/controller/mainController.py

@@ -1324,18 +1324,17 @@ class Controller(object):
  def manage_stream_errors(self, session):
   log.error(" Restarting %s session streams. It will be destroyed" % (session,))
   s = session_.sessions[session]
-  if hasattr(s, "main_stream"):
-   s.main_stream.disconnect()
-   log.error("main stream disconnected")
-   del s.main_stream
-  if hasattr(s, "timelinesStream"):
-   s.timelinesStream.disconnect()
-   del s.timelinesStream
+  try:
+   if hasattr(s, "main_stream"):
+    s.main_stream.disconnect()
+    log.error("main stream disconnected")
+    del s.main_stream
+   if hasattr(s, "timelinesStream"):
+    s.timelinesStream.disconnect()
+    del s.timelinesStream
+  except AttributeError:
+   pass
   s.counter = 0
-#  s.reconnection_function_active = False
-#  for i in self.buffers:
-#   if i.invisible == True and i.session.session_id == s.session_id and i.type != "people":
-#    i.start_stream()
 #  s.listen_stream_error()
 
  def check_connection(self):

src/controller/messages.py

@@ -18,12 +18,12 @@ from twitter import utils
 
 class basicTweet(object):
  """ This class handles the tweet main features. Other classes should derive from this class."""
- def __init__(self, session, title, caption, text, messageType="tweet", max=140):
+ def __init__(self, session, title, caption, text, messageType="tweet", max=140, *args, **kwargs):
   super(basicTweet, self).__init__()
   self.max = max
   self.title = title
   self.session = session
-  self.message = getattr(message, messageType)(title, caption, text)
+  self.message = getattr(message, messageType)(title, caption, text, *args, **kwargs)
   widgetUtils.connect_event(self.message.spellcheck, widgetUtils.BUTTON_PRESSED, self.spellcheck)
   widgetUtils.connect_event(self.message.attach, widgetUtils.BUTTON_PRESSED, self.attach)
 #  if system == "Windows":
@@ -125,8 +125,8 @@ class basicTweet(object):
   self.message.text_focus()
 
 class tweet(basicTweet):
- def __init__(self, session, title, caption, text, twishort_enabled, messageType="tweet", max=140):
-  super(tweet, self).__init__(session, title, caption, text, messageType, max)
+ def __init__(self, session, title, caption, text, twishort_enabled, messageType="tweet", max=140, *args, **kwargs):
+  super(tweet, self).__init__(session, title, caption, text, messageType, max, *args, **kwargs)
   self.image = None
   widgetUtils.connect_event(self.message.upload_image, widgetUtils.BUTTON_PRESSED, self.upload_image)
   widgetUtils.connect_event(self.message.autocompletionButton, widgetUtils.BUTTON_PRESSED, self.autocomplete_users)
@@ -145,21 +145,35 @@ class tweet(basicTweet):
   c.show_menu()
 
 class reply(tweet):
- def __init__(self, session, title, caption, text, twishort_enabled, users=None):
-  super(reply, self).__init__(session, title, caption, text, twishort_enabled, messageType="reply")
-  self.message.mentionAll.SetValue(True)
-  if len(users) > 1:
-#   widgetUtils.connect_event(self.message.mentionAll, widgetUtils.CHECKBOX, self.mention_all)
+ def __init__(self, session, title, caption, text, twishort_enabled, users=[], ids=[]):
+  super(reply, self).__init__(session, title, caption, text, twishort_enabled, messageType="reply", users=users)
+  self.ids = ids 
+  if len(users) > 0:
+   widgetUtils.connect_event(self.message.mentionAll, widgetUtils.CHECKBOX, self.mention_all)
    self.message.enable_button("mentionAll")
    self.message.mentionAll.SetValue(self.session.settings["mysc"]["mention_all"])
+   if self.message.mentionAll.GetValue() == True:
+    self.mention_all()
   self.message.set_cursor_at_end()
   self.text_processor()
 
  def mention_all(self, *args, **kwargs):
-  self.message.set_text(self.message.get_text()+self.users)
-  self.message.set_cursor_at_end()
-  self.message.text_focus()
-  self.text_processor()
+  if self.message.mentionAll.GetValue() == True:
+   for i in self.message.checkboxes:
+    i.SetValue(True)
+    i.Hide()
+  else:
+   for i in self.message.checkboxes:
+    i.SetValue(False)
+    i.Show()
+
+
+ def get_ids(self):
+  excluded_ids  = ""
+  for i in xrange(0, len(self.message.checkboxes)):
+   if self.message.checkboxes[i].GetValue() == False:
+    excluded_ids = excluded_ids + "{0},".format(self.ids[i],)
+  return excluded_ids
 
 class dm(basicTweet):
  def __init__(self, session, title, caption, text):