Added searching for messages in all threads
This commit is contained in:
committed by
GitHub
parent
3b43d3f0bd
commit
a8ce44b109
@@ -589,39 +589,47 @@ class Client(object):
|
|||||||
|
|
||||||
return rtn
|
return rtn
|
||||||
|
|
||||||
def searchForMessageIDs(self, query, offset=0, limit=5, thread_id=None):
|
def searchForMessageIDs(self, query, offset=0, limit=5, thread_id=None, threads_limit=5):
|
||||||
"""
|
"""
|
||||||
Find and get message IDs by query
|
Find and get message IDs by query
|
||||||
|
|
||||||
|
.. warning:
|
||||||
|
Searching in all threads sends request for every thread and it's very slow
|
||||||
|
|
||||||
:param query: Text to search for
|
:param query: Text to search for
|
||||||
:param offset: Number of messages to skip
|
:param offset: Number of messages to skip
|
||||||
:param limit: Max. number of messages to retrieve
|
:param limit: Max. number of messages to retrieve
|
||||||
:param thread_id: User/Group ID to search in. If empty searches in all threads. See :ref:`intro_threads`
|
:param thread_id: User/Group ID to search in. If empty searches in all threads. See :ref:`intro_threads`
|
||||||
|
:param threads_limit: Max. number of threads to retrieve
|
||||||
:type offset: int
|
:type offset: int
|
||||||
:type limit: int
|
:type limit: int
|
||||||
|
:type threads_limit: int
|
||||||
:return: Found Message IDs
|
:return: Found Message IDs
|
||||||
:rtype: list
|
:rtype: list
|
||||||
:raises: FBchatException if request failed
|
:raises: FBchatException if request failed
|
||||||
"""
|
"""
|
||||||
thread_id, thread_type = self._getThread(thread_id, None)
|
|
||||||
data = {
|
data = {
|
||||||
"query": query,
|
"query": query,
|
||||||
"snippetOffset": offset,
|
"snippetOffset": offset if thread_id else 0,
|
||||||
"snippetLimit": limit,
|
"snippetLimit": limit if thread_id else thread_limit,
|
||||||
"identifier": "thread_fbid",
|
"identifier": "thread_fbid",
|
||||||
"thread_fbid": thread_id
|
"thread_fbid": thread_id
|
||||||
}
|
}
|
||||||
j = self._post(self.req_url.SEARCH_MESSAGES, data, fix_request=True, as_json=True)
|
j = self._post(self.req_url.SEARCH_MESSAGES, data, fix_request=True, as_json=True)
|
||||||
result = j["payload"]["search_snippets"][query]
|
result = j["payload"]["search_snippets"][query]
|
||||||
|
if thread_id is None:
|
||||||
|
message_ids = [mid for l in [self.searchForMessageIDs(query, offset=offset, limit=limit, thread_id=id) for id in result] for mid in l]
|
||||||
|
return message_ids
|
||||||
|
else:
|
||||||
snippets = result[thread_id]["snippets"] if result.get(thread_id) else []
|
snippets = result[thread_id]["snippets"] if result.get(thread_id) else []
|
||||||
return [snippet["message_id"] for snippet in snippets]
|
return [snippet["message_id"] for snippet in snippets]
|
||||||
|
|
||||||
def searchForMessages(self, query, offset=0, limit=5, thread_id=None):
|
def searchForMessages(self, query, offset=0, limit=5, thread_id=None, threads_limit=5):
|
||||||
"""
|
"""
|
||||||
.. warning::
|
Find and get :class:`models.Message` objects by query
|
||||||
This method sends request for every found message ID and it's very slow.
|
|
||||||
|
|
||||||
Find and get :class:`models.Message` object by query
|
.. warning::
|
||||||
|
This method sends request for every found message ID and it's very slow and searching in all threads is much more slower.
|
||||||
|
|
||||||
:param query: Text to search for
|
:param query: Text to search for
|
||||||
:param offset: Number of messages to skip
|
:param offset: Number of messages to skip
|
||||||
@@ -633,7 +641,7 @@ class Client(object):
|
|||||||
:rtype: list
|
:rtype: list
|
||||||
:raises: FBchatException if request failed
|
:raises: FBchatException if request failed
|
||||||
"""
|
"""
|
||||||
message_ids = self.searchForMessageIDs(query, offset, limit, thread_id)
|
message_ids = self.searchForMessageIDs(query, offset=offset, limit=limit, thread_id=thread_id, threads_limit=threads_limit)
|
||||||
result = [self.fetchMessageInfo(mid, thread_id) for mid in message_ids]
|
result = [self.fetchMessageInfo(mid, thread_id) for mid in message_ids]
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user