* added delete vote functionality

	* fixed index error
	* removed setUserId, using session id instead

Author: jgrar

app/controllers/app.go

@@ -55,8 +55,11 @@ func (c *App) Index (arg models.Args) revel.Result {
 }
 
 func (c *App) Quote (id int) revel.Result {
-	e := c.getEntry(id)
-	return Utf8Result(e[0].Quote)
+	var quote string
+	if e := c.getEntry(id); len(e) != 0 {
+		quote = e[0].Quote
+	}
+	return Utf8Result(quote)
 }
 
 func (c *App) AdvSearch () revel.Result {

app/controllers/base.go

@@ -4,9 +4,6 @@ import (
 	"github.com/robfig/revel"
 	"github.com/PacketFire/goqdb/app/models"
 	"strings"
-	"encoding/hex"
-	"crypto/md5"
-	"io"
 	"time"
 )
 
@@ -22,16 +19,6 @@ const (
 	ERR_ID_NOT_FOUND = "id not found"
 )
 
-func setUserId (c *revel.Controller) revel.Result {
-	h := md5.New()
-
-	io.WriteString(h, c.Request.RemoteAddr)
-	io.WriteString(h, c.Request.Header.Get("User-Agent"))
-
-	c.Params.Set("userid", hex.EncodeToString(h.Sum(nil)))
-	return nil
-}
-
 func (c *Base) getEntries (arg models.Args) []models.Quote {
 	var entries []models.Quote
 
@@ -138,9 +125,7 @@ func (c *Base) getTotal (arg models.Args) int64 {
 
 func (c *Base) insertQuote (quote *models.Quote) {
 
-	var userId string
-
-	c.Params.Bind(&userId, "userid")
+	userId := c.Session.Id()
 
 	if !c.canPost(userId) {
 		c.Flash.Error(ERR_POST_THRESHOLD_REACHED)
@@ -223,15 +208,15 @@ func (c *Base) vote (voteId int, voteType string) {
 		return
 	}
 
-	var userId string
-	c.Params.Bind(&userId, "userid")
-
-	if !c.canVote(voteId, userId) {
-		c.Flash.Error(ERR_MULTIPLE_VOTE)
-		return
-	}
+	userId := c.Session.Id()
 
 	if voteType != models.VOTE_DELETE {
+
+		if !c.canVote(voteId, userId) {
+			c.Flash.Error(ERR_MULTIPLE_VOTE)
+			return
+		}
+
 		query := `UPDATE QuoteEntry SET Rating = Rating`
 		switch voteType {
 			case models.VOTE_UP:
@@ -250,6 +235,21 @@ func (c *Base) vote (voteId int, voteType string) {
 			c.Flash.Error(ERR_ID_NOT_FOUND)
 			return
 		}
+	} else {
+		t := time.Now().Truncate(24 * time.Hour).Unix()
+		res, err := c.Txn.Exec(
+			`DELETE FROM QuoteEntry ` +
+			`WHERE QuoteId = ? AND UserId = ? AND Created >= ?`,
+			voteId, userId, t)
+
+		if err != nil {
+			panic(err)
+		}
+		if n, err := res.RowsAffected(); n >= 1 {
+			return
+		} else if err != nil {
+			panic(err)
+		}
 	}
 
 	err := c.Txn.Insert(&models.VoteEntry{

app/controllers/init.go

@@ -10,7 +10,5 @@ func init() {
 	revel.InterceptMethod((*GorpController).Begin, revel.BEFORE)
 	revel.InterceptMethod((*GorpController).Commit, revel.AFTER)
 	revel.InterceptMethod((*GorpController).Rollback, revel.FINALLY)
-
-	revel.InterceptFunc(setUserId, revel.BEFORE, &Base{})
 }
 

app/views/App/Index.html

@@ -69,6 +69,10 @@
 				 [{{$entry.Rating}}] 
 				<a href="{{url "App.Vote" $entry.QuoteId "down" $arg}}"
 					class="btn btn-danger btn-xs btn-vote">-</a>
+				
+				<a href="{{url "App.Vote" $entry.QuoteId "delete" $arg}}"
+					class="btn btn-warning btn-xs btn-vote">x</a>
+			</p>
 			</p>
 
 			<ul class="tags list-inline">