bdd0c7bc06
TL;DR: supports for casemapping, now logs are saved in casemapped/canonical/tolower form (eg. in the #channel directory instead of #Channel... or something) == What is casemapping? == see <https://modern.ircdocs.horse/#casemapping-parameter> == Casemapping and multi-upstream == Since each upstream does not necessarily use the same casemapping, and since casemappings cannot coexist [0], 1. soju must also update the database accordingly to upstreams' casemapping, otherwise it will end up inconsistent, 2. soju must "normalize" entity names and expose only one casemapping that is a subset of all supported casemappings (here, ascii). [0] On some upstreams, "emersion[m]" and "emersion{m}" refer to the same user (upstreams that advertise rfc1459 for example), while on others (upstreams that advertise ascii) they don't. Once upstream's casemapping is known (default to rfc1459), entity names in map keys are made into casemapped form, for upstreamConn, upstreamChannel and network. downstreamConn advertises "CASEMAPPING=ascii", and always casemap map keys with ascii. Some functions require the caller to casemap their argument (to avoid needless calls to casemapping functions). == Message forwarding and casemapping == downstream message handling (joins and parts basically): When relaying entity names from downstreams to upstreams, soju uses the upstream casemapping, in order to not get in the way of the user. This does not brings any issue, as long as soju replies with the ascii casemapping in mind (solves point 1.). marshalEntity/marshalUserPrefix: When relaying entity names from upstreams with non-ascii casemappings, soju *partially* casemap them: it only change the case of characters which are not ascii letters. ASCII case is thus kept intact, while special symbols like []{} are the same every time soju sends them to downstreams (solves point 2.). == Casemapping changes == Casemapping changes are not fully supported by this patch and will result in loss of history. This is a limitation of the protocol and should be solved by the RENAME spec.
93 lines
2.3 KiB
Go
93 lines
2.3 KiB
Go
package soju
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
|
|
"gopkg.in/irc.v3"
|
|
)
|
|
|
|
func forwardChannel(dc *downstreamConn, ch *upstreamChannel) {
|
|
if !ch.complete {
|
|
panic("Tried to forward a partial channel")
|
|
}
|
|
|
|
sendTopic(dc, ch)
|
|
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: 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)
|
|
|
|
emptyNameReply := &irc.Message{
|
|
Prefix: dc.srv.prefix(),
|
|
Command: irc.RPL_NAMREPLY,
|
|
Params: []string{dc.nick, string(ch.Status), downstreamName, ""},
|
|
}
|
|
maxLength := maxMessageLength - len(emptyNameReply.String())
|
|
|
|
var buf strings.Builder
|
|
for _, entry := range ch.Members.innerMap {
|
|
nick := entry.originalKey
|
|
memberships := entry.value.(*memberships)
|
|
s := memberships.Format(dc) + dc.marshalEntity(ch.conn.network, nick)
|
|
|
|
n := buf.Len() + 1 + len(s)
|
|
if buf.Len() != 0 && n > maxLength {
|
|
// There's not enough space for the next space + nick.
|
|
dc.SendMessage(&irc.Message{
|
|
Prefix: dc.srv.prefix(),
|
|
Command: irc.RPL_NAMREPLY,
|
|
Params: []string{dc.nick, string(ch.Status), downstreamName, buf.String()},
|
|
})
|
|
buf.Reset()
|
|
}
|
|
|
|
if buf.Len() != 0 {
|
|
buf.WriteByte(' ')
|
|
}
|
|
buf.WriteString(s)
|
|
}
|
|
|
|
if buf.Len() != 0 {
|
|
dc.SendMessage(&irc.Message{
|
|
Prefix: dc.srv.prefix(),
|
|
Command: irc.RPL_NAMREPLY,
|
|
Params: []string{dc.nick, string(ch.Status), downstreamName, buf.String()},
|
|
})
|
|
}
|
|
|
|
dc.SendMessage(&irc.Message{
|
|
Prefix: dc.srv.prefix(),
|
|
Command: irc.RPL_ENDOFNAMES,
|
|
Params: []string{dc.nick, downstreamName, "End of /NAMES list"},
|
|
})
|
|
}
|