LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

Updated linter threw new warnings. Fixed.

Browse Source
This commit is contained in:
Gabe Kangas 2021-11-03 09:43:47 -07:00
parent 055ca479f0
commit 6ffa020c5f
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/chat/persistence.go
View File

@ -74,7 +74,7 @@ func saveEvent(id string, userID string, body string, eventType string, hidden *
func getChat(query string) []events.UserMessageEvent { func getChat(query string) []events.UserMessageEvent {
history := make([]events.UserMessageEvent, 0) history := make([]events.UserMessageEvent, 0)
rows, err := _datastore.DB.Query(query) rows, err := _datastore.DB.Query(query)
if err != nil { if err != nil || rows.Err() != nil {
log.Errorln("error fetching chat history", err) log.Errorln("error fetching chat history", err)
return history return history
} }

10
core/data/webhooks.go
View File

@ -42,7 +42,6 @@ func InsertWebhook(url string, events []models.EventType) (int, error) {
return 0, err return 0, err
} }
stmt, err := tx.Prepare("INSERT INTO webhooks(url, events) values(?, ?)") stmt, err := tx.Prepare("INSERT INTO webhooks(url, events) values(?, ?)")
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -74,7 +73,6 @@ func DeleteWebhook(id int) error {
return err return err
} }
stmt, err := tx.Prepare("DELETE FROM webhooks WHERE id = ?") stmt, err := tx.Prepare("DELETE FROM webhooks WHERE id = ?")
if err != nil { if err != nil {
return err return err
} }
@ -101,7 +99,7 @@ func DeleteWebhook(id int) error {
func GetWebhooksForEvent(event models.EventType) []models.Webhook { func GetWebhooksForEvent(event models.EventType) []models.Webhook {
webhooks := make([]models.Webhook, 0) webhooks := make([]models.Webhook, 0)
var query = `SELECT * FROM ( query := `SELECT * FROM (
WITH RECURSIVE split(id, url, event, rest) AS ( WITH RECURSIVE split(id, url, event, rest) AS (
SELECT id, url, '', events || ',' FROM webhooks SELECT id, url, '', events || ',' FROM webhooks
UNION ALL UNION ALL
@ -116,8 +114,7 @@ func GetWebhooksForEvent(event models.EventType) []models.Webhook {
) AS webhook WHERE event IS "` + event + `"` ) AS webhook WHERE event IS "` + event + `"`
rows, err := _db.Query(query) rows, err := _db.Query(query)
if err != nil || rows.Err() != nil {
if err != nil {
log.Fatal(err) log.Fatal(err)
} }
defer rows.Close() defer rows.Close()
@ -146,7 +143,7 @@ func GetWebhooksForEvent(event models.EventType) []models.Webhook {
func GetWebhooks() ([]models.Webhook, error) { //nolint func GetWebhooks() ([]models.Webhook, error) { //nolint
webhooks := make([]models.Webhook, 0) webhooks := make([]models.Webhook, 0)
var query = "SELECT * FROM webhooks" query := "SELECT * FROM webhooks"
rows, err := _db.Query(query) rows, err := _db.Query(query)
if err != nil { if err != nil {
@ -202,7 +199,6 @@ func SetWebhookAsUsed(webhook models.Webhook) error {
return err return err
} }
stmt, err := tx.Prepare("UPDATE webhooks SET last_used = CURRENT_TIMESTAMP WHERE id = ?") stmt, err := tx.Prepare("UPDATE webhooks SET last_used = CURRENT_TIMESTAMP WHERE id = ?")
if err != nil { if err != nil {
return err return err
} }