Simplify some usages of client.error.

72cbb5ff · Juliusz Chroboczek · e05f2fee · 72cbb5ff
Commit 72cbb5ff authored May 28, 2020 by Juliusz Chroboczek
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

client.go client.go +3 -6

No files found.
--- a/client.go
+++ b/client.go
@@ -1376,8 +1376,7 @@ func handleClientMessage(c *client, m clientMessage) error {
 		}
 	case "op", "unop", "present", "unpresent":
 		if !c.permissions.Op {
-			c.error(userError("not authorised"))
+			return c.error(userError("not authorised"))
-			return nil
 		}
 		err := setPermission(c.group, m.Id, m.Type)
 		if err != nil {
@@ -1385,8 +1384,7 @@ func handleClientMessage(c *client, m clientMessage) error {
 		}
 	case "lock", "unlock":
 		if !c.permissions.Op {
-			c.error(userError("not authorised"))
+			return c.error(userError("not authorised"))
-			return nil
 		}
 		var locked uint32
 		if m.Type == "lock" {
@@ -1395,8 +1393,7 @@ func handleClientMessage(c *client, m clientMessage) error {
 		atomic.StoreUint32(&c.group.locked, locked)
 	case "kick":
 		if !c.permissions.Op {
-			c.error(userError("not authorised"))
+			return c.error(userError("not authorised"))
-			return nil
 		}
 		err := kickClient(c.group, m.Id)
 		if err != nil {