Selaa lähdekoodia

simplify some logic

tags/v2.2.0
Shivaram Lingamneni 3 vuotta sitten
vanhempi
commit
562b85c1c0
1 muutettua tiedostoa jossa 9 lisäystä ja 5 poistoa
  1. 9
    5
      irc/znc.go

+ 9
- 5
irc/znc.go Näytä tiedosto

139
 	//     3.3  When the client sends a subsequent redundant JOIN line for those
139
 	//     3.3  When the client sends a subsequent redundant JOIN line for those
140
 	//          channels; redundant JOIN is a complete no-op so we won't replay twice
140
 	//          channels; redundant JOIN is a complete no-op so we won't replay twice
141
 
141
 
142
+	playPrivmsgs := false
142
 	if params[1] == "*" {
143
 	if params[1] == "*" {
143
-		zncPlayPrivmsgs(client, rb, "*", start, end)
144
-	} else if params[1] == "*self" {
145
-		zncPlayPrivmsgs(client, rb, "*", start, end)
146
-		targets = make(StringSet) // XXX non-nil but empty channel set means "no channels"
144
+		playPrivmsgs = true // XXX nil `targets` means "every channel"
147
 	} else {
145
 	} else {
148
 		targets = make(StringSet)
146
 		targets = make(StringSet)
149
 		for _, targetName := range strings.Split(targetString, ",") {
147
 		for _, targetName := range strings.Split(targetString, ",") {
150
-			if strings.HasPrefix(targetName, "#") {
148
+			if targetName == "*self" {
149
+				playPrivmsgs = true
150
+			} else if strings.HasPrefix(targetName, "#") {
151
 				if cfTarget, err := CasefoldChannel(targetName); err == nil {
151
 				if cfTarget, err := CasefoldChannel(targetName); err == nil {
152
 					targets.Add(cfTarget)
152
 					targets.Add(cfTarget)
153
 				}
153
 				}
159
 		}
159
 		}
160
 	}
160
 	}
161
 
161
 
162
+	if playPrivmsgs {
163
+		zncPlayPrivmsgs(client, rb, "*", start, end)
164
+	}
165
+
162
 	rb.session.zncPlaybackTimes = &zncPlaybackTimes{
166
 	rb.session.zncPlaybackTimes = &zncPlaybackTimes{
163
 		start:   start,
167
 		start:   start,
164
 		end:     end,
168
 		end:     end,

Loading…
Peruuta
Tallenna