From 2e0fa701ccec9f33034f1679c5cd6a61143e9775 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Wed, 31 Jul 2013 21:44:57 -0400 Subject: [PATCH 1/2] fixed friend add bugs --- prompt.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/prompt.c b/prompt.c index e18bdff..6970441 100644 --- a/prompt.c +++ b/prompt.c @@ -133,10 +133,26 @@ static void execute(ToxWindow* self, char* cmd) { } num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1); - - wprintw(self->window, "Friend added as %d.\n", num); - on_friendadded(num); + switch (num) { + case -1: + wprintw(self->window, "Message is too long.\n"); + break; + case -2: + wprintw(self->window, "That appears to be your own ID.\n"); + break; + case -3: + wprintw(self->window, "Friend request already sent.\n"); + break; + case -4: + wprintw(self->window, "Invalid ID.\n"); + break; + default: + wprintw(self->window, "Friend added as %d.\n", num); + on_friendadded(num); + break; + } } + else if(!strcmp(cmd, "help")) { wattron(self->window, COLOR_PAIR(2) | A_BOLD); wprintw(self->window, "Commands:\n"); From a77b4a962d14a1275f6c8014deda5d58e9ac51a5 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Thu, 1 Aug 2013 15:27:08 -0400 Subject: [PATCH 2/2] added error code for no message on friend add & updated nTox.c/nTox_win32.c --- prompt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/prompt.c b/prompt.c index 6970441..21c1f52 100644 --- a/prompt.c +++ b/prompt.c @@ -138,13 +138,15 @@ static void execute(ToxWindow* self, char* cmd) { wprintw(self->window, "Message is too long.\n"); break; case -2: + wprintw(self->window, "Please add a message to your request.\n"); + case -3: wprintw(self->window, "That appears to be your own ID.\n"); break; - case -3: + case -4: wprintw(self->window, "Friend request already sent.\n"); break; - case -4: - wprintw(self->window, "Invalid ID.\n"); + case -5: + wprintw(self->window, "[i] Undefined error when adding friend.\n"); break; default: wprintw(self->window, "Friend added as %d.\n", num);