diff options
| -rw-r--r-- | client.go | 38 | ||||
| -rw-r--r-- | databaseschema.psql | 3 | ||||
| -rw-r--r-- | main.go | 6 |
3 files changed, 24 insertions, 23 deletions
@@ -567,9 +567,9 @@ func DeleteRemovedPosts(db *sql.DB, collection *Collection) { } func CreateLocalDeleteDB(db *sql.DB, id string, _type string) { - query := fmt.Sprintf("select id from removed where id='%s'", id) + query := `select id from removed where id=$1` - rows, err := db.Query(query) + rows, err := db.Query(query, id) CheckError(err, "could not query removed") @@ -581,17 +581,17 @@ func CreateLocalDeleteDB(db *sql.DB, id string, _type string) { rows.Scan(&i) if i != "" { - query := fmt.Sprintf("update removed set type='%s' where id='%s'", _type, id) - - _, err := db.Exec(query) + query := `update removed set type=$1 where id=$2` + + _, err := db.Exec(query, _type, id) CheckError(err, "Could not update removed post") } } else { - query := fmt.Sprintf("insert into removed (id, type) values ('%s', '%s')", id, _type) + query := `insert into removed (id, type) values ($1, $2)` - _, err := db.Exec(query) + _, err := db.Exec(query, id, _type) CheckError(err, "Could not insert removed post") } @@ -600,8 +600,8 @@ func CreateLocalDeleteDB(db *sql.DB, id string, _type string) { func GetLocalDeleteDB(db *sql.DB) []Removed { var deleted []Removed - query := fmt.Sprintf("select id, type from removed") - + query := `select id, type from removed` + rows, err := db.Query(query) CheckError(err, "could not query removed") @@ -620,9 +620,9 @@ func GetLocalDeleteDB(db *sql.DB) []Removed { } func CreateLocalReportDB(db *sql.DB, id string, board string, reason string) { - query := fmt.Sprintf("select id, count from reported where id='%s' and board='%s'", id, board) + query := `select id, count from reported where id=$1 and board=$2` - rows, err := db.Query(query) + rows, err := db.Query(query, id, board) CheckError(err, "could not query reported") @@ -636,16 +636,16 @@ func CreateLocalReportDB(db *sql.DB, id string, board string, reason string) { if i != "" { count = count + 1 - query := fmt.Sprintf("update reported set count='%d' where id='%s'", count, id) + query := `update reported set count=$1 where id=$2` - _, err := db.Exec(query) + _, err := db.Exec(query, count, id) CheckError(err, "Could not update reported post") } } else { - query := fmt.Sprintf("insert into reported (id, count, board) values ('%s', '%d', '%s')", id, 1, board) + query := `insert into reported (id, count, board, reason) values ($1, $2, $3, $4)` - _, err := db.Exec(query) + _, err := db.Exec(query, id, 1, board, reason) CheckError(err, "Could not insert reported post") } @@ -655,9 +655,9 @@ func CreateLocalReportDB(db *sql.DB, id string, board string, reason string) { func GetLocalReportDB(db *sql.DB, board string) []Report { var reported []Report - query := fmt.Sprintf("select id, count from reported where board='%s'", board) + query := `select id, count from reported where board=$1` - rows, err := db.Query(query) + rows, err := db.Query(query, board) CheckError(err, "could not query reported") @@ -675,9 +675,9 @@ func GetLocalReportDB(db *sql.DB, board string) []Report { } func CloseLocalReportDB(db *sql.DB, id string, board string) { - query := fmt.Sprintf("delete from reported where id='%s' and board='%s'", id, board) + query := `delete from reported where id=$1 and board=$2` - _, err := db.Exec(query) + _, err := db.Exec(query, id, board) CheckError(err, "Could not delete local report from db") } diff --git a/databaseschema.psql b/databaseschema.psql index a99f363..d168882 100644 --- a/databaseschema.psql +++ b/databaseschema.psql @@ -36,7 +36,8 @@ created TIMESTAMP default NOW() CREATE TABLE IF NOT EXISTS reported( id varchar(100), count int, -board varchar(100) +board varchar(100), +reason varchar(100) ); CREATE TABLE IF NOT EXISTS verificationcooldown( @@ -287,7 +287,7 @@ func main() { return } - if(len(r.FormValue("subject")) > 100 || len(r.FormValue("name")) > 100 || len(r.FormValue("options" > 100) { + if(len(r.FormValue("subject")) > 100 || len(r.FormValue("name")) > 100 || len(r.FormValue("options")) > 100) { w.Write([]byte("Name, Subject or Options limit 100 characters")) return } @@ -1539,9 +1539,9 @@ func ReportActivity(db *sql.DB, id string, reason string) bool { } if count < 1 { - query = `insert into reported (id, count, board) values ($1, $2, $3)` + query = `insert into reported (id, count, board, reason) values ($1, $2, $3, $4)` - _, err := db.Exec(query, id, 1, actor.Actor.Id) + _, err := db.Exec(query, id, 1, actor.Actor.Id, reason) if err != nil { CheckError(err, "error inserting new reported activity") |