Merge branch 'main' into css-overhaulcss-overhaul

4 files changed, 148 insertions, 115 deletions

diff --git a/backend/handlers/home.go b/backend/handlers/home.go
index 714610a..095b666 100644
--- a/backend/handlers/home.go
+++ b/backend/handlers/home.go
@@ -6,6 +6,7 @@ import (
         "log"
         "net/http"
         "os"
+        "sort"
         "strings"
 
         "lphub/database"
@@ -106,6 +107,15 @@ func RankingsLPHUB(c *gin.Context) {
                         }
                 }
         }
+        // Sort the overall rankings
+        sort.Slice(response.Overall, func(i, j int) bool {
+                a := response.Overall[i]
+                b := response.Overall[j]
+                if a.TotalScore == b.TotalScore {
+                        return a.User.SteamID < b.User.SteamID
+                }
+                return a.TotalScore < b.TotalScore
+        })
 
         placement := 1
         ties := 0
@@ -317,7 +327,7 @@ func SearchWithQuery(c *gin.Context) {
                 {ID: 80, Game: "Portal 2 - Cooperative", Chapter: "Course 3 - Hard-Light Surfaces", Map: "Catapult Block"},
                 {ID: 81, Game: "Portal 2 - Cooperative", Chapter: "Course 3 - Hard-Light Surfaces", Map: "Bridge Fling"},
                 {ID: 82, Game: "Portal 2 - Cooperative", Chapter: "Course 3 - Hard-Light Surfaces", Map: "Turret Walls"},
-                {ID: 83, Game: "Portal 2 - Cooperative", Chapter: "Course 3 - Hard-Light Surfaces", Map: "Turret Assasin"},
+                {ID: 83, Game: "Portal 2 - Cooperative", Chapter: "Course 3 - Hard-Light Surfaces", Map: "Turret Assassin"},
                 {ID: 84, Game: "Portal 2 - Cooperative", Chapter: "Course 3 - Hard-Light Surfaces", Map: "Bridge Testing"},
                 {ID: 85, Game: "Portal 2 - Cooperative", Chapter: "Course 4 - Excursion Funnels", Map: "Cooperative Funnels"},
                 {ID: 86, Game: "Portal 2 - Cooperative", Chapter: "Course 4 - Excursion Funnels", Map: "Funnel Drill"},
diff --git a/backend/handlers/map.go b/backend/handlers/map.go
index b2a0b91..9cb0bcc 100644
--- a/backend/handlers/map.go
+++ b/backend/handlers/map.go
@@ -77,12 +77,12 @@ func FetchMapSummary(c *gin.Context) {
         }
         // Get map data
         response.Map.ID = intID
-        sql := `SELECT m.id, g.name, c.name, m.name, m.image, g.is_coop, m.is_disabled
+        sql := `SELECT m.id, g.name, c.name, m.name, m.image, g.is_coop, m.is_disabled, m.difficulty
         FROM maps m
         INNER JOIN games g ON m.game_id = g.id
         INNER JOIN chapters c ON m.chapter_id = c.id
         WHERE m.id = $1`
-        err = database.DB.QueryRow(sql, id).Scan(&response.Map.ID, &response.Map.GameName, &response.Map.ChapterName, &response.Map.MapName, &response.Map.Image, &response.Map.IsCoop, &response.Map.IsDisabled)
+        err = database.DB.QueryRow(sql, id).Scan(&response.Map.ID, &response.Map.GameName, &response.Map.ChapterName, &response.Map.MapName, &response.Map.Image, &response.Map.IsCoop, &response.Map.IsDisabled, &response.Map.Difficulty)
         if err != nil {
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
@@ -492,6 +492,7 @@ func FetchMaps(c *gin.Context) {
                 m.id,
                 m.name, 
                 m.is_disabled,
+                m.difficulty,
                 m.image,
                 cat.id,
                 cat.name,
@@ -529,7 +530,7 @@ func FetchMaps(c *gin.Context) {
         for rows.Next() {
                 var mapShort models.MapSelect
                 var categoryPortal models.CategoryPortal
-                if err := rows.Scan(&mapShort.ID, &mapShort.Name, &mapShort.IsDisabled, &mapShort.Image, &categoryPortal.Category.ID, &categoryPortal.Category.Name, &categoryPortal.PortalCount); err != nil {
+                if err := rows.Scan(&mapShort.ID, &mapShort.Name, &mapShort.IsDisabled, &mapShort.Difficulty, &mapShort.Image, &categoryPortal.Category.ID, &categoryPortal.Category.Name, &categoryPortal.PortalCount); err != nil {
                         c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                         return
                 }
@@ -571,6 +572,7 @@ func FetchChapterMaps(c *gin.Context) {
                 m.name AS map_name, 
                 c.name AS chapter_name, 
                 m.is_disabled,
+                m.difficulty,
                 m.image,
                 cat.id,
                 cat.name,
@@ -610,7 +612,7 @@ func FetchChapterMaps(c *gin.Context) {
         for rows.Next() {
                 var mapShort models.MapSelect
                 var categoryPortal models.CategoryPortal
-                if err := rows.Scan(&mapShort.ID, &mapShort.Name, &chapterName, &mapShort.IsDisabled, &mapShort.Image, &categoryPortal.Category.ID, &categoryPortal.Category.Name, &categoryPortal.PortalCount); err != nil {
+                if err := rows.Scan(&mapShort.ID, &mapShort.Name, &chapterName, &mapShort.IsDisabled, &mapShort.Difficulty, &mapShort.Image, &categoryPortal.Category.ID, &categoryPortal.Category.Name, &categoryPortal.PortalCount); err != nil {
                         c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                         return
                 }
diff --git a/backend/handlers/record.go b/backend/handlers/record.go
index bedde57..25a6c6d 100644
--- a/backend/handlers/record.go
+++ b/backend/handlers/record.go
@@ -2,10 +2,8 @@ package handlers
 
 import (
         "context"
-        "encoding/base64"
         "fmt"
         "io"
-        "log"
         "mime/multipart"
         "net/http"
         "os"
@@ -16,17 +14,14 @@ import (
         "lphub/models"
         "lphub/parser"
 
+        "github.com/Backblaze/blazer/b2"
         "github.com/gin-gonic/gin"
         "github.com/google/uuid"
-        "golang.org/x/oauth2/google"
-        "golang.org/x/oauth2/jwt"
-        "google.golang.org/api/drive/v3"
 )
 
 type RecordRequest struct {
         HostDemo    *multipart.FileHeader `json:"host_demo" form:"host_demo" binding:"required" swaggerignore:"true"`
         PartnerDemo *multipart.FileHeader `json:"partner_demo" form:"partner_demo" swaggerignore:"true"`
-        PartnerID   string                `json:"partner_id" form:"partner_id"`
 }
 
 type RecordResponse struct {
@@ -79,19 +74,14 @@ func CreateRecordWithDemo(c *gin.Context) {
                 return
         }
         // Demo files
-        demoFiles := []*multipart.FileHeader{record.HostDemo}
+        demoFileHeaders := []*multipart.FileHeader{record.HostDemo}
         if isCoop {
-                demoFiles = append(demoFiles, record.PartnerDemo)
+                demoFileHeaders = append(demoFileHeaders, record.PartnerDemo)
         }
-        var hostDemoUUID, hostDemoFileID, partnerDemoUUID, partnerDemoFileID string
+        var hostDemoUUID, partnerDemoUUID string
         var hostDemoScoreCount, hostDemoScoreTime int
         var hostSteamID, partnerSteamID string
         var hostDemoServerNumber, partnerDemoServerNumber int
-        srv, err := drive.New(serviceAccount())
-        if err != nil {
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
         // Create database transaction for inserts
         tx, err := database.DB.Begin()
         if err != nil {
@@ -100,22 +90,16 @@ func CreateRecordWithDemo(c *gin.Context) {
         }
         // Defer to a rollback in case anything fails
         defer tx.Rollback()
-        for i, header := range demoFiles {
+        for i, header := range demoFileHeaders {
                 uuid := uuid.New().String()
                 // Upload & insert into demos
-                err = c.SaveUploadedFile(header, "parser/"+uuid+".dem")
-                if err != nil {
-                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                        return
-                }
-                defer os.Remove("parser/" + uuid + ".dem")
-                f, err := os.Open("parser/" + uuid + ".dem")
+                f, err := header.Open()
                 if err != nil {
                         c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                         return
                 }
                 defer f.Close()
-                parserResult, err := parser.ProcessDemo("parser/" + uuid + ".dem")
+                parserResult, err := parser.ProcessDemo(f)
                 if err != nil {
                         c.JSON(http.StatusOK, models.ErrorResponse("Error while processing demo: "+err.Error()))
                         return
@@ -148,23 +132,15 @@ func CreateRecordWithDemo(c *gin.Context) {
                                 return
                         }
                 }
-                file, err := createFile(srv, uuid+".dem", "application/octet-stream", f, os.Getenv("GOOGLE_FOLDER_ID"))
-                if err != nil {
-                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                        return
-                }
                 if i == 0 {
-                        hostDemoFileID = file.Id
                         hostDemoUUID = uuid
                         hostDemoServerNumber = parserResult.ServerNumber
                 } else if i == 1 {
-                        partnerDemoFileID = file.Id
                         partnerDemoUUID = uuid
                         partnerDemoServerNumber = parserResult.ServerNumber
                 }
-                _, err = tx.Exec(`INSERT INTO demos (id,location_id) VALUES ($1,$2)`, uuid, file.Id)
+                _, err = tx.Exec(`INSERT INTO demos (id) VALUES ($1)`, uuid)
                 if err != nil {
-                        deleteFile(srv, file.Id)
                         c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                         return
                 }
@@ -172,8 +148,6 @@ func CreateRecordWithDemo(c *gin.Context) {
         // Insert into records
         if isCoop {
                 if hostDemoServerNumber != partnerDemoServerNumber {
-                        deleteFile(srv, hostDemoFileID)
-                        deleteFile(srv, partnerDemoFileID)
                         c.JSON(http.StatusOK, models.ErrorResponse(fmt.Sprintf("Host and partner demo server numbers (%d & %d) does not match!", hostDemoServerNumber, partnerDemoServerNumber)))
                         return
                 }
@@ -192,8 +166,6 @@ func CreateRecordWithDemo(c *gin.Context) {
                 //      return
                 // }
                 if convertedHostSteamID != user.(models.User).SteamID && convertedPartnerSteamID != user.(models.User).SteamID {
-                        deleteFile(srv, hostDemoFileID)
-                        deleteFile(srv, partnerDemoFileID)
                         c.JSON(http.StatusOK, models.ErrorResponse("You are permitted to only upload your own runs!"))
                         return
                 }
@@ -205,8 +177,6 @@ func CreateRecordWithDemo(c *gin.Context) {
                 }
                 database.DB.QueryRow("SELECT steam_id FROM users WHERE steam_id = $1", checkPartnerSteamID).Scan(&verifyPartnerSteamID)
                 if verifyPartnerSteamID != checkPartnerSteamID {
-                        deleteFile(srv, hostDemoFileID)
-                        deleteFile(srv, partnerDemoFileID)
                         c.JSON(http.StatusOK, models.ErrorResponse("Partner SteamID does not match an account on LPHUB."))
                         return
                 }
@@ -214,8 +184,6 @@ func CreateRecordWithDemo(c *gin.Context) {
                 VALUES($1, $2, $3, $4, $5, $6, $7)`
                 _, err := tx.Exec(sql, mapID, hostDemoScoreCount, hostDemoScoreTime, convertedHostSteamID, convertedPartnerSteamID, hostDemoUUID, partnerDemoUUID)
                 if err != nil {
-                        deleteFile(srv, hostDemoFileID)
-                        deleteFile(srv, partnerDemoFileID)
                         c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                         return
                 }
@@ -224,7 +192,78 @@ func CreateRecordWithDemo(c *gin.Context) {
                 VALUES($1, $2, $3, $4, $5)`
                 _, err := tx.Exec(sql, mapID, hostDemoScoreCount, hostDemoScoreTime, user.(models.User).SteamID, hostDemoUUID)
                 if err != nil {
-                        deleteFile(srv, hostDemoFileID)
+                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                        return
+                }
+        }
+        if os.Getenv("ENV") == "DEV" {
+                if localPath := os.Getenv("LOCAL_DEMOS_PATH"); localPath != "" {
+                        for i, header := range demoFileHeaders {
+                                f, err := header.Open()
+                                if err != nil {
+                                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                                        return
+                                }
+                                defer f.Close()
+                                var objectName string
+                                if i == 0 {
+                                        objectName = hostDemoUUID + ".dem"
+                                } else if i == 1 {
+                                        objectName = partnerDemoUUID + ".dem"
+                                }
+                                demo, err := os.Create(localPath + objectName)
+                                if err != nil {
+                                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                                        return
+                                }
+                                defer demo.Close()
+                                _, err = io.Copy(demo, f)
+                                if err != nil {
+                                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                                        return
+                                }
+                        }
+                        if err = tx.Commit(); err != nil {
+                                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                                return
+                        }
+                        c.JSON(http.StatusOK, models.Response{
+                                Success: true,
+                                Message: "Successfully created record.",
+                                Data:    RecordResponse{ScoreCount: hostDemoScoreCount, ScoreTime: hostDemoScoreTime},
+                        })
+                        return
+                }
+        }
+        // Everything is good, upload the demo files.
+        client, err := b2.NewClient(context.Background(), os.Getenv("B2_KEY_ID"), os.Getenv("B2_API_KEY"))
+        if err != nil {
+                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                return
+        }
+        bucket, err := client.Bucket(context.Background(), os.Getenv("B2_BUCKET_NAME"))
+        if err != nil {
+                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                return
+        }
+        for i, header := range demoFileHeaders {
+                f, err := header.Open()
+                if err != nil {
+                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                        return
+                }
+                defer f.Close()
+                var objectName string
+                if i == 0 {
+                        objectName = hostDemoUUID + ".dem"
+                } else if i == 1 {
+                        objectName = partnerDemoUUID + ".dem"
+                }
+                obj := bucket.Object(objectName)
+                writer := obj.NewWriter(context.Background())
+                defer writer.Close()
+                _, err = io.Copy(writer, f)
+                if err != nil {
                         c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                         return
                 }
@@ -339,91 +378,54 @@ func DownloadDemoWithID(c *gin.Context) {
                 c.JSON(http.StatusOK, models.ErrorResponse("Invalid id given."))
                 return
         }
-        srv, err := drive.New(serviceAccount())
+        var checkedUUID string
+        err := database.DB.QueryRow("SELECT d.id FROM demos d WHERE d.id = $1", uuid).Scan(&checkedUUID)
         if err != nil {
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                c.JSON(http.StatusOK, models.ErrorResponse("Given id does not match a demo."))
                 return
         }
 
-        // Query drive instead of finding location id from db because SOMEONE reuploaded the demos.
-        // Tbf I had to reupload and will have to do time after time. Fuck you Google.
-        // I guess there's no need to store location id of demos anymore?
-        // ALSO ALSO, Google keeps track of old deleted files so sort by createdTime to get the latest demo.
-        fileList, err := srv.Files.List().Q(fmt.Sprintf("name = '%s.dem'", uuid)).
-                Fields("files(id, name, createdTime)").OrderBy("createdTime desc").PageSize(1).Do()
-        if err != nil {
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        if len(fileList.Files) == 0 {
-                c.JSON(http.StatusOK, models.ErrorResponse("Demo not found."))
-                return
+        localPath := ""
+        if os.Getenv("ENV") == "DEV" {
+                localPath = os.Getenv("LOCAL_DEMOS_PATH")
         }
 
-        url := "https://drive.google.com/uc?export=download&id=" + fileList.Files[0].Id
         fileName := uuid + ".dem"
-        output, err := os.Create(fileName)
-        if err != nil {
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        defer os.Remove(fileName)
-        defer output.Close()
-        response, err := http.Get(url)
-        if err != nil {
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        defer response.Body.Close()
-        _, err = io.Copy(output, response.Body)
-        if err != nil {
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
+        if localPath == "" {
+                url := os.Getenv("B2_DOWNLOAD_URL") + fileName
+                output, err := os.Create(fileName)
+                if err != nil {
+                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                        return
+                }
+                defer os.Remove(fileName)
+                defer output.Close()
+                response, err := http.Get(url)
+                if err != nil {
+                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                        return
+                }
+                defer response.Body.Close()
+                _, err = io.Copy(output, response.Body)
+                if err != nil {
+                        c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
+                        return
+                }
         }
+
         // Downloaded file
         c.Header("Content-Description", "File Transfer")
         c.Header("Content-Transfer-Encoding", "binary")
         c.Header("Content-Disposition", "attachment; filename="+fileName)
         c.Header("Content-Type", "application/octet-stream")
-        c.File(fileName)
-        // c.FileAttachment()
-}
 
-// Use Service account
-func serviceAccount() *http.Client {
-        privateKey, _ := base64.StdEncoding.DecodeString(os.Getenv("GOOGLE_PRIVATE_KEY_BASE64"))
-        config := &jwt.Config{
-                Email:      os.Getenv("GOOGLE_CLIENT_EMAIL"),
-                PrivateKey: []byte(privateKey),
-                Scopes: []string{
-                        drive.DriveScope,
-                },
-                TokenURL: google.JWTTokenURL,
-        }
-        client := config.Client(context.Background())
-        return client
-}
-
-// Create Gdrive file
-func createFile(service *drive.Service, name string, mimeType string, content io.Reader, parentId string) (*drive.File, error) {
-        f := &drive.File{
-                MimeType: mimeType,
-                Name:     name,
-                Parents:  []string{parentId},
-        }
-        file, err := service.Files.Create(f).Media(content).Do()
-
-        if err != nil {
-                log.Println("Could not create file: " + err.Error())
-                return nil, err
+        if localPath == "" {
+                c.File(fileName)
+        } else {
+                c.File(localPath + fileName)
         }
 
-        return file, nil
-}
-
-// Delete Gdrive file
-func deleteFile(service *drive.Service, fileId string) {
-        service.Files.Delete(fileId)
+        // c.FileAttachment()
 }
 
 // Convert from SteamID64 to Legacy SteamID bits
diff --git a/backend/handlers/user.go b/backend/handlers/user.go
index 53f0d06..ea31065 100644
--- a/backend/handlers/user.go
+++ b/backend/handlers/user.go
@@ -4,6 +4,7 @@ import (
         "net/http"
         "os"
         "regexp"
+        "sort"
         "time"
 
         "lphub/database"
@@ -183,6 +184,15 @@ func Profile(c *gin.Context) {
                         }
                 }
         }
+        // Sort the overall rankings
+        sort.Slice(rankingsList.Overall, func(i, j int) bool {
+                a := rankingsList.Overall[i]
+                b := rankingsList.Overall[j]
+                if a.TotalScore == b.TotalScore {
+                        return a.User.SteamID < b.User.SteamID
+                }
+                return a.TotalScore < b.TotalScore
+        })
 
         placement := 1
         ties := 0
@@ -507,6 +517,15 @@ func FetchUser(c *gin.Context) {
                         }
                 }
         }
+        // Sort the overall rankings
+        sort.Slice(rankingsList.Overall, func(i, j int) bool {
+                a := rankingsList.Overall[i]
+                b := rankingsList.Overall[j]
+                if a.TotalScore == b.TotalScore {
+                        return a.User.SteamID < b.User.SteamID
+                }
+                return a.TotalScore < b.TotalScore
+        })
 
         placement := 1
         ties := 0