philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup check_auto_invite() and make it static

Browse Source
This commit is contained in:
Kevin Easton
2017-05-29 16:12:11 +10:00
parent fb35a00d1d
commit 09ab7a2130
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/notify.c
View File

@@ -367,32 +367,28 @@ void do_notify(void)
return; return;
} }
void check_auto_invite(char *nick, char *userhost) static void check_auto_invite(const char *nick, const char *userhost)
{ {
#ifdef WANT_USERLIST #ifdef WANT_USERLIST
ChannelList *chan = NULL; ChannelList *chan = NULL;
UserList *tmp = NULL;
for (chan = get_server_channels(from_server); chan; chan = chan->next) for (chan = get_server_channels(from_server); chan; chan = chan->next)
{ {
if ((tmp = lookup_userlevelc("*", userhost, chan->channel, NULL))) if (chan->have_op && get_cset_int_var(chan->csets, AINV_CSET))
{ {
NickList *n = NULL; const UserList *ul = lookup_userlevelc("*", userhost, chan->channel, NULL);
n = find_nicklist_in_channellist(nick, chan, 0);
if (!n && chan->have_op && get_cset_int_var(chan->csets, AINV_CSET) && (tmp->flags & ADD_INVITE) && get_cset_int_var(chan->csets, AINV_CSET)) if (ul && (ul->flags & ADD_INVITE) && !find_nicklist_in_channellist(nick, chan, 0))
{ {
bitchsay("Auto-inviting %s to %s", nick, chan->channel); bitchsay("Auto-inviting %s to %s", nick, chan->channel);
send_to_server("NOTICE %s :Auto-invite from %s", nick, get_server_nickname(from_server)); send_to_server("NOTICE %s :Auto-invite from %s", nick, get_server_nickname(from_server));
send_to_server("INVITE %s %s%s%s", nick, chan->channel, chan->key?space:empty_string, chan->key?chan->key:empty_string); send_to_server("INVITE %s %s%s%s", nick, chan->channel, chan->key?space:empty_string, chan->key?chan->key:empty_string);
} }
} }
tmp = NULL;
} }
#endif #endif
} }
static char *batched_notify_userhosts = NULL; static char *batched_notify_userhosts = NULL;
static int batched_notifies = 0; static int batched_notifies = 0;