e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep op/voice prefix when changing nick

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2017-02-21 13:56:04 +01:00
parent 8dfcf47281
commit 9f055da1a0
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
storage/channel.go
View File

@ -92,11 +92,11 @@ func (c *ChannelStore) SetMode(server, channel, user, add, remove string) {
c.userLock.Lock() c.userLock.Lock()
if strings.Contains(add, "o") { if strings.Contains(add, "o") {
c.rename(server, channel, user, "@"+user) c.setPrefix(server, channel, user, "@")
} else if strings.Contains(add, "v") { } else if strings.Contains(add, "v") {
c.rename(server, channel, user, "+"+user) c.setPrefix(server, channel, user, "+")
} else if strings.IndexAny(remove, "ov") > -1 { } else if strings.IndexAny(remove, "ov") > -1 {
c.rename(server, channel, user, user) c.setPrefix(server, channel, user, "")
} }
c.userLock.Unlock() c.userLock.Unlock()
@ -139,17 +139,28 @@ func (c *ChannelStore) SetTopic(topic, server, channel string) {
func (c *ChannelStore) rename(server, channel, oldNick, newNick string) { func (c *ChannelStore) rename(server, channel, oldNick, newNick string) {
for i, u := range c.users[server][channel] { for i, u := range c.users[server][channel] {
u = strings.TrimLeft(u, "@+") if strings.TrimLeft(u, "@+") == oldNick {
if u[0] == '@' || u[0] == '+' {
newNick = u[:1] + newNick
}
if u == oldNick {
c.users[server][channel][i] = newNick c.users[server][channel][i] = newNick
return return
} }
} }
} }
func (c *ChannelStore) setPrefix(server, channel, user, prefix string) {
for i, u := range c.users[server][channel] {
if strings.TrimLeft(u, "@+") == user {
c.users[server][channel][i] = prefix + user
return
}
}
}
func (c *ChannelStore) renameAll(server, oldNick, newNick string) { func (c *ChannelStore) renameAll(server, oldNick, newNick string) {
for channel, _ := range c.users[server] { for channel := range c.users[server] {
c.rename(server, channel, oldNick, newNick) c.rename(server, channel, oldNick, newNick)
} }
} }

4
storage/channel_test.go
View File

@ -40,6 +40,10 @@ func TestRenameUser(t *testing.T) {
channelStore.RenameUser("user", "new", "srv") channelStore.RenameUser("user", "new", "srv")
assert.Equal(t, []string{"new"}, channelStore.GetUsers("srv", "#chan1")) assert.Equal(t, []string{"new"}, channelStore.GetUsers("srv", "#chan1"))
assert.Equal(t, []string{"new"}, channelStore.GetUsers("srv", "#chan2")) assert.Equal(t, []string{"new"}, channelStore.GetUsers("srv", "#chan2"))
channelStore.AddUser("@gotop", "srv", "#chan3")
channelStore.RenameUser("gotop", "stillgotit", "srv")
assert.Equal(t, []string{"@stillgotit"}, channelStore.GetUsers("srv", "#chan3"))
} }
func TestMode(t *testing.T) { func TestMode(t *testing.T) {