aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Nicklist updates so that protocol specific xxx_NICK_REC can be used

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1177 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-02-02 22:10:20 +00:00 committed by cras
parent 7240717198
commit e387516951
8 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/nicklist.c
View File

@ -31,30 +31,15 @@
(isalnum(a) || (unsigned char) (a) >= 128)
/* Add new nick to list */
NICK_REC *nicklist_insert(CHANNEL_REC *channel, const char *nick,
int op, int voice, int send_massjoin)
void nicklist_insert(CHANNEL_REC *channel, NICK_REC *nick)
{
NICK_REC *rec;
MODULE_DATA_INIT(nick);
g_return_val_if_fail(IS_CHANNEL(channel), NULL);
g_return_val_if_fail(nick != NULL, NULL);
nick->type = module_get_uniq_id("NICK", 0);
nick->chat_type = channel->chat_type;
rec = g_new0(NICK_REC, 1);
MODULE_DATA_INIT(rec);
rec->type = module_get_uniq_id("NICK", 0);
rec->chat_type = channel->chat_type;
if (op) rec->op = TRUE;
if (voice) rec->voice = TRUE;
rec->send_massjoin = send_massjoin;
rec->nick = g_strdup(nick);
rec->host = NULL;
g_hash_table_insert(channel->nicks, rec->nick, rec);
signal_emit("nicklist new", 2, channel, rec);
return rec;
g_hash_table_insert(channel->nicks, nick->nick, nick);
signal_emit("nicklist new", 2, channel, nick);
}
/* Set host address for nick */

3
src/core/nicklist.h
View File

@ -13,8 +13,7 @@ struct _NICK_REC {
};
/* Add new nick to list */
NICK_REC *nicklist_insert(CHANNEL_REC *channel, const char *nick,
int op, int voice, int send_massjoin);
void nicklist_insert(CHANNEL_REC *channel, NICK_REC *nick);
/* Set host address for nick */
void nicklist_set_host(CHANNEL_REC *channel, NICK_REC *nick, const char *host);
/* Remove nick from list */

30
src/irc/core/irc-nicklist.c
View File

@ -29,6 +29,26 @@
#include "modes.h"
#include "servers.h"
/* Add new nick to list */
NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
int op, int voice, int send_massjoin)
{
NICK_REC *rec;
g_return_val_if_fail(IS_IRC_CHANNEL(channel), NULL);
g_return_val_if_fail(nick != NULL, NULL);
rec = g_new0(NICK_REC, 1);
rec->nick = g_strdup(nick);
if (op) rec->op = TRUE;
if (voice) rec->voice = TRUE;
rec->send_massjoin = send_massjoin;
nicklist_insert(CHANNEL(channel), rec);
return rec;
}
#define isnickchar(a) \
(isalnum((int) (a)) || (a) == '`' || (a) == '-' || (a) == '_' || \
(a) == '[' || (a) == ']' || (a) == '{' || (a) == '}' || \
@ -53,16 +73,16 @@ char *irc_nick_strip(const char *nick)
return stripped;
}
static void event_names_list(SERVER_REC *server, const char *data)
static void event_names_list(IRC_SERVER_REC *server, const char *data)
{
CHANNEL_REC *chanrec;
IRC_CHANNEL_REC *chanrec;
char *params, *type, *channel, *names, *ptr;
g_return_if_fail(data != NULL);
params = event_get_params(data, 4, NULL, &type, &channel, &names);
chanrec = channel_find(server, channel);
chanrec = irc_channel_find(server, channel);
if (chanrec == NULL || chanrec->names_got) {
/* unknown channel / names list already read */
g_free(params);
@ -85,8 +105,8 @@ static void event_names_list(SERVER_REC *server, const char *data)
while (*names != '\0' && *names != ' ') names++;
if (*names != '\0') *names++ = '\0';
nicklist_insert(chanrec, ptr+isnickflag(*ptr),
*ptr == '@', *ptr == '+', FALSE);
irc_nicklist_insert(chanrec, ptr+isnickflag(*ptr),
*ptr == '@', *ptr == '+', FALSE);
}
g_free(params);

8
src/irc/core/irc-nicklist.h
View File

@ -3,10 +3,14 @@
#include "nicklist.h"
void irc_nicklist_init(void);
void irc_nicklist_deinit(void);
/* Add new nick to list */
NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
int op, int voice, int send_massjoin);
/* Remove all "extra" characters from `nick'. Like _nick_ -> nick */
char *irc_nick_strip(const char *nick);
void irc_nicklist_init(void);
void irc_nicklist_deinit(void);
#endif

4
src/irc/core/massjoin.c
View File

@ -25,7 +25,7 @@
#include "irc.h"
#include "irc-servers.h"
#include "irc-channels.h"
#include "nicklist.h"
#include "irc-nicklist.h"
static int massjoin_tag;
static int massjoin_max_joins;
@ -58,7 +58,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
if (chanrec == NULL) return;
/* add user to nicklist */
nickrec = nicklist_insert(CHANNEL(chanrec), nick, FALSE, FALSE, TRUE);
nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, TRUE);
nicklist_set_host(CHANNEL(chanrec), nickrec, address);
if (chanrec->massjoins == 0) {

13
src/perl/common/Channel.xs
View File

@ -83,17 +83,12 @@ void
channel_destroy(channel)
Irssi::Channel channel
Irssi::Nick
nick_insert(channel, nick, op, voice, send_massjoin)
void
nick_insert(channel, nick)
Irssi::Channel channel
char *nick
int op
int voice
int send_massjoin
Irssi::Nick nick
CODE:
RETVAL = nicklist_insert(channel, nick, op, voice, send_massjoin);
OUTPUT:
RETVAL
nicklist_insert(channel, nick);
void
nick_remove(channel, nick)

14
src/perl/irc/IrcChannel.xs
View File

@ -1,4 +1,4 @@
MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Channel PREFIX = irc_channel_
MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Channel PREFIX = irc_
void
bans(channel)
@ -34,6 +34,18 @@ PPCODE:
XPUSHs(new_pv(tmp->data));
}
Irssi::Nick
irc_nick_insert(channel, nick, op, voice, send_massjoin)
Irssi::Channel channel
char *nick
int op
int voice
int send_massjoin
CODE:
RETVAL = irc_nicklist_insert(channel, nick, op, voice, send_massjoin);
OUTPUT:
RETVAL
MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Server PREFIX = irc_
Irssi::Irc::Channel

1
src/perl/irc/module.h
View File

@ -4,6 +4,7 @@
#include "irc-servers.h"
#include "irc-channels.h"
#include "irc-queries.h"
#include "irc-nicklist.h"
#include "bans.h"
#include "modes.h"