9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

callerid: align soft caller-id behavior with ircd-hybrid implementation

Browse source
This commit is contained in:
Ariadne Conill 2020-07-10 18:17:50 -06:00
parent b07445c6d9
commit ace0c8655b
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/messages.h
View file

@ -217,9 +217,9 @@
#define NUMERIC_STR_713 "%s :Channel is open."
#define NUMERIC_STR_714 ":%s 714 %s %s :You are already on that channel."
#define NUMERIC_STR_715 ":%s 715 %s :KNOCKs are disabled."
#define NUMERIC_STR_716 "%s :is in +g mode (server-side ignore.)"
#define NUMERIC_STR_716 "%s :is in %s mode (server-side ignore.)"
#define NUMERIC_STR_717 "%s :has been informed that you messaged them."
#define NUMERIC_STR_718 ":%s 718 %s %s %s@%s :is messaging you, and you have umode +g."
#define NUMERIC_STR_718 ":%s 718 %s %s %s@%s :is messaging you, and you have umode %s."
#define NUMERIC_STR_720 ":%s 720 %s :Start of OPER MOTD"
#define NUMERIC_STR_721 ":%s 721 %s :%s"
#define NUMERIC_STR_722 ":%s 722 %s :End of OPER MOTD"

13
modules/um_callerid.c
View file

@ -80,8 +80,9 @@ um_callerid_moddeinit(void)
delete_isupport("CALLERID");
}
#define IsSetCallerID(c) ((c->umodes & user_modes['g']) == user_modes['g'])
#define IsSetStrictCallerID(c) ((c->umodes & user_modes['g']) == user_modes['g'])
#define IsSetRelaxedCallerID(c) ((c->umodes & user_modes['G']) == user_modes['G'])
#define IsSetAnyCallerID(c) (IsSetStrictCallerID(c) || IsSetRelaxedCallerID(c))
static const char um_callerid_desc[] =
"Provides usermodes +g and +G which restrict messages from unauthorized users.";
@ -107,10 +108,10 @@ allow_message(struct Client *source_p, struct Client *target_p)
if (!MyClient(target_p))
return true;
if (!IsSetCallerID(target_p))
if (!IsSetAnyCallerID(target_p))
return true;
if (IsSetRelaxedCallerID(target_p) && has_common_channel(source_p, target_p))
if (IsSetRelaxedCallerID(target_p) && has_common_channel(source_p, target_p) && !IsSetStrictCallerID(target_p))
return true;
if (IsServer(source_p))
@ -136,7 +137,7 @@ send_callerid_notice(enum message_type msgtype, struct Client *source_p, struct
return;
sendto_one_numeric(source_p, ERR_TARGUMODEG, form_str(ERR_TARGUMODEG),
target_p->name);
target_p->name, IsSetStrictCallerID(target_p) ? "+g" : "+G");
if ((target_p->localClient->last_caller_id_time + ConfigFileEntry.caller_id_wait) < rb_current_time())
{
@ -145,7 +146,7 @@ send_callerid_notice(enum message_type msgtype, struct Client *source_p, struct
sendto_one(target_p, form_str(RPL_UMODEGMSG),
me.name, target_p->name, source_p->name,
source_p->username, source_p->host);
source_p->username, source_p->host, IsSetStrictCallerID(target_p) ? "+g" : "+G");
target_p->localClient->last_caller_id_time = rb_current_time();
}
@ -165,7 +166,7 @@ add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_
* as a way of griefing. --nenolod
*/
if(msgtype != MESSAGE_TYPE_NOTICE &&
IsSetCallerID(source_p) &&
IsSetAnyCallerID(source_p) &&
!accept_message(target_p, source_p) &&
!IsOper(target_p))
{