From f07fc33876b3122425096986873fab425cb80cd1 Mon Sep 17 00:00:00 2001
From: Sarang Joshi <sarangj@msn.com>
Date: Tue, 14 Aug 2018 00:55:14 -0700
Subject: [PATCH 1/3] Add 'Me' in menu when user has sent the last message

---
 .settings        | 1 +
 lib/listeners.js | 7 +++++++
 lib/messenger.js | 3 ++-
 lib/settings.js  | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.settings b/.settings
index 0dc79c2..14a643e 100644
--- a/.settings
+++ b/.settings
@@ -4,6 +4,7 @@
   "conversationsToLoad": 15,
   "preventMessageFlicker": false,
   "desktopNotifications": false,
+  "showSenderInMenu": true,
   "showTimestamps": true,
   "useCustomNicknames": true,
   "timestampLocale": "en-US",
diff --git a/lib/listeners.js b/lib/listeners.js
index c18fc58..f397c9c 100644
--- a/lib/listeners.js
+++ b/lib/listeners.js
@@ -1,6 +1,7 @@
 const { refreshConsole } = require('./util');
 const heading = require('./heading');
 const search = require('./search');
+const Settings = require('./settings');
 
 const messageLimit = 75;
 
@@ -33,6 +34,12 @@ class Listeners {
             thread.snippet = `${ thread.snippet.substr(0, messageLimit) }...`;
         }
 
+        debugger;
+
+        if (Settings.properties.showSelfInMenu && thread.sent_by_me) {
+          line += `[${"Me".green}] : `;
+        }
+
         if (thread.snippet !== '')
             line += `${thread.snippet} `;
 
diff --git a/lib/messenger.js b/lib/messenger.js
index ddf947b..6fe66c3 100644
--- a/lib/messenger.js
+++ b/lib/messenger.js
@@ -422,7 +422,8 @@ class Messenger {
                 'snippet': thread.last_message.nodes[0].snippet,
                 'attachments': thread.last_message.nodes[0].blob_attachements,
                 'thread_fbid': id,
-                'timestamp': thread.last_message.nodes[0].timestamp_precise
+                'timestamp': thread.last_message.nodes[0].timestamp_precise,
+                'sent_by_me': thread.last_message.nodes[0].message_sender.messaging_actor.id === this.userId,
             };
         });
     }
diff --git a/lib/settings.js b/lib/settings.js
index ec0458a..a20d863 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -15,6 +15,7 @@ class Settings {
             conversationsToLoad: 15,
             preventMessageFlicker: false,
             desktopNotifications: false,
+            showSelfInMenu: false,
             showTimestamps: false,
             useCustomNicknames: true,
             timestampLocale: "en-US",

From fc191d65d27d508f68cfe7596ce065664f0c5c20 Mon Sep 17 00:00:00 2001
From: Sarang Joshi <sarangj@msn.com>
Date: Tue, 14 Aug 2018 15:01:51 -0700
Subject: [PATCH 2/3] Add functionality to show sender in menu

---
 lib/listeners.js |  6 ++----
 lib/messenger.js | 13 ++++++++++++-
 lib/settings.js  |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/listeners.js b/lib/listeners.js
index f397c9c..7b344a8 100644
--- a/lib/listeners.js
+++ b/lib/listeners.js
@@ -34,10 +34,8 @@ class Listeners {
             thread.snippet = `${ thread.snippet.substr(0, messageLimit) }...`;
         }
 
-        debugger;
-
-        if (Settings.properties.showSelfInMenu && thread.sent_by_me) {
-          line += `[${"Me".green}] : `;
+        if (Settings.properties.showSenderInMenu && thread.sender) {
+            line += `[${thread.sender.green}] : `;
         }
 
         if (thread.snippet !== '')
diff --git a/lib/messenger.js b/lib/messenger.js
index 6fe66c3..56d8e3f 100644
--- a/lib/messenger.js
+++ b/lib/messenger.js
@@ -416,6 +416,17 @@ class Messenger {
                 }
             }
 
+            let sender = thread.last_message.nodes[0].message_sender.messaging_actor.id;
+            if (sender === this.userId) {
+                sender = "Me";
+            } else if (isGroup) {
+                sender = thread.all_participants.nodes.find(
+                    (n) => n.messaging_actor.id === sender
+                ).messaging_actor.name;
+            } else {
+                sender = "";
+            }
+
             return {
                 name,
                 isGroup,
@@ -423,7 +434,7 @@ class Messenger {
                 'attachments': thread.last_message.nodes[0].blob_attachements,
                 'thread_fbid': id,
                 'timestamp': thread.last_message.nodes[0].timestamp_precise,
-                'sent_by_me': thread.last_message.nodes[0].message_sender.messaging_actor.id === this.userId,
+                'sender': sender,
             };
         });
     }
diff --git a/lib/settings.js b/lib/settings.js
index a20d863..7b0ba90 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -15,7 +15,7 @@ class Settings {
             conversationsToLoad: 15,
             preventMessageFlicker: false,
             desktopNotifications: false,
-            showSelfInMenu: false,
+            showSenderInMenu: false,
             showTimestamps: false,
             useCustomNicknames: true,
             timestampLocale: "en-US",

From cbbc8105cc846addaab0b4a295c0221bca3988f6 Mon Sep 17 00:00:00 2001
From: Sarang Joshi <sarangj@msn.com>
Date: Mon, 20 Aug 2018 10:15:19 -0700
Subject: [PATCH 3/3] Delete settings

---
 .settings | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 .settings

diff --git a/.settings b/.settings
deleted file mode 100644
index 14a643e..0000000
--- a/.settings
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "disableColors": false,
-  "groupColors": true,
-  "conversationsToLoad": 15,
-  "preventMessageFlicker": false,
-  "desktopNotifications": false,
-  "showSenderInMenu": true,
-  "showTimestamps": true,
-  "useCustomNicknames": true,
-  "timestampLocale": "en-US",
-  "timestampOptions": {},
-  "twoFactorAuth": false,
-  "headlessLogin": true,
-  "noSandbox": false,
-  "logonTimeout": 86400000
-}