Implemented periodic post IP purging for replies.

Update for MySQL now supports DateCutoff and DateOlderThan.
Added the DateOlderThan method to accUpdateBuilder.

Added the PostIPCutoff config setting.

common/site.go

@@ -88,6 +88,7 @@ type config struct {
 
 	PrimaryServer bool
 	ServerCount   int
+	PostIPCutoff int
 
 	DisableLiveTopicList bool
 	DisableJSAntispam    bool
@@ -197,6 +198,10 @@ func ProcessConfig() (err error) {
 	}
 	Site.MaxRequestSize = Config.MaxRequestSize
 
+	if Config.PostIPCutoff == 0 {
+		Config.PostIPCutoff = 180 // Default cutoff
+	}
+
 	// ? Find a way of making these unlimited if zero? It might rule out some optimisations, waste memory, and break layouts
 	if Config.MaxTopicTitleLength == 0 {
 		Config.MaxTopicTitleLength = 100

docs/configuration.md

@@ -80,6 +80,8 @@ BuildSlugs - Whether you want the title appear in the URL. For instance: `/topic
 
 ServerCount - The number of instances you're running. This setting is currently experimental.
 
+PostIPCutoff - The number of days which need to pass before the IP data for a post is automatically deleted. 0 defaults to whatever the current default is, currently 180 and -1 disables this feature. Default: 0
+
 DisableLiveTopicList - This switch allows you to disable the live topic list. Default: false
 
 DisableJSAntispam - This switch lets you disable the JS anti-spam feature. It may be useful if you primarily get users who for one reason or another have decided to disable JavaScript. Default: false

query_gen/acc_builders.go

@@ -44,37 +44,47 @@ type accUpdateBuilder struct {
 	build *Accumulator
 }
 
-func (update *accUpdateBuilder) Set(set string) *accUpdateBuilder {
+func (u *accUpdateBuilder) Set(set string) *accUpdateBuilder {
-	update.up.set = set
+	u.up.set = set
-	return update
+	return u
 }
 
-func (update *accUpdateBuilder) Where(where string) *accUpdateBuilder {
+func (u *accUpdateBuilder) Where(where string) *accUpdateBuilder {
-	if update.up.where != "" {
+	if u.up.where != "" {
-		update.up.where += " AND "
+		u.up.where += " AND "
 	}
-	update.up.where += where
+	u.up.where += where
-	return update
+	return u
 }
 
-func (update *accUpdateBuilder) WhereQ(sel *selectPrebuilder) *accUpdateBuilder {
+func (u *accUpdateBuilder) DateCutoff(column string, quantity int, unit string) *accUpdateBuilder {
-	update.up.whereSubQuery = sel
+	u.up.dateCutoff = &dateCutoff{column, quantity, unit, 0}
-	return update
+	return u
 }
 
-func (builder *accUpdateBuilder) Prepare() *sql.Stmt {
+func (u *accUpdateBuilder) DateOlderThan(column string, quantity int, unit string) *accUpdateBuilder {
-	if builder.up.whereSubQuery != nil {
+	u.up.dateCutoff = &dateCutoff{column, quantity, unit, 1}
-		return builder.build.prepare(builder.build.adapter.SimpleUpdateSelect(builder.up))
+	return u
+}
+
+func (u *accUpdateBuilder) WhereQ(sel *selectPrebuilder) *accUpdateBuilder {
+	u.up.whereSubQuery = sel
+	return u
+}
+
+func (u *accUpdateBuilder) Prepare() *sql.Stmt {
+	if u.up.whereSubQuery != nil {
+		return u.build.prepare(u.build.adapter.SimpleUpdateSelect(u.up))
 	}
-	return builder.build.prepare(builder.build.adapter.SimpleUpdate(builder.up))
+	return u.build.prepare(u.build.adapter.SimpleUpdate(u.up))
 }
 
-func (builder *accUpdateBuilder) Exec(args ...interface{}) (res sql.Result, err error) {
+func (u *accUpdateBuilder) Exec(args ...interface{}) (res sql.Result, err error) {
-	query, err := builder.build.adapter.SimpleUpdate(builder.up)
+	query, err := u.build.adapter.SimpleUpdate(u.up)
 	if err != nil {
 		return res, err
 	}
-	return builder.build.exec(query, args...)
+	return u.build.exec(query, args...)
 }
 
 type AccSelectBuilder struct {
@@ -134,7 +144,7 @@ func (selectItem *AccSelectBuilder) InQ(column string, subBuilder *AccSelectBuil
 }
 
 func (builder *AccSelectBuilder) DateCutoff(column string, quantity int, unit string) *AccSelectBuilder {
-	builder.dateCutoff = &dateCutoff{column, quantity, unit}
+	builder.dateCutoff = &dateCutoff{column, quantity, unit, 0}
 	return builder
 }
 
@@ -309,7 +319,7 @@ func (b *accCountBuilder) Limit(limit string) *accCountBuilder {
 }
 
 func (b *accCountBuilder) DateCutoff(column string, quantity int, unit string) *accCountBuilder {
-	b.dateCutoff = &dateCutoff{column, quantity, unit}
+	b.dateCutoff = &dateCutoff{column, quantity, unit, 0}
 	return b
 }
 

query_gen/micro_builders.go

@@ -4,6 +4,7 @@ type dateCutoff struct {
 	Column   string
 	Quantity int
 	Unit     string
+	Type int
 }
 
 type prebuilder struct {
@@ -27,7 +28,7 @@ func (build *prebuilder) Insert(nlist ...string) *insertPrebuilder {
 
 func (build *prebuilder) Update(nlist ...string) *updatePrebuilder {
 	name := optString(nlist, "")
-	return &updatePrebuilder{name, "", "", "", nil, build.adapter}
+	return &updatePrebuilder{name, "", "", "", nil, nil, build.adapter}
 }
 
 func (build *prebuilder) Delete(nlist ...string) *deletePrebuilder {
@@ -69,6 +70,7 @@ type updatePrebuilder struct {
 	table         string
 	set           string
 	where         string
+	dateCutoff *dateCutoff // We might want to do this in a slightly less hacky way
 	whereSubQuery *selectPrebuilder
 
 	build Adapter

query_gen/mysql.go

@@ -402,7 +402,7 @@ func (adapter *MysqlAdapter) SimpleUpdate(up *updatePrebuilder) (string, error)
 	}
 	querystr = querystr[0 : len(querystr)-1]
 
-	whereStr, err := adapter.buildWhere(up.where)
+	whereStr, err := adapter.buildFlexiWhere(up.where,up.dateCutoff)
 	if err != nil {
 		return querystr, err
 	}
@@ -485,7 +485,11 @@ func (adapter *MysqlAdapter) buildFlexiWhere(where string, dateCutoff *dateCutof
 	}
 	querystr = " WHERE"
 	if dateCutoff != nil {
+		if dateCutoff.Type == 0 {
 			querystr += " " + dateCutoff.Column + " BETWEEN (UTC_TIMESTAMP() - interval " + strconv.Itoa(dateCutoff.Quantity) + " " + dateCutoff.Unit + ") AND UTC_TIMESTAMP() AND"
+		} else {
+			querystr += " " + dateCutoff.Column + " < UTC_TIMESTAMP() - interval " + strconv.Itoa(dateCutoff.Quantity) + " " + dateCutoff.Unit + " AND"
+		}
 	}
 	if len(where) != 0 {
 		for _, loc := range processWhere(where) {

tickloop.go

@@ -142,6 +142,14 @@ func tickLoop(thumbChan chan bool) {
 			if err != nil && err != sql.ErrNoRows {
 				c.LogError(err)
 			}
+
+			if c.Config.PostIPCutoff > -1 {
+				// TODO: Use unixtime to remove this MySQLesque logic?
+				_, err := qgen.NewAcc().Update("replies").Set("ipaddress = '0'").DateOlderThan("createdAt",c.Config.PostIPCutoff,"day").Where("ipaddress != '0'").Exec()
+				if err != nil {
+					c.LogError(err)
+				}
+			}
 		}
 
 		// TODO: Handle the daily clean-up.