mcvsoftware/socializer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of code.manuelcortez.net:manuelcortez/socializer

Browse Source
This commit is contained in:
Manuel Cortez 2019-01-11 03:19:31 -06:00
commit a28c088c06
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sessionmanager/renderers.py
View File

@ -185,7 +185,7 @@ def render_newsfeed_item(status, session):
def render_message(message, session): def render_message(message, session):
""" Render a message posted in a private conversation. """ Render a message posted in a private conversation.
Reference: https://vk.com/dev/message""" Reference: https://vk.com/dev/message"""
user = session.get_user_name(message["from_id"], "nom") user = session.get_user(message["from_id"], key="user1")
original_date = arrow.get(message["date"]) original_date = arrow.get(message["date"])
now = arrow.now() now = arrow.now()
original_date = original_date.to(now.tzinfo) original_date = original_date.to(now.tzinfo)
@ -199,26 +199,32 @@ def render_message(message, session):
body = message["body"] body = message["body"]
else: else:
body = message["text"] body = message["text"]
return ["{2}, {0} {1}".format(body, created_at, user)] data = dict(body=body, created_at=created_at)
data.update(user)
return ["{user1_nom}, {body} {created_at}".format(**data)]
def render_status(status, session): def render_status(status, session):
""" Render a wall post (shown in user's wall, not in newsfeed). """ Render a wall post (shown in user's wall, not in newsfeed).
Reference: https://vk.com/dev/post""" Reference: https://vk.com/dev/post"""
user = session.get_user_name(status["from_id"], "nom") user = session.get_user(status["from_id"], key="user1")
if "copy_history" in status: if "copy_history" in status:
user = _("{0} has shared the {1}'s post").format(user, session.get_user_name(status["copy_history"][0]["owner_id"])) user2 = session.get_user(status["copy_history"][0]["owner_id"], key="user2")
user2.update(user)
user = dict(user1_nom=_("{user1_nom} has shared the {user2_nom}'s post").format(**user2))
message = "" message = ""
original_date = arrow.get(status["date"]) original_date = arrow.get(status["date"])
created_at = original_date.humanize(locale=languageHandler.curLang[:2]) created_at = original_date.humanize(locale=languageHandler.curLang[:2])
if "copy_owner_id" in status: if "copy_owner_id" in status:
user = _("{0} has shared the {1}'s post").format(user, session.get_user_name(status["copy_owner_id"])) user2 = session.get_user(status["copy_owner_id"], key="user2")
user2.update(user)
user = _("{user1_nom} has shared the {user2_nom}'s post").format(**user2)
if status["post_type"] == "post" or status["post_type"] == "copy": if status["post_type"] == "post" or status["post_type"] == "copy":
message += short_text(status) message += short_text(status)
if "attachment" in status and len(status["attachment"]) > 0: if "attachment" in status and len(status["attachment"]) > 0:
message += extract_attachment(status["attachment"]) message += extract_attachment(status["attachment"])
if message == "": if message == "":
message = "no description available" message = "no description available"
return [user, message, created_at] return [user["user1_nom"], message, created_at]
def render_audio(audio, session=None): def render_audio(audio, session=None):
""" Render audio files added to VK. """ Render audio files added to VK.