Ads enabled settings, ads in FAQ, ads actually in code (#1493)

* Update base.jet.html

* Remove inline styling, put whole thing into a div instead of center to be able to move it at other places at will

* Move inline styling in there & some adjustements that will need further tweaking

* Add GetAdsEnabledFromRequest() function

* Ads Enabled global var

* Need to add global var in test file for it to work properly

* AdEnabled handler in settings

* Create AdsEnabled var for users

* Check if user wants to hide ads

* change var name

* change var name

* change var name

* change var name

* var name changes

* Add ad enabled settings & put each indiviidual setting into a span

* add |raw

* add translation strings

* add ads to faq

* Remove <br> and add faq link

* Fix travis

* Fix wrong condition check

* exclude aldColors & hideAds cookie from deletion

* remove useless things

* Fix template_test.go

* No idea why that part got removed

* Forgot }}

* lower padding for ad container

controllers/settings/settings.go

@@ -34,6 +34,7 @@ func ChangePublicSettingsHandler(c *gin.Context) {
 	mascot := c.PostForm("mascot")
 	mascotURL := c.PostForm("mascot_url")
 	altColors := c.PostForm("altColors")
+	hideAds := c.PostForm("hideAds")
 
 	messages := msg.GetMessages(c)
 
@@ -61,6 +62,7 @@ func ChangePublicSettingsHandler(c *gin.Context) {
 		user.Mascot = mascot
 		user.MascotURL = mascotURL
 		user.AltColors = altColors
+		user.HideAds = hideAds
 		user.UpdateRaw()
 	}
 	// Set cookie with http and not gin for expires (maxage not supported in <IE8)
@@ -69,6 +71,7 @@ func ChangePublicSettingsHandler(c *gin.Context) {
 	http.SetCookie(c.Writer, &http.Cookie{Name: "mascot", Value: mascot, Domain: getDomainName(), Path: "/", Expires: timeHelper.FewDaysLater(365)})
 	http.SetCookie(c.Writer, &http.Cookie{Name: "mascot_url", Value: mascotURL, Domain: getDomainName(), Path: "/", Expires: timeHelper.FewDaysLater(365)})
 	http.SetCookie(c.Writer, &http.Cookie{Name: "altColors", Value: altColors, Domain: getDomainName(), Path: "/", Expires: timeHelper.FewDaysLater(365)})
+	http.SetCookie(c.Writer, &http.Cookie{Name: "hideAds", Value: hideAds, Domain: getDomainName(), Path: "/", Expires: timeHelper.FewDaysLater(365)})
 
 	c.Redirect(http.StatusSeeOther, "/")
 }

models/user.go

@@ -45,6 +45,7 @@ type User struct {
 	Language       string    `gorm:"column:language"`
 	Theme          string    `gorm:"column:theme"`
 	AltColors      string    `gorm:"column:alt_colors"`
+	HideAds      string    `gorm:"column:hide_ads"`
 	Mascot         string    `gorm:"column:mascot"`
 	MascotURL      string    `gorm:"column:mascot_url"`
 	UserSettings   string    `gorm:"column:settings"`

public/css/main.css

@@ -1879,6 +1879,19 @@ span.tag {
     display: none;
 }
 
+#ad-container {
+    z-index: 4;
+    position: relative;
+    padding: 0 5%;
+}
+#ad-container > iframe {
+    width: 728px;
+    max-width: 100%;
+    height: 90px;
+    border: none;
+    overflow: hidden;
+}
+
 /* Language specific CSS */
 
 

public/js/main.js

@@ -87,7 +87,7 @@ parseAllDates()
 //called if no Commit cookie is set or if the website has a newer commit than the one in cookie
 function resetCookies() {
   var cookies = document.cookie.split(";")
-  var excludedCookies = ["mascot", "theme", "theme2", "mascot_url", "lang", "csrf_token"]
+  var excludedCookies = ["mascot", "theme", "theme2", "mascot_url", "lang", "csrf_token", "altColors", "hideAds"]
 
   //Remove all cookies but exclude those in the above array
   for (var i = 0; i < cookies.length; i++) {

templates/layouts/partials/base.jet.html

@@ -81,6 +81,12 @@
     <div class="container pagination">
       {{ genNav(Navigation, URL, 15)|raw }}
     </div>
+    {{ if !HideAds }}
+    <center class="container" id="ad-container">
+      {{ adId = Sukebei() ? 634159 : 634157 }}
+      <iframe data-aa='{{adId}}' src='//ad.a-ads.com/{{adId}}?size=728x90' scrolling='no' allowtransparency='true'></iframe>
+    </center>
+    {{ end }}
     <footer id="footer">
       <div class="container footer center">
         <div class="footer-opt">

templates/site/static/faq.jet.html

@@ -53,6 +53,9 @@
     <p>{{ T("magnet_link_should_look_like")}} <span style="font-family:monospace">
             magnet:?xt=urn:btih:[hash]&amp;dn=[name]&amp;tr=[tracker]&amp;tr=[...]</span></p>
 
+    <h2 id="why_ads">{{ T("faq_ads")}}</h2>
+    <p>{{ T("faq_ads_explanation")|raw}}</p>
+    
     <h2 id="how_get_old_account">{{ T("how_do_i_link_my_old_account")}}</h2>
     <p>{{ T("answer_how_do_i_link_my_old_account")|raw}}</p>
 

templates/site/user/public/settings.jet.html

@@ -5,38 +5,57 @@
 <div style="text-align: left;" class="box">
   <form role="form" method="POST"> 
     {{ yield csrf_field() }}
-    <div class="form-group">
+    <div id="settings-container">
+      <span class="form-group">
       <h3>{{ T("language")}}</h3>
       <select id="language" name="language" class="form-input">
         {{ range translatedName := Form.Languages }}
         <option value="{{ translatedName[2] }}" {{ if Form.Current == translatedName[2] }}selected{{end}}>{{ translatedName[0] }}</option>
         {{ end }}
       </select>
+      </span>
+      
+      <span class="form-group">
       <h3>{{ T("theme")}}</h3>
       <select id="theme-selector" name="theme" class="form-input" onchange="switchThemes()">
         <option value="g"{{ if Theme == "g" || Theme == "" }} selected{{end}}>/g/</option>
         <option value="tomorrow"{{ if Theme == "tomorrow" }} selected{{end}}>Tomorrow</option>
         <option value="classic"{{ if Theme == "classic" }} selected{{end}}>Classic</option>
       </select>
-    </br>
+      </span>
+
+    <span class="form-group">
     <h3>{{ T("mascot")}}</h3>
     <select id="mascot-selector" name="mascot" class="form-input">
       {{ T("mascot")}}
       <option value="show" {{ if Mascot == "show" }} selected{{end}}>{{ T("show")}}</option>
       <option value="hide" {{ if Mascot == "hide" }} selected{{end}}>{{ T("hide")}}</option>
     </select>
-    <br/>
+    </span>
 
+    <span class="form-group">
     <h3>{{ T("mascot_url")}}</h3>
     <input type="text" name="mascot_url" class="form-input" value="{{ MascotURL }}"/>
     <br/>
+    </span>
 
+    <span class="form-group">
     <h3>{{ T("alternating_color") }}</h3>
     <select id="altColors-selector" name="altColors" class="form-input">
       <option value="false">Disabled</option>
       <option value="true" {{if AltColors}}selected{{end}}>Enabled</option>
     </select>
     <br/>
+    </span>
+    
+    <span class="form-group">
+    <h3>{{ T("hide_ads") }}</h3>
+      <p><a href="/faq#why_ads">{{ T("hide_ads_setting_explanation")|raw }}</a></p>
+      <select id="hideAds-selector" name="hideAds" class="form-input">
+        <option value="false">Disabled</option>
+        <option value="true" {{if HideAds}}selected{{end}}>Enabled</option>
+      </select>
+    </span>
     
     <p>{{ T("cookies")}}</p>
     <button type="submit" class="form-input btn">{{ T("save_changes")}}</button>

templates/template.go

@@ -54,6 +54,7 @@ func Commonvariables(c *gin.Context) jet.VarMap {
 	variables.Set("T", publicSettings.GetTfuncFromRequest(c))
 	variables.Set("Theme", publicSettings.GetThemeFromRequest(c))
 	variables.Set("AltColors", publicSettings.GetAltColorsFromRequest(c))
+	variables.Set("HideAds", publicSettings.GetAdsEnabledFromRequest(c))
 	variables.Set("Mascot", publicSettings.GetMascotFromRequest(c))
 	variables.Set("MascotURL", publicSettings.GetMascotURLFromRequest(c))
 	variables.Set("User", user)

templates/template_test.go

@@ -51,9 +51,7 @@ func walkDirTest(dir string, t *testing.T) {
 	em := "cop@cat.fe"
 
 	fakeTag := &models.Tag{1, 1, "12345", "anidbid", 1, 0, true}
-	//fakeUser := &models.User{1, "test", "test", "test", 1, time.Now(), time.Now(), "test", time.Now(), "en", "test", "test", "test", "test", 0, []models.User{}, []models.User{}, "test", []models.Torrent{}, []models.Notification{}, 1, models.UserSettings{}, []models.Tag{*fakeTag}}
-	//The first fakeUser is the real line, had to modify it without knowing what the fuck i did to fix travis
-	fakeUser := &models.User{1, "test", "test", "test", 1, time.Now(), time.Now(), "test", time.Now(), "en", "test", "test", "test", "test", "test", 0.0, []models.User{}, []models.User{}, "test", []models.Torrent{}, []models.Notification{}, 1, models.UserSettings{}, []models.Tag{*fakeTag}}
+	fakeUser := &models.User{1, "test", "test", "test", 1, time.Now(), time.Now(), "test", time.Now(), "en", "test", "test", "test", "test", "test", "test", 0.0, []models.User{}, []models.User{}, "test", []models.Torrent{}, []models.Notification{}, 1, models.UserSettings{}, []models.Tag{*fakeTag}}
 	fakeComment := &models.Comment{1, 1, 1, "test", time.Now(), time.Now(), nil, &models.Torrent{}, fakeUser}
 	fakeScrapeData := &models.Scrape{1, 0, 0, 10, time.Now()}
 	fakeFile := &models.File{1, 1, "l12:somefile.mp4e", 3}
@@ -284,6 +282,7 @@ func mockupCommonvariables(t *testing.T) jet.VarMap {
 	variables.Set("T", T)
 	variables.Set("Theme", "test")
 	variables.Set("AltColors", "test")
+	variables.Set("HideAds", "test")
 	variables.Set("Mascot", "test")
 	variables.Set("MascotURL", "test")
 	variables.Set("User", &models.User{})

translations/en-us.all.json

@@ -1087,6 +1087,14 @@
     "id": "upload_as_anon",
     "translation": "Upload Anonymously"
   },
+  {
+    "id": "hide_ads",
+    "translation": "Hide Ads"
+  },
+  {
+    "id": "hide_ads_setting_explanation",
+    "translation": "This setting will prevent ads from loading if enabled. Why does pantsu has ads?"
+  },
   {
     "id": "cookies",
     "translation": "By clicking save, you consent to our use of cookies"
@@ -1879,6 +1887,14 @@
     "id": "torrent_colors",
     "translation": "Torrent colors"
   },
+  {
+    "id": "faq_ads",
+    "translation": "Why does pantsu has ads?"
+  },
+  {
+    "id": "faq_ads_explanation",
+    "translation": "[lengthy explanation as to why we have ads"
+  },
   {
     "id": "torrent_preview",
     "translation": "Preview your torrent"

utils/publicSettings/publicSettings.go

@@ -181,6 +181,7 @@ func GetThemeFromRequest(c *gin.Context) string {
 	return ""
 }
 
+// GetAltColorsFromRequest : Return whether user has enabled alt colors or not
 func GetAltColorsFromRequest(c *gin.Context) bool {
 	user, _ := getCurrentUser(c)
 	if user.ID > 0 {
@@ -194,7 +195,20 @@ func GetAltColorsFromRequest(c *gin.Context) bool {
 	return true
 }
 
-// GetMascotFromRequest : Gets the user selected theme from the request
+// GetAltColorsFromRequest : Return whether user wants to Hide ads (false by default)
+func GetAdsEnabledFromRequest(c *gin.Context) bool {
+	user, _ := getCurrentUser(c)
+	if user.ID > 0 {
+		return user.HideAds == "true"
+	}
+	cookie, err := c.Cookie("hideAds")
+	if err == nil {
+		return cookie == "true"
+	}
+	return false
+}
+
+// GetMascotFromRequest : Return whether user has enabled mascot or not
 func GetMascotFromRequest(c *gin.Context) string {
 	user, _ := getCurrentUser(c)
 	if user.ID > 0 {