Add command to auto-accept inbound file transfers

This command is disabled by default, and is only temporarily enabled
for an individual friend for a given client session

Author: JFreegman

Diff for: src/chat.c

@@ -67,6 +67,7 @@ static void kill_infobox(ToxWindow *self);
 static const char *chat_cmd_list[] = {
     "/accept",
     "/add",
+    "/autoaccept",
     "/avatar",
     "/cancel",
     "/cinvite",
@@ -506,17 +507,12 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, uint32_t friendnum, uint
     }
 
     switch (control) {
-        case TOX_FILE_CONTROL_RESUME: {
-            /* transfer is accepted */
+        case TOX_FILE_CONTROL_RESUME: {    /* transfer is accepted */
             if (ft->state == FILE_TRANSFER_PENDING) {
                 ft->state = FILE_TRANSFER_STARTED;
                 line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "File transfer [%zu] for '%s' accepted.",
                               ft->index, ft->file_name);
-                char progline[MAX_STR_SIZE];
-                init_progress_bar(progline);
-                line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", progline);
                 sound_notify(self, silent, NT_NOFOCUS | user_settings->bell_on_filetrans_accept | NT_WNDALERT_2, NULL);
-                ft->line_id = self->chatwin->hst->line_end->id + 2;
             } else if (ft->state == FILE_TRANSFER_PAUSED) {    /* transfer is resumed */
                 ft->state = FILE_TRANSFER_STARTED;
             }
@@ -706,8 +702,6 @@ static void chat_onFileRecv(ToxWindow *self, Tox *m, uint32_t friendnum, uint32_
         }
     }
 
-    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Type '/savefile %zu' to accept the file transfer.", ft->index);
-
     ft->file_size = file_size;
     snprintf(ft->file_path, sizeof(ft->file_path), "%s", file_path);
     snprintf(ft->file_name, sizeof(ft->file_name), "%s", filename);
@@ -722,6 +716,19 @@ static void chat_onFileRecv(ToxWindow *self, Tox *m, uint32_t friendnum, uint32_
         box_notify(self, transfer_pending, NT_WNDALERT_0 | NT_NOFOCUS | user_settings->bell_on_filetrans,
                    &self->active_box, self->name, "Incoming file: %s", filename);
     }
+
+    const bool auto_accept_files = friend_get_auto_accept_files(friendnum);
+
+    if (auto_accept_files) {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Auto-accepting file transfer %zu", ft->index);
+
+        char cmd[MAX_STR_SIZE];
+        snprintf(cmd, sizeof(cmd), "/savefile %zu", ft->index);
+        execute(self->window, self, m, cmd, CHAT_COMMAND_MODE);
+    } else {
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0,
+                      "Type '/savefile %zu' to accept the file transfer.", ft->index);
+    }
 }
 
 static void chat_onConferenceInvite(ToxWindow *self, Tox *m, int32_t friendnumber, uint8_t type,
@@ -1596,6 +1603,8 @@ static void chat_onInit(ToxWindow *self, Tox *m)
 
     scrollok(ctx->history, 0);
     wmove(self->window, y2 - CURS_Y_OFFSET, 0);
+
+    line_info_print(self);
 }
 
 ToxWindow *new_chat(Tox *m, uint32_t friendnum)

Diff for: src/chat_commands.c

@@ -37,6 +37,40 @@
 extern ToxWindow *prompt;
 extern FriendsList Friends;
 
+void cmd_autoaccept_files(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
+{
+    UNUSED_VAR(window);
+    UNUSED_VAR(m);
+
+    const char *msg;
+    const bool auto_accept_files = friend_get_auto_accept_files(self->num);
+
+    if (argc == 0) {
+        if (auto_accept_files) {
+            msg = "Auto-file accept for this friend is enabled; type \"/autoaccept off\" to disable";
+        } else {
+            msg = "Auto-file accept for this friend is disabled; type \"/autoaccept on\" to enable";
+        }
+
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, msg);
+        return;
+    }
+
+    const char *option = argv[1];
+
+    if (!strcmp(option, "1") || !strcmp(option, "on")) {
+        friend_set_auto_file_accept(self->num, true);
+        msg = "Auto-accepting file transfers has been enabled for this friend";
+    } else if (!strcmp(option, "0") || !strcmp(option, "off")) {
+        friend_set_auto_file_accept(self->num, false);
+        msg = "Auto-accepting file transfers has been disabled for this friend";
+    } else {
+        msg = "Invalid option. Use \"/autoaccept on\" and \"/autoaccept off\" to toggle auto-file accept";
+    }
+
+    line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, msg);
+}
+
 void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
 {
     UNUSED_VAR(window);
@@ -313,19 +347,19 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
     long int idx = strtol(argv[1], NULL, 10);
 
     if ((idx == 0 && strcmp(argv[1], "0")) || idx < 0 || idx >= MAX_FILES) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with ID %ld", idx);
         return;
     }
 
     FileTransfer *ft = get_file_transfer_struct_index(self->num, idx, FILE_TRANSFER_RECV);
 
     if (!ft) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with ID %ld.", idx);
         return;
     }
 
     if (ft->state != FILE_TRANSFER_PENDING) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with that ID.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "No pending file transfers with ID %ld.", idx);
         return;
     }
 
@@ -344,12 +378,13 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
 
     line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "Saving file [%ld] as: '%s'", idx, ft->file_path);
 
-    /* prep progress bar line */
+    const bool auto_accept_files = friend_get_auto_accept_files(self->num);
+    const uint32_t line_skip = auto_accept_files ? 4 : 2;
+
     char progline[MAX_STR_SIZE];
     init_progress_bar(progline);
     line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "%s", progline);
-
-    ft->line_id = self->chatwin->hst->line_end->id + 2;
+    ft->line_id = self->chatwin->hst->line_end->id + line_skip;
     ft->state = FILE_TRANSFER_STARTED;
 
     return;

Diff for: src/chat_commands.h

@@ -26,6 +26,7 @@
 #include "toxic.h"
 #include "windows.h"
 
+void cmd_autoaccept_files(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_conference_invite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_conference_join(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);

Diff for: src/execute.c

@@ -83,6 +83,7 @@ static struct cmd_func global_commands[] = {
 };
 
 static struct cmd_func chat_commands[] = {
+    { "/autoaccept", cmd_autoaccept_files  },
     { "/cancel",    cmd_cancelfile        },
     { "/cinvite",   cmd_conference_invite },
     { "/cjoin",     cmd_conference_join   },

Diff for: src/friendlist.c

@@ -502,6 +502,7 @@ void friendlist_onFriendAdded(ToxWindow *self, Tox *m, uint32_t num, bool sort)
         Friends.list[i].num = num;
         Friends.list[i].active = true;
         Friends.list[i].chatwin = -1;
+        Friends.list[i].auto_accept_files = false;  // do not change
         Friends.list[i].connection_status = TOX_CONNECTION_NONE;
         Friends.list[i].status = TOX_USER_STATUS_NONE;
         Friends.list[i].logging_on = (bool) user_settings->autolog == AUTOLOG_ON;
@@ -1344,6 +1345,10 @@ void friendlist_onInit(ToxWindow *self, Tox *m)
 
 void disable_chatwin(uint32_t f_num)
 {
+    if (f_num >= Friends.max_idx) {
+        return;
+    }
+
     Friends.list[f_num].chatwin = -1;
 }
 
@@ -1381,12 +1386,20 @@ static void friendlist_onAV(ToxWindow *self, ToxAV *av, uint32_t friend_number,
 /* Returns a friend's status */
 Tox_User_Status get_friend_status(uint32_t friendnumber)
 {
+    if (friendnumber >= Friends.max_idx) {
+        return TOX_USER_STATUS_NONE;
+    }
+
     return Friends.list[friendnumber].status;
 }
 
 /* Returns a friend's connection status */
 Tox_Connection get_friend_connection_status(uint32_t friendnumber)
 {
+    if (friendnumber >= Friends.max_idx) {
+        return TOX_CONNECTION_NONE;
+    }
+
     return Friends.list[friendnumber].connection_status;
 }
 
@@ -1410,6 +1423,24 @@ bool friend_is_blocked(const char *public_key)
     return false;
 }
 
+void friend_set_auto_file_accept(uint32_t friendnumber, bool auto_accept)
+{
+    if (friendnumber >= Friends.max_idx) {
+        return;
+    }
+
+    Friends.list[friendnumber].auto_accept_files = auto_accept;
+}
+
+bool friend_get_auto_accept_files(uint32_t friendnumber)
+{
+    if (friendnumber >= Friends.max_idx) {
+        return false;
+    }
+
+    return Friends.list[friendnumber].auto_accept_files;
+}
+
 ToxWindow *new_friendlist(void)
 {
     ToxWindow *ret = calloc(1, sizeof(ToxWindow));

Diff for: src/friendlist.h

@@ -75,6 +75,7 @@ typedef struct {
     Tox_Connection connection_status;
     bool is_typing;
     bool logging_on;    /* saves preference for friend irrespective of global settings */
+    bool auto_accept_files;  /* default should always be false */
     Tox_User_Status status;
 
     struct LastOnline last_online;
@@ -131,4 +132,14 @@ void sort_friendlist_index(void);
  */
 bool friend_is_blocked(const char *public_key);
 
+/*
+ * Enable or disable auto-accepting file transfers for this friend.
+ */
+void friend_set_auto_file_accept(uint32_t friendnumber, bool auto_accept);
+
+/*
+ * Return true if auto-accepting file transfers is enabled for this friend.
+ */
+bool friend_get_auto_accept_files(uint32_t friendnumber);
+
 #endif /* end of include guard: FRIENDLIST_H */

Diff for: src/help.c

@@ -185,7 +185,7 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /note <msg>                : Set a personal note\n");
     wprintw(win, "  /nick <name>               : Set your global name (doesn't affect groups)\n");
     wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");
-    wprintw(win, "  /log <on> or <off>         : Enable/disable logging\n");
+    wprintw(win, "  /log <on>|<off>            : Enable/disable logging\n");
     wprintw(win, "  /myid                      : Print your Tox ID\n");
     wprintw(win, "  /group <name>              : Create a new group chat\n");
     wprintw(win, "  /join <chatid>             : Join a groupchat using a Chat ID\n");
@@ -195,7 +195,7 @@ static void help_draw_global(ToxWindow *self)
 
 #ifdef QRCODE
 #ifdef QRPNG
-    wprintw(win, "  /myqr <txt> or <png>       : Print your Tox ID's QR code to a file.\n");
+    wprintw(win, "  /myqr <txt>|<png>          : Print your Tox ID's QR code to a file.\n");
 #else
     wprintw(win, "  /myqr                      : Print your Tox ID's QR code to a file.\n");
 #endif /* QRPNG */
@@ -246,6 +246,7 @@ static void help_draw_chat(ToxWindow *self)
     wprintw(win, "Chat Commands:\n");
     wattroff(win, A_BOLD | COLOR_PAIR(RED));
 
+    wprintw(win, "  /autoaccept <on>|<off>     : Toggle auto-accepting file transfers\n");
     wprintw(win, "  /cinvite <n>               : Invite contact to a conference \n");
     wprintw(win, "  /cjoin                     : Join a pending conference\n");
     wprintw(win, "  /invite <n>                : Invite contact to a groupchat \n");
@@ -363,16 +364,16 @@ static void help_draw_conference(ToxWindow *self)
     wprintw(win, "Conference commands:\n");
     wattroff(win, A_BOLD | COLOR_PAIR(RED));
 
-    wprintw(win, "  /title <msg>               : Show/set conference title\n");
+    wprintw(win, "  /title <msg>            : Show/set conference title\n");
 #ifdef AUDIO
     wattron(win, A_BOLD);
     wprintw(win, "\n Audio:\n");
     wattroff(win, A_BOLD);
-    wprintw(win, "  /audio <on> or <off>       : Enable/disable audio in an audio conference\n");
-    wprintw(win, "  /mute                      : Toggle self audio mute status\n");
-    wprintw(win, "  /mute <nick> or <pubkey>   : Toggle peer audio mute status\n");
-    wprintw(win, "  /ptt <on> or <off>         : Toggle audio input Push-To-Talk (F2 to activate)\n");
-    wprintw(win, "  /sense <n>                 : VAD sensitivity threshold\n\n");
+    wprintw(win, "  /audio <on>|<off>       : Enable/disable audio in an audio conference\n");
+    wprintw(win, "  /mute                   : Toggle self audio mute status\n");
+    wprintw(win, "  /mute <nick>|<pubkey>   : Toggle peer audio mute status\n");
+    wprintw(win, "  /ptt <on>|<off>         : Toggle audio input Push-To-Talk (F2 to activate)\n");
+    wprintw(win, "  /sense <n>              : VAD sensitivity threshold\n\n");
 #endif
 
     help_draw_bottom_menu(win);
@@ -434,7 +435,7 @@ void help_onKey(ToxWindow *self, wint_t key)
             break;
 
         case L'c':
-            height = 12;
+            height = 13;
 #ifdef VIDEO
             height += 15;
 #elif AUDIO