Remove bridge.go
All of its functions belong to downstream.go.
This commit is contained in:
Simon Ser
parent
289a4e118a
commit
3c5e603192
88
bridge.go
88
bridge.go
|
|
@ -1,88 +0,0 @@
|
|||
package soju
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"gopkg.in/irc.v3"
|
||||
|
||||
"git.sr.ht/~emersion/soju/xirc"
|
||||
)
|
||||
|
||||
func forwardChannel(ctx context.Context, dc *downstreamConn, ch *upstreamChannel) {
|
||||
if !ch.complete {
|
||||
panic("Tried to forward a partial channel")
|
||||
}
|
||||
|
||||
// RPL_NOTOPIC shouldn't be sent on JOIN
|
||||
if ch.Topic != "" {
|
||||
sendTopic(dc, ch)
|
||||
}
|
||||
|
||||
if dc.caps.IsEnabled("soju.im/read") {
|
||||
channelCM := ch.conn.network.casemap(ch.Name)
|
||||
r, err := dc.srv.db.GetReadReceipt(ctx, ch.conn.network.ID, channelCM)
|
||||
if err != nil {
|
||||
dc.logger.Printf("failed to get the read receipt for %q: %v", ch.Name, err)
|
||||
} else {
|
||||
timestampStr := "*"
|
||||
if r != nil {
|
||||
timestampStr = fmt.Sprintf("timestamp=%s", xirc.FormatServerTime(r.Timestamp))
|
||||
}
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.prefix(),
|
||||
Command: "READ",
|
||||
Params: []string{dc.marshalEntity(ch.conn.network, ch.Name), timestampStr},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if !dc.caps.IsEnabled("soju.im/no-implicit-names") {
|
||||
sendNames(dc, ch)
|
||||
}
|
||||
}
|
||||
|
||||
func sendTopic(dc *downstreamConn, ch *upstreamChannel) {
|
||||
downstreamName := dc.marshalEntity(ch.conn.network, ch.Name)
|
||||
|
||||
if ch.Topic != "" {
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.srv.prefix(),
|
||||
Command: irc.RPL_TOPIC,
|
||||
Params: []string{dc.nick, downstreamName, ch.Topic},
|
||||
})
|
||||
if ch.TopicWho != nil {
|
||||
topicWho := dc.marshalUserPrefix(ch.conn.network, ch.TopicWho)
|
||||
topicTime := strconv.FormatInt(ch.TopicTime.Unix(), 10)
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.srv.prefix(),
|
||||
Command: xirc.RPL_TOPICWHOTIME,
|
||||
Params: []string{dc.nick, downstreamName, topicWho.String(), topicTime},
|
||||
})
|
||||
}
|
||||
} else {
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.srv.prefix(),
|
||||
Command: irc.RPL_NOTOPIC,
|
||||
Params: []string{dc.nick, downstreamName, "No topic is set"},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func sendNames(dc *downstreamConn, ch *upstreamChannel) {
|
||||
downstreamName := dc.marshalEntity(ch.conn.network, ch.Name)
|
||||
|
||||
var members []string
|
||||
for _, entry := range ch.Members.innerMap {
|
||||
nick := entry.originalKey
|
||||
memberships := entry.value.(*xirc.MembershipSet)
|
||||
s := formatMemberPrefix(*memberships, dc) + dc.marshalEntity(ch.conn.network, nick)
|
||||
members = append(members, s)
|
||||
}
|
||||
|
||||
msgs := xirc.GenerateNamesReply(dc.srv.prefix(), dc.nick, downstreamName, ch.Status, members)
|
||||
for _, msg := range msgs {
|
||||
dc.SendMessage(msg)
|
||||
}
|
||||
}
|
||||
|
|
@ -3257,3 +3257,80 @@ func parseNickServCredentials(text, nick string) (username, password string, ok
|
|||
}
|
||||
return username, password, true
|
||||
}
|
||||
|
||||
func forwardChannel(ctx context.Context, dc *downstreamConn, ch *upstreamChannel) {
|
||||
if !ch.complete {
|
||||
panic("Tried to forward a partial channel")
|
||||
}
|
||||
|
||||
// RPL_NOTOPIC shouldn't be sent on JOIN
|
||||
if ch.Topic != "" {
|
||||
sendTopic(dc, ch)
|
||||
}
|
||||
|
||||
if dc.caps.IsEnabled("soju.im/read") {
|
||||
channelCM := ch.conn.network.casemap(ch.Name)
|
||||
r, err := dc.srv.db.GetReadReceipt(ctx, ch.conn.network.ID, channelCM)
|
||||
if err != nil {
|
||||
dc.logger.Printf("failed to get the read receipt for %q: %v", ch.Name, err)
|
||||
} else {
|
||||
timestampStr := "*"
|
||||
if r != nil {
|
||||
timestampStr = fmt.Sprintf("timestamp=%s", xirc.FormatServerTime(r.Timestamp))
|
||||
}
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.prefix(),
|
||||
Command: "READ",
|
||||
Params: []string{dc.marshalEntity(ch.conn.network, ch.Name), timestampStr},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if !dc.caps.IsEnabled("soju.im/no-implicit-names") {
|
||||
sendNames(dc, ch)
|
||||
}
|
||||
}
|
||||
|
||||
func sendTopic(dc *downstreamConn, ch *upstreamChannel) {
|
||||
downstreamName := dc.marshalEntity(ch.conn.network, ch.Name)
|
||||
|
||||
if ch.Topic != "" {
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.srv.prefix(),
|
||||
Command: irc.RPL_TOPIC,
|
||||
Params: []string{dc.nick, downstreamName, ch.Topic},
|
||||
})
|
||||
if ch.TopicWho != nil {
|
||||
topicWho := dc.marshalUserPrefix(ch.conn.network, ch.TopicWho)
|
||||
topicTime := strconv.FormatInt(ch.TopicTime.Unix(), 10)
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.srv.prefix(),
|
||||
Command: xirc.RPL_TOPICWHOTIME,
|
||||
Params: []string{dc.nick, downstreamName, topicWho.String(), topicTime},
|
||||
})
|
||||
}
|
||||
} else {
|
||||
dc.SendMessage(&irc.Message{
|
||||
Prefix: dc.srv.prefix(),
|
||||
Command: irc.RPL_NOTOPIC,
|
||||
Params: []string{dc.nick, downstreamName, "No topic is set"},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func sendNames(dc *downstreamConn, ch *upstreamChannel) {
|
||||
downstreamName := dc.marshalEntity(ch.conn.network, ch.Name)
|
||||
|
||||
var members []string
|
||||
for _, entry := range ch.Members.innerMap {
|
||||
nick := entry.originalKey
|
||||
memberships := entry.value.(*xirc.MembershipSet)
|
||||
s := formatMemberPrefix(*memberships, dc) + dc.marshalEntity(ch.conn.network, nick)
|
||||
members = append(members, s)
|
||||
}
|
||||
|
||||
msgs := xirc.GenerateNamesReply(dc.srv.prefix(), dc.nick, downstreamName, ch.Status, members)
|
||||
for _, msg := range msgs {
|
||||
dc.SendMessage(msg)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue