Trying to make the timeline load quicker

ITU-DevOps-N · Apr 12, 2022 · e2a9d67 · e2a9d67
1 parent e0cba4f
commit e2a9d67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/controller/messages.go b/src/controller/messages.go
@@ -14,17 +14,15 @@ import (
 )
 
 func GetMessages(user string, page string) []map[string]interface{} {
-	var messages []model.Message
-
-	database.DB.Find(&messages)
 	var results []map[string]interface{}
 
 	offset, messagesPerPage := LimitMessages(page)
 
+
 	if user == "" {
-		database.DB.Table("messages").Order("created_at desc").Limit(messagesPerPage).Offset(offset).Find(&results)
+		database.DB.Table("messages").Limit(messagesPerPage).Order("created_at desc").Offset(offset).Find(&results)
 	} else {
-		database.DB.Table("messages").Order("created_at desc").Where("author = ?", user).Limit(messagesPerPage).Offset(offset).Find(&results)
+		database.DB.Table("messages").Where("author = ?", user).Limit(messagesPerPage).Order("created_at desc").Offset(offset).Find(&results)
 	}
 	return results
 }

diff --git a/src/database/database.go b/src/database/database.go
@@ -13,6 +13,7 @@ var DB *gorm.DB
 
 func SetupDB() {
 	dsn := "minitwit:" + os.Getenv("DB_PASS") + "@tcp(db:3306)/minitwit?charset=utf8mb4&parseTime=True&loc=Local"
+	// dsn := "minitwit:" + os.Getenv("DB_PASS") + "@tcp(go-minitwit.duckdns.org:3306)/minitwit?charset=utf8mb4&parseTime=True&loc=Local"
     db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	if err != nil {
 		fmt.Printf("Error: %s", err.Error())