summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC. McEnroe2020-09-18 18:13:09 -0400
committerC. McEnroe2020-09-18 18:13:09 -0400
commit2b8a45779dcdb9f94060ddf694e99560ea80dabf (patch)
tree1b09a4ef1bfef4734c2d9d4d8200b5757ae3923a
parentb2de129e3f48136bd56a5f0f1d9028c2ecef0bc2 (diff)
Switch back to checking for server by nick with '.'
This fixes a bug where if you send a private message before joining any channels, your message will be routed to the <network> window. That happens because without a JOIN, self.user remains unset, which means that require will copy self.nick (set by echoMessage) to self.host. The easiest solution is to go back to checking for '.' and add a '.' to the default nick, so now if a server sends a NOTICE with no origin it will look like -*.*- which is kinda cute.
-rw-r--r--handle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/handle.c b/handle.c
index e5e370e..cf3c977 100644
--- a/handle.c
+++ b/handle.c
@@ -76,7 +76,7 @@ static const char *capList(enum Cap caps) {
static void require(struct Message *msg, bool origin, uint len) {
if (origin) {
- if (!msg->nick) msg->nick = "*";
+ if (!msg->nick) msg->nick = "*.*";
if (!msg->user) msg->user = msg->nick;
if (!msg->host) msg->host = msg->user;
}
@@ -1114,7 +1114,7 @@ static const char *colorMentions(uint id, struct Message *msg) {
static void handlePrivmsg(struct Message *msg) {
require(msg, true, 2);
bool query = !strchr(network.chanTypes, msg->params[0][0]);
- bool server = (msg->host == msg->nick);
+ bool server = strchr(msg->nick, '.');
bool mine = !strcmp(msg->nick, self.nick);
uint id;
if (query && server) {