From 48730ead63695ac088140ace36c9a3c2d550976f Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Mon, 21 Nov 2022 19:36:34 -0600 Subject: [PATCH] Keep sensitive content tag when replying to posts --- src/controller/buffers/mastodon/base.py | 9 +++++++++ src/controller/buffers/mastodon/conversations.py | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/controller/buffers/mastodon/base.py b/src/controller/buffers/mastodon/base.py index 9b860d36..452587af 100644 --- a/src/controller/buffers/mastodon/base.py +++ b/src/controller/buffers/mastodon/base.py @@ -303,6 +303,11 @@ class BaseBuffer(base.Buffer): post = messages.post(session=self.session, title=title, caption=caption, text=users_str) visibility_settings = dict(public=0, unlisted=1, private=2, direct=3) post.message.visibility.SetSelection(visibility_settings.get(visibility)) + # Respect content warning settings. + if item.sensitive: + post.message.sensitive.SetValue(item.sensitive) + post.message.spoiler.ChangeValue(item.spoiler_text) + post.message.on_sensitivity_changed() response = post.message.ShowModal() if response == wx.ID_OK: post_data = post.get_data() @@ -325,6 +330,10 @@ class BaseBuffer(base.Buffer): users_str = "".join(users) post = messages.post(session=self.session, title=title, caption=caption, text=users_str) post.message.visibility.SetSelection(3) + if item.sensitive: + post.message.sensitive.SetValue(item.sensitive) + post.message.spoiler.ChangeValue(item.spoiler_text) + post.message.on_sensitivity_changed() response = post.message.ShowModal() if response == wx.ID_OK: post_data = post.get_data() diff --git a/src/controller/buffers/mastodon/conversations.py b/src/controller/buffers/mastodon/conversations.py index cbed5610..6ae5ccc4 100644 --- a/src/controller/buffers/mastodon/conversations.py +++ b/src/controller/buffers/mastodon/conversations.py @@ -180,6 +180,10 @@ class ConversationListBuffer(BaseBuffer): post = messages.post(session=self.session, title=title, caption=caption, text=users_str) visibility_settings = dict(public=0, unlisted=1, private=2, direct=3) post.message.visibility.SetSelection(visibility_settings.get(visibility)) + if item.sensitive: + post.message.sensitive.SetValue(item.sensitive) + post.message.spoiler.ChangeValue(item.spoiler_text) + post.message.on_sensitivity_changed() response = post.message.ShowModal() if response == wx.ID_OK: post_data = post.get_data()