projects
/
NeonServV5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4306aa8
)
fixed last commits
author
pk910
<philipp@zoelle1.de>
Wed, 14 Dec 2011 20:54:06 +0000
(21:54 +0100)
committer
pk910
<philipp@zoelle1.de>
Wed, 14 Dec 2011 20:54:06 +0000
(21:54 +0100)
src/IRCParser.c
patch
|
blob
|
history
diff --git
a/src/IRCParser.c
b/src/IRCParser.c
index e96063e54ff0219aebcf469f8604c4d1f38e31fd..d1189bb7adaca0569fd05f910ba489fa03654452 100644
(file)
--- a/
src/IRCParser.c
+++ b/
src/IRCParser.c
@@
-171,7
+171,7
@@
static IRC_CMD(raw_join) {
struct UserNode *user = getUserByMask(from);
struct ChanNode *chan = getChanByName(argv[0]);
if(!chan && !(user->flags & USERFLAG_ISBOT)) return 0;
struct UserNode *user = getUserByMask(from);
struct ChanNode *chan = getChanByName(argv[0]);
if(!chan && !(user->flags & USERFLAG_ISBOT)) return 0;
- if(chan && ((
!isBot(user) && chan->chanbot != client->user) || (isBot(user
) && client->user != user))) return 1; //we ignore it - but it's not a parse error
+ if(chan && ((
(!user || !isBot(user)) && chan->chanbot != client->user) || ((user && isBot(user)
) && client->user != user))) return 1; //we ignore it - but it's not a parse error
//let Bots always add themselves! (maybe they join invisible)
if(user == NULL) {
user = addUserMask(from);
//let Bots always add themselves! (maybe they join invisible)
if(user == NULL) {
user = addUserMask(from);