mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-08-27 10:19:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace 'toot' term to follow mastodon changes

Browse Source
This commit is contained in:
Manuel Cortez
2022-11-16 13:28:45 -06:00
parent aebdcae9cf
commit 8f72ee97c9
16 changed files with 281 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/sessions/mastodon/compose.py
View File

@@ -3,23 +3,23 @@ import arrow
import languageHandler
from . import utils, templates
def compose_toot(toot, db, relative_times, show_screen_names):
def compose_post(post, db, relative_times, show_screen_names):
if show_screen_names == False:
user = toot.account.get("display_name")
user = post.account.get("display_name")
if user == "":
user = toot.account.get("username")
user = post.account.get("username")
else:
user = toot.account.get("acct")
original_date = arrow.get(toot.created_at)
user = post.account.get("acct")
original_date = arrow.get(post.created_at)
if relative_times:
ts = original_date.humanize(locale=languageHandler.curLang[:2])
else:
ts = original_date.shift(hours=db["utc_offset"]).format(_("dddd, MMMM D, YYYY H:m"), locale=languageHandler.curLang[:2])
if toot.reblog != None:
text = _("Boosted from @{}: {}").format(toot.reblog.account.acct, templates.process_text(toot.reblog))
if post.reblog != None:
text = _("Boosted from @{}: {}").format(post.reblog.account.acct, templates.process_text(post.reblog))
else:
text = templates.process_text(toot)
source = toot.get("application", "")
text = templates.process_text(post)
source = post.get("application", "")
# "" means remote user, None for legacy apps so we should cover both sides.
if source != None and source != "":
source = source.get("name", "")
@@ -36,7 +36,7 @@ def compose_user(user, db, relative_times=True, show_screen_names=False):
name = user.display_name
if name == "":
name = user.get("username")
return [_("%s (@%s). %s followers, %s following, %s toots. Joined %s") % (name, user.acct, user.followers_count, user.following_count, user.statuses_count, ts)]
return [_("%s (@%s). %s followers, %s following, %s posts. Joined %s") % (name, user.acct, user.followers_count, user.following_count, user.statuses_count, ts)]
def compose_conversation(conversation, db, relative_times, show_screen_names):
users = []
@@ -46,6 +46,6 @@ def compose_conversation(conversation, db, relative_times, show_screen_names):
else:
users.append(account.username)
users = ", ".join(users)
last_toot = compose_toot(conversation.last_status, db, relative_times, show_screen_names)
text = _("Last message from {}: {}").format(last_toot[0], last_toot[1])
return [users, text, last_toot[-2], last_toot[-1]]
last_post = compose_post(conversation.last_status, db, relative_times, show_screen_names)
text = _("Last message from {}: {}").format(last_post[0], last_post[1])
return [users, text, last_post[-2], last_post[-1]]