Changeset d088ee8

Timestamp:

2015-11-26T04:46:51Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

47ab9a9

Parents:

1ec454c

Message:

irc: Send numeric error when failing to join a channel

This fixes issues like getting a blank window with a channel that the
irc client thinks the user is in but bitlbee doesn't.

The error is sent either by returning NULL in the chat_join prpl
function, or by calling imcb_chat_free() before the user is added to the
channel.

This wasn't possible before since purple returned NULL in its chat_join,
which resulted in other bugs too. Since that's fixed, I can finally
apply this, which has been in my stash for a very long while.

Files:

• irc_channel.c (modified) (1 diff)
• irc_im.c (modified) (2 diffs)

irc_channel.c

@@ -255 +255 @@
 
         if (!(icu = irc_channel_has_user(ic, iu))) {
+                if (iu == ic->irc->user && type == IRC_CDU_KICK) {
+                        /* an error happened before joining, inform the client with a numeric */
+                        irc_send_num(ic->irc, 403, "%s :Error joining channel (check control channel?)", ic->name);
+                }
                 return 0;
         }

irc_im.c

@@ -883 +883 @@
             acc->prpl->chat_join) {
                 char *nick;
+                struct groupchat *gc;
 
                 if (!(nick = set_getstr(&ic->set, "nick"))) {
@@ -889 +890 @@
 
                 ic->flags |= IRC_CHANNEL_CHAT_PICKME;
-                acc->prpl->chat_join(acc->ic, room, nick, NULL, &ic->set);
+                gc = acc->prpl->chat_join(acc->ic, room, nick, NULL, &ic->set);
                 ic->flags &= ~IRC_CHANNEL_CHAT_PICKME;
+
+                if (!gc) {
+                        irc_send_num(ic->irc, 403, "%s :Error joining channel (check control channel?)", ic->name);
+                }
 
                 return FALSE;