add perm_manage_bans to roles

nektro · Oct 9, 2020 · 0de3a79 · 0de3a79
1 parent 583eac6
commit 0de3a79
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/pkg/db/db.go b/pkg/db/db.go
@@ -38,7 +38,7 @@ var (
 	Props        = Properties{}
 	BuiltInRoles = map[UUID]*Role{
 		"o": &Role{
-			0, "o", 0, "Owner", "", pa, pa, false, pa, pa, Time(etc.Epoch), pa,
+			0, "o", 0, "Owner", "", pa, pa, false, pa, pa, Time(etc.Epoch), pa, pa,
 		},
 	}
 )

diff --git a/pkg/db/role.go b/pkg/db/role.go
@@ -23,6 +23,7 @@ type Role struct {
 	PermManageInvites  Perm   `json:"perm_manage_invites" dbsorm:"1"`
 	CreatedOn          Time   `json:"created_on" dbsorm:"1"`
 	PermViewAudits     Perm   `json:"perm_view_audits" dbsorm:"1"`
+	PermManageBans     Perm   `json:"perm_manage_bans" dbsorm:"1"`
 }
 
 //
@@ -36,7 +37,7 @@ func CreateRole(name string) *Role {
 	uid := NewUUID()
 	p := PermIgnore
 	co := now()
-	r := &Role{id, uid, int(id), name, "", p, p, false, p, p, co, p}
+	r := &Role{id, uid, int(id), name, "", p, p, false, p, p, co, p, p}
 	db.Build().InsI(cTableRoles, r).Exe()
 	Props.Increment("count_" + cTableRoles)
 	return r
@@ -58,7 +59,7 @@ func QueryRoleByUID(uid UUID) (*Role, bool) {
 // Scan implements dbstorage.Scannable
 func (v Role) Scan(rows *sql.Rows) dbstorage.Scannable {
 	rows.Scan(&v.ID, &v.UUID, &v.Position, &v.Name, &v.Color, &v.PermManageChannels, &v.PermManageRoles, &v.Distinguish, &v.PermManageServer, &v.PermManageInvites, &v.CreatedOn,
-		&v.PermViewAudits)
+		&v.PermViewAudits, &v.PermManageBans)
 	return &v
 }
 
@@ -209,3 +210,9 @@ func (v *Role) SetPermViewAudits(p Perm) {
 	doUp(v, "perm_view_audits", strconv.Itoa(int(p)))
 	v.PermManageInvites = p
 }
+
+// SetPermMngBans sets
+func (v *Role) SetPermMngBans(p Perm) {
+	doUp(v, "perm_manage_bans", strconv.Itoa(int(p)))
+	v.PermManageBans = p
+}
diff --git a/pkg/handler/roles.go b/pkg/handler/roles.go
@@ -113,6 +113,7 @@ func RoleUpdate(w http.ResponseWriter, r *http.Request) {
 		"perm_manage_roles":    rl.SetPermMngRoles,
 		"perm_manage_invites":  rl.SetPermMngInvites,
 		"perm_view_audits":     rl.SetPermViewAudits,
+		"perm_manage_bans":     rl.SetPermMngBans,
 	}
 	for pk, pv := range perms {
 		if n == pk {

diff --git a/pkg/ws/user_perms.go b/pkg/ws/user_perms.go
@@ -10,6 +10,7 @@ type UserPerms struct {
 	ManageServer   bool `json:"manage_server"`
 	ManageInvites  bool `json:"manage_invites"`
 	ViewAudits     bool `json:"view_audits"`
+	ManageBans     bool `json:"manage_bans"`
 }
 
 // From calculates a user's permissions based on the roles they have
@@ -38,6 +39,10 @@ func (v UserPerms) From(user *db.User) *UserPerms {
 		case db.PermDeny, db.PermAllow:
 			v.ViewAudits = role.PermViewAudits.ToBool()
 		}
+		switch role.PermManageBans {
+		case db.PermDeny, db.PermAllow:
+			v.ManageBans = role.PermManageBans.ToBool()
+		}
 	}
 	return &v
 }
diff --git a/www/chat/index.hbs b/www/chat/index.hbs
@@ -186,6 +186,7 @@
                                 <x-3s-toggle name="perm_manage_roles" label="{{translate 's030'}}" fill=""></x-3s-toggle>
                                 <x-3s-toggle name="perm_manage_invites" label="{{translate 's036'}}" fill=""></x-3s-toggle>
                                 <x-3s-toggle name="perm_view_audits" label="{{translate 's046'}}" fill=""></x-3s-toggle>
+                                <x-3s-toggle name="perm_manage_bans" label="{{translate 's052'}}" fill=""></x-3s-toggle>
                                 <hr>
                                 <h3>{{translate 's047'}}</h3>
                                 <x-button method="delete" class="danger" fill="" text="{{translate 's041'}}"></x-button>