mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
Better support for halfops, patch by yathen@web.de
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2228 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
a8419ed5b9
commit
15e815e8d3
@ -356,16 +356,38 @@ GSList *nicklist_get_same_unique(SERVER_REC *server, void *id)
|
|||||||
/* nick record comparision for sort functions */
|
/* nick record comparision for sort functions */
|
||||||
int nicklist_compare(NICK_REC *p1, NICK_REC *p2)
|
int nicklist_compare(NICK_REC *p1, NICK_REC *p2)
|
||||||
{
|
{
|
||||||
|
int status1, status2;
|
||||||
|
|
||||||
if (p1 == NULL) return -1;
|
if (p1 == NULL) return -1;
|
||||||
if (p2 == NULL) return 1;
|
if (p2 == NULL) return 1;
|
||||||
|
|
||||||
if (p1->op && !p2->op) return -1;
|
/* we assign each status (op, halfop, voice, normal) a number
|
||||||
if (!p1->op && p2->op) return 1;
|
* and compare them. this is easier than 100,000 if's and
|
||||||
|
* returns :-)
|
||||||
|
* -- yath */
|
||||||
|
|
||||||
if (!p1->op) {
|
if (p1->op)
|
||||||
if (p1->voice && !p2->voice) return -1;
|
status1 = 4;
|
||||||
if (!p1->voice && p2->voice) return 1;
|
else if (p1->halfop)
|
||||||
}
|
status1 = 3;
|
||||||
|
else if (p1->voice)
|
||||||
|
status1 = 2;
|
||||||
|
else
|
||||||
|
status1 = 1;
|
||||||
|
|
||||||
|
if (p2->op)
|
||||||
|
status2 = 4;
|
||||||
|
else if (p2->halfop)
|
||||||
|
status2 = 3;
|
||||||
|
else if (p2->voice)
|
||||||
|
status2 = 2;
|
||||||
|
else
|
||||||
|
status2 = 1;
|
||||||
|
|
||||||
|
if (status1 < status2)
|
||||||
|
return 1;
|
||||||
|
else if (status1 > status2)
|
||||||
|
return -1;
|
||||||
|
|
||||||
return g_strcasecmp(p1->nick, p2->nick);
|
return g_strcasecmp(p1->nick, p2->nick);
|
||||||
}
|
}
|
||||||
|
@ -390,7 +390,14 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
|
|||||||
for (tmp = nicklist; tmp != NULL; tmp = tmp->next) {
|
for (tmp = nicklist; tmp != NULL; tmp = tmp->next) {
|
||||||
NICK_REC *rec = tmp->data;
|
NICK_REC *rec = tmp->data;
|
||||||
|
|
||||||
nickmode[0] = rec->op ? '@' : rec->voice ? '+' : ' ';
|
if (rec->op)
|
||||||
|
nickmode[0] = '@';
|
||||||
|
else if (rec->halfop)
|
||||||
|
nickmode[0] = '%';
|
||||||
|
else if (rec->voice)
|
||||||
|
nickmode[0] = '+';
|
||||||
|
else
|
||||||
|
nickmode[0] = ' ';
|
||||||
|
|
||||||
if (linebuf_size < columns[col]-item_extra+1) {
|
if (linebuf_size < columns[col]-item_extra+1) {
|
||||||
linebuf_size = (columns[col]-item_extra+1)*2;
|
linebuf_size = (columns[col]-item_extra+1)*2;
|
||||||
@ -439,9 +446,9 @@ void fe_channels_nicklist(CHANNEL_REC *channel, int flags)
|
|||||||
{
|
{
|
||||||
NICK_REC *nick;
|
NICK_REC *nick;
|
||||||
GSList *tmp, *nicklist, *sorted;
|
GSList *tmp, *nicklist, *sorted;
|
||||||
int nicks, normal, voices, ops;
|
int nicks, normal, voices, halfops, ops;
|
||||||
|
|
||||||
nicks = normal = voices = ops = 0;
|
nicks = normal = voices = halfops = ops = 0;
|
||||||
nicklist = nicklist_getnicks(channel);
|
nicklist = nicklist_getnicks(channel);
|
||||||
sorted = NULL;
|
sorted = NULL;
|
||||||
|
|
||||||
@ -455,6 +462,7 @@ void fe_channels_nicklist(CHANNEL_REC *channel, int flags)
|
|||||||
if ((flags & CHANNEL_NICKLIST_FLAG_OPS) == 0)
|
if ((flags & CHANNEL_NICKLIST_FLAG_OPS) == 0)
|
||||||
continue;
|
continue;
|
||||||
} else if (nick->halfop) {
|
} else if (nick->halfop) {
|
||||||
|
halfops++;
|
||||||
if ((flags & CHANNEL_NICKLIST_FLAG_HALFOPS) == 0)
|
if ((flags & CHANNEL_NICKLIST_FLAG_HALFOPS) == 0)
|
||||||
continue;
|
continue;
|
||||||
} else if (nick->voice) {
|
} else if (nick->voice) {
|
||||||
@ -482,7 +490,7 @@ void fe_channels_nicklist(CHANNEL_REC *channel, int flags)
|
|||||||
|
|
||||||
printformat(channel->server, channel->name,
|
printformat(channel->server, channel->name,
|
||||||
MSGLEVEL_CRAP, TXT_ENDOFNAMES,
|
MSGLEVEL_CRAP, TXT_ENDOFNAMES,
|
||||||
channel->name, nicks, ops, voices, normal);
|
channel->name, nicks, ops, halfops, voices, normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* SYNTAX: NAMES [-count | -ops -halfops -voices -normal] [<channels> | **] */
|
/* SYNTAX: NAMES [-count | -ops -halfops -voices -normal] [<channels> | **] */
|
||||||
|
@ -108,7 +108,7 @@ FORMAT_REC fecommon_core_formats[] = {
|
|||||||
{ "names_nick_halfop", "{names_nick_halfop $0 $1}", 2, { 0, 0 } },
|
{ "names_nick_halfop", "{names_nick_halfop $0 $1}", 2, { 0, 0 } },
|
||||||
{ "names_nick_voice", "{names_nick_voice $0 $1}", 2, { 0, 0 } },
|
{ "names_nick_voice", "{names_nick_voice $0 $1}", 2, { 0, 0 } },
|
||||||
{ "names_nick", "{names_nick $0 $1}", 2, { 0, 0 } },
|
{ "names_nick", "{names_nick $0 $1}", 2, { 0, 0 } },
|
||||||
{ "endofnames", "{channel $0}: Total of {hilight $1} nicks {comment {hilight $2} ops, {hilight $3} voices, {hilight $4} normal}", 5, { 0, 1, 1, 1, 1 } },
|
{ "endofnames", "{channel $0}: Total of {hilight $1} nicks {comment {hilight $2} ops, {hilight $3} halfops, {hilight $4} voices, {hilight $5} normal}", 6, { 0, 1, 1, 1, 1, 1 } },
|
||||||
{ "chanlist_header", "You are on the following channels:", 0 },
|
{ "chanlist_header", "You are on the following channels:", 0 },
|
||||||
{ "chanlist_line", "{channel $[-10]0} %|+$1 ($2): $3", 4, { 0, 0, 0, 0 } },
|
{ "chanlist_line", "{channel $[-10]0} %|+$1 ($2): $3", 4, { 0, 0, 0, 0 } },
|
||||||
{ "chansetup_not_found", "Channel {channel $0} not found", 2, { 0, 0 } },
|
{ "chansetup_not_found", "Channel {channel $0} not found", 2, { 0, 0 } },
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
/* Add new nick to list */
|
/* Add new nick to list */
|
||||||
NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
|
NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
|
||||||
int op, int voice, int send_massjoin)
|
int op, int halfop, int voice, int send_massjoin)
|
||||||
{
|
{
|
||||||
NICK_REC *rec;
|
NICK_REC *rec;
|
||||||
|
|
||||||
@ -42,6 +42,7 @@ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
|
|||||||
rec->nick = g_strdup(nick);
|
rec->nick = g_strdup(nick);
|
||||||
|
|
||||||
if (op) rec->op = TRUE;
|
if (op) rec->op = TRUE;
|
||||||
|
if (halfop) rec->halfop = TRUE;
|
||||||
if (voice) rec->voice = TRUE;
|
if (voice) rec->voice = TRUE;
|
||||||
rec->send_massjoin = send_massjoin;
|
rec->send_massjoin = send_massjoin;
|
||||||
|
|
||||||
@ -112,7 +113,8 @@ static void event_names_list(IRC_SERVER_REC *server, const char *data)
|
|||||||
if (*names != '\0') *names++ = '\0';
|
if (*names != '\0') *names++ = '\0';
|
||||||
|
|
||||||
irc_nicklist_insert(chanrec, ptr+isnickflag(*ptr),
|
irc_nicklist_insert(chanrec, ptr+isnickflag(*ptr),
|
||||||
*ptr == '@', *ptr == '+', FALSE);
|
*ptr == '@', *ptr == '%', *ptr == '+',
|
||||||
|
FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
g_free(params);
|
g_free(params);
|
||||||
@ -138,7 +140,7 @@ static void event_end_of_names(IRC_SERVER_REC *server, const char *data)
|
|||||||
nicks = g_hash_table_size(chanrec->nicks);
|
nicks = g_hash_table_size(chanrec->nicks);
|
||||||
ownnick = irc_nicklist_insert(chanrec, server->nick,
|
ownnick = irc_nicklist_insert(chanrec, server->nick,
|
||||||
nicks == 0, FALSE,
|
nicks == 0, FALSE,
|
||||||
FALSE);
|
FALSE, FALSE);
|
||||||
}
|
}
|
||||||
nicklist_set_own(CHANNEL(chanrec), ownnick);
|
nicklist_set_own(CHANNEL(chanrec), ownnick);
|
||||||
chanrec->chanop = chanrec->ownnick->op;
|
chanrec->chanop = chanrec->ownnick->op;
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
/* Add new nick to list */
|
/* Add new nick to list */
|
||||||
NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
|
NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
|
||||||
int op, int voice, int send_massjoin);
|
int op, int halfop, int voice, int send_massjoin);
|
||||||
|
|
||||||
/* Remove all "extra" characters from `nick'. Like _nick_ -> nick */
|
/* Remove all "extra" characters from `nick'. Like _nick_ -> nick */
|
||||||
char *irc_nick_strip(const char *nick);
|
char *irc_nick_strip(const char *nick);
|
||||||
|
@ -77,7 +77,7 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel,
|
|||||||
CONFIG_NODE *node)
|
CONFIG_NODE *node)
|
||||||
{
|
{
|
||||||
const char *nick;
|
const char *nick;
|
||||||
int op, voice;
|
int op, halfop, voice;
|
||||||
NICK_REC *nickrec;
|
NICK_REC *nickrec;
|
||||||
|
|
||||||
if (!IS_IRC_CHANNEL(channel))
|
if (!IS_IRC_CHANNEL(channel))
|
||||||
@ -89,8 +89,8 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel,
|
|||||||
|
|
||||||
op = config_node_get_bool(node, "op", FALSE);
|
op = config_node_get_bool(node, "op", FALSE);
|
||||||
voice = config_node_get_bool(node, "voice", FALSE);
|
voice = config_node_get_bool(node, "voice", FALSE);
|
||||||
nickrec = irc_nicklist_insert(channel, nick, op, voice, FALSE);
|
halfop = config_node_get_bool(node, "halfop", FALSE);
|
||||||
nickrec->halfop = config_node_get_bool(node, "halfop", FALSE);
|
nickrec = irc_nicklist_insert(channel, nick, op, halfop, voice, FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void session_restore_channel(IRC_CHANNEL_REC *channel)
|
static void session_restore_channel(IRC_CHANNEL_REC *channel)
|
||||||
|
@ -57,7 +57,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
|
|||||||
if (chanrec == NULL) return;
|
if (chanrec == NULL) return;
|
||||||
|
|
||||||
/* add user to nicklist */
|
/* add user to nicklist */
|
||||||
nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, TRUE);
|
nickrec = irc_nicklist_insert(chanrec, nick, FALSE, FALSE, FALSE, TRUE);
|
||||||
nicklist_set_host(CHANNEL(chanrec), nickrec, address);
|
nicklist_set_host(CHANNEL(chanrec), nickrec, address);
|
||||||
|
|
||||||
if (chanrec->massjoins == 0) {
|
if (chanrec->massjoins == 0) {
|
||||||
|
@ -50,14 +50,15 @@ PPCODE:
|
|||||||
}
|
}
|
||||||
|
|
||||||
Irssi::Irc::Nick
|
Irssi::Irc::Nick
|
||||||
irc_nick_insert(channel, nick, op, voice, send_massjoin)
|
irc_nick_insert(channel, nick, op, halfop, voice, send_massjoin)
|
||||||
Irssi::Irc::Channel channel
|
Irssi::Irc::Channel channel
|
||||||
char *nick
|
char *nick
|
||||||
int op
|
int op
|
||||||
|
int halfop
|
||||||
int voice
|
int voice
|
||||||
int send_massjoin
|
int send_massjoin
|
||||||
CODE:
|
CODE:
|
||||||
RETVAL = irc_nicklist_insert(channel, nick, op, voice, send_massjoin);
|
RETVAL = irc_nicklist_insert(channel, nick, op, halfop, voice, send_massjoin);
|
||||||
OUTPUT:
|
OUTPUT:
|
||||||
RETVAL
|
RETVAL
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user