mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-01-31 05:10:45 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some rendering for dm's and people

Browse Source
This commit is contained in:
Manuel Cortez 2021-01-05 11:04:06 -06:00
parent fa49637d0e
commit 3db8b7b021
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sessions/twitter/compose.py
View File

@ -20,7 +20,6 @@ import config
from .long_tweets import twishort, tweets from .long_tweets import twishort, tweets
log = logging.getLogger("compose") log = logging.getLogger("compose")
def StripChars(s): def StripChars(s):
"""Converts any html entities in s to their unicode-decoded equivalents and returns a string.""" """Converts any html entities in s to their unicode-decoded equivalents and returns a string."""
entity_re = re.compile(r"&(#\d+|\w+);") entity_re = re.compile(r"&(#\d+|\w+);")
@ -92,19 +91,19 @@ def compose_direct_message(item, db, relative_times, show_screen_names=False, se
ts = item.created_timestamp ts = item.created_timestamp
text = StripChars(item.message_create.message_data.text) text = StripChars(item.message_create.message_data.text)
source = "DM" source = "DM"
sender = session.get_user(item.message_create.sender_id) sender = session.get_user(item.message_create["sender_id"])
if db["user_name"] == sender.screen_name: if db["user_name"] == sender["screen_name"]:
if show_screen_names: if show_screen_names:
user = _(u"Dm to %s ") % (session.get_user(item.message_create.target.recipient_id).screen_name) user = _(u"Dm to %s ") % (session.get_user(item.message_create["target"]["recipient_id"]).screen_name)
else: else:
user = _(u"Dm to %s ") % (session.get_user(item.message_create.target.recipient_id).name) user = _(u"Dm to %s ") % (session.get_user(item["message_create"]["target"]["recipient_id"]).name)
else: else:
if show_screen_names: if show_screen_names:
user = sender.screen_name user = sender["screen_name"]
else: else:
user = sender.name user = sender["name"]
if text[-1] in chars: text=text+"." if text[-1] in chars: text=text+"."
text = utils.expand_urls(text, item.message_create.message_data.entities) text = utils.expand_urls(text, item.message_create["message_data"]["entities"])
return [user+", ", text, ts+", ", source] return [user+", ", text, ts+", ", source]
def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False, session=None): def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False, session=None):
@ -125,7 +124,7 @@ def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False,
quoting_user = quoted_tweet.user.screen_name quoting_user = quoted_tweet.user.screen_name
else: else:
quoting_user = quoted_tweet.user.name quoting_user = quoted_tweet.user.name
source = re.sub(r"(?s)<.*?>", "", quoted_tweet.source) source = quoted_tweet.source
if hasattr(quoted_tweet, "retweeted_status"): if hasattr(quoted_tweet, "retweeted_status"):
text = "rt @%s: %s" % (quoted_tweet.retweeted_status.user.screen_name, text) text = "rt @%s: %s" % (quoted_tweet.retweeted_status.user.screen_name, text)
if text[-1] in chars: text=text+"." if text[-1] in chars: text=text+"."
@ -143,7 +142,7 @@ def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False,
def compose_followers_list(tweet, db, relative_times=True, show_screen_names=False, session=None): def compose_followers_list(tweet, db, relative_times=True, show_screen_names=False, session=None):
if system == "Windows": if system == "Windows":
original_date = arrow.get(tweet.created_at, "ddd MMM D H:m:s Z YYYY", locale="en") original_date = arrow.get(tweet.created_at, locale="en")
if relative_times == True: if relative_times == True:
ts = original_date.humanize(locale=languageHandler.curLang[:2]) ts = original_date.humanize(locale=languageHandler.curLang[:2])
else: else:
@ -152,7 +151,7 @@ def compose_followers_list(tweet, db, relative_times=True, show_screen_names=Fal
ts = tweet.created_at ts = tweet.created_at
if hasattr(tweet, "status"): if hasattr(tweet, "status"):
if len(tweet.status) > 4 and system == "Windows": if len(tweet.status) > 4 and system == "Windows":
original_date2 = arrow.get(tweet.status.created_at, "ddd MMM D H:m:s Z YYYY", locale="en") original_date2 = arrow.get(tweet.status.created_at, locale="en")
if relative_times: if relative_times:
ts2 = original_date2.humanize(locale=languageHandler.curLang[:2]) ts2 = original_date2.humanize(locale=languageHandler.curLang[:2])
else: else: