mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-29 22:23:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mastodon: Started working on recovering from errors when sending posts. #527, #526, #377, #137, #108

Browse Source
This commit is contained in:
Manuel Cortez 2023-03-23 11:58:42 -06:00
parent ae5515b6e1
commit d320daa6a1
No known key found for this signature in database
GPG Key ID: 9E0735CA15EFE790
1 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/sessions/mastodon/session.py
View File

@ -6,6 +6,7 @@ import logging
import webbrowser import webbrowser
import wx import wx
import mastodon import mastodon
import demoji
import config import config
import config_utils import config_utils
import output import output
@ -123,14 +124,23 @@ class Session(base.baseSession):
self.db["muted_users"] = self.api.mutes() self.db["muted_users"] = self.api.mutes()
def get_user_alias(self, user): def get_user_alias(self, user):
if user.display_name == None or user.display_name == "":
display_name = user.username
else:
display_name = user.display_name
aliases = self.settings.get("user-aliases") aliases = self.settings.get("user-aliases")
if aliases == None: if aliases == None:
log.error("Aliases are not defined for this config spec.") log.error("Aliases are not defined for this config spec.")
return user.name return self.demoji_user(display_name)
user_alias = aliases.get(user.id_str) user_alias = aliases.get(user.id)
if user_alias != None: if user_alias != None:
return user_alias return user_alias
return user.name return self.demoji_user(display_name)
def demoji_user(self, name):
if self.settings["general"]["hide_emojis"] == True:
return demoji.replace(name, "")
return name
def order_buffer(self, name, data, ignore_older=False): def order_buffer(self, name, data, ignore_older=False):
num = 0 num = 0
@ -173,25 +183,24 @@ class Session(base.baseSession):
tries = 0 tries = 0
if preexec_message: if preexec_message:
output.speak(preexec_message, True) output.speak(preexec_message, True)
while finished==False and tries < 25: while finished==False and tries < 5:
try: try:
val = getattr(self.api, call_name)(*args, **kwargs) val = getattr(self.api, call_name)(*args, **kwargs)
finished = True finished = True
except MastodonError as e: except Exception as e:
output.speak(str(e)) output.speak(str(e))
val = None val = None
if type(e) != MastodonNotFoundError and type(e) != MastodonUnauthorizedError : if type(e) != MastodonNotFoundError and type(e) != MastodonUnauthorizedError :
tries = tries+1 tries = tries+1
time.sleep(5) time.sleep(5)
elif report_failure: if tries == 4 and finished == False:
output.speak(_("%s failed. Reason: %s") % (action, str(e))) raise e
finished = True else:
# except: raise e
# tries = tries + 1
# time.sleep(5)
if report_success: if report_success:
output.speak(_("%s succeeded.") % action) output.speak(_("%s succeeded.") % action)
if _sound != None: self.sound.play(_sound) if _sound != None:
self.sound.play(_sound)
return val return val
def send_post(self, reply_to=None, users=None, visibility=None, posts=[]): def send_post(self, reply_to=None, users=None, visibility=None, posts=[]):
@ -200,11 +209,18 @@ class Session(base.baseSession):
for obj in posts: for obj in posts:
text = obj.get("text") text = obj.get("text")
if len(obj["attachments"]) == 0: if len(obj["attachments"]) == 0:
try:
item = self.api_call(call_name="status_post", status=text, _sound="tweet_send.ogg", in_reply_to_id=in_reply_to_id, visibility=visibility, sensitive=obj["sensitive"], spoiler_text=obj["spoiler_text"]) item = self.api_call(call_name="status_post", status=text, _sound="tweet_send.ogg", in_reply_to_id=in_reply_to_id, visibility=visibility, sensitive=obj["sensitive"], spoiler_text=obj["spoiler_text"])
# If it fails, let's basically send an event with all passed info so we will catch it later.
except Exception as e:
pub.sendMessage("mastodon.error_post", reply_to=reply_to, users=users, visibility=visibility, posts=posts)
print("message sent")
return
if item != None: if item != None:
in_reply_to_id = item["id"] in_reply_to_id = item["id"]
else: else:
media_ids = [] media_ids = []
try:
poll = None poll = None
if len(obj["attachments"]) == 1 and obj["attachments"][0]["type"] == "poll": if len(obj["attachments"]) == 1 and obj["attachments"][0]["type"] == "poll":
poll = self.api.make_poll(options=obj["attachments"][0]["options"], expires_in=obj["attachments"][0]["expires_in"], multiple=obj["attachments"][0]["multiple"], hide_totals=obj["attachments"][0]["hide_totals"]) poll = self.api.make_poll(options=obj["attachments"][0]["options"], expires_in=obj["attachments"][0]["expires_in"], multiple=obj["attachments"][0]["multiple"], hide_totals=obj["attachments"][0]["hide_totals"])
@ -215,6 +231,9 @@ class Session(base.baseSession):
item = self.api_call(call_name="status_post", status=text, _sound="tweet_send.ogg", in_reply_to_id=in_reply_to_id, media_ids=media_ids, visibility=visibility, poll=poll, sensitive=obj["sensitive"], spoiler_text=obj["spoiler_text"]) item = self.api_call(call_name="status_post", status=text, _sound="tweet_send.ogg", in_reply_to_id=in_reply_to_id, media_ids=media_ids, visibility=visibility, poll=poll, sensitive=obj["sensitive"], spoiler_text=obj["spoiler_text"])
if item != None: if item != None:
in_reply_to_id = item["id"] in_reply_to_id = item["id"]
except Exception as e:
pub.sendMessage("mastodon.error_post", reply_to=reply_to, users=users, visibility=visibility, posts=posts)
return
def get_name(self): def get_name(self):
instance = self.settings["mastodon"]["instance"] instance = self.settings["mastodon"]["instance"]