Hide spammy referrers by default.

Added the panel_statistics_spam_hide phrase.
Added the panel_statistics_spam_show phrase.

common/pages.go

@@ -424,6 +424,13 @@ type PanelAnalyticsAgentsPage struct {
 	TimeRange string
 }
 
+type PanelAnalyticsReferrersPage struct {
+	*BasePanelPage
+	ItemList  []PanelAnalyticsAgentsItem
+	TimeRange string
+	ShowSpam  bool
+}
+
 type PanelAnalyticsRoutePage struct {
 	*BasePanelPage
 	Route     string

langs/english.json

@@ -887,6 +887,9 @@
 		"panel_statistics_memory_head":"Memory Usage",
 		"panel_statistics_active_memory_head":"Active Memory",
 
+		"panel_statistics_spam_hide":"Hide Spam",
+		"panel_statistics_spam_show":"Show Spam",
+
 		"panel_statistics_time_range_one_year":"1 year",
 		"panel_statistics_time_range_three_months":"3 months",
 		"panel_statistics_time_range_one_month":"1 month",

public/global.js

@@ -885,9 +885,23 @@ function mainInit(){
 	});
 
 	// The time range selector for the time graphs in the Control Panel
-	$(".timeRangeSelector").change(function(){
+	/*$(".timeRangeSelector").change(function(){
 		console.log("Changed the time range to " + this.options[this.selectedIndex].getAttribute("val"));
 		window.location = this.form.getAttribute("action")+"?timeRange=" + this.options[this.selectedIndex].getAttribute("val"); // Do a redirect as a form submission refuses to work properly
+	});*/
+	$(".autoSubmitRedirect").change(function(){
+		let elems = this.form.elements;
+		let s = "";
+		for(let i = 0; i < elems.length; i++) {
+			let elem = elems[i];
+			if(elem.nodeName=="SELECT") {
+				s += elem.name + "=" + elem.options[elem.selectedIndex].getAttribute("val") + "&";
+			}
+			// TODO: Implement other element types...
+		}
+		if(s.length > 0) s = "?" + s.substr(0, s.length-1);
+
+		window.location = this.form.getAttribute("action") + s; // Do a redirect as a form submission refuses to work properly
 	});
 
 	$(".unix_to_24_hour_time").each(function(){

routes/panel/analytics.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	c "github.com/Azareal/Gosora/common"
@@ -238,7 +239,7 @@ func AnalyticsViews(w http.ResponseWriter, r *http.Request, user c.User) c.Route
 	}
 
 	pi := c.PanelAnalyticsStd{graph, viewItems, timeRange.Range, timeRange.Unit, ttime}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_views", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_views", pi})
 }
 
 func AnalyticsRouteViews(w http.ResponseWriter, r *http.Request, user c.User, route string) c.RouteError {
@@ -273,7 +274,7 @@ func AnalyticsRouteViews(w http.ResponseWriter, r *http.Request, user c.User, ro
 	c.DebugLogf("graph: %+v\n", graph)
 
 	pi := c.PanelAnalyticsRoutePage{basePage, c.SanitiseSingleLine(route), graph, viewItems, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_route_views", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_route_views", pi})
 }
 
 func AnalyticsAgentViews(w http.ResponseWriter, r *http.Request, user c.User, agent string) c.RouteError {
@@ -313,7 +314,7 @@ func AnalyticsAgentViews(w http.ResponseWriter, r *http.Request, user c.User, ag
 	}
 
 	pi := c.PanelAnalyticsAgentPage{basePage, agent, friendlyAgent, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_agent_views", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_agent_views", pi})
 }
 
 func AnalyticsForumViews(w http.ResponseWriter, r *http.Request, user c.User, sfid string) c.RouteError {
@@ -356,7 +357,7 @@ func AnalyticsForumViews(w http.ResponseWriter, r *http.Request, user c.User, sf
 	}
 
 	pi := c.PanelAnalyticsAgentPage{basePage, sfid, forum.Name, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_forum_views", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_forum_views", pi})
 }
 
 func AnalyticsSystemViews(w http.ResponseWriter, r *http.Request, user c.User, system string) c.RouteError {
@@ -395,7 +396,7 @@ func AnalyticsSystemViews(w http.ResponseWriter, r *http.Request, user c.User, s
 	}
 
 	pi := c.PanelAnalyticsAgentPage{basePage, system, friendlySystem, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_system_views", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_system_views", pi})
 }
 
 func AnalyticsLanguageViews(w http.ResponseWriter, r *http.Request, user c.User, lang string) c.RouteError {
@@ -435,7 +436,7 @@ func AnalyticsLanguageViews(w http.ResponseWriter, r *http.Request, user c.User,
 	}
 
 	pi := c.PanelAnalyticsAgentPage{basePage, lang, friendlyLang, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_lang_views", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_lang_views", pi})
 }
 
 func AnalyticsReferrerViews(w http.ResponseWriter, r *http.Request, user c.User, domain string) c.RouteError {
@@ -467,7 +468,7 @@ func AnalyticsReferrerViews(w http.ResponseWriter, r *http.Request, user c.User,
 	graph := c.PanelTimeGraph{Series: [][]int64{viewList}, Labels: labelList}
 	c.DebugLogf("graph: %+v\n", graph)
 	pi := c.PanelAnalyticsAgentPage{basePage, c.SanitiseSingleLine(domain), "", graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_referrer_views", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_referrer_views", pi})
 }
 
 func AnalyticsTopics(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -500,7 +501,7 @@ func AnalyticsTopics(w http.ResponseWriter, r *http.Request, user c.User) c.Rout
 	graph := c.PanelTimeGraph{Series: [][]int64{viewList}, Labels: labelList}
 	c.DebugLogf("graph: %+v\n", graph)
 	pi := c.PanelAnalyticsStd{graph, viewItems, timeRange.Range, timeRange.Unit, "time"}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_topics", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_topics", pi})
 }
 
 func AnalyticsPosts(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -533,7 +534,7 @@ func AnalyticsPosts(w http.ResponseWriter, r *http.Request, user c.User) c.Route
 	graph := c.PanelTimeGraph{Series: [][]int64{viewList}, Labels: labelList}
 	c.DebugLogf("graph: %+v\n", graph)
 	pi := c.PanelAnalyticsStd{graph, viewItems, timeRange.Range, timeRange.Unit, "time"}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_posts", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_posts", pi})
 }
 
 func AnalyticsMemory(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -568,7 +569,7 @@ func AnalyticsMemory(w http.ResponseWriter, r *http.Request, user c.User) c.Rout
 	graph := c.PanelTimeGraph{Series: [][]int64{avgList}, Labels: labelList}
 	c.DebugLogf("graph: %+v\n", graph)
 	pi := c.PanelAnalyticsStdUnit{graph, avgItems, timeRange.Range, timeRange.Unit, "time"}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_memory", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_memory", pi})
 }
 
 // TODO: Show stack and heap memory separately on the chart
@@ -604,7 +605,7 @@ func AnalyticsActiveMemory(w http.ResponseWriter, r *http.Request, user c.User)
 	graph := c.PanelTimeGraph{Series: [][]int64{avgList}, Labels: labelList}
 	c.DebugLogf("graph: %+v\n", graph)
 	pi := c.PanelAnalyticsStdUnit{graph, avgItems, timeRange.Range, timeRange.Unit, "time"}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_active_memory", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_active_memory", pi})
 }
 
 func analyticsRowsToNameMap(rows *sql.Rows) (map[string]int, error) {
@@ -784,7 +785,7 @@ func AnalyticsForums(w http.ResponseWriter, r *http.Request, user c.User) c.Rout
 	}
 
 	pi := c.PanelAnalyticsDuoPage{basePage, forumItems, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_forums", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_forums", pi})
 }
 
 func AnalyticsRoutes(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -839,7 +840,7 @@ func AnalyticsRoutes(w http.ResponseWriter, r *http.Request, user c.User) c.Rout
 	}
 
 	pi := c.PanelAnalyticsRoutesPage{basePage, routeItems, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_routes", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_routes", pi})
 }
 
 // Trialling multi-series charts
@@ -904,7 +905,7 @@ func AnalyticsAgents(w http.ResponseWriter, r *http.Request, user c.User) c.Rout
 	}
 
 	pi := c.PanelAnalyticsDuoPage{basePage, agentItems, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_agents", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_agents", pi})
 }
 
 func AnalyticsSystems(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -968,7 +969,7 @@ func AnalyticsSystems(w http.ResponseWriter, r *http.Request, user c.User) c.Rou
 	}
 
 	pi := c.PanelAnalyticsDuoPage{basePage, systemItems, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_systems", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_systems", pi})
 }
 
 func AnalyticsLanguages(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -1033,9 +1034,11 @@ func AnalyticsLanguages(w http.ResponseWriter, r *http.Request, user c.User) c.R
 	}
 
 	pi := c.PanelAnalyticsDuoPage{basePage, langItems, graph, timeRange.Range}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_langs", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_langs", pi})
 }
 
+var spamDomains = []string{"porn", "sexy"}
+
 func AnalyticsReferrers(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
 	basePage, ferr := buildBasePage(w, r, &user, "analytics", "analytics")
 	if ferr != nil {
@@ -1054,16 +1057,30 @@ func AnalyticsReferrers(w http.ResponseWriter, r *http.Request, user c.User) c.R
 	if err != nil {
 		return c.InternalError(err, w, r)
 	}
+	showSpam := r.FormValue("spam") == "1"
+
+	var isSpammy = func(domain string) bool {
+		for _, substr := range spamDomains {
+			if strings.Contains(domain, substr) {
+				return true
+			}
+		}
+		return false
+	}
 
 	// TODO: Sort this slice
 	var refItems []c.PanelAnalyticsAgentsItem
 	for domain, count := range refMap {
+		sdomain := c.SanitiseSingleLine(domain)
+		if !showSpam && isSpammy(sdomain) {
+			continue
+		}
 		refItems = append(refItems, c.PanelAnalyticsAgentsItem{
-			Agent: c.SanitiseSingleLine(domain),
+			Agent: sdomain,
 			Count: count,
 		})
 	}
 
-	pi := c.PanelAnalyticsAgentsPage{basePage, refItems, timeRange.Range}
+	pi := c.PanelAnalyticsReferrersPage{basePage, refItems, timeRange.Range, showSpam}
-	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right","analytics","panel_analytics_referrers", pi})
+	return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_analytics_right", "analytics", "panel_analytics_referrers", pi})
 }

templates/panel_analytics_referrers.html

@@ -1,6 +1,10 @@
 <div class="colstack_item colstack_head">
 	<div class="rowitem">
 		<h1>{{lang "panel_statistics_referrers_head"}}</h1>
+		<select form="timeRangeForm" class="spamSelector to_right autoSubmitRedirect" name="spam">
+			<option val="0"{{if not .ShowSpam}} selected{{end}}>{{lang "panel_statistics_spam_hide"}}</option>
+			<option val="1"{{if .ShowSpam}} selected{{end}}>{{lang "panel_statistics_spam_show"}}</option>
+		</select>
 		{{template "panel_analytics_time_range.html" . }}
 	</div>
 </div>

templates/panel_analytics_time_range.html

@@ -1,4 +1,4 @@
-<select form="timeRangeForm" class="timeRangeSelector to_right" name="timeRange">
+<select form="timeRangeForm" class="timeRangeSelector to_right autoSubmitRedirect" name="timeRange">
 	<option val="one-year"{{if eq .TimeRange "one-year"}} selected{{end}}>{{lang "panel_statistics_time_range_one_year"}}</option>
 	<option val="three-months"{{if eq .TimeRange "three-months"}} selected{{end}}>{{lang "panel_statistics_time_range_three_months"}}</option>
 	<option val="one-month"{{if eq .TimeRange "one-month"}} selected{{end}}>{{lang "panel_statistics_time_range_one_month"}}</option>

templates/panel_analytics_time_range_month.html

@@ -1,4 +1,4 @@
-<select form="timeRangeForm" class="timeRangeSelector to_right" name="timeRange">
+<select form="timeRangeForm" class="timeRangeSelector to_right autoSubmitRedirect" name="timeRange">
 	<option val="one-month"{{if eq .TimeRange "one-month"}} selected{{end}}>{{lang "panel_statistics_time_range_one_month"}}</option>
 	<option val="one-week"{{if eq .TimeRange "one-week"}} selected{{end}}>{{lang "panel_statistics_time_range_one_week"}}</option>
 	<option val="two-days"{{if eq .TimeRange "two-days"}} selected{{end}}>{{lang "panel_statistics_time_range_two_days"}}</option>

themes/cosora/public/panel.css

@@ -353,6 +353,9 @@
 .analytics .colstack_head h1 {
 	margin-top: 2px;
 }
+.spamSelector + .timeRangeSelector {
+	margin-left: 8px;
+}
 
 /* Experimental header tweaks */
 .colstack_head a {
@@ -369,10 +372,7 @@
 	display: flex;
 	width: 100%;
 }
-#widgetTmpl {
+#widgetTmpl, .widget_disabled {
-	display: none;
-}
-.widget_disabled {
 	display: none;
 }
 .bg_red .widget_disabled {

themes/nox/public/panel.css

@@ -172,6 +172,10 @@ button, .formbutton, .panel_right_button:not(.has_inner_button), #panel_users .p
     color: rgb(200,200,200);
 }*/
 
+.spamSelector + .timeRangeSelector {
+	margin-left: 8px;
+}
+
 .colstack_graph_holder {
 	background-color: #444444;
 	border-radius: 3px;

themes/shadow/public/panel.css

@@ -129,11 +129,11 @@
 .ct-series-a .ct-bar, .ct-series-a .ct-line, .ct-series-a .ct-point, .ct-series-a .ct-slice-donut {
     stroke: hsl(359,98%,43%) !important;
 }
-
+.spamSelector + .timeRangeSelector {
-#widgetTmpl {
+	margin-left: 8px;
-	display: none;
 }
-.widget_disabled {
+
+#widgetTmpl, .widget_disabled {
 	display: none;
 }
 .bg_red .widget_disabled {

themes/tempra_simple/public/panel.css

@@ -162,6 +162,7 @@
 	padding-left: 2px;
 	padding-right: 2px;
 }
+
 .ct_chart {
 	padding-left: 10px;
     padding-top: 14px;
@@ -172,11 +173,11 @@
 	background-color: white;
 	border: 1px solid hsl(0,0%,85%);
 }
-
+.spamSelector + .timeRangeSelector {
-#widgetTmpl {
+	margin-left: 8px;
-	display: none;
 }
-.widget_disabled {
+
+#widgetTmpl, .widget_disabled {
 	display: none;
 }
 .bg_red .widget_disabled {