Automated merge with ssh://shadowircd/uranium/shadowircd/

[irc/rqf/shadowircd.git] / modules / core / m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index b4d8d40046d83ddbc55ad317f13eeb15fbbe1e37..0718e1f575a49ebf89034e2640876bd66381c147 100644 (file)
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -45,6 +45,7 @@
 #include "s_stats.h"
 #include "tgchange.h"
 #include "inline/stringops.h"
+#include "irc_dictionary.h"
 
 static int m_message(int, const char *, struct Client *, struct Client *, int, const char **);
 static int m_privmsg(struct Client *, struct Client *, int, const char **);
@@ -361,7 +362,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
 
                                msptr = find_channel_membership(chptr, source_p);
 
-                               if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr))
+                               if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr) && !IsOverride(source_p))
                                {
                                        sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                                                   get_id(&me, source_p),
@@ -484,6 +485,11 @@ msg_channel(int p_or_n, const char *command,
 {
        int result;
        char text2[BUFSIZE];
+       int contor;
+       int caps = 0;
+       int len = 0;
+       struct membership *msptr = find_channel_membership(chptr, source_p);
+       struct Metadata *md;
 
        if(MyClient(source_p))
        {
@@ -492,7 +498,24 @@ msg_channel(int p_or_n, const char *command,
                        source_p->localClient->last = rb_current_time();
        }
 
-       if(chptr->mode.mode & MODE_NOCOLOR)
+       if(chptr->mode.mode & MODE_NOREPEAT)
+       {
+               md = channel_metadata_find(chptr, "NOREPEAT");
+               if(md && (!ConfigChannel.exempt_cmode_K || !is_any_op(msptr)))
+               {
+                       if(!(strcmp(md->value, strip_colour(text))))
+                       {
+                               if(p_or_n != NOTICE)
+                                       sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
+                                                       form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
+                               return;
+                       }
+               }
+               channel_metadata_delete(chptr, "NOREPEAT", 0);
+               channel_metadata_add(chptr, "NOREPEAT", strip_colour(text), 0);
+       }
+
+       if(chptr->mode.mode & MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr)))
        {
                rb_strlcpy(text2, text, BUFSIZE);
                strip_colour(text2);
@@ -513,14 +536,30 @@ msg_channel(int p_or_n, const char *command,
                if(result == CAN_SEND_OPV ||
                   !flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
                {
-                       if (p_or_n != PRIVMSG && chptr->mode.mode & MODE_NONOTICE)
+                       if (strlen(text) > 10 && chptr->mode.mode & MODE_NOCAPS && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr)))
+                       {
+                               for(contor=0; contor < strlen(text); contor++)
+                               {
+                                       if(IsUpper(text[contor]) && !isdigit(text[contor]))
+                                               caps++; 
+                                       len++;
+                               }
+                               if(((caps*100)/(len)) >= 50)
+                               {
+                                       sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
+                                                       form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
+                                       return;
+                               }
+                       }
+                       if (p_or_n != PRIVMSG && chptr->mode.mode & MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr)))
                        {
                                sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
                                                form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
                                return;
                        }
-                       if (p_or_n != NOTICE && chptr->mode.mode & MODE_NOACTION)
-                                       !strncasecmp(text + 1, "ACTION", 6))
+                       if (p_or_n != NOTICE && chptr->mode.mode & MODE_NOACTION &&
+                                       !strncasecmp(text + 1, "ACTION", 6) &&
+                                       (!ConfigChannel.exempt_cmode_D || !is_any_op(msptr)))
                        {
                                sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
                                                form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
@@ -529,7 +568,7 @@ msg_channel(int p_or_n, const char *command,
                        if (p_or_n != NOTICE && *text == '\001' &&
                                        strncasecmp(text + 1, "ACTION", 6))
                        {
-                               if (chptr->mode.mode & MODE_NOCTCP)
+                               if (chptr->mode.mode & MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr)))
                                {
                                        sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
                                                           form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
@@ -692,6 +731,9 @@ msg_client(int p_or_n, const char *command,
           struct Client *source_p, struct Client *target_p, const char *text)
 {
        int do_floodcount = 0;
+       struct Metadata *md;
+       struct DictionaryIter iter;
+       int oaccept = 0;
 
        if(MyClient(source_p))
        {
@@ -747,12 +789,24 @@ msg_client(int p_or_n, const char *command,
                                    form_str(ERR_NOCTCP),
                                    target_p->name);
                }
-               /* XXX Controversial? allow opers always to send through a +g */
-               else if(!IsServer(source_p) && (IsSetCallerId(target_p) ||
+               /* If opers want to go through +g, they should load oaccept.*/
+               else if(!IsServer(source_p) && !IsService(source_p) && (IsSetCallerId(target_p) ||
+                                       (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) ||
                                        (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])))
                {
+                       if (IsOper(source_p))
+                       {
+                               DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
+                               {
+                                       if(!strcmp(md->value, source_p->id))
+                                       {
+                                               oaccept = 1;
+                                               break;
+                                       }
+                               }
+                       }
                        /* Here is the anti-flood bot/spambot code -db */
-                       if(accept_message(source_p, target_p) || IsOper(source_p))
+                       if(accept_message(source_p, target_p) || oaccept)
                        {
                                add_reply_target(target_p, source_p);
                                sendto_one(target_p, ":%s!%s@%s %s %s :%s",
@@ -767,6 +821,13 @@ msg_client(int p_or_n, const char *command,
                                                        form_str(ERR_NONONREG),
                                                        target_p->name);
                        }
+                       else if (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p))
+                       {
+                               if (p_or_n != NOTICE)
+                                       sendto_one_numeric(source_p, ERR_NOCOMMONCHAN,
+                                                       form_str(ERR_NOCOMMONCHAN),
+                                                       target_p->name);
+                       }
                        else
                        {
                                /* check for accept, flag recipient incoming message */