Add the moderator role

lib/admin.go

@@ -16,7 +16,7 @@ const (
 )
 
 func deleteHandler(h handler) {
-	if !h.sess.IsAdmin() {
+	if !h.sess.IsModerator() {
 		notFound(h)
 		return
 	}
@@ -54,7 +54,7 @@ func deleteHandler(h handler) {
 
 func editHandler(h handler) {
 	id := mux.Vars(h.r)["id"]
-	if !h.sess.IsAdmin() {
+	if !h.sess.IsModerator() {
 		notFound(h)
 		return
 	}
@@ -83,7 +83,7 @@ func cleanEmptyStr(s []string) []string {
 
 func saveHandler(h handler) {
 	id := mux.Vars(h.r)["id"]
-	if !h.sess.IsAdmin() {
+	if !h.sess.IsModerator() {
 		notFound(h)
 		return
 	}
@@ -133,7 +133,7 @@ type newData struct {
 }
 
 func newHandler(h handler) {
-	if !h.sess.IsAdmin() {
+	if !h.sess.IsModerator() {
 		notFound(h)
 		return
 	}
@@ -177,7 +177,7 @@ func newHandler(h handler) {
 }
 
 func storeHandler(h handler) {
-	if !h.sess.IsAdmin() {
+	if !h.sess.IsModerator() {
 		notFound(h)
 		return
 	}

lib/cover.go

@@ -39,7 +39,7 @@ func coverHandler(h handler) {
 	}
 
 	if !book.Active {
-		if !h.sess.IsAdmin() {
+		if !h.sess.IsModerator() {
 			notFound(h)
 			return
 		}

lib/reader.go

@@ -182,7 +182,7 @@ func openReadEpub(h handler) (*epubgo.Epub, database.Book) {
 		return nil, book
 	}
 	if !book.Active {
-		if !h.sess.IsAdmin() {
+		if !h.sess.IsModerator() {
 			return nil, book
 		}
 	}
@@ -227,7 +227,7 @@ func openEpubFile(h handler, id string, file string) error {
 		return err
 	}
 	if !book.Active {
-		if !h.sess.IsAdmin() {
+		if !h.sess.IsModerator() {
 			return err
 		}
 	}

lib/session.go

@@ -81,3 +81,11 @@ func (s *Session) Id() string {
 func (s *Session) IsAdmin() bool {
 	return s.Role == "admin"
 }
+
+func (s *Session) IsModerator() bool {
+	admin := map[string]bool{
+		"admin":     true,
+		"moderator": true,
+	}
+	return admin[s.Role]
+}

lib/template.go

@@ -21,7 +21,7 @@ type Status struct {
 	Title    string
 	Search   string
 	User     string
-	IsAdmin  bool
+	Role     string
 	Notif    []Notification
 	Updated  string
 	Home     bool
@@ -39,7 +39,7 @@ func GetStatus(h handler) Status {
 	s.FullURL = s.BaseURL + h.r.RequestURI
 	s.Title = "Imperial Library of Trantor"
 	s.User = h.sess.User
-	s.IsAdmin = h.sess.IsAdmin()
+	s.Role = h.sess.Role
 	s.Notif = h.sess.GetNotif()
 	s.Updated = time.Now().UTC().Format("2006-01-02T15:04:05Z")
 	h.sess.Save(h.w, h.r)

lib/trantor.go

@@ -87,7 +87,7 @@ func downloadHandler(h handler) {
 	}
 
 	if !book.Active {
-		if !h.sess.IsAdmin() {
+		if !h.sess.IsModerator() {
 			notFound(h)
 			return
 		}

templates/book.html

@@ -1,6 +1,6 @@
 {{template "header.html" .S}}
 
-{{$isAdmin := .S.IsAdmin}}
+{{$role := .S.Role}}
 {{$flaggedBadQuality := .FlaggedBadQuality}}
 {{with .Book}}
 <script>
@@ -50,7 +50,7 @@ function delBook(){
 		<a href="/read/{{.Id}}" class="btn btn-large btn-warning"><i class="icon-eye-open icon-white"></i> read it!</a>
 		</div>
 		</div>
-		{{if $isAdmin}}
+		{{if eq $role "admin" "moderator"}}
 		<div class="row"><p></p></div>
 		<div class="row">
 		<div class="btn-group pull-right">

templates/dashboard.html

@@ -4,9 +4,11 @@
 
 <div class="span8 offset2">
 	<ul class="nav nav-tabs nav-stacked">
-		{{if .S.IsAdmin}}
+		{{if eq .S.Role "admin" "moderator"}}
 		<li><a href="/new/"><i class="icon-book"></i> New books</a></li>
+		{{if eq .S.Role "admin"}}
 		<li><a href="/news/edit"><i class="icon-certificate"></i> Edit news</a></li>
+		{{end}}
 		<li class="divider"></li>
 		{{end}}
 		<li><a href="/settings/"><i class="icon-wrench"></i> Settings</a></li>

templates/header.html

@@ -68,11 +68,13 @@
 				</a>
 				<ul class="dropdown-menu">
 					<li><a href="/dashboard/"><i class="icon-tasks"></i> Dashboard</a></li>
-					{{if .IsAdmin}}
+					{{if eq .Role "admin" "moderator"}}
 					<li><a href="/new/"><i class="icon-book"></i> New books</a></li>
+					{{if eq .Role "admin"}}
 					<li><a href="/news/edit"><i class="icon-certificate"></i> Edit news</a></li>
+					{{end}}
 					<li class="divider"></li>
- 					{{end}}
+					{{end}}
 					<li><a href="/settings/"><i class="icon-wrench"></i> Settings</a></li>
 					<li class="divider"></li>
 					<li><a href="/logout/"><i class="icon-off"></i> Log Out</a></li>