Cleaned up friend request code.

This commit is contained in:
Håvard Pettersson 2014-09-18 01:01:36 +02:00
parent a467fb7455
commit 7d5ffb89a5
4 changed files with 77 additions and 54 deletions

View file

@ -12,18 +12,36 @@
#include "tox-weechat-friend-requests.h"
void
tox_weechat_friend_request_free(struct t_tox_weechat_friend_request *request)
tox_weechat_friend_request_new(struct t_tox_weechat_identity *identity,
const uint8_t *client_id,
const char *message)
{
free(request->message);
free(request);
}
// check friend request count
struct t_config_option *option =
identity->options[TOX_WEECHAT_IDENTITY_OPTION_MAX_FRIEND_REQUESTS];
unsigned int max_requests = weechat_config_integer(option);
if (identity->friend_request_count >= max_requests)
{
weechat_printf(identity->buffer,
"%sReceived a friend request, but your friend request list is full!",
weechat_prefix("warning"));
return;
}
void
tox_weechat_friend_request_add(struct t_tox_weechat_identity *identity,
struct t_tox_weechat_friend_request *request)
{
struct t_tox_weechat_friend_request *request = malloc(sizeof(*request));
request->identity = identity;
request->message = strdup(message);
memcpy(request->address, client_id, TOX_CLIENT_ID_SIZE);
char hex_address[TOX_CLIENT_ID_SIZE * 2 + 1];
tox_weechat_bin2hex(request->address, TOX_CLIENT_ID_SIZE, hex_address);
weechat_printf(identity->buffer,
"%sReceived a friend request from %s: \"%s\"",
weechat_prefix("network"),
hex_address,
request->message);
// add to list
request->prev_request = identity->last_friend_request;
request->next_request = NULL;
@ -39,17 +57,19 @@ tox_weechat_friend_request_add(struct t_tox_weechat_identity *identity,
void
tox_weechat_friend_request_remove(struct t_tox_weechat_friend_request *request)
{
struct t_tox_weechat_identity *identity = request->identity;
if (request == identity->last_friend_request)
identity->last_friend_request = request->prev_request;
if (request->prev_request)
request->prev_request->next_request = request->next_request;
else
identity->friend_requests = request->next_request;
if (request->next_request)
request->next_request->prev_request = request->prev_request;
if (request == request->identity->friend_requests)
request->identity->friend_requests = request->next_request;
if (request == request->identity->last_friend_request)
request->identity->last_friend_request = request->prev_request;
tox_weechat_friend_request_free(request);
--(identity->friend_request_count);
}
void
@ -83,14 +103,35 @@ tox_weechat_friend_request_with_num(struct t_tox_weechat_identity *identity,
}
void
tox_weechat_friend_requests_init()
tox_weechat_friend_request_init_identity(struct t_tox_weechat_identity *identity)
{
// TODO: load from file
identity->friend_requests = identity->last_friend_request = NULL;
identity->friend_request_count = 0;
}
void
tox_weechat_friend_requests_free(struct t_tox_weechat_identity *identity)
tox_weechat_friend_request_save_identity(struct t_tox_weechat_identity *identity)
{
for (struct t_tox_weechat_friend_request *request = identity->friend_requests;
request;
request = request->next_request)
{
// TODO: actually save requests
}
}
void
tox_weechat_friend_request_free(struct t_tox_weechat_friend_request *request)
{
free(request->message);
free(request);
}
void
tox_weechat_friend_request_free_identity(struct t_tox_weechat_identity *identity)
{
// TODO: persist requests
while (identity->friend_requests)
tox_weechat_friend_request_remove(identity->friend_requests);
}