mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-14 12:45:58 +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; return;
} }
send({ send({
type: 'clearchat', type: 'groupaction',
kind: 'clearchat',
}); });
return; return;
case '/lock': case '/lock':
@ -1068,7 +1069,8 @@ function handleInput() {
return; return;
} }
send({ send({
type: cmd.slice(1), type: 'groupaction',
kind: cmd.slice(1),
}); });
return; return;
case '/record': case '/record':
@ -1078,7 +1080,8 @@ function handleInput() {
return; return;
} }
send({ send({
type: cmd.slice(1), type: 'groupaction',
kind: cmd.slice(1),
}); });
return; return;
case '/op': case '/op':
@ -1106,7 +1109,8 @@ function handleInput() {
return; return;
} }
send({ send({
type: cmd.slice(1), type: 'useraction',
kind: cmd.slice(1),
id: id, id: id,
}); });
return; return;

28
webclient.go
View file

@ -1006,6 +1006,8 @@ func handleClientMessage(c *webClient, m clientMessage) error {
cc.write(m) cc.write(m)
} }
} }
case "groupaction":
switch m.Kind {
case "clearchat": case "clearchat":
c.group.clearChatHistory() c.group.clearChatHistory()
m := clientMessage{Type: "clearchat"} m := clientMessage{Type: "clearchat"}
@ -1016,20 +1018,12 @@ func handleClientMessage(c *webClient, m clientMessage) error {
cc.write(m) 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": case "lock", "unlock":
if !c.permissions.Op { if !c.permissions.Op {
return c.error(userError("not authorised")) return c.error(userError("not authorised"))
} }
var locked uint32 var locked uint32
if m.Type == "lock" { if m.Kind == "lock" {
locked = 1 locked = 1
} }
atomic.StoreUint32(&c.group.locked, locked) atomic.StoreUint32(&c.group.locked, locked)
@ -1064,6 +1058,19 @@ func handleClientMessage(c *webClient, m clientMessage) error {
delClient(disk) delClient(disk)
} }
} }
default:
return protocolError("unknown group action")
}
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": case "kick":
if !c.permissions.Op { if !c.permissions.Op {
return c.error(userError("not authorised")) return c.error(userError("not authorised"))
@ -1072,6 +1079,9 @@ func handleClientMessage(c *webClient, m clientMessage) error {
if err != nil { if err != nil {
return c.error(err) return c.error(err)
} }
default:
return protocolError("unknown user action")
}
case "pong": case "pong":
// nothing // nothing
case "ping": case "ping":