mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 16:45:58 +01:00
Code Activity

Make Kick part of the Client interface.

Browse source 
All clients implement Kick, no need for a separate interface.
This commit is contained in:
Juliusz Chroboczek 2021-02-26 16:20:13 +01:00
parent 69c438ab30
commit ea321be17a
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
group/client.go
View file

@ -101,8 +101,5 @@ type Client interface {
OverridePermissions(*Group) bool OverridePermissions(*Group) bool
PushConn(g *Group, id string, conn conn.Up, tracks []conn.UpTrack, replace string) error PushConn(g *Group, id string, conn conn.Up, tracks []conn.UpTrack, replace string) error
PushClient(id, username string, add bool) error PushClient(id, username string, add bool) error
}
type Kickable interface {
Kick(id, user, message string) error Kick(id, user, message string) error
} }

5
group/group.go
View file

@ -586,10 +586,7 @@ func (g *Group) Range(f func(c Client) bool) {
func kickall(g *Group, message string) { func kickall(g *Group, message string) {
g.Range(func(c Client) bool { g.Range(func(c Client) bool {
cc, ok := c.(Kickable) c.Kick("", "", message)
if ok {
cc.Kick("", "", message)
}
return true return true
}) })
} }

7
rtpconn/webclient.go
View file

@ -1099,12 +1099,7 @@ func kickClient(g *group.Group, id, user, dest string, message string) error {
return group.UserError("no such user") return group.UserError("no such user")
} }
c, ok := client.(group.Kickable) return client.Kick(id, user, message)
if !ok {
return group.UserError("this client is not kickable")
}
return c.Kick(id, user, message)
} }
func handleClientMessage(c *webClient, m clientMessage) error { func handleClientMessage(c *webClient, m clientMessage) error {