PlayerBan: Add field for player who set the ban

Author: vibhavp

controllers/admin/ban.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/TF2Stadium/Helen/config"
+	chelpers "github.com/TF2Stadium/Helen/controllers/controllerhelpers"
 	"github.com/TF2Stadium/Helen/models/player"
 	"golang.org/x/net/xsrftoken"
 )
@@ -72,7 +73,10 @@ func BanPlayer(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = player.BanUntil(until, ban, reason)
+	jwt, _ := chelpers.GetToken(r)
+	bannedByPlayer := chelpers.GetPlayer(jwt)
+
+	err = player.BanUntil(until, ban, reason, bannedByPlayer.ID)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
@@ -81,19 +85,13 @@ func BanPlayer(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "Player %s (%s) has been banned (%s) till %v", player.Name, player.SteamID, ban.String(), until)
 }
 
-type BanData struct {
-	Player *player.Player
-	Ban    *player.PlayerBan
-}
-
 func GetBanLogs(w http.ResponseWriter, r *http.Request) {
 	values := r.URL.Query()
 	if !xsrftoken.Valid(values.Get("xsrf-token"), config.Constants.CookieStoreSecret, "admin", "POST") {
 		http.Error(w, "invalid xsrf token", http.StatusBadRequest)
 		return
 	}
 
-	var banData []BanData
 	var bans []*player.PlayerBan
 
 	all := values.Get("all")
@@ -106,10 +104,6 @@ func GetBanLogs(w http.ResponseWriter, r *http.Request) {
 			bans = player.GetAllBans()
 		}
 
-		for _, ban := range bans {
-			p, _ := player.GetPlayerByID(ban.PlayerID)
-			banData = append(banData, BanData{p, ban})
-		}
 	} else {
 		player, err := player.GetPlayerBySteamID(steamid)
 		if err != nil {
@@ -123,12 +117,9 @@ func GetBanLogs(w http.ResponseWriter, r *http.Request) {
 			bans, _ = player.GetAllBans()
 		}
 
-		for _, ban := range bans {
-			banData = append(banData, BanData{player, ban})
-		}
 	}
 
-	err := banlogsTempl.Execute(w, banData)
+	err := banlogsTempl.Execute(w, bans)
 	if err != nil {
 		logrus.Error(err)
 	}

models/player/player_bans.go

@@ -20,11 +20,16 @@ const (
 //PlayerBan represents a player ban
 type PlayerBan struct {
 	gorm.Model
-	PlayerID uint      // ID of the player banned
-	Type     BanType   // Ban type
-	Until    time.Time // Time until which the ban is valid
-	Reason   string    // Reason for the ban
-	Active   bool      `sql:"default:true"` // Whether the ban is active
+	PlayerID uint   // ID of the player banned
+	Player   Player `gorm:"ForeignKey:PlayerID"`
+
+	BannedByPlayerID uint   // ID of the admin/mod who set ban
+	BannedByPlayer   Player `gorm:"ForeignKey:BannedByPlayerID"`
+
+	Type   BanType   // Ban type
+	Until  time.Time // Time until which the ban is valid
+	Reason string    // Reason for the ban
+	Active bool      `sql:"default:true"` // Whether the ban is active
 }
 
 func (t BanType) String() string {
@@ -52,17 +57,18 @@ func (player *Player) IsBanned(t BanType) bool {
 	return res
 }
 
-func (player *Player) BanUntil(tim time.Time, t BanType, reason string) error {
+func (player *Player) BanUntil(tim time.Time, t BanType, reason string, bannedBy uint) error {
 	// first check if player is already banned
 	if banned := player.IsBanned(t); banned {
 		db.DB.Model(&PlayerBan{}).Where("player_id = ? AND type = ? AND active = TRUE AND until > now()", player.ID, t).Update("until", tim)
 		return nil
 	}
 	ban := PlayerBan{
-		PlayerID: player.ID,
-		Type:     t,
-		Until:    tim,
-		Reason:   reason,
+		PlayerID:         player.ID,
+		Type:             t,
+		Until:            tim,
+		Reason:           reason,
+		BannedByPlayerID: bannedBy,
 	}
 
 	return db.DB.Create(&ban).Error
@@ -88,25 +94,25 @@ func (player *Player) GetActiveBan(banType BanType) (*PlayerBan, error) {
 
 func (player *Player) GetActiveBans() ([]*PlayerBan, error) {
 	var bans []*PlayerBan
-	err := db.DB.Where("player_id = ? AND active = TRUE AND until > now()", player.ID).Find(&bans).Error
+	err := db.DB.Preload("Player").Preload("BannedByPlayer").Where("player_id = ? AND active = TRUE AND until > now()", player.ID).Find(&bans).Error
 	return bans, err
 }
 
 func (player *Player) GetAllBans() ([]*PlayerBan, error) {
 	var bans []*PlayerBan
-	err := db.DB.Where("player_id = ?", player.ID).Find(&bans).Error
+	err := db.DB.Preload("Player").Preload("BannedByPlayer").Where("player_id = ?", player.ID).Find(&bans).Error
 	return bans, err
 
 }
 
 func GetAllActiveBans() []*PlayerBan {
 	var bans []*PlayerBan
-	db.DB.Where("active = TRUE AND until > now()").Find(&bans)
+	db.DB.Preload("Player").Preload("BannedByPlayer").Where("active = TRUE AND until > now()").Find(&bans)
 	return bans
 }
 
 func GetAllBans() []*PlayerBan {
 	var bans []*PlayerBan
-	db.DB.Model(&PlayerBan{}).Find(&bans)
+	db.DB.Preload("Player").Preload("BannedByPlayer").Model(&PlayerBan{}).Find(&bans)
 	return bans
 }

models/player/player_report.go

@@ -32,15 +32,15 @@ func (player *Player) NewReport(rtype ReportType, lobbyid uint) {
 	switch rtype {
 	case Substitute:
 		if count == 1 {
-			player.BanUntil(time.Now().Add(30*time.Minute), BanJoin, "For !subbing twice in the last 30 minutes")
+			player.BanUntil(time.Now().Add(30*time.Minute), BanJoin, "For !subbing twice in the last 30 minutes", 0)
 		}
 	case Vote:
 		if count != 0 {
-			player.BanUntil(time.Now().Add(30*time.Minute), BanJoin, "For getting !repped from a lobby multiple times in the last 30 minutes")
+			player.BanUntil(time.Now().Add(30*time.Minute), BanJoin, "For getting !repped from a lobby multiple times in the last 30 minutes", 0)
 		}
 	case RageQuit:
 		if count != 0 {
-			player.BanUntil(time.Now().Add(30*time.Minute), BanJoin, "For ragequitting a lobby multiple times in the last 30 minutes")
+			player.BanUntil(time.Now().Add(30*time.Minute), BanJoin, "For ragequitting a lobby multiple times in the last 30 minutes", 0)
 		}
 
 	}

views/admin/templates/ban_logs.html

@@ -12,16 +12,18 @@
 	  <td>Reason</td>
 	  <td>On</td>
 	  <td>Until</td>
+	  <td>By</td>
 	</tr>
       </thead>
       <tbody>
 	{{range .}}
 	<tr>
 	  <td>{{.Player.Name}} ({{.Player.SteamID}})</td>
-	  <td>{{.Ban.Type.String}}</td>
-	  <td>{{.Ban.Reason}}</td>
-	  <td>{{.Ban.CreatedAt.Format "Mon Jan _2 15:04:05 2006"}}</td>
-	  <td>{{.Ban.Until.Format "Mon Jan _2 15:04:05 2006"}}</td>
+	  <td>{{.Type.String}}</td>
+	  <td>{{.Reason}}</td>
+	  <td>{{.CreatedAt.Format "Mon Jan _2 15:04:05 2006"}}</td>
+	  <td>{{.Until.Format "Mon Jan _2 15:04:05 2006"}}</td>
+	  <td>{{if .BannedByPlayerID}} {{.BannedByPlayer.Name}} ({{.BannedByPlayer.SteamID}}) {{else}} automatic {{end}}</td>
 	</tr>
 	{{end}}
       </tbody>