Wrote group chat invite code.
This commit is contained in:
parent
4c6e739527
commit
f81176881f
@ -40,6 +40,7 @@ add_library(tox MODULE
|
|||||||
src/twc-config.c
|
src/twc-config.c
|
||||||
src/twc-friend-request.c
|
src/twc-friend-request.c
|
||||||
src/twc-gui.c
|
src/twc-gui.c
|
||||||
|
src/twc-group-invite.c
|
||||||
src/twc-list.c
|
src/twc-list.c
|
||||||
src/twc-message-queue.c
|
src/twc-message-queue.c
|
||||||
src/twc-profile.c
|
src/twc-profile.c
|
||||||
|
@ -308,16 +308,16 @@ twc_chat_buffer_close_callback(void *data,
|
|||||||
* Free all chats connected to a profile.
|
* Free all chats connected to a profile.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
twc_chat_free_profile(struct t_twc_profile *profile)
|
twc_chat_free_list(struct t_twc_list *list)
|
||||||
{
|
{
|
||||||
struct t_twc_chat *chat;
|
struct t_twc_chat *chat;
|
||||||
while ((chat = twc_list_pop(profile->chats)))
|
while ((chat = twc_list_pop(list)))
|
||||||
{
|
{
|
||||||
weechat_buffer_set_pointer(chat->buffer, "close_callback", NULL);
|
weechat_buffer_set_pointer(chat->buffer, "close_callback", NULL);
|
||||||
weechat_buffer_close(chat->buffer);
|
weechat_buffer_close(chat->buffer);
|
||||||
free(chat);
|
free(chat);
|
||||||
}
|
}
|
||||||
|
|
||||||
free(profile->chats);
|
free(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ void
|
|||||||
twc_chat_queue_refresh(struct t_twc_chat *chat);
|
twc_chat_queue_refresh(struct t_twc_chat *chat);
|
||||||
|
|
||||||
void
|
void
|
||||||
twc_chat_free_profile(struct t_twc_profile *profile);
|
twc_chat_free_list(struct t_twc_list *list);
|
||||||
|
|
||||||
#endif // TOX_WEECHAT_CHAT_H
|
#endif // TOX_WEECHAT_CHAT_H
|
||||||
|
|
||||||
|
110
src/twc-group-invite.c
Normal file
110
src/twc-group-invite.c
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2014 Håvard Pettersson <haavard.pettersson@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of Tox-WeeChat.
|
||||||
|
*
|
||||||
|
* Tox-WeeChat is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Tox-WeeChat is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Tox-WeeChat. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <weechat/weechat-plugin.h>
|
||||||
|
#include <tox/tox.h>
|
||||||
|
|
||||||
|
#include "twc.h"
|
||||||
|
#include "twc-list.h"
|
||||||
|
#include "twc-profile.h"
|
||||||
|
#include "twc-utils.h"
|
||||||
|
|
||||||
|
#include "twc-group-invite.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a new group invite to a profile.
|
||||||
|
*
|
||||||
|
* Returns 0 on success, -1 on error.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
twc_group_chat_invite_add(struct t_twc_profile *profile,
|
||||||
|
int32_t friend_number,
|
||||||
|
const uint8_t *data,
|
||||||
|
size_t size)
|
||||||
|
{
|
||||||
|
// create a new invite object
|
||||||
|
struct t_twc_group_chat_invite *invite
|
||||||
|
= malloc(sizeof(struct t_twc_group_chat_invite));
|
||||||
|
if (!invite)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
invite->profile = profile;
|
||||||
|
invite->data = data;
|
||||||
|
invite->data_size = size;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Accept a group chat invite. Remove and free the invite.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_accept(struct t_twc_group_chat_invite *invite)
|
||||||
|
{
|
||||||
|
tox_join_groupchat(invite->profile->tox,
|
||||||
|
invite->friend_number,
|
||||||
|
invite->data,
|
||||||
|
invite->data_size);
|
||||||
|
twc_group_chat_invite_remove(invite);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove and free a group chat invite.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_remove(struct t_twc_group_chat_invite *invite)
|
||||||
|
{
|
||||||
|
twc_list_remove_with_data(invite->profile->group_chat_invites, invite);
|
||||||
|
twc_group_chat_invite_free(invite);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get group chat invite with a given index.
|
||||||
|
*/
|
||||||
|
struct t_twc_group_chat_invite *
|
||||||
|
twc_group_chat_invite_with_index(struct t_twc_profile *profile,
|
||||||
|
int64_t index)
|
||||||
|
{
|
||||||
|
return twc_list_get(profile->group_chat_invites, index)->group_chat_invite;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Free a group chat invite.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_free(struct t_twc_group_chat_invite *invite)
|
||||||
|
{
|
||||||
|
free(invite);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Free a list of group chat invites.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_free_list(struct t_twc_list *list)
|
||||||
|
{
|
||||||
|
struct t_twc_group_chat_invite *invite;
|
||||||
|
while ((invite = twc_list_pop(list)))
|
||||||
|
twc_group_chat_invite_free(invite);
|
||||||
|
|
||||||
|
free(list);
|
||||||
|
}
|
||||||
|
|
64
src/twc-group-invite.h
Normal file
64
src/twc-group-invite.h
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2014 Håvard Pettersson <haavard.pettersson@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of Tox-WeeChat.
|
||||||
|
*
|
||||||
|
* Tox-WeeChat is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Tox-WeeChat is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Tox-WeeChat. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef TOX_WEECHAT_GROUP_INVITE_H
|
||||||
|
#define TOX_WEECHAT_GROUP_INVITE_H
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <tox/tox.h>
|
||||||
|
|
||||||
|
struct t_twc_list;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a group chat invite.
|
||||||
|
*/
|
||||||
|
struct t_twc_group_chat_invite
|
||||||
|
{
|
||||||
|
struct t_twc_profile *profile;
|
||||||
|
|
||||||
|
int32_t friend_number;
|
||||||
|
const uint8_t *data;
|
||||||
|
size_t data_size;
|
||||||
|
};
|
||||||
|
|
||||||
|
int
|
||||||
|
twc_group_chat_invite_add(struct t_twc_profile *profile,
|
||||||
|
int32_t friend_number,
|
||||||
|
const uint8_t *data,
|
||||||
|
size_t size);
|
||||||
|
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_accept(struct t_twc_group_chat_invite *invite);
|
||||||
|
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_remove(struct t_twc_group_chat_invite *invite);
|
||||||
|
|
||||||
|
struct t_twc_group_chat_invite *
|
||||||
|
twc_group_chat_invite_with_index(struct t_twc_profile *profile,
|
||||||
|
int64_t index);
|
||||||
|
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_free(struct t_twc_group_chat_invite *invite);
|
||||||
|
|
||||||
|
void
|
||||||
|
twc_group_chat_invite_free_list(struct t_twc_list *list);
|
||||||
|
|
||||||
|
#endif // TOX_WEECHAT_GROUP_INVITE_H
|
||||||
|
|
@ -40,6 +40,7 @@ struct t_twc_list_item
|
|||||||
void *data;
|
void *data;
|
||||||
struct t_twc_profile *profile;
|
struct t_twc_profile *profile;
|
||||||
struct t_twc_friend_request *friend_request;
|
struct t_twc_friend_request *friend_request;
|
||||||
|
struct t_twc_group_chat_invite *group_chat_invite;
|
||||||
struct t_twc_chat *chat;
|
struct t_twc_chat *chat;
|
||||||
struct t_twc_queued_message *queued_message;
|
struct t_twc_queued_message *queued_message;
|
||||||
};
|
};
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
#include "twc-bootstrap.h"
|
#include "twc-bootstrap.h"
|
||||||
#include "twc-config.h"
|
#include "twc-config.h"
|
||||||
#include "twc-friend-request.h"
|
#include "twc-friend-request.h"
|
||||||
|
#include "twc-group-invite.h"
|
||||||
#include "twc-message-queue.h"
|
#include "twc-message-queue.h"
|
||||||
#include "twc-chat.h"
|
#include "twc-chat.h"
|
||||||
#include "twc-tox-callbacks.h"
|
#include "twc-tox-callbacks.h"
|
||||||
@ -177,6 +178,7 @@ twc_profile_new(const char *name)
|
|||||||
profile->tox_online = false;
|
profile->tox_online = false;
|
||||||
|
|
||||||
profile->chats = twc_list_new();
|
profile->chats = twc_list_new();
|
||||||
|
profile->group_chat_invites = twc_list_new();
|
||||||
profile->message_queues = weechat_hashtable_new(32,
|
profile->message_queues = weechat_hashtable_new(32,
|
||||||
WEECHAT_HASHTABLE_INTEGER,
|
WEECHAT_HASHTABLE_INTEGER,
|
||||||
WEECHAT_HASHTABLE_POINTER,
|
WEECHAT_HASHTABLE_POINTER,
|
||||||
@ -432,7 +434,8 @@ twc_profile_free(struct t_twc_profile *profile)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// free things
|
// free things
|
||||||
twc_chat_free_profile(profile);
|
twc_chat_free_list(profile->chats);
|
||||||
|
twc_group_chat_invite_free_list(profile->group_chat_invites);
|
||||||
twc_message_queue_free_profile(profile);
|
twc_message_queue_free_profile(profile);
|
||||||
free(profile->name);
|
free(profile->name);
|
||||||
free(profile);
|
free(profile);
|
||||||
|
@ -47,6 +47,7 @@ struct t_twc_profile
|
|||||||
struct t_hook *tox_do_timer;
|
struct t_hook *tox_do_timer;
|
||||||
|
|
||||||
struct t_twc_list *chats;
|
struct t_twc_list *chats;
|
||||||
|
struct t_twc_list *group_chat_invites;
|
||||||
struct t_hashtable *message_queues;
|
struct t_hashtable *message_queues;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user