|
@@ -1002,6 +1002,10 @@ func (client *Client) getWhoisOf(target *Client) {
|
1002
|
1002
|
if target.flags[TLS] {
|
1003
|
1003
|
client.Send(nil, client.server.name, RPL_WHOISSECURE, client.nick, target.nick, "is using a secure connection")
|
1004
|
1004
|
}
|
|
1005
|
+ accountName := target.AccountName()
|
|
1006
|
+ if accountName != "" {
|
|
1007
|
+ client.Send(nil, client.server.name, RPL_WHOISACCOUNT, client.nick, accountName, "is logged in as")
|
|
1008
|
+ }
|
1005
|
1009
|
if target.flags[Bot] {
|
1006
|
1010
|
client.Send(nil, client.server.name, RPL_WHOISBOT, client.nick, target.nick, ircfmt.Unescape("is a $bBot$b on ")+client.server.networkName)
|
1007
|
1011
|
}
|
|
@@ -2093,8 +2097,10 @@ func resumeHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
|
2093
|
2097
|
|
2094
|
2098
|
var timestamp *time.Time
|
2095
|
2099
|
if 1 < len(msg.Params) {
|
2096
|
|
- timestamp, err = time.Parse("2006-01-02T15:04:05.999Z", msg.Params[1])
|
2097
|
|
- if err != nil {
|
|
2100
|
+ ts, err := time.Parse("2006-01-02T15:04:05.999Z", msg.Params[1])
|
|
2101
|
+ if err == nil {
|
|
2102
|
+ timestamp = &ts
|
|
2103
|
+ } else {
|
2098
|
2104
|
client.Send(nil, server.name, ERR_CANNOT_RESUME, oldnick, "Timestamp is not in 2006-01-02T15:04:05.999Z format, ignoring it")
|
2099
|
2105
|
}
|
2100
|
2106
|
}
|
|
@@ -2104,7 +2110,7 @@ func resumeHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
|
2104
|
2110
|
Timestamp: timestamp,
|
2105
|
2111
|
}
|
2106
|
2112
|
|
2107
|
|
- return true
|
|
2113
|
+ return false
|
2108
|
2114
|
}
|
2109
|
2115
|
|
2110
|
2116
|
// USERHOST <nickname> [<nickname> <nickname> ...]
|