From e7dcf2aedb35ea5cc8435134d45104222b9d258b Mon Sep 17 00:00:00 2001 From: Harmon Date: Thu, 20 Jun 2019 20:33:27 -0500 Subject: [PATCH] Update DirectMessage model --- tweepy/models.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tweepy/models.py b/tweepy/models.py index bd98ab9..8615588 100644 --- a/tweepy/models.py +++ b/tweepy/models.py @@ -217,15 +217,24 @@ class DirectMessage(Model): @classmethod def parse(cls, api, json): dm = cls(api) + if "event" in json: + json = json["event"] for k, v in json.items(): - if k == 'sender' or k == 'recipient': - setattr(dm, k, User.parse(api, v)) - elif k == 'created_at': - setattr(dm, k, parse_datetime(v)) - else: - setattr(dm, k, v) + setattr(dm, k, v) return dm + @classmethod + def parse_list(cls, api, json_list): + if isinstance(json_list, list): + item_list = json_list + else: + item_list = json_list['events'] + + results = ResultSet() + for obj in item_list: + results.append(cls.parse(api, obj)) + return results + def destroy(self): return self._api.destroy_direct_message(self.id) -- 2.25.1