From c6433d8655c6c8b5ee4e2bb41050b9f04fb07fae Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Wed, 9 Nov 2022 10:20:14 -0600 Subject: [PATCH] Fixed reply and toot things to make it work properly --- src/controller/buffers/mastodon/base.py | 8 ++++---- src/sessions/mastodon/session.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/controller/buffers/mastodon/base.py b/src/controller/buffers/mastodon/base.py index e7b10bee..4e27aefd 100644 --- a/src/controller/buffers/mastodon/base.py +++ b/src/controller/buffers/mastodon/base.py @@ -63,7 +63,7 @@ class BaseBuffer(base.Buffer): response = toot.message.ShowModal() if response == wx.ID_OK: toot_data = toot.get_tweet_data() - call_threaded(self.session.send_toot, *toot_data) + call_threaded(self.session.send_toot, toots=toot_data) if hasattr(toot.message, "destroy"): toot.message.destroy() @@ -272,9 +272,9 @@ class BaseBuffer(base.Buffer): if response == wx.ID_OK: toot_data = toot.get_tweet_data() users = toot.get_people() - if users == "" and item.account.id != self.session.db["user_id"]: - users = users +"@{}".format(item.account.acct) - call_threaded(self.session.send_toot, item.id, users, *toot_data) + if item.account.acct not in users and item.account.id != self.session.db["user_id"]: + users = "@{} {}".format(item.account.acct, users) + call_threaded(self.session.send_toot, reply_to=item.id, users=users, toots=toot_data) if hasattr(toot.message, "destroy"): toot.message.destroy() diff --git a/src/sessions/mastodon/session.py b/src/sessions/mastodon/session.py index 53dbcac1..0ca671d8 100644 --- a/src/sessions/mastodon/session.py +++ b/src/sessions/mastodon/session.py @@ -142,21 +142,21 @@ class Session(base.baseSession): if _sound != None: self.sound.play(_sound) return val - def send_toot(self, reply_to=None, users=None, *toots): + def send_toot(self, reply_to=None, users=None, visibility=None, toots=[]): """ Convenience function to send a thread. """ in_reply_to_id = reply_to for obj in toots: if users != None: - text = "{} {}".format(users, obj.get("text")) + text = users+obj.get("text") else: text = obj.get("text") if len(obj["attachments"]) == 0: - item = self.api_call(call_name="status_post", status=text, _sound="tweet_send.ogg", in_reply_to_id=in_reply_to_id) + item = self.api_call(call_name="status_post", status=text, _sound="tweet_send.ogg", in_reply_to_id=in_reply_to_id, visibility=visibility) in_reply_to_id = item["id"] else: media_ids = [] for i in obj["attachments"]: img = self.api_call("media_post", media_file=i["file"], description=i["description"]) media_ids.append(img.id) - 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) + 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) in_reply_to_id = item["id"]