Implement Staff sql funcs

initdb_master.sql

@@ -110,7 +110,7 @@ CREATE TABLE DBPREFIXstaff(
 	password_checksum VARCHAR(120) NOT NULL,
 	global_rank INT,
 	added_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	last_login TIMESTAMP NOT NULL,
+	last_login TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	is_active BOOL NOT NULL DEFAULT TRUE,
 	UNIQUE(username)
 );

initdb_mysql.sql

@@ -110,7 +110,7 @@ CREATE TABLE DBPREFIXstaff(
 	password_checksum VARCHAR(120) NOT NULL,
 	global_rank INT,
 	added_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	last_login TIMESTAMP NOT NULL,
+	last_login TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	is_active BOOL NOT NULL DEFAULT TRUE,
 	UNIQUE(username)
 );

initdb_postgres.sql

@@ -110,7 +110,7 @@ CREATE TABLE DBPREFIXstaff(
 	password_checksum VARCHAR(120) NOT NULL,
 	global_rank INT,
 	added_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	last_login TIMESTAMP NOT NULL,
+	last_login TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	is_active BOOL NOT NULL DEFAULT TRUE,
 	UNIQUE(username)
 );

initdb_sqlite3.sql

@@ -110,7 +110,7 @@ CREATE TABLE DBPREFIXstaff(
 	password_checksum VARCHAR(120) NOT NULL,
 	global_rank INT,
 	added_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	last_login TIMESTAMP NOT NULL,
+	last_login TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	is_active BOOL NOT NULL DEFAULT TRUE,
 	UNIQUE(username)
 );

pkg/gcsql/queries.go

@@ -4,6 +4,8 @@ import (
 	"errors"
 	"net"
 	"time"
+
+	"github.com/gochan-org/gochan/pkg/gcutil"
 )
 
 // GetAllNondeletedMessageRaw gets all the raw message texts from the database, saved per id
@@ -130,28 +132,31 @@ func GetStaffByName(name string) (*Staff, error) {
 }
 
 // NewStaff creates a new staff account from a given username, password and rank
-func NewStaff(username string, password string, rank int) error { //TODO not up to date with old db yet
+func NewStaff(username string, password string, rank int) error {
-	// _, err := execSQL("INSERT INTO DBPREFIXstaff (username, password_checksum, rank) VALUES(?,?,?)",
+	const sql = `INSERT INTO DBPREFIXstaff (username, password_checksum, global_rank)
-	// 	&username, bcryptSum(password), &rank)
+	VALUES (?, ?, ?);`
-	// return err
+	_, err := ExecSQL(sql, username, gcutil.BcryptSum(password), rank)
-	return errors.New("Not implemented")
+	return err
 }
 
 // DeleteStaff deletes the staff with a given name.
-func DeleteStaff(username string) error { //TODO not up to date with old db yet
+// Implemented to change the account name to a random string and set it to inactive
-	// _, err := execSQL("DELETE FROM DBPREFIXstaff WHERE username = ?", username)
+func DeleteStaff(username string) error {
-	// return err
+	const sql = `UPDATE DBPREFIXstaff SET username = ?, is_active = FALSE WHERE username = ?`
-	return errors.New("Not implemented")
+	_, err := ExecSQL(sql, gcutil.RandomString(45), username)
+	return err
 }
 
 // CreateSession inserts a session for a given key and username into the database
-func CreateSession(key string, username string) error { //TODO not up to date with old db yet
+func CreateSession(key string, username string) error {
-	//TODO move amount of time to config file
+	const sql = `INSERT INTO DBPREFIXsessions (staff_id,data,expires) VALUES(?,?,?); 
-	//TODO also set last login
+	UPDATE DBPREFIXstaff SET last_login = CURRENT_TIMESTAMP WHERE id = ?;`
-	// return execSQL("INSERT INTO DBPREFIXsessions (name,sessiondata,expires) VALUES(?,?,?)",
+	staff, err := GetStaffByName(username)
-	// 	key, username, getSpecificSQLDateTime(time.Now().Add(time.Duration(time.Hour*730))),
+	if err != nil {
-	// )
+		return err
-	return errors.New("Not implemented")
+	}
+	_, err = ExecSQL(sql, staff.ID, key, time.Now().Add(time.Duration(time.Hour*730)), staff.ID) //TODO move amount of time to config file
+	return err
 }
 
 // PermanentlyRemoveDeletedPosts removes all posts and files marked as deleted from the database