mirror of
https://github.com/MCV-Software/TWBlue.git
synced 2026-11-06 19:49:35 +01:00
Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
737322c6b9 | ||
|
|
c75be67c5e | ||
|
|
a6dfec4d29 | ||
|
|
ca9c820b1b | ||
|
|
8f8da7f394 | ||
|
|
f2883c8573 | ||
|
|
60a8ad9a91 | ||
|
|
cf8f54816d | ||
|
|
fcfa35744c | ||
|
|
a762f94546 | ||
|
|
9822f25809 | ||
|
|
1120a74dc4 | ||
|
|
8b09e9102b | ||
|
|
d0287bc5bf | ||
|
|
25f522b799 | ||
|
|
c448d86cea | ||
|
|
4b7d97aef2 |
+6
-6
@@ -8,8 +8,8 @@ chardet==7.7.0
|
|||||||
charset-normalizer==3.5.2
|
charset-normalizer==3.5.2
|
||||||
colorama==0.4.6
|
colorama==0.4.6
|
||||||
configobj==5.0.9
|
configobj==5.0.9
|
||||||
coverage==7.16.2
|
coverage==7.17.0
|
||||||
cx-Freeze==8.7.2
|
cx-Freeze==8.7.4
|
||||||
cx-Logging==3.2.1
|
cx-Logging==3.2.1
|
||||||
decorator==5.3.1
|
decorator==5.3.1
|
||||||
demoji==2.0.0
|
demoji==2.0.0
|
||||||
@@ -17,12 +17,12 @@ deepl==1.32.0
|
|||||||
future==1.0.0
|
future==1.0.0
|
||||||
grapheme==0.6.0
|
grapheme==0.6.0
|
||||||
idna==3.20
|
idna==3.20
|
||||||
importlib-metadata==9.0.1
|
importlib-metadata==10.0.0
|
||||||
iniconfig==2.3.1
|
iniconfig==2.3.1
|
||||||
libloader @ git+https://github.com/accessibleapps/libloader@bc94811c095b2e57a036acd88660be9a33260267
|
libloader @ git+https://github.com/accessibleapps/libloader@bc94811c095b2e57a036acd88660be9a33260267
|
||||||
libretranslatepy==2.1.4
|
libretranslatepy==2.1.4
|
||||||
lief==1.0.0
|
lief==1.0.0
|
||||||
Markdown==3.11.1
|
Markdown==3.11.2
|
||||||
Mastodon.py==2.3.3
|
Mastodon.py==2.3.3
|
||||||
numpy==2.5.4
|
numpy==2.5.4
|
||||||
oauthlib==4.0.0
|
oauthlib==4.0.0
|
||||||
@@ -49,11 +49,11 @@ six==1.17.0
|
|||||||
sniffio==1.3.1
|
sniffio==1.3.1
|
||||||
sound_lib @ git+https://github.com/accessibleapps/sound_lib@a439f0943fb95ee7b6ba24f51a686f47c4ad66b2
|
sound_lib @ git+https://github.com/accessibleapps/sound_lib@a439f0943fb95ee7b6ba24f51a686f47c4ad66b2
|
||||||
sqlitedict==2.1.0
|
sqlitedict==2.1.0
|
||||||
types-python-dateutil==2.9.0.20260807
|
types-python-dateutil==2.9.0.20261029
|
||||||
urllib3==2.8.0
|
urllib3==2.8.0
|
||||||
win-inet-pton==1.1.0
|
win-inet-pton==1.1.0
|
||||||
winpaths==0.2
|
winpaths==0.2
|
||||||
wxPython==4.3.2
|
wxPython==4.3.2
|
||||||
youtube-dl==2021.12.17
|
youtube-dl==2021.12.17
|
||||||
zipp==4.1.1
|
zipp==4.1.2
|
||||||
atproto>=0.0.73
|
atproto>=0.0.73
|
||||||
|
|||||||
@@ -224,19 +224,8 @@ class BaseBuffer(base.Buffer):
|
|||||||
reply_cid = self.get_selected_item_cid()
|
reply_cid = self.get_selected_item_cid()
|
||||||
# Attempt to get CID if present for consistency, though send_message handles it
|
# Attempt to get CID if present for consistency, though send_message handles it
|
||||||
|
|
||||||
def g(obj, key, default=None):
|
# No "@handle" prefill: the reply reference (parent/root) already notifies the author.
|
||||||
if isinstance(obj, dict):
|
dlg = blueski_messages.post(session=self.session, title=_("Reply"), caption=_("Reply"))
|
||||||
return obj.get(key, default)
|
|
||||||
return getattr(obj, key, default)
|
|
||||||
|
|
||||||
author = g(item, "author")
|
|
||||||
if not author:
|
|
||||||
post = g(item, "post") or g(item, "record")
|
|
||||||
author = g(post, "author") if post else None
|
|
||||||
handle = g(author, "handle", "")
|
|
||||||
initial_text = f"@{handle} " if handle and not handle.startswith("@") else (f"{handle} " if handle else "")
|
|
||||||
|
|
||||||
dlg = blueski_messages.post(session=self.session, title=_("Reply"), caption=_("Reply"), text=initial_text)
|
|
||||||
if dlg.message.ShowModal() == wx.ID_OK:
|
if dlg.message.ShowModal() == wx.ID_OK:
|
||||||
text, files, cw, langs = dlg.get_data()
|
text, files, cw, langs = dlg.get_data()
|
||||||
refresh_args = (True, False) if getattr(self, "type", "") == "conversation" else None
|
refresh_args = (True, False) if getattr(self, "type", "") == "conversation" else None
|
||||||
@@ -495,9 +484,8 @@ class BaseBuffer(base.Buffer):
|
|||||||
# Use full post dialog like Mastodon
|
# Use full post dialog like Mastodon
|
||||||
title = _("Conversation with {0}").format(handle)
|
title = _("Conversation with {0}").format(handle)
|
||||||
caption = _("Write your message here")
|
caption = _("Write your message here")
|
||||||
initial_text = "@{} ".format(handle)
|
|
||||||
|
|
||||||
post = blueski_messages.post(session=self.session, title=title, caption=caption, text=initial_text)
|
post = blueski_messages.post(session=self.session, title=title, caption=caption)
|
||||||
if post.message.ShowModal() == wx.ID_OK:
|
if post.message.ShowModal() == wx.ID_OK:
|
||||||
text, files, cw_text, langs = post.get_data()
|
text, files, cw_text, langs = post.get_data()
|
||||||
if text:
|
if text:
|
||||||
|
|||||||
@@ -331,9 +331,8 @@ class ConversationListBuffer(BaseBuffer):
|
|||||||
|
|
||||||
title = _("Conversation with {0}").format(username)
|
title = _("Conversation with {0}").format(username)
|
||||||
caption = _("Write your message here")
|
caption = _("Write your message here")
|
||||||
initial_text = "@{} ".format(username)
|
|
||||||
|
|
||||||
post = blueski_messages.post(session=self.session, title=title, caption=caption, text=initial_text)
|
post = blueski_messages.post(session=self.session, title=title, caption=caption)
|
||||||
if post.message.ShowModal() == wx.ID_OK:
|
if post.message.ShowModal() == wx.ID_OK:
|
||||||
text, files, cw_text, langs = post.get_data()
|
text, files, cw_text, langs = post.get_data()
|
||||||
if text:
|
if text:
|
||||||
|
|||||||
@@ -449,7 +449,7 @@ class BaseBuffer(base.Buffer):
|
|||||||
users.append("@{} ".format(item.reblog.account.acct))
|
users.append("@{} ".format(item.reblog.account.acct))
|
||||||
else:
|
else:
|
||||||
users = ["@{} ".format(user.acct) for user in item.mentions if user.id != self.session.db["user_id"]]
|
users = ["@{} ".format(user.acct) for user in item.mentions if user.id != self.session.db["user_id"]]
|
||||||
if item.account.acct not in users and item.account.id != self.session.db["user_id"]:
|
if "@{} ".format(item.account.acct) not in users and item.account.id != self.session.db["user_id"]:
|
||||||
users.insert(0, "@{} ".format(item.account.acct))
|
users.insert(0, "@{} ".format(item.account.acct))
|
||||||
users_str = "".join(users)
|
users_str = "".join(users)
|
||||||
post = messages.post(session=self.session, title=title, caption=caption, text=users_str)
|
post = messages.post(session=self.session, title=title, caption=caption, text=users_str)
|
||||||
|
|||||||
Reference in New Issue
Block a user