mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-12 19:55:59 +01:00
Code Activity

Restructure group and client management messages.

Browse source
This commit is contained in:
Juliusz Chroboczek 2020-08-12 12:40:40 +02:00
parent 88d2a96819
commit 675035ab29
2 changed files with 78 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
static/sfu.js
View file

@ -1058,7 +1058,8 @@ function handleInput() {
return;
}
send({
type: 'clearchat',
type: 'groupaction',
kind: 'clearchat',
});
return;
case '/lock':
@ -1068,7 +1069,8 @@ function handleInput() {
return;
}
send({
type: cmd.slice(1),
type: 'groupaction',
kind: cmd.slice(1),
});
return;
case '/record':
@ -1078,7 +1080,8 @@ function handleInput() {
return;
}
send({
type: cmd.slice(1),
type: 'groupaction',
kind: cmd.slice(1),
});
return;
case '/op':
@ -1106,7 +1109,8 @@ function handleInput() {
return;
}
send({
type: cmd.slice(1),
type: 'useraction',
kind: cmd.slice(1),
id: id,
});
return;

130
webclient.go
View file

@ -1006,71 +1006,81 @@ func handleClientMessage(c *webClient, m clientMessage) error {
cc.write(m)
}
}
case "clearchat":
c.group.clearChatHistory()
m := clientMessage{Type: "clearchat"}
clients := c.group.getClients(nil)
for _, cc := range clients {
cc, ok := cc.(*webClient)
if ok {
cc.write(m)
case "groupaction":
switch m.Kind {
case "clearchat":
c.group.clearChatHistory()
m := clientMessage{Type: "clearchat"}
clients := c.group.getClients(nil)
for _, cc := range clients {
cc, ok := cc.(*webClient)
if ok {
cc.write(m)
}
}
}
case "op", "unop", "present", "unpresent":
if !c.permissions.Op {
return c.error(userError("not authorised"))
}
err := setPermissions(c.group, m.Id, m.Type)
if err != nil {
return c.error(err)
}
case "lock", "unlock":
if !c.permissions.Op {
return c.error(userError("not authorised"))
}
var locked uint32
if m.Type == "lock" {
locked = 1
}
atomic.StoreUint32(&c.group.locked, locked)
case "record":
if !c.permissions.Record {
return c.error(userError("not authorised"))
}
for _, cc := range c.group.getClients(c) {
_, ok := cc.(*diskClient)
if ok {
return c.error(userError("already recording"))
case "lock", "unlock":
if !c.permissions.Op {
return c.error(userError("not authorised"))
}
}
disk := &diskClient{
group: c.group,
id: "recording",
}
_, err := addClient(c.group.name, disk)
if err != nil {
disk.Close()
return c.error(err)
}
go pushConns(disk)
case "unrecord":
if !c.permissions.Record {
return c.error(userError("not authorised"))
}
for _, cc := range c.group.getClients(c) {
disk, ok := cc.(*diskClient)
if ok {
var locked uint32
if m.Kind == "lock" {
locked = 1
}
atomic.StoreUint32(&c.group.locked, locked)
case "record":
if !c.permissions.Record {
return c.error(userError("not authorised"))
}
for _, cc := range c.group.getClients(c) {
_, ok := cc.(*diskClient)
if ok {
return c.error(userError("already recording"))
}
}
disk := &diskClient{
group: c.group,
id: "recording",
}
_, err := addClient(c.group.name, disk)
if err != nil {
disk.Close()
delClient(disk)
return c.error(err)
}
go pushConns(disk)
case "unrecord":
if !c.permissions.Record {
return c.error(userError("not authorised"))
}
for _, cc := range c.group.getClients(c) {
disk, ok := cc.(*diskClient)
if ok {
disk.Close()
delClient(disk)
}
}
default:
return protocolError("unknown group action")
}
case "kick":
if !c.permissions.Op {
return c.error(userError("not authorised"))
}
err := kickClient(c.group, m.Id)
if err != nil {
return c.error(err)
case "useraction":
switch m.Kind {
case "op", "unop", "present", "unpresent":
if !c.permissions.Op {
return c.error(userError("not authorised"))
}
err := setPermissions(c.group, m.Id, m.Kind)
if err != nil {
return c.error(err)
}
case "kick":
if !c.permissions.Op {
return c.error(userError("not authorised"))
}
err := kickClient(c.group, m.Id)
if err != nil {
return c.error(err)
}
default:
return protocolError("unknown user action")
}
case "pong":
// nothing