add command to decline friend requests

src/execute.c

@@ -43,6 +43,7 @@ static struct cmd_func global_commands[] = {
     { "/add",       cmd_add           },
     { "/clear",     cmd_clear         },
     { "/connect",   cmd_connect       },
+    { "/decline",   cmd_decline       },
     { "/exit",      cmd_quit          },
     { "/groupchat", cmd_groupchat     },
     { "/help",      cmd_prompt_help   },

src/execute.h

@@ -29,10 +29,10 @@
 #define MAX_NUM_ARGS 4     /* Includes command */
 
 #ifdef _AUDIO
-#define GLOBAL_NUM_COMMANDS 17
+#define GLOBAL_NUM_COMMANDS 18
 #define CHAT_NUM_COMMANDS 12
 #else
-#define GLOBAL_NUM_COMMANDS 15
+#define GLOBAL_NUM_COMMANDS 16
 #define CHAT_NUM_COMMANDS 5
 #endif /* _AUDIO */
 

src/global_commands.c

@@ -213,6 +213,38 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)
     free(binary_string);
 }
 
+void cmd_decline(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    if (argc < 1) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Request ID required.");
+        return;
+    }
+
+    int req = atoi(argv[1]);
+
+    if ((req == 0 && strcmp(argv[1], "0")) || req < 0 || req > MAX_FRIEND_REQUESTS) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending friend request with that ID.");
+        return;
+    }
+
+    if (!FriendRequests.request[req].active) {
+        line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "No pending friend request with that ID.");
+        return;
+    }
+
+    memset(&FriendRequests.request[req], 0, sizeof(struct _friend_request));
+
+    int i;
+
+    for (i = FriendRequests.max_idx; i > 0; --i) {
+        if (FriendRequests.request[i - 1].active)
+            break;
+    }
+
+    FriendRequests.max_idx = i;
+    --FriendRequests.num_requests;
+}
+
 void cmd_groupchat(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     if (get_num_active_windows() >= MAX_WINDOWS_NUM) {

src/global_commands.h

@@ -30,6 +30,7 @@ void cmd_accept(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZ
 void cmd_add(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_clear(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_connect(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
+void cmd_decline(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_groupchat(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_log(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_myid(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);

src/help.c

@@ -138,6 +138,7 @@ static void help_draw_global(ToxWindow *self)
 
     wprintw(win, "  /add <addr> <msg>          : Add contact with optional message\n");
     wprintw(win, "  /accept <id>               : Accept friend request\n");
+    wprintw(win, "  /decline <id>              : Decline friend request\n");
     wprintw(win, "  /requests                  : List pending friend requests\n");
     wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
     wprintw(win, "  /status <type> <msg>       : Set status with optional note\n");
@@ -265,9 +266,9 @@ void help_onKey(ToxWindow *self, wint_t key)
 
         case 'g':
 #ifdef _AUDIO
-            help_init_window(self, 22, 80);
+            help_init_window(self, 23, 80);
 #else
-            help_init_window(self, 18, 80);
+            help_init_window(self, 19, 80);
 #endif
             self->help->type = HELP_GLOBAL;
             break;

src/prompt.c

@@ -55,6 +55,7 @@ const char glob_cmd_list[AC_NUM_GLOB_COMMANDS][MAX_CMDNAME_SIZE] = {
     { "/clear"      },
     { "/close"      },    /* rm /close when groupchats gets its own list */
     { "/connect"    },
+    { "/decline"    },
     { "/exit"       },
     { "/groupchat"  },
     { "/help"       },
@@ -377,7 +378,7 @@ static void prompt_onFriendRequest(ToxWindow *self, Tox *m, const char *key, con
         return;
     }
 
-    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Type \"/accept %d\" to accept it.", n);
+    line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Type \"/accept %d\" or \"/decline %d\"", n, n);
     sound_notify(self, generic_message, NT_WNDALERT_1 | NT_NOTIFWND, NULL);
 }
 

src/prompt.h

@@ -27,9 +27,9 @@
 #include "windows.h"
 
 #ifdef _AUDIO
-#define AC_NUM_GLOB_COMMANDS 17
+#define AC_NUM_GLOB_COMMANDS 18
 #else
-#define AC_NUM_GLOB_COMMANDS 15
+#define AC_NUM_GLOB_COMMANDS 16
 #endif /* _AUDIO */
 
 #define MAX_FRIEND_REQUESTS 32