From 93d1b6fc1fd6e654f80a924ce2aa3e999adb8c38 Mon Sep 17 00:00:00 2001
From: terrtia <or1994@hotmail.fr>
Date: Thu, 15 Feb 2024 16:22:00 +0100
Subject: [PATCH] fix: [tracker] fix message trackers

---
 bin/lib/Tracker.py                        | 4 ++--
 bin/lib/ail_core.py                       | 4 ++--
 var/www/templates/hunter/tracker_add.html | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/lib/Tracker.py b/bin/lib/Tracker.py
index 2e07570a..f2f536d3 100755
--- a/bin/lib/Tracker.py
+++ b/bin/lib/Tracker.py
@@ -929,7 +929,7 @@ def api_add_tracker(dict_input, user_id):
     # Filters # TODO MOVE ME
     filters = dict_input.get('filters', {})
     if filters:
-        if filters.keys() == {'decoded', 'item', 'pgp', 'title'} and set(filters['pgp'].get('subtypes', [])) == {'mail', 'name'}:
+        if filters.keys() == set(get_objects_tracked()) and set(filters['pgp'].get('subtypes', [])) == {'mail', 'name'}:
             filters = {}
         for obj_type in filters:
             if obj_type not in get_objects_tracked():
@@ -1004,7 +1004,7 @@ def api_edit_tracker(dict_input, user_id):
     # Filters # TODO MOVE ME
     filters = dict_input.get('filters', {})
     if filters:
-        if filters.keys() == {'decoded', 'item', 'pgp', 'title'} and set(filters['pgp'].get('subtypes', [])) == {'mail', 'name'}:
+        if filters.keys() == set(get_objects_tracked()) and set(filters['pgp'].get('subtypes', [])) == {'mail', 'name'}:
             if not filters['decoded'] and not filters['item']:
                 filters = {}
         for obj_type in filters:
diff --git a/bin/lib/ail_core.py b/bin/lib/ail_core.py
index 1006be73..fc18e7b9 100755
--- a/bin/lib/ail_core.py
+++ b/bin/lib/ail_core.py
@@ -61,10 +61,10 @@ def get_obj_queued():
     return ['item', 'image']
 
 def get_objects_tracked():
-    return ['decoded', 'item', 'pgp', 'title']
+    return ['decoded', 'item', 'pgp', 'message', 'title']
 
 def get_objects_retro_hunted():
-    return ['decoded', 'item']
+    return ['decoded', 'item', 'message']
 
 def get_all_objects_with_subtypes_tuple():
     str_objs = []
diff --git a/var/www/templates/hunter/tracker_add.html b/var/www/templates/hunter/tracker_add.html
index 4f8c6f3e..6fb1deae 100644
--- a/var/www/templates/hunter/tracker_add.html
+++ b/var/www/templates/hunter/tracker_add.html
@@ -136,6 +136,10 @@
                                                         <input class="custom-control-input" type="checkbox" name="title_obj" id="title_obj" checked="">
                                                         <label class="custom-control-label" for="title_obj"><i class="fas fa-heading"></i>&nbsp;Decoded <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="Title that has been extracted from a HTML page"></i></label>
                                                     </div>
+                                                    <div class="custom-control custom-switch mt-1">
+                                                        <input class="custom-control-input" type="checkbox" name="message_obj" id="message_obj" checked="">
+                                                        <label class="custom-control-label" for="message_obj"><i class="fas fa-comment-dots"></i>&nbsp;Message <i class="fas fa-info-circle text-info" data-toggle="tooltip" data-placement="right" title="Messages from Chats"></i></label>
+                                                    </div>
 
 {#                                                    <div class="custom-control custom-switch mt-1">#}
 {#                                                        <input class="custom-control-input" type="checkbox" name="level" id="screenshot_obj" checked="">#}