Foppe Hemminga 6 tahun lalu
induk
melakukan
f86364b182
1 mengubah file dengan 10 tambahan dan 7 penghapusan
  1. 10 7
      main.go

+ 10 - 7
main.go

@@ -126,7 +126,7 @@ func getEventsFromDatabase(factionName string) (Event, error) {
 	}
 	defer rows.Close()
 	for rows.Next() {
-		rows.Scan(&e.id, &e.timestamp, &e.news)
+		err = rows.Scan(&e.id, &e.timestamp, &e.news)
 		if err != nil {
 			return e, err
 		}
@@ -155,7 +155,7 @@ func getAttackFromDatabase(factionName string) (Attacks, error) {
 	}
 	defer rows.Close()
 	for rows.Next() {
-		rows.Scan(&a.id, &a.timestamp, &a.news)
+		err = rows.Scan(&a.id, &a.timestamp, &a.news)
 		if err != nil {
 			return attacks, err
 		}
@@ -185,7 +185,7 @@ func (a Attack) String() string {
 }
 
 func replaceLinks(news string) string {
-	re := regexp.MustCompile(`<[aA].*?href\s?=\s?"?(.*?)[ "]?(?: .*?)?>(.*?)<\/a>`)
+	re := regexp.MustCompile(`<[aA].*?href\s?=\s?"?(.*?)[ "]?(?: .*?)?>(.*?)</a>`)
 	fmt.Println(re.FindAllStringSubmatch(news, -1))
 	return re.ReplaceAllString(news, "[${2}](${1})")
 	//return news
@@ -229,7 +229,10 @@ func broadcastSingleAttack(attack Attack, faction Faction) error {
 		fmt.Println(faction.name + ": " + strconv.Itoa(code))
 		if code == 204 {
 			// Assuming sent
-			setAttackBroadcastTrue(attack.id)
+			err = setAttackBroadcastTrue(attack.id)
+			if err != nil {
+				return err
+			}
 		}
 	}
 	return nil
@@ -250,7 +253,7 @@ func setBroadcastTrue(id int) error {
 	}
 	defer tx.Rollback()
 
-	tx.Exec(`SET TIME ZONE 'utc'`)
+	_, err = tx.Exec(`SET TIME ZONE 'utc'`)
 	stmt, err := tx.Prepare("UPDATE events SET broadcast = TRUE WHERE id = $1;")
 	if err != nil {
 		return err
@@ -282,7 +285,7 @@ func setAttackBroadcastTrue(id int) error {
 	}
 	defer tx.Rollback()
 
-	tx.Exec(`SET TIME ZONE 'utc'`)
+	_, err = tx.Exec(`SET TIME ZONE 'utc'`)
 	stmt, err := tx.Prepare("UPDATE attacks SET broadcast = TRUE WHERE id = $1;")
 	if err != nil {
 		return err
@@ -315,7 +318,7 @@ func getRelentlessMembers() ([]string, error) {
 	defer rows.Close()
 	var name string
 	for rows.Next() {
-		rows.Scan(&name)
+		err = rows.Scan(&name)
 		if err != nil {
 			return members, err
 		}