diff --git a/NOTES.md b/NOTES.md index a368c8bc50feda160db236be31a998266d72063b..8249392226a66dd7768c5b2ba6e932139e1d2818 100644 --- a/NOTES.md +++ b/NOTES.md @@ -20,9 +20,6 @@ Switch between MAIL and BULLETIN modes? MAIL commands are documented ## Things to do - * Remove all file related things. Which means no need for most - (all?) /EDIT flags - * Stop the seeded messages from being deleted by the expire batch command. * Run [godoc](http://localhost:6060/) and then review where the help text is lacking. * Implement each command. * Next: folder commands - MODIFY @@ -69,6 +66,9 @@ Done: * ~~Remove BBOARD references.~~ * ~~format with `par w72j1`~~ * ~~Handle MARK for SELECT and DIRECTORY.~~ + * ~~Remove all file related things. Which means no need for most + (all?) /EDIT flags~~ + * ~~Stop the seeded messages from being deleted by the expire batch command.~~ ## Module links diff --git a/storage/batch.sql.go b/storage/batch.sql.go index 793f70d1af1f2f34fcbf60d8416a5eca7dfcba76..a8c811322ba90338f36b4cbdc9d895eb3c97eec2 100644 --- a/storage/batch.sql.go +++ b/storage/batch.sql.go @@ -11,7 +11,7 @@ import ( const deleteAllExpiredMessages = `-- name: DeleteAllExpiredMessages :execrows DELETE FROM messages -WHERE permanent != 0 AND expiration < CURRENT_TIMESTAMP +WHERE permanent != 1 AND expiration < CURRENT_TIMESTAMP ` func (q *Queries) DeleteAllExpiredMessages(ctx context.Context) (int64, error) { @@ -24,7 +24,7 @@ func (q *Queries) DeleteAllExpiredMessages(ctx context.Context) (int64, error) { const deleteAllShutdownMessages = `-- name: DeleteAllShutdownMessages :execrows DELETE FROM messages -WHERE permanent != 0 AND shutdown > 0 +WHERE permanent != 1 AND shutdown > 0 ` func (q *Queries) DeleteAllShutdownMessages(ctx context.Context) (int64, error) { diff --git a/storage/queries/batch.sql b/storage/queries/batch.sql index e78577f6830e956cf5526412fd9db5e06a280666..5eb8127243239a4225d9634cbcdcc553eb69cfec 100644 --- a/storage/queries/batch.sql +++ b/storage/queries/batch.sql @@ -1,7 +1,7 @@ -- name: DeleteAllExpiredMessages :execrows DELETE FROM messages -WHERE permanent != 0 AND expiration < CURRENT_TIMESTAMP; +WHERE permanent != 1 AND expiration < CURRENT_TIMESTAMP; -- name: DeleteAllShutdownMessages :execrows DELETE FROM messages -WHERE permanent != 0 AND shutdown > 0; +WHERE permanent != 1 AND shutdown > 0;