ircd: send tags on every message

[solanum.git] / ircd / channel.c

diff --git a/ircd/channel.c b/ircd/channel.c
index 8f0b094e43e72134bb0e7ff5ed6d5eb243f02425..50e96a3a899e35248fb3d49b6d3579e449393c59 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -126,10 +126,10 @@ send_channel_join(struct Channel *chptr, struct Client *client_p)
        if (!IsClient(client_p))
                return;
 
-       sendto_channel_local_with_capability(ALL_MEMBERS, NOCAPS, CLICAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN %s",
+       sendto_channel_local_with_capability(client_p, ALL_MEMBERS, NOCAPS, CLICAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN %s",
                                             client_p->name, client_p->username, client_p->host, chptr->chname);
 
-       sendto_channel_local_with_capability(ALL_MEMBERS, CLICAP_EXTENDED_JOIN, NOCAPS, chptr, ":%s!%s@%s JOIN %s %s :%s",
+       sendto_channel_local_with_capability(client_p, ALL_MEMBERS, CLICAP_EXTENDED_JOIN, NOCAPS, chptr, ":%s!%s@%s JOIN %s %s :%s",
                                             client_p->name, client_p->username, client_p->host, chptr->chname,
                                             EmptyString(client_p->user->suser) ? "*" : client_p->user->suser,
                                             client_p->info);
@@ -667,6 +667,7 @@ int
 is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
          const char *s, const char *s2, const char **forward)
 {
+#if 0
        if (chptr->last_checked_client != NULL &&
                who == chptr->last_checked_client &&
                chptr->last_checked_type == CHFL_BAN &&
@@ -679,6 +680,9 @@ is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
        chptr->last_checked_ts = rb_current_time();
 
        return chptr->last_checked_result;
+#else
+       return is_banned_list(chptr, &chptr->banlist, who, msptr, s, s2, forward);
+#endif
 }
 
 /* is_quieted()
@@ -692,6 +696,7 @@ int
 is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
           const char *s, const char *s2)
 {
+#if 0
        if (chptr->last_checked_client != NULL &&
                who == chptr->last_checked_client &&
                chptr->last_checked_type == CHFL_QUIET &&
@@ -704,6 +709,9 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
        chptr->last_checked_ts = rb_current_time();
 
        return chptr->last_checked_result;
+#else
+       return is_banned_list(chptr, &chptr->quietlist, who, msptr, s, s2, NULL);
+#endif
 }
 
 /* can_join()
@@ -1375,7 +1383,7 @@ resv_chan_forcepart(const char *name, const char *reason, int temp_time)
                        sendto_server(target_p, chptr, CAP_TS6, NOCAPS,
                                      ":%s PART %s", target_p->id, chptr->chname);
 
-                       sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
+                       sendto_channel_local(target_p, ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
                                             target_p->name, target_p->username,
                                             target_p->host, chptr->chname, target_p->name);