From a0bb4c7d1e2cf017dc99bb1315737e372964b6ce Mon Sep 17 00:00:00 2001
From: Chris Sexton <chrissexton@users.noreply.github.com>
Date: Sun, 11 Aug 2019 15:05:15 -0400
Subject: [PATCH] newsbid: divide all bids amongst winners

* No more negative scores
* Winners divide all points based on their bets
---
 plugins/newsbid/newsbid.go         |  4 ++--
 plugins/newsbid/webshit/webshit.go | 30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/plugins/newsbid/newsbid.go b/plugins/newsbid/newsbid.go
index 63c4ebb..67128bb 100644
--- a/plugins/newsbid/newsbid.go
+++ b/plugins/newsbid/newsbid.go
@@ -102,8 +102,8 @@ func (p *NewsBid) check(conn bot.Connector, ch string) {
 		return
 	}
 	for _, res := range wr {
-		msg := fmt.Sprintf("%s won %d and lost %d for a score of %d",
-			res.User, res.Won, res.Lost, res.Score)
+		msg := fmt.Sprintf("%s won %d for a score of %d",
+			res.User, res.Won, res.Score)
 		if len(res.WinningArticles) > 0 {
 			msg += "\nWinning articles: " + res.WinningArticles.Titles()
 		}
diff --git a/plugins/newsbid/webshit/webshit.go b/plugins/newsbid/webshit/webshit.go
index 3dd170e..99dd517 100644
--- a/plugins/newsbid/webshit/webshit.go
+++ b/plugins/newsbid/webshit/webshit.go
@@ -72,7 +72,6 @@ type WeeklyResult struct {
 	User            string
 	Won             int
 	WinningArticles Stories
-	Lost            int
 	LosingArticles  Stories
 	Score           int
 }
@@ -155,14 +154,16 @@ func (w *Webshit) Check() ([]WeeklyResult, error) {
 }
 
 func (w *Webshit) checkBids(bids []Bid, storyMap map[string]Story) []WeeklyResult {
+
+	var wins []Bid
+	total, totalWinning := 0, 0
 	wr := map[string]WeeklyResult{}
+
 	for _, b := range bids {
 		score := w.GetScore(b.User)
 		if _, ok := wr[b.User]; !ok {
 			wr[b.User] = WeeklyResult{
 				User:  b.User,
-				Won:   0,
-				Lost:  0,
 				Score: score,
 			}
 		}
@@ -176,21 +177,24 @@ func (w *Webshit) checkBids(bids []Bid, storyMap map[string]Story) []WeeklyResul
 		id := u.Query().Get("id")
 
 		if s, ok := storyMap[id]; ok {
-			log.Debug().Interface("story", s).Msg("won bid")
-			rec.Won += b.Bid
-			rec.Score += b.Bid
+			wins = append(wins, b)
 			rec.WinningArticles = append(rec.WinningArticles, s)
-			log.Debug().Interface("story", s).Msg("Appending to winning log")
+			totalWinning += b.Bid
 		} else {
-			log.Debug().Interface("story", s).Msg("lost bid")
-			rec.Lost += b.Bid
-			rec.Score -= b.Bid
-			rec.LosingArticles = append(rec.LosingArticles, Story{Title: b.Title, URL: b.URL})
-			log.Debug().Interface("story", s).Msg("Appending to losing log")
+			rec.LosingArticles = append(rec.LosingArticles, Story{b.Title, b.URL})
 		}
+		total += b.Bid
 		wr[b.User] = rec
-		log.Debug().Interface("WR User", wr[b.User]).Str("user", b.User).Msg("setting WR")
 	}
+
+	for _, b := range wins {
+		payout := b.Bid / totalWinning * total
+		rec := wr[b.User]
+		rec.Won += payout
+		rec.Score += payout
+		wr[b.User] = rec
+	}
+
 	return wrMapToSlice(wr)
 }