Fix setting forwarded when creating Message objects

This commit is contained in:
Mads Marquart
2019-05-01 23:18:12 +02:00
parent 3cd0f3a9a7
commit d244856b41

View File

@@ -170,9 +170,9 @@ class Message(object):
for m in data["message"].get("ranges") or () for m in data["message"].get("ranges") or ()
], ],
emoji_size=EmojiSize._from_tags(tags), emoji_size=EmojiSize._from_tags(tags),
forwarded=cls._get_forwarded_from_tags(tags),
sticker=_sticker.Sticker._from_graphql(data.get("sticker")), sticker=_sticker.Sticker._from_graphql(data.get("sticker")),
) )
rtn.forwarded = cls._get_forwarded_from_tags(tags)
rtn.uid = str(data["message_id"]) rtn.uid = str(data["message_id"])
rtn.author = str(data["message_sender"]["id"]) rtn.author = str(data["message_sender"]["id"])
rtn.timestamp = data.get("timestamp_precise") rtn.timestamp = data.get("timestamp_precise")
@@ -221,9 +221,9 @@ class Message(object):
for m in json.loads(data.get("data", {}).get("prng", "[]")) for m in json.loads(data.get("data", {}).get("prng", "[]"))
], ],
emoji_size=EmojiSize._from_tags(tags), emoji_size=EmojiSize._from_tags(tags),
forwarded=cls._get_forwarded_from_tags(tags),
) )
metadata = data.get("messageMetadata", {}) metadata = data.get("messageMetadata", {})
rtn.forwarded = cls._get_forwarded_from_tags(tags)
rtn.uid = metadata.get("messageId") rtn.uid = metadata.get("messageId")
rtn.author = str(metadata.get("actorFbId")) rtn.author = str(metadata.get("actorFbId"))
rtn.timestamp = metadata.get("timestamp") rtn.timestamp = metadata.get("timestamp")
@@ -324,7 +324,6 @@ class Message(object):
rtn.emoji_size = EmojiSize._from_tags(tags) rtn.emoji_size = EmojiSize._from_tags(tags)
rtn.forwarded = cls._get_forwarded_from_tags(tags) rtn.forwarded = cls._get_forwarded_from_tags(tags)
return rtn return rtn