Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:13:01 +01:00
Code Issues Projects Releases Wiki Activity

rm /msg command

Browse Source
This commit is contained in:
Jfreegman 2013-10-18 23:46:58 -04:00
parent 361c4cfafc
commit 0396ce6456
4 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/chat.c
View File

@ -571,8 +571,9 @@ ToxWindow new_chat(Tox *m, ToxWindow *prompt, int friendnum)
ret.onFileData = &chat_onFileData;
uint8_t name[TOX_MAX_NAME_LENGTH] = {'\0'};
tox_getname(m, friendnum, name);
snprintf(ret.name, sizeof(ret.name), "%s", name);
uint16_t len = tox_getname(m, friendnum, name);
memcpy(ret.name, name, len);
ret.name[TOXIC_MAX_NAME_LENGTH] = '\0';
ChatContext *chatwin = calloc(1, sizeof(ChatContext));
StatusBar *stb = calloc(1, sizeof(StatusBar));

33
src/commands.c
View File

@ -261,39 +261,6 @@ void cmd_join(WINDOW *window, ToxWindow *prompt, Tox *m, int argc, char **argv)
}
}
void cmd_msg(WINDOW *window, ToxWindow *prompt, Tox *m, int argc, char **argv)
{
/* check arguments */
if (argc < 2) {
wprintw(window, "Invalid syntax.\n");
return;
}
uint8_t *name = argv[1];
uint8_t *msg = argv[2];
if (name == NULL || msg == NULL) {
wprintw(window, "Invalid syntax.\n");
return;
}
if (msg[0] != '\"') {
wprintw(window, "Messages must be enclosed in quotes.\n");
return;
}
msg[strlen(++msg)-1] = L'\0';
int friendnum = get_friendnum(name);
if (friendnum == -1) {
wprintw(window, "Friend '%s' not found.\n", name);
return;
}
if (tox_sendmessage(m, friendnum, msg, strlen(msg) + 1) == 0)
wprintw(window, "Failed to send message.\n");
}
void cmd_myid(WINDOW *window, ToxWindow *prompt, Tox *m, int argc, char **argv)
{
char id[TOX_FRIEND_ADDRESS_SIZE * 2 + 1] = {0};

4
src/commands.h
View File

@ -9,7 +9,6 @@ void cmd_clear(WINDOW *, ToxWindow *, Tox *m, int, char **);
void cmd_connect(WINDOW *, ToxWindow *, Tox *m, int, char **);
void cmd_groupchat(WINDOW *, ToxWindow *, Tox *m, int, char **);
void cmd_join(WINDOW *, ToxWindow *, Tox *m, int, char **);
void cmd_msg(WINDOW *, ToxWindow *, Tox *m, int, char **);
void cmd_myid(WINDOW *, ToxWindow *, Tox *m, int, char **);
void cmd_nick(WINDOW *, ToxWindow *, Tox *m, int, char **);
void cmd_note(WINDOW *, ToxWindow *, Tox *m, int, char **);
@ -18,7 +17,7 @@ void cmd_status(WINDOW *, ToxWindow *, Tox *m, int, char **);
void execute(WINDOW *window, ToxWindow *prompt, Tox *m, char *u_cmd, int buf_len);
#define NUM_COMMANDS 14
#define NUM_COMMANDS 13
static struct {
char *name;
@ -31,7 +30,6 @@ static struct {
{ "/exit", cmd_quit },
{ "/groupchat", cmd_groupchat },
{ "/join", cmd_join },
{ "/msg", cmd_msg },
{ "/myid", cmd_myid },
{ "/nick", cmd_nick },
{ "/note", cmd_note },

13
src/friendlist.c
View File

@ -255,19 +255,6 @@ void disable_chatwin(int f_num)
friends[f_num].chatwin = -1;
}
/* Returns the respective friend number of name. Returns -1 on no match */
int get_friendnum(uint8_t *name)
{
int i;
for (i = 0; i < num_friends; ++i) {
if (strcmp(friends[i].name, name) == 0)
return friends[i].num;
}
return -1;
}
static void friendlist_onInit(ToxWindow *self, Tox *m)
{