- if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s",
- Client_ID(cl), Req->argv[1]))
- return false;
- } else if (strchr("$#", currentTarget[0])
+ if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
+ Req->command, Client_ID(cl),
+ Req->argv[1]))
+ return DISCONNECTED;
+ } else if (ForceType != CLIENT_SERVICE
+ && strchr("$#", currentTarget[0])