Procházet zdrojové kódy

Send nick parameter correctly on ERR_NOSUCHNICK numerics

tags/v0.9.1
Daniel Oaks před 6 roky
rodič
revize
3b0d9c4db9
4 změnil soubory, kde provedl 11 přidání a 11 odebrání
  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 Zobrazit soubor

@@ -569,7 +569,7 @@ func (channel *Channel) applyModeMemberNoMutex(client *Client, mode Mode,
569 569
 	casefoldedName, err := CasefoldName(nick)
570 570
 	target := channel.server.clients.Get(casefoldedName)
571 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 573
 		return nil
574 574
 	}
575 575
 

+ 1
- 1
irc/nickname.go Zobrazit soubor

@@ -89,7 +89,7 @@ func sanickHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
89 89
 
90 90
 	target := server.clients.Get(oldnick)
91 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 93
 		return false
94 94
 	}
95 95
 

+ 1
- 1
irc/roleplay.go Zobrazit soubor

@@ -99,7 +99,7 @@ func sendRoleplayMessage(server *Server, client *Client, source string, targetSt
99 99
 		target, err := CasefoldName(targetString)
100 100
 		user := server.clients.Get(target)
101 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 103
 			return
104 104
 		}
105 105
 

+ 8
- 8
irc/server.go Zobrazit soubor

@@ -1083,7 +1083,7 @@ func privmsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool
1083 1083
 			user := server.clients.Get(target)
1084 1084
 			if err != nil || user == nil {
1085 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 1088
 				continue
1089 1089
 			}
@@ -1150,7 +1150,7 @@ func tagmsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
1150 1150
 			user := server.clients.Get(target)
1151 1151
 			if err != nil || user == nil {
1152 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 1155
 				continue
1156 1156
 			}
@@ -1214,12 +1214,12 @@ func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
1214 1214
 		for _, mask := range masks {
1215 1215
 			casefoldedMask, err := Casefold(mask)
1216 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 1218
 				continue
1219 1219
 			}
1220 1220
 			matches := server.clients.FindAll(casefoldedMask)
1221 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 1223
 				continue
1224 1224
 			}
1225 1225
 			for mclient := range matches {
@@ -1231,7 +1231,7 @@ func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
1231 1231
 		casefoldedMask, err := Casefold(strings.Split(masksString, ",")[0])
1232 1232
 		mclient := server.clients.Get(casefoldedMask)
1233 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 1235
 			// fall through, ENDOFWHOIS is always sent
1236 1236
 		} else {
1237 1237
 			client.getWhoisOf(mclient)
@@ -1849,7 +1849,7 @@ func kickHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
1849 1849
 		casefoldedNickname, err := CasefoldName(nickname)
1850 1850
 		target := server.clients.Get(casefoldedNickname)
1851 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 1853
 			continue
1854 1854
 		}
1855 1855
 
@@ -2118,7 +2118,7 @@ func killHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
2118 2118
 	casefoldedNickname, err := CasefoldName(nickname)
2119 2119
 	target := server.clients.Get(casefoldedNickname)
2120 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 2122
 		return false
2123 2123
 	}
2124 2124
 
@@ -2198,7 +2198,7 @@ func userhostHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool
2198 2198
 		casefoldedNickname, err := CasefoldName(nickname)
2199 2199
 		target := server.clients.Get(casefoldedNickname)
2200 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 2202
 			return false
2203 2203
 		}
2204 2204
 		if returnedNicks[casefoldedNickname] {

Načítá se…
Zrušit
Uložit