sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kill downstreamConn.marshal{Nick,Channel}

Browse Source 
We can just use downstreamConn.marshalEntity instead.
This commit is contained in:
Simon Ser 2020-04-16 16:57:33 +02:00
parent 96be0b5945
commit 5cf876cb89
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bridge.go
View File

@ -16,7 +16,7 @@ func forwardChannel(dc *downstreamConn, ch *upstreamChannel) {
} }
func sendTopic(dc *downstreamConn, ch *upstreamChannel) { func sendTopic(dc *downstreamConn, ch *upstreamChannel) {
downstreamName := dc.marshalChannel(ch.conn, ch.Name) downstreamName := dc.marshalEntity(ch.conn, ch.Name)
if ch.Topic != "" { if ch.Topic != "" {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -36,10 +36,10 @@ func sendTopic(dc *downstreamConn, ch *upstreamChannel) {
func sendNames(dc *downstreamConn, ch *upstreamChannel) { func sendNames(dc *downstreamConn, ch *upstreamChannel) {
// TODO: send multiple members in each message // TODO: send multiple members in each message
downstreamName := dc.marshalChannel(ch.conn, ch.Name) downstreamName := dc.marshalEntity(ch.conn, ch.Name)
for nick, membership := range ch.Members { for nick, membership := range ch.Members {
s := membership.String() + dc.marshalNick(ch.conn, nick) s := membership.String() + dc.marshalEntity(ch.conn, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),

20
downstream.go
View File

@ -139,14 +139,6 @@ func (dc *downstreamConn) marshalEntity(uc *upstreamConn, name string) string {
return name + "/" + uc.network.GetName() return name + "/" + uc.network.GetName()
} }
func (dc *downstreamConn) marshalChannel(uc *upstreamConn, name string) string {
return dc.marshalEntity(uc, name)
}
func (dc *downstreamConn) marshalNick(uc *upstreamConn, name string) string {
return dc.marshalEntity(uc, name)
}
func (dc *downstreamConn) marshalUserPrefix(uc *upstreamConn, prefix *irc.Prefix) *irc.Prefix { func (dc *downstreamConn) marshalUserPrefix(uc *upstreamConn, prefix *irc.Prefix) *irc.Prefix {
if prefix.Name == uc.nick { if prefix.Name == uc.nick {
return dc.prefix() return dc.prefix()
@ -243,14 +235,14 @@ func (dc *downstreamConn) marshalMessage(msg *irc.Message, uc *upstreamConn) *ir
msg.Params[0] = dc.marshalEntity(uc, msg.Params[0]) msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
case "NICK": case "NICK":
// Nick change for another user // Nick change for another user
msg.Params[0] = dc.marshalNick(uc, msg.Params[0]) msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
case "JOIN", "PART": case "JOIN", "PART":
msg.Params[0] = dc.marshalChannel(uc, msg.Params[0]) msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
case "KICK": case "KICK":
msg.Params[0] = dc.marshalChannel(uc, msg.Params[0]) msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
msg.Params[1] = dc.marshalNick(uc, msg.Params[1]) msg.Params[1] = dc.marshalEntity(uc, msg.Params[1])
case "TOPIC": case "TOPIC":
msg.Params[0] = dc.marshalChannel(uc, msg.Params[0]) msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
case "MODE": case "MODE":
msg.Params[0] = dc.marshalEntity(uc, msg.Params[0]) msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
case "QUIT": case "QUIT":
@ -670,7 +662,7 @@ func (dc *downstreamConn) welcome() error {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.prefix(), Prefix: dc.prefix(),
Command: "JOIN", Command: "JOIN",
Params: []string{dc.marshalChannel(ch.conn, ch.Name)}, Params: []string{dc.marshalEntity(ch.conn, ch.Name)},
}) })
forwardChannel(dc, ch) forwardChannel(dc, ch)

32
upstream.go
View File

@ -764,7 +764,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
modeStr, modeParams := ch.modes.Format() modeStr, modeParams := ch.modes.Format()
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
params := []string{dc.nick, dc.marshalChannel(uc, channel), modeStr} params := []string{dc.nick, dc.marshalEntity(uc, channel), modeStr}
params = append(params, modeParams...) params = append(params, modeParams...)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -826,7 +826,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_LIST, Command: irc.RPL_LIST,
Params: []string{dc.nick, dc.marshalChannel(uc, channel), clients, topic}, Params: []string{dc.nick, dc.marshalEntity(uc, channel), clients, topic},
}) })
}) })
case irc.RPL_LISTEND: case irc.RPL_LISTEND:
@ -844,11 +844,11 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
if !ok { if !ok {
// NAMES on a channel we have not joined, forward to downstream // NAMES on a channel we have not joined, forward to downstream
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
channel := dc.marshalChannel(uc, name) channel := dc.marshalEntity(uc, name)
members := splitSpace(members) members := splitSpace(members)
for i, member := range members { for i, member := range members {
membership, nick := uc.parseMembershipPrefix(member) membership, nick := uc.parseMembershipPrefix(member)
members[i] = membership.String() + dc.marshalNick(uc, nick) members[i] = membership.String() + dc.marshalEntity(uc, nick)
} }
memberStr := strings.Join(members, " ") memberStr := strings.Join(members, " ")
@ -881,7 +881,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
if !ok { if !ok {
// NAMES on a channel we have not joined, forward to downstream // NAMES on a channel we have not joined, forward to downstream
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
channel := dc.marshalChannel(uc, name) channel := dc.marshalEntity(uc, name)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
@ -922,9 +922,9 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
channel := channel channel := channel
if channel != "*" { if channel != "*" {
channel = dc.marshalChannel(uc, channel) channel = dc.marshalEntity(uc, channel)
} }
nick := dc.marshalNick(uc, nick) nick := dc.marshalEntity(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_WHOREPLY, Command: irc.RPL_WHOREPLY,
@ -956,7 +956,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
} }
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalEntity(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_WHOISUSER, Command: irc.RPL_WHOISUSER,
@ -970,7 +970,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
} }
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalEntity(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_WHOISSERVER, Command: irc.RPL_WHOISSERVER,
@ -984,7 +984,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
} }
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalEntity(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_WHOISOPERATOR, Command: irc.RPL_WHOISOPERATOR,
@ -998,7 +998,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
} }
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalEntity(uc, nick)
params := []string{dc.nick, nick} params := []string{dc.nick, nick}
params = append(params, msg.Params[2:]...) params = append(params, msg.Params[2:]...)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -1015,11 +1015,11 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
channels := splitSpace(channelList) channels := splitSpace(channelList)
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalEntity(uc, nick)
channelList := make([]string, len(channels)) channelList := make([]string, len(channels))
for i, channel := range channels { for i, channel := range channels {
prefix, channel := uc.parseMembershipPrefix(channel) prefix, channel := uc.parseMembershipPrefix(channel)
channel = dc.marshalChannel(uc, channel) channel = dc.marshalEntity(uc, channel)
channelList[i] = prefix.String() + channel channelList[i] = prefix.String() + channel
} }
channels := strings.Join(channelList, " ") channels := strings.Join(channelList, " ")
@ -1036,7 +1036,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
} }
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) { uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalEntity(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_ENDOFWHOIS, Command: irc.RPL_ENDOFWHOIS,
@ -1078,7 +1078,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.marshalUserPrefix(uc, msg.Prefix), Prefix: dc.marshalUserPrefix(uc, msg.Prefix),
Command: "INVITE", Command: "INVITE",
Params: []string{dc.marshalNick(uc, nick), dc.marshalChannel(uc, channel)}, Params: []string{dc.marshalEntity(uc, nick), dc.marshalEntity(uc, channel)},
}) })
}) })
case irc.RPL_INVITING: case irc.RPL_INVITING:
@ -1092,7 +1092,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_INVITING, Command: irc.RPL_INVITING,
Params: []string{dc.nick, dc.marshalNick(uc, nick), dc.marshalChannel(uc, channel)}, Params: []string{dc.nick, dc.marshalEntity(uc, nick), dc.marshalEntity(uc, channel)},
}) })
}) })
case irc.ERR_UNKNOWNCOMMAND, irc.RPL_TRYAGAIN: case irc.ERR_UNKNOWNCOMMAND, irc.RPL_TRYAGAIN: