mirror of
https://github.com/Tha14/toxic.git
synced 2024-12-23 11:13:24 +01:00
Modified clients to properly work with the changes
This commit is contained in:
parent
088e7d3e17
commit
174604a448
2
chat.c
2
chat.c
@ -162,7 +162,7 @@ void execute(ToxWindow *self, ChatContext *ctx, char *cmd)
|
||||
return;
|
||||
}
|
||||
msg++;
|
||||
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
|
||||
m_set_statusmessage((uint8_t*) msg, strlen(msg)+1);
|
||||
wprintw(ctx->history, "Status set to: %s\n", msg);
|
||||
}
|
||||
|
||||
|
@ -20,7 +20,7 @@ extern int active_window;
|
||||
|
||||
typedef struct {
|
||||
uint8_t name[MAX_NAME_LENGTH];
|
||||
uint8_t status[MAX_USERSTATUS_LENGTH];
|
||||
uint8_t status[MAX_STATUSMESSAGE_LENGTH];
|
||||
int num;
|
||||
int chatwin;
|
||||
} friend_t;
|
||||
@ -74,7 +74,7 @@ void friendlist_onNickChange(ToxWindow *self, int num, uint8_t *str, uint16_t le
|
||||
|
||||
void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t len)
|
||||
{
|
||||
if (len >= MAX_USERSTATUS_LENGTH || num >= num_friends)
|
||||
if (len >= MAX_STATUSMESSAGE_LENGTH || num >= num_friends)
|
||||
return;
|
||||
|
||||
memcpy((char*) &friends[num].status, (char*) str, len);
|
||||
|
4
main.c
4
main.c
@ -68,7 +68,7 @@ void on_nickchange(int friendnumber, uint8_t *string, uint16_t length)
|
||||
}
|
||||
}
|
||||
|
||||
void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
|
||||
void on_statuschange(int friendnumber, uint8_t *string, uint16_t length)
|
||||
{
|
||||
wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
|
||||
int i;
|
||||
@ -112,7 +112,7 @@ static void init_tox()
|
||||
m_callback_friendrequest(on_request);
|
||||
m_callback_friendmessage(on_message);
|
||||
m_callback_namechange(on_nickchange);
|
||||
m_callback_userstatus(on_statuschange);
|
||||
m_callback_statusmessage(on_statuschange);
|
||||
}
|
||||
|
||||
void init_window_status()
|
||||
|
20
prompt.c
20
prompt.c
@ -183,27 +183,22 @@ static void execute(ToxWindow *self, char *u_cmd)
|
||||
return;
|
||||
}
|
||||
status++;
|
||||
USERSTATUS_KIND status_kind;
|
||||
USERSTATUS status_kind;
|
||||
if (!strncmp(status, "online", strlen("online"))) {
|
||||
status_kind = USERSTATUS_KIND_ONLINE;
|
||||
status_kind = USERSTATUS_NONE;
|
||||
status_text = "ONLINE";
|
||||
}
|
||||
|
||||
else if (!strncmp(status, "away", strlen("away"))) {
|
||||
status_kind = USERSTATUS_KIND_AWAY;
|
||||
status_kind = USERSTATUS_AWAY;
|
||||
status_text = "AWAY";
|
||||
}
|
||||
|
||||
else if (!strncmp(status, "busy", strlen("busy"))) {
|
||||
status_kind = USERSTATUS_KIND_BUSY;
|
||||
status_kind = USERSTATUS_BUSY;
|
||||
status_text = "BUSY";
|
||||
}
|
||||
|
||||
else if (!strncmp(status, "offline", strlen("offline"))) {
|
||||
status_kind = USERSTATUS_KIND_OFFLINE;
|
||||
status_text = "OFFLINE";
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
wprintw(self->window, "Invalid status.\n");
|
||||
@ -212,12 +207,13 @@ static void execute(ToxWindow *self, char *u_cmd)
|
||||
|
||||
msg = strchr(status, ' ');
|
||||
if (msg == NULL) {
|
||||
m_set_userstatus_kind(status_kind);
|
||||
m_set_userstatus(status_kind);
|
||||
wprintw(self->window, "Status set to: %s\n", status_text);
|
||||
}
|
||||
else {
|
||||
msg++;
|
||||
m_set_userstatus(status_kind, (uint8_t*) msg, strlen(msg)+1);
|
||||
m_set_userstatus(status_kind);
|
||||
m_set_statusmessage((uint8_t*) msg, strlen(msg)+1);
|
||||
wprintw(self->window, "Status set to: %s, %s\n", status_text, msg);
|
||||
}
|
||||
}
|
||||
@ -229,7 +225,7 @@ static void execute(ToxWindow *self, char *u_cmd)
|
||||
return;
|
||||
}
|
||||
msg++;
|
||||
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
|
||||
m_set_statusmessage((uint8_t*) msg, strlen(msg)+1);
|
||||
wprintw(self->window, "Status set to: %s\n", msg);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user