1 files changed, 40 insertions, 7 deletions

diff --git a/testing/nTox.c b/testing/nTox.c
index 3d410f19..9876f4ba 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -20,10 +20,10 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-
 #include "nTox.h"
 #include "misc_tools.h"
 
+
 #include <stdio.h>
 #include <time.h>
 #ifdef WIN32
@@ -50,13 +50,33 @@ void new_lines(char *line)
     do_refresh();
 }
 
+
+void print_friendlist()
+{
+    char name[MAX_NAME_LENGTH];
+    uint32_t i;
+
+    new_lines("[i] Friend List:");
+    for (i=0; i <= num_requests; i++) {
+        char fstring[128];
+
+        getname(i, (uint8_t*)name);
+        if (strlen(name) <= 0) {
+            sprintf(fstring, "[i] Friend: NULL\n\tid: %i", i);
+        } else {
+            sprintf(fstring, "[i] Friend: %s\n\tid: %i", (uint8_t*)name, i);
+        }
+        new_lines(fstring);
+    }
+}
+
 char *format_message(char *message, int friendnum)
 {
         char name[MAX_NAME_LENGTH];
         if(friendnum != -1) {
-                getfriendname(friendnum, (uint8_t*)name);
+                getname(friendnum, (uint8_t*)name);
         } else {
-                getname((uint8_t*)name);
+                getself_name((uint8_t*)name);
         }
         char *msg = malloc(100+strlen(message)+strlen(name)+1);
     time_t rawtime;
@@ -126,6 +146,9 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
             sprintf(numstring, "[i] changed nick to %s", (char*)name);
             new_lines(numstring);
         }
+        else if (line[1] == 'l') {
+            print_friendlist();
+        }
         else if (line[1] == 's') {
             uint8_t status[MAX_USERSTATUS_LENGTH];
             int i = 0;
@@ -151,11 +174,20 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
             do_refresh();
             
         }
+        
+       else if (line[1] == 'h') { //help
+           new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)");
+           new_lines("[i] /l list (list friends), /h for help, /n nick (to change nickname), /q (to quit)");
+        }
+
         else if (line[1] == 'q') { //exit
             endwin();
             exit(EXIT_SUCCESS);
+        } else { 
+            new_lines("[i] invalid command");
         }
     } else {
+        new_lines("[i] invalid command");
         //new_lines(line);
     }
 }
@@ -236,7 +268,7 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
 void print_message(int friendnumber, uint8_t * string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
-    getfriendname(friendnumber, (uint8_t*)name);
+    getname(friendnumber, (uint8_t*)name);
     char msg[100+length+strlen(name)+1];
     time_t rawtime;
     struct tm * timeinfo;
@@ -251,7 +283,7 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
 
 void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
     char name[MAX_NAME_LENGTH];
-    getfriendname(friendnumber, (uint8_t*)name);
+    getname(friendnumber, (uint8_t*)name);
     char msg[100+length];
     sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string);
     new_lines(msg);
@@ -259,7 +291,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) {
 
 void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) {
     char name[MAX_NAME_LENGTH];
-    getfriendname(friendnumber, (uint8_t*)name);
+    getname(friendnumber, (uint8_t*)name);
     char msg[100+length+strlen(name)+1];
     sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string);
     new_lines(msg);
@@ -335,7 +367,8 @@ int main(int argc, char *argv[])
     raw();
     getmaxyx(stdscr,y,x);
     new_lines(idstring0);
-    new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status), /n nick (to change nickname), /q (to quit)");
+    new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)");
+    new_lines("[i] /l list (list friends), /n nick (to change nickname), /q (to quit)");
     strcpy(line, "");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));