Skip to content

Fix gotkick(): unset chan.status CHAN_ACTIVE #1842

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

Open
michaelortmann wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix gotkick(): unset chan.status CHAN_ACTIVE #1842

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
707b7e8
Fix gotkick(): unset chan.status CHAN_ACTIVE
michaelortmann Oct 14, 2025
3c13510
Refix
michaelortmann Oct 14, 2025
5506ced
Enhance fix, to not send PART after being kicked
michaelortmann Oct 14, 2025
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
29 changes: 17 additions & 12 deletions src/mod/irc.mod/chan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,6 +2320,7 @@ static int gotkick(char *from, char *origmsg)
struct chanset_t *chan;
struct userrec *u;
struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };
int kicked_me = 0;

strlcpy(buf2, origmsg, sizeof buf2);
msg = buf2;
Expand All @@ -2328,19 +2329,21 @@ static int gotkick(char *from, char *origmsg)
if (!chan)
return 0;
nick = newsplit(&msg);
if (match_my_nick(nick) && channel_pending(chan) &&
!channel_inactive(chan)) {
chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
if (match_my_nick(nick) && !channel_inactive(chan)) {
if (channel_pending(chan)) {
chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);

key = chan->channel.key[0] ? chan->channel.key : chan->key_prot;
if (key[0])
dprintf(DP_SERVER, "JOIN %s %s\n",
chan->name[0] ? chan->name : chan->dname, key);
else
dprintf(DP_SERVER, "JOIN %s\n",
chan->name[0] ? chan->name : chan->dname);
clear_channel(chan, CHAN_RESETALL);
return 0; /* rejoin if kicked before getting needed info <Wcc[08/08/02]> */
key = chan->channel.key[0] ? chan->channel.key : chan->key_prot;
if (key[0])
dprintf(DP_SERVER, "JOIN %s %s\n",
chan->name[0] ? chan->name : chan->dname, key);
else
dprintf(DP_SERVER, "JOIN %s\n",
chan->name[0] ? chan->name : chan->dname);
clear_channel(chan, CHAN_RESETALL);
return 0; /* rejoin if kicked before getting needed info <Wcc[08/08/02]> */
} else
kicked_me = 1; // unset CHAN_ACTIVE aftter check_tcl_kick()
}
if (channel_active(chan)) {
fixcolon(msg);
Expand All @@ -2360,6 +2363,8 @@ static int gotkick(char *from, char *origmsg)
/* This _needs_ to use chan->dname <cybah> */
get_user_flagrec(u, &fr, chan->dname);
set_handle_laston(chan->dname, u, now);
if (kicked_me)
chan->status &= ~CHAN_ACTIVE;
check_tcl_kick(whodid, uhost, u, chan->dname, nick, msg);

chan = findchan(chname);
Expand Down
Loading