mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-01-31 13:20:45 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

tweets, replies and retweets will be added to sent tweets after being sent

Browse Source
This commit is contained in:
Manuel Cortez 2018-08-16 11:17:15 -05:00
parent b44e30ed28
commit 2668e47a6f
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/controller/buffersController.py
View File

@ -162,9 +162,11 @@ class bufferController(object):
else: else:
text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text, 1) text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text, 1)
if not hasattr(tweet, "attachments") or len(tweet.attachments) == 0: if not hasattr(tweet, "attachments") or len(tweet.attachments) == 0:
call_threaded(self.session.api_call, call_name="update_status", status=text, _sound="tweet_send.ogg") item = self.session.api_call(call_name="update_status", status=text, _sound="tweet_send.ogg")
else: # else:
call_threaded(self.post_with_media, text=text, attachments=tweet.attachments, _sound="tweet_send.ogg") # call_threaded(self.post_with_media, text=text, attachments=tweet.attachments, _sound="tweet_send.ogg")
if item != None:
pub.sendMessage("sent-tweet", data=item, user=self.session.db["user_name"])
if hasattr(tweet.message, "destroy"): tweet.message.destroy() if hasattr(tweet.message, "destroy"): tweet.message.destroy()
self.session.settings.write() self.session.settings.write()
@ -568,7 +570,9 @@ class baseBufferController(bufferController):
else: else:
params["call_name"] = "update_status_with_media" params["call_name"] = "update_status_with_media"
params["media"] = message.file params["media"] = message.file
call_threaded(self.session.api_call, **params) item = self.session.api_call(**params)
if item != None:
pub.sendMessage("sent-tweet", data=item, user=self.session.db["user_name"])
if hasattr(message.message, "destroy"): message.message.destroy() if hasattr(message.message, "destroy"): message.message.destroy()
self.session.settings.write() self.session.settings.write()
@ -637,13 +641,17 @@ class baseBufferController(bufferController):
text = retweet.message.get_text() text = retweet.message.get_text()
text = text+" https://twitter.com/{0}/status/{1}".format(tweet["user"]["screen_name"], id) text = text+" https://twitter.com/{0}/status/{1}".format(tweet["user"]["screen_name"], id)
if retweet.image == None: if retweet.image == None:
call_threaded(self.session.api_call, call_name="update_status", _sound="retweet_send.ogg", status=text, in_reply_to_status_id=id) item = self.session.api_call(call_name="update_status", _sound="retweet_send.ogg", status=text, in_reply_to_status_id=id)
if item != None:
pub.sendMessage("sent-tweet", data=item, user=self.session.db["user_name"])
else: else:
call_threaded(self.session.api_call, call_name="update_status", _sound="retweet_send.ogg", status=text, media=retweet.image) call_threaded(self.session.api_call, call_name="update_status", _sound="retweet_send.ogg", status=text, media=retweet.image)
if hasattr(retweet.message, "destroy"): retweet.message.destroy() if hasattr(retweet.message, "destroy"): retweet.message.destroy()
def _direct_retweet(self, id): def _direct_retweet(self, id):
call_threaded(self.session.api_call, call_name="retweet", _sound="retweet_send.ogg", id=id) item = self.session.api_call(call_name="retweet", _sound="retweet_send.ogg", id=id)
if item != None:
pub.sendMessage("sent-tweet", data=item, user=self.session.db["user_name"])
def onFocus(self, *args, **kwargs): def onFocus(self, *args, **kwargs):
tweet = self.get_tweet() tweet = self.get_tweet()
@ -809,7 +817,9 @@ class directMessagesController(baseBufferController):
config.app["app-settings"]["longtweet"] = message.message.long_tweet.GetValue() config.app["app-settings"]["longtweet"] = message.message.long_tweet.GetValue()
config.app.write() config.app.write()
if message.image == None: if message.image == None:
call_threaded(self.session.api_call, call_name="update_status", _sound="reply_send.ogg", status=message.message.get_text()) item = self.session.api_call(call_name="update_status", _sound="reply_send.ogg", status=message.message.get_text())
if item != None:
pub.sendMessage("sent-tweet", data=item, user=self.session.db["user_name"])
else: else:
call_threaded(self.session.api_call, call_name="update_status_with_media", _sound="reply_send.ogg", status=message.message.get_text(), media=message.file) call_threaded(self.session.api_call, call_name="update_status_with_media", _sound="reply_send.ogg", status=message.message.get_text(), media=message.file)
if hasattr(message.message, "destroy"): message.message.destroy() if hasattr(message.message, "destroy"): message.message.destroy()
@ -1012,7 +1022,9 @@ class peopleBufferController(baseBufferController):
config.app["app-settings"]["longtweet"] = message.message.long_tweet.GetValue() config.app["app-settings"]["longtweet"] = message.message.long_tweet.GetValue()
config.app.write() config.app.write()
if message.image == None: if message.image == None:
call_threaded(self.session.api_call, call_name="update_status", _sound="reply_send.ogg", status=message.message.get_text()) item = self.session.api_call(call_name="update_status", _sound="reply_send.ogg", status=message.message.get_text())
if item != None:
pub.sendMessage("sent-tweet", data=item, user=self.session.db["user_name"])
else: else:
call_threaded(self.session.api_call, call_name="update_status_with_media", _sound="reply_send.ogg", status=message.message.get_text(), media=message.file) call_threaded(self.session.api_call, call_name="update_status_with_media", _sound="reply_send.ogg", status=message.message.get_text(), media=message.file)
if hasattr(message.message, "destroy"): message.message.destroy() if hasattr(message.message, "destroy"): message.message.destroy()

9
src/controller/mainController.py
View File

@ -1252,9 +1252,12 @@ class Controller(object):
def manage_sent_tweets(self, data, user): def manage_sent_tweets(self, data, user):
buffer = self.search_buffer("sent_tweets", user) buffer = self.search_buffer("sent_tweets", user)
if buffer == None: return if buffer == None: return
play_sound = "tweet_send.ogg" # if "sent_tweets" not in buffer.session.settings["other_buffers"]["muted_buffers"]:
if "sent_tweets" not in buffer.session.settings["other_buffers"]["muted_buffers"]: # self.notify(buffer.session, play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound) if buffer.session.settings["general"]["reverse_timelines"] == False:
buffer.session.db[buffer.name].append(data)
else:
buffer.session.db[buffer.name].insert(0, data)
buffer.add_new_item(data) buffer.add_new_item(data)
def manage_friend(self, data, user): def manage_friend(self, data, user):