Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47ed519376 | ||
|
|
22912c7367 | ||
|
|
6b15540d4e | ||
|
|
e526d27f4a |
@@ -26,8 +26,8 @@ jobs:
|
||||
GOPATH: /home/runner/work/Geeksbot/
|
||||
run: |
|
||||
go get -u github.com/go-bindata/go-bindata/...
|
||||
/home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -prefix $GITHUB_WORKSPACE/internal/database/migrations/ -o $GITHUB_WORKSPACE/internal/database/migrations/bindata.go $GITHUB_WORKSPACE/internal/database/migrations/
|
||||
head $GITHUB_WORKSPACE/internal/database/migrations/bindata.go
|
||||
/home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -prefix $GITHUB_WORKSPACE/pkg/database/migrations/ -o $GITHUB_WORKSPACE/pkg/database/migrations/bindata.go $GITHUB_WORKSPACE/pkg/database/migrations/
|
||||
head $GITHUB_WORKSPACE/pkg/database/migrations/bindata.go
|
||||
|
||||
- name: Build container image
|
||||
env:
|
||||
@@ -43,7 +43,9 @@ jobs:
|
||||
run: doctl registry login --expiry-seconds 600
|
||||
|
||||
- name: Push image to DigitalOcean Container Registry
|
||||
run: docker push registry.digitalocean.com/djpianalto/geeksbot
|
||||
run: docker push registry.digitalocean.com/djpianalto/geeksbot:$IMAGE_TAG
|
||||
env:
|
||||
IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
|
||||
|
||||
- name: Update deployment file
|
||||
run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
|
||||
|
||||
@@ -32,4 +32,6 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
|
||||
_ = g.AddCommand(guild.SelfAssignRoleCommand)
|
||||
_ = g.AddCommand(guild.UnAssignRoleCommand)
|
||||
_ = g.AddCommand(requests.RequestCommand)
|
||||
_ = g.AddCommand(requests.CloseCommand)
|
||||
_ = g.AddCommand(requests.ListCommand)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
BEGIN;
|
||||
ALTER TABLE messages
|
||||
ALTER COLUMN previous_content DROP NOT NULL;
|
||||
ALTER TABLE messages
|
||||
ALTER COLUMN previous_content DROP DEFAULT;
|
||||
COMMIT;
|
||||
@@ -0,0 +1,7 @@
|
||||
BEGIN;
|
||||
UPDATE messages SET previous_content = array[]::varchar[];
|
||||
ALTER TABLE messages
|
||||
ALTER COLUMN previous_content SET NOT NULL;
|
||||
ALTER TABLE messages
|
||||
ALTER COLUMN prevous_content SET DEFAULT array[]::varchar[]
|
||||
COMMIT;
|
||||
@@ -19,7 +19,7 @@ func (s requestService) Request(id int64) (geeksbot.Request, error) {
|
||||
var uID sql.NullString
|
||||
var mID string
|
||||
queryString := `SELECT id, author_id, channel_id, guild_id, content, requested_at, completed,
|
||||
completed_at, completed_by, message_id, completed_message
|
||||
completed_at, completed_by, message_id, completed_message FROM requests
|
||||
WHERE id = $1`
|
||||
row := s.db.QueryRow(queryString, id)
|
||||
err := row.Scan(&r.ID, &aID, &cID, &gID, &r.Content, &r.RequestedAt, &r.Completed,
|
||||
@@ -168,7 +168,7 @@ func (s requestService) Comment(id int64) (geeksbot.Comment, error) {
|
||||
var c geeksbot.Comment
|
||||
var aID string
|
||||
var rID int64
|
||||
queryString := "SELECT id, author_id, request_id, comment_at, content WHERE id = $1"
|
||||
queryString := "SELECT id, author_id, request_id, comment_at, content FROM comments WHERE id = $1"
|
||||
row := s.db.QueryRow(queryString, id)
|
||||
err := row.Scan(&c.ID, &aID, &rID, &c.CommentAt, &c.Content)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user