From 1f915943e79cf30179700e0e0d1950c1e1dbae5f Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Thu, 16 Jan 2025 17:40:36 -0300
Subject: [PATCH] Refactor chat message retrieval in ChatService to include
 optional filters for message ID, sender, type, and timestamps. Update
 test_evolution.py to include commented-out examples for fetching group
 messages. Remove unused response print statements.

---
 .../services/__pycache__/chat.cpython-310.pyc | Bin 3111 -> 3878 bytes
 .../__pycache__/group.cpython-310.pyc         | Bin 3807 -> 3785 bytes
 evolutionapi/services/chat.py                 |  48 ++++++++++++++++--
 test_evolution.py                             |  23 +++++++--
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/evolutionapi/services/__pycache__/chat.cpython-310.pyc b/evolutionapi/services/__pycache__/chat.cpython-310.pyc
index 87c1661f22780b1621447cb4941635647850d003..5b4d4f751843b742935de72b7f02bf1e78342102 100644
GIT binary patch
literal 3878
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

delta 1323
zcmaJ=OKTKC5T5RNZZ^Al7?aI=6OB3|iRL0=@U8JdV#LQGBI~f-n~d4rS$ZbQ#+3+q
zRSA7mK@gN2ynEEY(RlOZMMUr<KB{KdxcJCG)pS>V^;LCO^^2jGnRJj!wP^4KUv4k_
zNUo&^PVa^t(-<jgB{EM+be<B8QKlF5OWL%?3})Wfn0b%R8_c?>x%LMPcd0Tjm;Iou
zoMV336V)^4*Y5Twli)f65`Nd#UcB4EMwreG)(>KW4Dbva<e5SX8)C!v&G}xI1;SDJ
znVfTMh+5Y~LY|~wr&F*IX|(799m=Q#VWgZ~j`{g0ms>Z4gOFBK8(@*ZZLIK!s#m_%
zd*w6zeHLvl5nJ#_6&>HJNU0eupBoqUw}W?`#`#1iBAb)+fFZ7^ISg#7OI|m-<YDtX
zX_Jr4zJ16dI#6|?`lF;)PvjT<n>?3a^rCJAbW3IKzt{##SD#(!Li<F?6HCWoak(tG
z$0o$)ob3pY33JPFz+j!1SqGt}XVy*^<K4zhT8tNY#N)g8t3>(98YA7Z+dc)6*X*&r
z|7Vs@>}>#jW1j%1>FgT*KNPa7L3!61v?lA71<q**dhHBs#{bdD0Kc6$0MMg}{>jbx
zQz0+2Tt#sB=lPL(o`;Dc`6|(~YE--huB@O?2zivZ!1?RL;W9yvgM@oPF~Vq#`ot$S
zqh>PwiGIhbX*aYRgc&vRSbIuqR!wK-105#UTFFfFC|lxT2noV$K?J3&m&G0`eTi39
zLhw=$t@5)zb9H6jTI7NY7t#oPbSs^4w+num%`_+)y&eFsYd6jKE{wqk@jF`C6|Y(h
zJoeX&E$}G!tEOp)X$x_jTXae&vA$WR98Qh4&AL?VK*F7%+&+0FHAa%MmdcW?@@cB)
z8V-?49<7fn4x<=COG|wwW5aN4Xq0}ASH%b#(sLpx_(eVkFLfD?JBr5E8P0sK0TtV1
zM|#WDc62y%jh2Zq-0FTg5)-g$I@HF47T7rhB+SUAbnn&ec5In-O=U&ZieFw36hn1T
hDp?9((!+7Q;u!WXM&(QaY`Mq}5u`=_cFiH3^d~e~8<YS5

diff --git a/evolutionapi/services/__pycache__/group.cpython-310.pyc b/evolutionapi/services/__pycache__/group.cpython-310.pyc
index 60b4301703abba5e3e2b9e5fe5a0bfeb12afe45e..a5d9328c0a7be15a7ee6324dbad9d15d9de42e0c 100644
GIT binary patch
delta 922
zcmZXS&rcIU6vubl-Pv|$cS|W$DDq2MWI-&17>v+xAWFcXL_`x0n!=8CYwb4U0+BQt
z<3&t7y(95zFdoD|L2uslS`S`47!yz2O#Cr#mjHn_`R>fy&->0d`{rBcr%uZ=O<fYd
zOXbbd)28><*C;%W$NF}AM6E8BrLyeEb$Ls2BK63Y^h&8m%aOX`L|;asMd`7A>r*A}
zt=8sTr@#|%Rhe%>J0e@MB1dHMXQLNtv;{sYUFZux6q_alz?)Fo;e(ojyxL0Bxa|<K
z$B(Nf)YN3qv#Aar={Z9?_xW7lZ;*-MgNPztWKpt}D;vomUEZy(xjvir9G2&8qV<go
zkH}0iE0()4A(&UB{R?kn8TduI<SsC@TywX0Wk)y>51vFh6$HMarN|&|v*2mZ<Pq4_
zW<^IK);_dhOdXt6;Ap^mgxCt#a7|H8qnLr!4l#7Mde<ArQWmyj6T;|wtdH(@?wy&7
zCrBZLF2rAt1kSe7h(7drL#=r0jE6CM1!Jp+4l}W75Sn#co`y;NvhaVd_YNHLM*u%U
zDDi+7GKY&Se9^~(DHwF%$P`j=ji$%~VjXawo(r&Tnmva7qzQ5}#QxFI06TB=AH(WK
zlH3k4FeXLL&qjCap%FBQ!z#>Y;TLJ96;@nhcY*=4Fsp6O%R{hkW?M3%&@g83YA&uW
zm)VNXPr^Gh{Uo?JeTe4}p#d@*To2xl<pC5M-zm$USK()IkJD}>mugPYXA4E{yDM(3
zSoL`x>t<MAWWMiKOMC=tiR)geRACou_t*o*ixobKHe(X(SZTOrooLrGT3SmJ@fX@A
OG($3?meJsawe%k<e$ngz

delta 968
zcmZWn&rcIU6z*)d(`~n{Ed^S(6e>Te4V0>Ynn(x{m4Lx$kVFp#7dn(}N_R6|IFPCb
zPsVt9@npQ3c;u+Yg9i^@jPY1Q{1ZHoc*4Z@wh0i}&3^mdH{Z;B^WJ>R{?5kiXf*7@
zCtZC}d7ape{qm1;OlR@i&mlB@RbQ2rS(Cl-y;aIeQ?XdnUsalF+5bvif;}|_qpFr^
zX%%U2ISW?#y}!jBQ<|F%8Nmf)6t1g_aSA!p7-uR|7(amNKrehy(~QGU^@83*$~Zv=
zzUWEF1-f{O(kxsHTtQJIFmX!sHPEB?dm@CLVVDUR;OCREBcJHe54U(9SEPX&5PU9q
z4ugF<bK4G@`3Il*RhEOle7NH*4ipqgHINB{A<xfDFv-U#&BMdsb2bTk!TISN5(V|n
zPQp8S$*ON#u9&Z{+oe{xoy^*0A!$iD;Av%$Vx6D>kJL0g)#9NkO7jS4!+>3_53T&r
z2KB>vo`=rPif~uFomMQ|gF1w6@}YNXfnkxqhf=9Q<O+dfn?y-ego99lEkHhedm%>(
zw47{P#y+{$n&p^vw^5R5QXkuuQtc2z6crKfQILmE;c@KCpK$3^U#9e={(wYTgq?ou
zODELzUR1x-M^2~*^v8$FjHgs0bSW~C;t6FE)*}hN;i=(CWD2YFG1A|4tYIx)7B%6D
zcF#KWnlQITyJQYc%R@4{$i~2o4n6Bdq7|8=JG->CS`}-q>?11fQ8z?mO<Im?*>&mN
zuwj}{H>ah0f_bmk@;uQa1fw*juG)4@UZk7~)k-WoWz!XRkE$#$5g%PHcmqqqb**|u
vjuUz2zFn!*#7$>IYzk@C<OHpA8H%y79?j6YweDd1P2=AP8ps(MxUuE`a0uHr

diff --git a/evolutionapi/services/chat.py b/evolutionapi/services/chat.py
index d4d3291..f1e06a5 100644
--- a/evolutionapi/services/chat.py
+++ b/evolutionapi/services/chat.py
@@ -1,4 +1,4 @@
-from typing import Union, BinaryIO
+from typing import Union, BinaryIO, Optional
 from ..models.chat import *
 
 class ChatService:
@@ -68,13 +68,53 @@ class ChatService:
             instance_token=instance_token
         )
     
-    def get_messages(self, instance_id: str, remote_jid: str, instance_token: str, page: int = 1, offset: int = 50):
-        '''Get messages from a chat'''        
+    def get_messages(
+        self, 
+        instance_id: str, 
+        remote_jid: str, 
+        instance_token: str, 
+        message_id: Optional[str] = None,
+        whatsapp_message_id: Optional[str] = None,
+        from_me: Optional[bool] = None,
+        message_type: Optional[str] = None,
+        source: Optional[str] = None,
+        timestamp_start: Optional[str] = None,
+        timestamp_end: Optional[str] = None,
+        page: int = 1, 
+        offset: int = 50
+    ):
+        '''
+        Obtém mensagens de um chat com filtros opcionais
+        
+        Args:
+            timestamp_start: Data inicial no formato ISO (ex: "2025-01-16T00:00:00Z")
+            timestamp_end: Data final no formato ISO (ex: "2025-01-16T23:59:59Z")
+        '''
+        where = {"key": {"remoteJid": remote_jid}}
+        
+        if message_id:
+            where["id"] = message_id
+        if whatsapp_message_id:
+            where["key"]["id"] = whatsapp_message_id
+        if from_me is not None:
+            where["key"]["fromMe"] = from_me
+        if message_type:
+            where["messageType"] = message_type
+        if source:
+            where["source"] = source
+        if timestamp_start or timestamp_end:
+            where["messageTimestamp"] = {}
+            if timestamp_start:
+                where["messageTimestamp"]["gte"] = timestamp_start
+            if timestamp_end:
+                where["messageTimestamp"]["lte"] = timestamp_end
+            
         payload = {
-            "where": {"key": {"remoteJid": remote_jid}},
+            "where": where,
             "page": page,
             "offset": offset,
         }
+        
         return self.client.post(
             f'chat/findMessages/{instance_id}', 
             data=payload,
diff --git a/test_evolution.py b/test_evolution.py
index cb91767..5652156 100644
--- a/test_evolution.py
+++ b/test_evolution.py
@@ -14,9 +14,10 @@ client = EvolutionClient(
 instance_token = "60BDC703E413-4710-9473-CA2A763866FE"
 instance_id = "94a0aafa-e636-4534-a185-5562bf8f2c22"
 
-response = client.group.fetch_all_groups(instance_id, instance_token, False)
+# response = client.group.fetch_all_groups(instance_id, instance_token, False)
+
+# print(response)
 
-print(response)
 
 # text_message = TextMessage(
 #     number="557499879409",
@@ -91,4 +92,20 @@ print(response)
 # delete_instance = client.instance_operations.delete(instance_id, instance_token)
 
 # print("Instância deletada")
-# print(delete_instance)
\ No newline at end of file
+# print(delete_instance)
+
+# group_id = "120363024931487276@g.us"
+
+# # Buscando as 3 últimas mensagens do grupo
+# mensagens = client.chat.get_messages(
+#     instance_id=instance_id,
+#     remote_jid=group_id,
+#     instance_token=instance_token,
+#     timestamp_start="2024-12-27T00:00:00Z",
+#     timestamp_end="2024-12-27T23:59:59Z",
+#     page=1,
+#     offset=3
+# )
+
+# print("Mensagens encontradas:")
+# print(mensagens)
\ No newline at end of file