Make hidden act as progressIsSecret

Author: mxmeinhold

database/poll.go

@@ -21,12 +21,11 @@ type Poll struct {
 	Gatekeep         bool      `bson:"gatekeep"`
 	QuorumType       float64   `bson:"quorumType"`
 	AllowedUsers     []string  `bson:"allowedUsers"`
-	Hidden           bool      `bson:"hidden"`
 	AllowWriteIns    bool      `bson:"writeins"`
 
 	// Prevent this poll from having progress displayed
 	// This is important for events like elections where the results shouldn't be visible mid vote
-	SecretProgress bool	   `bson:"secretProgress"`
+	Hidden           bool      `bson:"hidden"`
 }
 
 const POLL_TYPE_SIMPLE = "simple"
@@ -73,50 +72,6 @@ func (poll *Poll) Hide(ctx context.Context) error {
 	return nil
 }
 
-func (poll *Poll) Reveal(ctx context.Context) error {
-	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-	defer cancel()
-
-	objId, _ := primitive.ObjectIDFromHex(poll.Id)
-
-	_, err := Client.Database(db).Collection("polls").UpdateOne(ctx, map[string]interface{}{"_id": objId}, map[string]interface{}{"$set": map[string]interface{}{"hidden": false}})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// This is currently unused, if you make a poll you're committing to if it's secret or not
-func (poll *Poll) MakeProgressSecret(ctx context.Context) error {
-	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-	defer cancel()
-
-	objId, _ := primitive.ObjectIDFromHex(poll.Id)
-
-	_, err := Client.Database(db).Collection("polls").UpdateOne(ctx, map[string]interface{}{"_id": objId}, map[string]interface{}{"$set": map[string]interface{}{"secretProgress": true}})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// This is currently unused, if you make a poll you're committing to if it's secret or not
-func (poll *Poll) RevealProgress(ctx context.Context) error {
-	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-	defer cancel()
-
-	objId, _ := primitive.ObjectIDFromHex(poll.Id)
-
-	_, err := Client.Database(db).Collection("polls").UpdateOne(ctx, map[string]interface{}{"_id": objId}, map[string]interface{}{"$set": map[string]interface{}{"secretProgress": false}})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func CreatePoll(ctx context.Context, poll *Poll) (string, error) {
 	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()

main.go

@@ -158,10 +158,9 @@ func main() {
 			OpenedTime:       time.Now(),
 			Open:             true,
 			QuorumType:       quorum,
-			Hidden:           false,
 			Gatekeep:         c.PostForm("gatekeep") == "true",
 			AllowWriteIns:    c.PostForm("allowWriteIn") == "true",
-			SecretProgress:   c.PostForm("secretProgress") == "true",
+			Hidden:           c.PostForm("hidden") == "true",
 		}
 		if c.PostForm("rankedChoice") == "true" {
 			poll.VoteType = database.POLL_TYPE_RANKED
@@ -394,14 +393,6 @@ func main() {
 			return
 		}
 
-		if poll.Hidden && poll.CreatedBy != claims.UserInfo.Username {
-			c.HTML(403, "hidden.tmpl", gin.H{
-				"Username": claims.UserInfo.Username,
-				"FullName": claims.UserInfo.FullName,
-			})
-			return
-		}
-
 		results, err := poll.GetResult(c)
 		if err != nil {
 			c.JSON(500, gin.H{"error": err.Error()})
@@ -421,7 +412,6 @@ func main() {
 			"Results":          results,
 			"IsOpen":           poll.Open,
 			"IsHidden":         poll.Hidden,
-			"ProgressIsSecret": poll.SecretProgress,
 			"CanModify":        canModify,
 			"Username":         claims.UserInfo.Username,
 			"FullName":         claims.UserInfo.FullName,

templates/create.tmpl

@@ -75,7 +75,7 @@
         <div class="form-group">
           <input
             type="checkbox"
-            name="secretProgress"
+            name="hidden"
             value="true"
           >
           <span>Hide Results Till Vote is Complete</span>

templates/result.tmpl

@@ -33,7 +33,7 @@
       <br />
       <br />
 
-      {{ if $.ProgressIsSecret }} 
+      {{ if and $.IsHidden $.IsOpen }}
       <div id="results">
         <h4>Results will be available once the poll closes</h4>
       </div>