foo

1 files changed, 17 insertions, 0 deletions

diff --git a/src/db/talk.go b/src/db/talk.go
index 216bf13..34a245a 100644
--- a/src/db/talk.go
+++ b/src/db/talk.go
@@ -2,7 +2,10 @@ package db
 
 import (
 	"fmt"
+<<<<<<< HEAD
 	"time"
+=======
+>>>>>>> refs/remotes/origin/master
 
 	"git.darknebu.la/chaosdorf/freitagsfoo/src/structs"
 	pg "github.com/go-pg/pg/v9"
@@ -22,7 +25,11 @@ func InsertTalk(db *pg.DB, talk *structs.Talk) error {
 // UpcomingTalksLimited returns the next 3 upcoming talks
 func UpcomingTalksLimited(db *pg.DB) ([]structs.Talk, error) {
 	var talks []structs.Talk
+<<<<<<< HEAD
 	err := db.Model(&talks).Order("date ASC").Where("date > ?", time.Now()).Limit(3).Select()
+=======
+	err := db.Model(&talks).Order("id DESC").Limit(3).Select()
+>>>>>>> refs/remotes/origin/master
 	if err != nil {
 		return []structs.Talk{}, fmt.Errorf("could not get the talks from the db: %s", err)
 	}
@@ -33,6 +40,7 @@ func UpcomingTalksLimited(db *pg.DB) ([]structs.Talk, error) {
 // UpcomingTalks returns the next upcoming talks
 func UpcomingTalks(db *pg.DB) ([]structs.Talk, error) {
 	var talks []structs.Talk
+<<<<<<< HEAD
 	err := db.Model(&talks).Order("date ASC").Where("date > ?", time.Now()).Select()
 	if err != nil {
 		return []structs.Talk{}, fmt.Errorf("could not get the talks from the db: %s", err)
@@ -56,6 +64,9 @@ func PastTalksLimited(db *pg.DB) ([]structs.Talk, error) {
 func PastTalks(db *pg.DB) ([]structs.Talk, error) {
 	var talks []structs.Talk
 	err := db.Model(&talks).Order("date DESC").Where("date < ?", time.Now()).Select()
+=======
+	err := db.Model(&talks).Order("id DESC").Select()
+>>>>>>> refs/remotes/origin/master
 	if err != nil {
 		return []structs.Talk{}, fmt.Errorf("could not get the talks from the db: %s", err)
 	}
@@ -65,6 +76,7 @@ func PastTalks(db *pg.DB) ([]structs.Talk, error) {
 
 // CountUpcomingTalks counts the amount of talks upcoming
 func CountUpcomingTalks(db *pg.DB) (int, error) {
+<<<<<<< HEAD
 	var talks []structs.Talk
 	count, err := db.Model(&talks).Where("date > ?", time.Now()).Where("upcoming = ?", true).SelectAndCount()
 	if err != nil {
@@ -78,6 +90,11 @@ func CountUpcomingTalks(db *pg.DB) (int, error) {
 func CountPastTalks(db *pg.DB) (int, error) {
 	var talks []structs.Talk
 	count, err := db.Model(&talks).Where("date < ?", time.Now()).SelectAndCount()
+=======
+
+	var talks []structs.Talk
+	count, err := db.Model(&talks).Where("upcoming = ?", true).SelectAndCount()
+>>>>>>> refs/remotes/origin/master
 	if err != nil {
 		return -1, fmt.Errorf("could not get the talks from the db: %s", err)
 	}