Browse Source

Send nick parameter correctly on ERR_NOSUCHNICK numerics

tags/v0.9.1
Daniel Oaks 6 years ago
parent
commit
3b0d9c4db9
4 changed files with 11 additions and 11 deletions
  1. 1
    1
      irc/channel.go
  2. 1
    1
      irc/nickname.go
  3. 1
    1
      irc/roleplay.go
  4. 8
    8
      irc/server.go

+ 1
- 1
irc/channel.go View File

569
 	casefoldedName, err := CasefoldName(nick)
569
 	casefoldedName, err := CasefoldName(nick)
570
 	target := channel.server.clients.Get(casefoldedName)
570
 	target := channel.server.clients.Get(casefoldedName)
571
 	if err != nil || target == nil {
571
 	if err != nil || target == nil {
572
-		client.Send(nil, client.server.name, ERR_NOSUCHNICK, nick, "No such nick")
572
+		client.Send(nil, client.server.name, ERR_NOSUCHNICK, client.nick, nick, "No such nick")
573
 		return nil
573
 		return nil
574
 	}
574
 	}
575
 
575
 

+ 1
- 1
irc/nickname.go View File

89
 
89
 
90
 	target := server.clients.Get(oldnick)
90
 	target := server.clients.Get(oldnick)
91
 	if target == nil {
91
 	if target == nil {
92
-		client.Send(nil, server.name, ERR_NOSUCHNICK, msg.Params[0], "No such nick")
92
+		client.Send(nil, server.name, ERR_NOSUCHNICK, client.nick, msg.Params[0], "No such nick")
93
 		return false
93
 		return false
94
 	}
94
 	}
95
 
95
 

+ 1
- 1
irc/roleplay.go View File

99
 		target, err := CasefoldName(targetString)
99
 		target, err := CasefoldName(targetString)
100
 		user := server.clients.Get(target)
100
 		user := server.clients.Get(target)
101
 		if err != nil || user == nil {
101
 		if err != nil || user == nil {
102
-			client.Send(nil, server.name, ERR_NOSUCHNICK, target, "No such nick")
102
+			client.Send(nil, server.name, ERR_NOSUCHNICK, client.nick, target, "No such nick")
103
 			return
103
 			return
104
 		}
104
 		}
105
 
105
 

+ 8
- 8
irc/server.go View File

1083
 			user := server.clients.Get(target)
1083
 			user := server.clients.Get(target)
1084
 			if err != nil || user == nil {
1084
 			if err != nil || user == nil {
1085
 				if len(target) > 0 {
1085
 				if len(target) > 0 {
1086
-					client.Send(nil, server.name, ERR_NOSUCHNICK, target, "No such nick")
1086
+					client.Send(nil, server.name, ERR_NOSUCHNICK, client.nick, target, "No such nick")
1087
 				}
1087
 				}
1088
 				continue
1088
 				continue
1089
 			}
1089
 			}
1150
 			user := server.clients.Get(target)
1150
 			user := server.clients.Get(target)
1151
 			if err != nil || user == nil {
1151
 			if err != nil || user == nil {
1152
 				if len(target) > 0 {
1152
 				if len(target) > 0 {
1153
-					client.Send(nil, server.name, ERR_NOSUCHNICK, target, "No such nick")
1153
+					client.Send(nil, server.name, ERR_NOSUCHNICK, client.nick, target, "No such nick")
1154
 				}
1154
 				}
1155
 				continue
1155
 				continue
1156
 			}
1156
 			}
1214
 		for _, mask := range masks {
1214
 		for _, mask := range masks {
1215
 			casefoldedMask, err := Casefold(mask)
1215
 			casefoldedMask, err := Casefold(mask)
1216
 			if err != nil {
1216
 			if err != nil {
1217
-				client.Send(nil, client.server.name, ERR_NOSUCHNICK, mask, "No such nick")
1217
+				client.Send(nil, client.server.name, ERR_NOSUCHNICK, client.nick, mask, "No such nick")
1218
 				continue
1218
 				continue
1219
 			}
1219
 			}
1220
 			matches := server.clients.FindAll(casefoldedMask)
1220
 			matches := server.clients.FindAll(casefoldedMask)
1221
 			if len(matches) == 0 {
1221
 			if len(matches) == 0 {
1222
-				client.Send(nil, client.server.name, ERR_NOSUCHNICK, mask, "No such nick")
1222
+				client.Send(nil, client.server.name, ERR_NOSUCHNICK, client.nick, mask, "No such nick")
1223
 				continue
1223
 				continue
1224
 			}
1224
 			}
1225
 			for mclient := range matches {
1225
 			for mclient := range matches {
1231
 		casefoldedMask, err := Casefold(strings.Split(masksString, ",")[0])
1231
 		casefoldedMask, err := Casefold(strings.Split(masksString, ",")[0])
1232
 		mclient := server.clients.Get(casefoldedMask)
1232
 		mclient := server.clients.Get(casefoldedMask)
1233
 		if err != nil || mclient == nil {
1233
 		if err != nil || mclient == nil {
1234
-			client.Send(nil, client.server.name, ERR_NOSUCHNICK, masksString, "No such nick")
1234
+			client.Send(nil, client.server.name, ERR_NOSUCHNICK, client.nick, masksString, "No such nick")
1235
 			// fall through, ENDOFWHOIS is always sent
1235
 			// fall through, ENDOFWHOIS is always sent
1236
 		} else {
1236
 		} else {
1237
 			client.getWhoisOf(mclient)
1237
 			client.getWhoisOf(mclient)
1849
 		casefoldedNickname, err := CasefoldName(nickname)
1849
 		casefoldedNickname, err := CasefoldName(nickname)
1850
 		target := server.clients.Get(casefoldedNickname)
1850
 		target := server.clients.Get(casefoldedNickname)
1851
 		if err != nil || target == nil {
1851
 		if err != nil || target == nil {
1852
-			client.Send(nil, server.name, ERR_NOSUCHNICK, nickname, "No such nick")
1852
+			client.Send(nil, server.name, ERR_NOSUCHNICK, client.nick, nickname, "No such nick")
1853
 			continue
1853
 			continue
1854
 		}
1854
 		}
1855
 
1855
 
2118
 	casefoldedNickname, err := CasefoldName(nickname)
2118
 	casefoldedNickname, err := CasefoldName(nickname)
2119
 	target := server.clients.Get(casefoldedNickname)
2119
 	target := server.clients.Get(casefoldedNickname)
2120
 	if err != nil || target == nil {
2120
 	if err != nil || target == nil {
2121
-		client.Send(nil, client.server.name, ERR_NOSUCHNICK, nickname, "No such nick")
2121
+		client.Send(nil, client.server.name, ERR_NOSUCHNICK, client.nick, nickname, "No such nick")
2122
 		return false
2122
 		return false
2123
 	}
2123
 	}
2124
 
2124
 
2198
 		casefoldedNickname, err := CasefoldName(nickname)
2198
 		casefoldedNickname, err := CasefoldName(nickname)
2199
 		target := server.clients.Get(casefoldedNickname)
2199
 		target := server.clients.Get(casefoldedNickname)
2200
 		if err != nil || target == nil {
2200
 		if err != nil || target == nil {
2201
-			client.Send(nil, client.server.name, ERR_NOSUCHNICK, nickname, "No such nick")
2201
+			client.Send(nil, client.server.name, ERR_NOSUCHNICK, client.nick, nickname, "No such nick")
2202
 			return false
2202
 			return false
2203
 		}
2203
 		}
2204
 		if returnedNicks[casefoldedNickname] {
2204
 		if returnedNicks[casefoldedNickname] {

Loading…
Cancel
Save