Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added option to leave group #135

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

Added option to leave group #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88bdaf0
Added option to leave group
KamalGalrani Feb 25, 2017
6c57ebd
ISO C90 compatibility fix
KamalGalrani Feb 25, 2017
b69d862
Array declaration issue
KamalGalrani Feb 25, 2017
7f43dc5
Fixed IRC root message on fbleave prints wrong thread id
KamalGalrani Feb 25, 2017
1cf042a
Added support to leave group using channel name
KamalGalrani Feb 25, 2017
4c17a88
Removed unused variable
KamalGalrani Feb 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions facebook/facebook-data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ fb_data_init(FbData *fata)
priv->msgs = g_queue_new();
priv->tids = g_queue_new();
priv->evs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
priv->gcs = g_hash_table_new(g_direct_hash, g_direct_equal);
priv->gcs = g_hash_table_new(g_str_hash, g_str_equal);
}

FbData *
Expand Down Expand Up @@ -211,22 +211,26 @@ void
fb_data_add_groupchat(FbData *fata, struct groupchat *gc)
{
FbDataPrivate *priv;
irc_channel_t *ich;

g_return_if_fail(FB_IS_DATA(fata));
priv = fata->priv;
ich = gc->ui_data;

g_hash_table_replace(priv->gcs, gc, gc);
g_hash_table_replace(priv->gcs, ich->name, gc);
}

void
fb_data_remove_groupchat(FbData *fata, struct groupchat *gc)
{
FbDataPrivate *priv;
irc_channel_t *ich;

g_return_if_fail(FB_IS_DATA(fata));
priv = fata->priv;
ich = gc->ui_data;

g_hash_table_remove(priv->gcs, gc);
g_hash_table_remove(priv->gcs, ich->name);
}

void
Expand Down Expand Up @@ -270,6 +274,19 @@ fb_data_clear_threads(FbData *fata)
}
}

struct groupchat *
fb_data_get_gc(FbData *fata, gchar* chan)
{
FbDataPrivate *priv;
struct groupchat *gc;

g_return_val_if_fail(FB_IS_DATA(fata), 0);
priv = fata->priv;

gc = g_hash_table_lookup (priv->gcs, chan);
return gc;
}

FbId
fb_data_get_thread(FbData *fata, guint n)
{
Expand Down
12 changes: 12 additions & 0 deletions facebook/facebook-data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,18 @@ fb_data_add_thread_tail(FbData *fata, FbId tid);
void
fb_data_clear_threads(FbData *fata);

/**
* fb_data_get_gc:
* @fata: The #FbData.
* @chan: The channel for groupchat.
*
* Gets the #groupchat connected to a particulr channel.
*
* Returns: The #FbId at @index.
*/
struct groupchat *
fb_data_get_gc(FbData *fata, gchar* chan);

/**
* fb_data_get_thread:
* @fata: The #FbData.
Expand Down
118 changes: 115 additions & 3 deletions facebook/facebook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,49 @@ typedef enum {
FB_PTRBIT_UNREAD_MSG
} FbPtrBit;

static void
fb_cb_api_messages(FbApi *api, GSList *msgs, gpointer data);
static struct groupchat * fb_groupchat_new(struct im_connection *ic, FbId tid, const gchar *name);
static gboolean fb_channel_join(struct im_connection *ic, FbId tid, const gchar **channel);
static void fb_cb_api_auth(FbApi *api, gpointer data);
static void fb_cb_api_connect(FbApi *api, gpointer data);
static void fb_cb_api_contact(FbApi *api, FbApiUser *user, gpointer data);
static gboolean fb_cb_sync_contacts(gpointer data, gint fd, b_input_condition cond);
static void fb_sync_contacts_add_timeout(FbData *fata);
static void fb_cb_api_contacts(FbApi *api, GSList *users, gboolean complete, gpointer data);
static void fb_cb_api_contacts_delta(FbApi *api, GSList *added, GSList *removed, gpointer data);
static void fb_cb_api_error(FbApi *api, GError *error, gpointer data);
static void fb_cb_api_events(FbApi *api, GSList *events, gpointer data);
static void fb_cb_api_messages(FbApi *api, GSList *msgs, gpointer data);
static void fb_cb_api_presences(FbApi *api, GSList *press, gpointer data);
static gchar * fb_thread_topic_gen(FbApiThread *thrd);
static void fb_cb_api_thread(FbApi *api, FbApiThread *thrd, gpointer data);
static void fb_cb_api_thread_create(FbApi *api, FbId tid, gpointer data);
static void fb_cb_api_thread_kicked(FbApi *api, FbApiThread *thrd, gpointer data);
static void fb_cb_api_threads(FbApi *api, GSList *thrds, gpointer data);
static void fb_cb_api_typing(FbApi *api, FbApiTyping *typg, gpointer data);
static char * fb_eval_open(struct set *set, char *value);
static char * fb_eval_mark_read(struct set *set, char *value);
static void fb_init(account_t *acct);
static void fb_login(account_t *acc);
static void fb_logout(struct im_connection *ic);
static int fb_buddy_msg(struct im_connection *ic, char *to, char *message, int flags);
static void fb_set_away(struct im_connection *ic, char *state, char *message);
static int fb_send_typing(struct im_connection *ic, char *who, int flags);
static void fb_add_buddy(struct im_connection *ic, char *name, char *group);
static void fb_remove_buddy(struct im_connection *ic, char *name, char *group);
static void fb_chat_invite(struct groupchat *gc, char *who, char *message);
static void fb_chat_kick(struct groupchat *gc, char *who, const char *message);
static void fb_chat_leave(struct groupchat *gc);
static void fb_chat_msg(struct groupchat *gc, char *message, int flags);
static struct groupchat * fb_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password, set_t **sets);
static void fb_chat_topic(struct groupchat *gc, char *topic);
static GList * fb_away_states(struct im_connection *ic);
static void fb_buddy_data_add(struct bee_user *bu);
static void fb_buddy_data_free(struct bee_user *bu);
static account_t * fb_cmd_account(irc_t *irc, char **args, guint required, guint *offset);
static void fb_cmd_fbchats(irc_t *irc, char **args);
static void fb_cmd_fbcreate(irc_t *irc, char **args);
static void fb_cmd_fbjoin(irc_t *irc, char **args);
static void fb_cmd_fbleave(irc_t *irc, char **args);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this whole block? Please don't include unrelated changes


static struct groupchat *
fb_groupchat_new(struct im_connection *ic, FbId tid, const gchar *name)
Expand Down Expand Up @@ -638,7 +679,7 @@ fb_cb_api_threads(FbApi *api, GSList *thrds, gpointer data)
fb_data_clear_threads(fata);

if (thrds == NULL) {
imcb_log(ic, "No chats to display.");
imcb_log(ic, "No group chats to display.");
return;
}

Expand Down Expand Up @@ -748,6 +789,7 @@ fb_login(account_t *acc)
FbApi *api;
FbData *fata;
struct im_connection *ic;
char *command[] = {acc->tag, NULL};

fata = fb_data_new(acc);
api = fb_data_get_api(fata);
Expand Down Expand Up @@ -819,6 +861,8 @@ fb_login(account_t *acc)

imcb_log(ic, "Fetching contacts");
fb_api_contacts(api);
imcb_log(ic, "Fetching group chats");
fb_cmd_fbchats(acc->bee->ui_data, command);
}

static void
Expand Down Expand Up @@ -1180,6 +1224,73 @@ fb_cmd_fbjoin(irc_t *irc, char **args)
irc_rootmsg(irc, "Joining channel %s", chan);
}

static void
fb_cmd_fbleave(irc_t *irc, char **args)
{
FbApi *api;
account_t *acct;
FbData *fata;
FbId tid;
gchar stid[FB_ID_STRMAX];
guint i;
guint oset;
irc_channel_t *ich;
struct groupchat *gc;
struct im_connection *ic;
char *command[] = {"part", NULL, NULL};


acct = fb_cmd_account(irc, args, 1, &oset);

if (acct == NULL) {
return;
}

fata = acct->ic->proto_data;
ic = fb_data_get_connection(fata);

i = g_ascii_strtoll(args[oset], NULL, 10);
tid = fb_data_get_thread(fata, i - 1);
gc = fb_data_get_gc(fata, args[oset]);

if ( gc != NULL) {
irc_rootmsg(irc, "Leaving group associated with channel %s.", args[oset]);
tid = FB_ID_FROM_STR(gc->title);
} else if ((i > 0) && (tid)) {
FB_ID_TO_STR(tid, stid);
gc = bee_chat_by_title(ic->bee, ic, stid);
if (G_UNLIKELY(gc == NULL)) {
irc_rootmsg(irc, "Group at index %s with thread id %s not found.", args[oset], stid);
return;
}
irc_rootmsg(irc, "Leaving group with thread id %s.", stid);
} else {
gc = bee_chat_by_title(ic->bee, ic, args[oset]);
if (G_UNLIKELY(gc == NULL)) {
irc_rootmsg(irc, "Parameter: %s is not a valid channel, index or thread id.", args[oset]);
return;
}
tid = FB_ID_FROM_STR(args[oset]);
irc_rootmsg(irc, "Leaving group with thread id %s.", args[oset]);
}
ich = gc->ui_data;

command[1] = ich->name;
irc_exec(irc, command);

command[0] = "channel";
command[2] = "del";
root_command(irc, command);

api = fb_data_get_api(fata);
fb_api_thread_remove(api, tid, 0);

command[0] = acct->tag;
command[1] = NULL;
command[2] = NULL;
fb_cmd_fbchats(irc, command);
}

G_MODULE_EXPORT void
init_plugin(void);

Expand Down Expand Up @@ -1220,6 +1331,7 @@ init_plugin(void)
root_command_add("fbchats", 0, fb_cmd_fbchats, 0);
root_command_add("fbcreate", 0, fb_cmd_fbcreate, 0);
root_command_add("fbjoin", 0, fb_cmd_fbjoin, 0);
root_command_add("fbleave", 0, fb_cmd_fbleave, 0);
}


Expand Down