Revert "fix: resolve "Course data can't be loaded" on 3DS Recommended Courses (#21)"
Some checks failed
Build and Publish Docker Image / Build and Publish Docker Image (amd64) (push) Has been cancelled
Build and Publish Docker Image / Build and Publish Docker Image (arm64) (push) Has been cancelled

This reverts commit 12deaca1cf.
This commit is contained in:
William Oldham
2026-03-22 22:15:58 +00:00
parent 7db08c6a6c
commit 85673ae9f8
2 changed files with 11 additions and 13 deletions

View File

@@ -1,6 +1,7 @@
package datastore_smm_db
import (
"database/sql"
"time"
"github.com/PretendoNetwork/nex-go/v2"
@@ -34,22 +35,26 @@ func GetRandomCoursesWithLimit(limit int) (types.List[datastore_super_mario_make
object.tags,
object.creation_date,
object.update_date,
COALESCE(ranking.value, 0)
ranking.value
FROM datastore.objects object
LEFT JOIN datastore.object_custom_rankings ranking
JOIN datastore.object_custom_rankings ranking
ON
object.data_id = ranking.data_id AND
ranking.application_id = 0
WHERE
object.upload_completed = TRUE AND
object.deleted = FALSE AND
object.under_review = FALSE
object.under_review = FALSE AND
ranking.application_id = 0
ORDER BY RANDOM()
LIMIT $1
`, limit)
if err != nil {
if err == sql.ErrNoRows {
return nil, nex.NewError(nex.ResultCodes.DataStore.NotFound, "Object not found")
}
globals.Logger.Error(err.Error())
// TODO - Send more specific errors?
return nil, nex.NewError(nex.ResultCodes.DataStore.Unknown, err.Error())
}

View File

@@ -30,14 +30,7 @@ func CTRPickUpCourseSearchObject(err error, packet nex.PacketInterface, callID u
// TODO - Research extraData
// TODO - Use the offet? Real client never uses it, but might be nice for completeness sake?
length := int(param.ResultRange.Length)
maxLength := 25
if length <= 0 || length > maxLength {
globals.Logger.Warningf("Limiting request to %d courses (was %d)", maxLength, length)
length = maxLength
}
pRankingResults, nexError := datastore_smm_db.GetRandomCoursesWithLimit(length)
pRankingResults, nexError := datastore_smm_db.GetRandomCoursesWithLimit(int(param.ResultRange.Length))
if nexError != nil {
return nil, nexError
}