Преглед изворни кода

fix some issues found with staticcheck.io

tags/v1.1.0-rc1
Shivaram Lingamneni пре 5 година
родитељ
комит
c193def606
9 измењених фајлова са 12 додато и 63 уклоњено
  1. 1
    3
      irc/accounts.go
  2. 0
    28
      irc/channel.go
  3. 0
    2
      irc/client.go
  4. 1
    1
      irc/config.go
  5. 5
    11
      irc/handlers.go
  6. 1
    1
      irc/modes/modes.go
  7. 0
    1
      irc/semaphores.go
  8. 1
    13
      irc/server.go
  9. 3
    3
      irc/snomanager.go

+ 1
- 3
irc/accounts.go Прегледај датотеку

5
 
5
 
6
 import (
6
 import (
7
 	"encoding/json"
7
 	"encoding/json"
8
-	"errors"
9
 	"fmt"
8
 	"fmt"
10
 	"net/smtp"
9
 	"net/smtp"
11
 	"strconv"
10
 	"strconv"
480
 	} else if callbackNamespace == "mailto" {
479
 	} else if callbackNamespace == "mailto" {
481
 		return am.dispatchMailtoCallback(client, casefoldedAccount, callbackValue)
480
 		return am.dispatchMailtoCallback(client, casefoldedAccount, callbackValue)
482
 	} else {
481
 	} else {
483
-		return "", errors.New(fmt.Sprintf("Callback not implemented: %s", callbackNamespace))
482
+		return "", fmt.Errorf("Callback not implemented: %s", callbackNamespace)
484
 	}
483
 	}
485
 }
484
 }
486
 
485
 
1262
 		}
1261
 		}
1263
 	}
1262
 	}
1264
 	am.accountToClients[casefoldedAccount] = remainingClients
1263
 	am.accountToClients[casefoldedAccount] = remainingClients
1265
-	return
1266
 }
1264
 }
1267
 
1265
 
1268
 var (
1266
 var (

+ 0
- 28
irc/channel.go Прегледај датотеку

1043
 	rb.Add(nil, client.server.name, rplendoflist, nick, channel.name, client.t("End of list"))
1043
 	rb.Add(nil, client.server.name, rplendoflist, nick, channel.name, client.t("End of list"))
1044
 }
1044
 }
1045
 
1045
 
1046
-func (channel *Channel) applyModeMask(client *Client, mode modes.Mode, op modes.ModeOp, mask string, rb *ResponseBuffer) bool {
1047
-	list := channel.lists[mode]
1048
-	if list == nil {
1049
-		// This should never happen, but better safe than panicky.
1050
-		return false
1051
-	}
1052
-
1053
-	if (op == modes.List) || (mask == "") {
1054
-		channel.ShowMaskList(client, mode, rb)
1055
-		return false
1056
-	}
1057
-
1058
-	if !channel.ClientIsAtLeast(client, modes.ChannelOperator) {
1059
-		rb.Add(nil, client.server.name, ERR_CHANOPRIVSNEEDED, client.Nick(), channel.Name(), client.t("You're not a channel operator"))
1060
-		return false
1061
-	}
1062
-
1063
-	if op == modes.Add {
1064
-		return list.Add(mask)
1065
-	}
1066
-
1067
-	if op == modes.Remove {
1068
-		return list.Remove(mask)
1069
-	}
1070
-
1071
-	return false
1072
-}
1073
-
1074
 // Quit removes the given client from the channel
1046
 // Quit removes the given client from the channel
1075
 func (channel *Channel) Quit(client *Client) {
1047
 func (channel *Channel) Quit(client *Client) {
1076
 	channelEmpty := func() bool {
1048
 	channelEmpty := func() bool {

+ 0
- 2
irc/client.go Прегледај датотеку

538
 func (client *Client) tryResumeChannels() {
538
 func (client *Client) tryResumeChannels() {
539
 	details := client.resumeDetails
539
 	details := client.resumeDetails
540
 
540
 
541
-	channels := make([]*Channel, len(details.Channels))
542
 	for _, name := range details.Channels {
541
 	for _, name := range details.Channels {
543
 		channel := client.server.channels.Get(name)
542
 		channel := client.server.channels.Get(name)
544
 		if channel == nil {
543
 		if channel == nil {
545
 			continue
544
 			continue
546
 		}
545
 		}
547
 		channel.Resume(client, details.OldClient, details.Timestamp)
546
 		channel.Resume(client, details.OldClient, details.Timestamp)
548
-		channels = append(channels, channel)
549
 	}
547
 	}
550
 
548
 
551
 	// replay direct PRIVSMG history
549
 	// replay direct PRIVSMG history

+ 1
- 1
irc/config.go Прегледај датотеку

393
 
393
 
394
 			// get inhereted info from other operclasses
394
 			// get inhereted info from other operclasses
395
 			if len(info.Extends) > 0 {
395
 			if len(info.Extends) > 0 {
396
-				einfo, _ := ocs[info.Extends]
396
+				einfo := ocs[info.Extends]
397
 
397
 
398
 				for capab := range einfo.Capabilities {
398
 				for capab := range einfo.Capabilities {
399
 					oc.Capabilities[capab] = true
399
 					oc.Capabilities[capab] = true

+ 5
- 11
irc/handlers.go Прегледај датотеку

1184
 func isonHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
1184
 func isonHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
1185
 	var nicks = msg.Params
1185
 	var nicks = msg.Params
1186
 
1186
 
1187
-	var err error
1188
-	var casefoldedNick string
1189
-	ison := make([]string, 0)
1187
+	ison := make([]string, 0, len(msg.Params))
1190
 	for _, nick := range nicks {
1188
 	for _, nick := range nicks {
1191
-		casefoldedNick, err = CasefoldName(nick)
1192
-		if err != nil {
1193
-			continue
1194
-		}
1195
-		if iclient := server.clients.Get(casefoldedNick); iclient != nil {
1196
-			ison = append(ison, iclient.nick)
1189
+		if iclient := server.clients.Get(nick); iclient != nil {
1190
+			ison = append(ison, iclient.Nick())
1197
 		}
1191
 		}
1198
 	}
1192
 	}
1199
 
1193
 
1200
-	rb.Add(nil, server.name, RPL_ISON, client.nick, strings.Join(nicks, " "))
1194
+	rb.Add(nil, server.name, RPL_ISON, client.nick, strings.Join(ison, " "))
1201
 	return false
1195
 	return false
1202
 }
1196
 }
1203
 
1197
 
2099
 
2093
 
2100
 // OPER <name> <password>
2094
 // OPER <name> <password>
2101
 func operHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
2095
 func operHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
2102
-	if client.HasMode(modes.Operator) == true {
2096
+	if client.HasMode(modes.Operator) {
2103
 		rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.Nick(), "OPER", client.t("You're already opered-up!"))
2097
 		rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.Nick(), "OPER", client.t("You're already opered-up!"))
2104
 		return false
2098
 		return false
2105
 	}
2099
 	}

+ 1
- 1
irc/modes/modes.go Прегледај датотеку

170
 			prefixes = target[:i+1]
170
 			prefixes = target[:i+1]
171
 			name = target[i+1:]
171
 			name = target[i+1:]
172
 		default:
172
 		default:
173
-			break
173
+			return
174
 		}
174
 		}
175
 	}
175
 	}
176
 
176
 

+ 0
- 1
irc/semaphores.go Прегледај датотеку

36
 		capacity = MaxServerSemaphoreCapacity
36
 		capacity = MaxServerSemaphoreCapacity
37
 	}
37
 	}
38
 	serversem.ClientDestroy.Initialize(capacity)
38
 	serversem.ClientDestroy.Initialize(capacity)
39
-	return
40
 }
39
 }

+ 1
- 13
irc/server.go Прегледај датотеку

24
 	"github.com/goshuirc/irc-go/ircfmt"
24
 	"github.com/goshuirc/irc-go/ircfmt"
25
 	"github.com/oragono/oragono/irc/caps"
25
 	"github.com/oragono/oragono/irc/caps"
26
 	"github.com/oragono/oragono/irc/connection_limits"
26
 	"github.com/oragono/oragono/irc/connection_limits"
27
-	"github.com/oragono/oragono/irc/isupport"
28
 	"github.com/oragono/oragono/irc/logger"
27
 	"github.com/oragono/oragono/irc/logger"
29
 	"github.com/oragono/oragono/irc/modes"
28
 	"github.com/oragono/oragono/irc/modes"
30
 	"github.com/oragono/oragono/irc/sno"
29
 	"github.com/oragono/oragono/irc/sno"
73
 	ctime               time.Time
72
 	ctime               time.Time
74
 	dlines              *DLineManager
73
 	dlines              *DLineManager
75
 	helpIndexManager    HelpIndexManager
74
 	helpIndexManager    HelpIndexManager
76
-	isupport            *isupport.List
77
 	klines              *KLineManager
75
 	klines              *KLineManager
78
 	listeners           map[string]*ListenerWrapper
76
 	listeners           map[string]*ListenerWrapper
79
 	logger              *logger.Manager
77
 	logger              *logger.Manager
80
 	monitorManager      *MonitorManager
78
 	monitorManager      *MonitorManager
81
-	motdLines           []string
82
 	name                string
79
 	name                string
83
 	nameCasefolded      string
80
 	nameCasefolded      string
84
 	rehashMutex         sync.Mutex // tier 4
81
 	rehashMutex         sync.Mutex // tier 4
176
 	return
173
 	return
177
 }
174
 }
178
 
175
 
179
-func loadChannelList(channel *Channel, list string, maskMode modes.Mode) {
180
-	if list == "" {
181
-		return
182
-	}
183
-	channel.lists[maskMode].AddAll(strings.Split(list, " "))
184
-}
185
-
186
 // Shutdown shuts down the server.
176
 // Shutdown shuts down the server.
187
 func (server *Server) Shutdown() {
177
 func (server *Server) Shutdown() {
188
 	//TODO(dan): Make sure we disallow new nicks
178
 	//TODO(dan): Make sure we disallow new nicks
518
 	tLanguages := target.Languages()
508
 	tLanguages := target.Languages()
519
 	if 0 < len(tLanguages) {
509
 	if 0 < len(tLanguages) {
520
 		params := []string{cnick, tnick}
510
 		params := []string{cnick, tnick}
521
-		for _, str := range client.server.Languages().Codes(tLanguages) {
522
-			params = append(params, str)
523
-		}
511
+		params = append(params, client.server.Languages().Codes(tLanguages)...)
524
 		params = append(params, client.t("can speak these languages"))
512
 		params = append(params, client.t("can speak these languages"))
525
 		rb.Add(nil, client.server.name, RPL_WHOISLANGUAGE, params...)
513
 		rb.Add(nil, client.server.name, RPL_WHOISLANGUAGE, params...)
526
 	}
514
 	}

+ 3
- 3
irc/snomanager.go Прегледај датотеку

52
 	for _, mask := range masks {
52
 	for _, mask := range masks {
53
 		currentClientList := m.sendLists[mask]
53
 		currentClientList := m.sendLists[mask]
54
 
54
 
55
-		if currentClientList == nil || len(currentClientList) == 0 {
55
+		if len(currentClientList) == 0 {
56
 			continue
56
 			continue
57
 		}
57
 		}
58
 
58
 
70
 	for mask := range m.sendLists {
70
 	for mask := range m.sendLists {
71
 		currentClientList := m.sendLists[mask]
71
 		currentClientList := m.sendLists[mask]
72
 
72
 
73
-		if currentClientList == nil || len(currentClientList) == 0 {
73
+		if len(currentClientList) == 0 {
74
 			continue
74
 			continue
75
 		}
75
 		}
76
 
76
 
87
 
87
 
88
 	currentClientList := m.sendLists[mask]
88
 	currentClientList := m.sendLists[mask]
89
 
89
 
90
-	if currentClientList == nil || len(currentClientList) == 0 {
90
+	if len(currentClientList) == 0 {
91
 		return
91
 		return
92
 	}
92
 	}
93
 
93
 

Loading…
Откажи
Сачувај