refactor: enable again ethicalads keywords support (#238)

idoshamun · web-flow · commit 03caa47e4b5b · 2022-04-14T14:46:35.000+03:00
diff --git a/db.go b/db.go
@@ -95,7 +95,7 @@ func initializeDatabase() {
 		log.Fatal("failed to prepare query ", err)
 	}
 
-	getUserTagsStmt, err = db.Prepare("select tag from user_tags where user_id = ?")
+	getUserTagsStmt, err = db.Prepare("select tag from user_tags where user_id = ? order by last_read desc limit 50")
 	if err != nil {
 		log.Fatal("failed to prepare query ", err)
 	}
diff --git a/ethicalads.go b/ethicalads.go
@@ -35,7 +35,7 @@ var fetchEthicalAds = func(r *http.Request, keywords []string) (*EthicalAdsAd, e
 	}
 	ip := getIpAddress(r)
 	ua := r.UserAgent()
-	var body = []byte(`{ "publisher": "dailydev", "placements": [{ "div_id": "ad-div-1", "ad_type": "image-v1" }], "campaign_types": ["paid"], "user_ip": "` + ip + `", "user_ua": "` + ua + `" }`)
+	var body = []byte(`{ "publisher": "dailydev", "placements": [{ "div_id": "ad-div-1", "ad_type": "image-v1" }], "campaign_types": ["paid"], "user_ip": "` + ip + `", "user_ua": "` + ua + `", "keywords": [` + keywordsString + `] }`)
 	var res EthicalAdsResponse
 	req, _ := http.NewRequest("POST", "https://server.ethicalads.io/api/v1/decision/", bytes.NewBuffer(body))
 	req.Header.Set("Content-Type", "application/json")

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func initializeDatabase() {`
`95`	`95`	`log.Fatal("failed to prepare query ", err)`
`96`	`96`	`}`
`97`	`97`
`98`		`- getUserTagsStmt, err = db.Prepare("select tag from user_tags where user_id = ?")`
	`98`	`+ getUserTagsStmt, err = db.Prepare("select tag from user_tags where user_id = ? order by last_read desc limit 50")`
`99`	`99`	`if err != nil {`
`100`	`100`	`log.Fatal("failed to prepare query ", err)`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ var fetchEthicalAds = func(r http.Request, keywords []string) (EthicalAdsAd, e`
`35`	`35`	`}`
`36`	`36`	`ip := getIpAddress(r)`
`37`	`37`	`ua := r.UserAgent()`
`38`		- var body = []byte(`{ "publisher": "dailydev", "placements": [{ "div_id": "ad-div-1", "ad_type": "image-v1" }], "campaign_types": ["paid"], "user_ip": "` + ip + `", "user_ua": "` + ua + `" }`)
	`38`	+ var body = []byte(`{ "publisher": "dailydev", "placements": [{ "div_id": "ad-div-1", "ad_type": "image-v1" }], "campaign_types": ["paid"], "user_ip": "` + ip + `", "user_ua": "` + ua + `", "keywords": [` + keywordsString + `] }`)
`39`	`39`	`var res EthicalAdsResponse`
`40`	`40`	`req, _ := http.NewRequest("POST", "https://server.ethicalads.io/api/v1/decision/", bytes.NewBuffer(body))`
`41`	`41`	`req.Header.Set("Content-Type", "application/json")`