From 2e2657dde85758a61797b32f0c6976228de740eb Mon Sep 17 00:00:00 2001 From: tjphopkins Date: Fri, 30 Oct 2015 15:12:39 +0000 Subject: [PATCH] Allow 'full_text' param when getting direct messages --- docs/api.rst | 15 +++++++++++++-- docs/parameters.rst | 1 + tweepy/api.py | 12 ++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index d89f25b..0b9efe4 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -216,7 +216,7 @@ User methods Direct Message Methods ---------------------- -.. method:: API.direct_messages([since_id], [max_id], [count], [page]) +.. method:: API.direct_messages([since_id], [max_id], [count], [page], [full_text]) Returns direct messages sent to the authenticating user. @@ -224,10 +224,20 @@ Direct Message Methods :param max_id: |max_id| :param count: |count| :param page: |page| + :param full_text: |full_text| :rtype: list of :class:`DirectMessage` objects -.. method:: API.sent_direct_messages([since_id], [max_id], [count], [page]) +.. method:: API.get_direct_message([id], [full_text]) + + Returns a specific direct message. + + :param id: |id| + :param full_text: |full_text| + :rtype: :class:`DirectMessage` object + + +.. method:: API.sent_direct_messages([since_id], [max_id], [count], [page], [full_text]) Returns direct messages sent by the authenticating user. @@ -235,6 +245,7 @@ Direct Message Methods :param max_id: |max_id| :param count: |count| :param page: |page| + :param full_text: |full_text| :rtype: list of :class:`DirectMessage` objects diff --git a/docs/parameters.rst b/docs/parameters.rst index 5fa1338..313b04f 100644 --- a/docs/parameters.rst +++ b/docs/parameters.rst @@ -14,4 +14,5 @@ .. |slug| replace:: the slug name or numerical ID of the list .. |list_mode| replace:: Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified. .. |list_owner| replace:: the screen name of the owner of the list +.. |full_text| replace:: A boolean indicating whether or not the full text of a message should be returned. If False the message text returned will be truncated to 140 chars. Defaults to False. diff --git a/tweepy/api.py b/tweepy/api.py index 1b7789d..2216eff 100644 --- a/tweepy/api.py +++ b/tweepy/api.py @@ -392,39 +392,39 @@ class API(object): @property def direct_messages(self): """ :reference: https://dev.twitter.com/rest/reference/get/direct_messages - :allowed_param:'since_id', 'max_id', 'count' + :allowed_param:'since_id', 'max_id', 'count', 'full_text' """ return bind_api( api=self, path='/direct_messages.json', payload_type='direct_message', payload_list=True, - allowed_param=['since_id', 'max_id', 'count'], + allowed_param=['since_id', 'max_id', 'count', 'full_text'], require_auth=True ) @property def get_direct_message(self): """ :reference: https://dev.twitter.com/rest/reference/get/direct_messages/show - :allowed_param:'id' + :allowed_param:'id', 'full_text' """ return bind_api( api=self, path='/direct_messages/show/{id}.json', payload_type='direct_message', - allowed_param=['id'], + allowed_param=['id', 'full_text'], require_auth=True ) @property def sent_direct_messages(self): """ :reference: https://dev.twitter.com/rest/reference/get/direct_messages/sent - :allowed_param:'since_id', 'max_id', 'count', 'page' + :allowed_param:'since_id', 'max_id', 'count', 'page', 'full_text' """ return bind_api( api=self, path='/direct_messages/sent.json', payload_type='direct_message', payload_list=True, - allowed_param=['since_id', 'max_id', 'count', 'page'], + allowed_param=['since_id', 'max_id', 'count', 'page', 'full_text'], require_auth=True ) -- 2.25.1