marcorealacci/WASAPhoto
1
0
Fork 0
mirror of https://github.com/notherealmarco/WASAPhoto.git synced 2025-05-05 12:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix query errors

Browse source
This commit is contained in:
Marco Realacci 2022-11-22 22:02:44 +01:00
parent 09adc06e18
commit ebb5c4e6f7
10 changed files with 73 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/api/helpers/get-limits.go
View file

@ -6,7 +6,7 @@ import (
)
const (
DEFAULT_LIMIT = 10 // todo: move to config
DEFAULT_LIMIT = 15 // don't know if should be moved to config
DEFAULT_OFFSET = 0
)

33
service/api/photos.go
View file

@ -15,7 +15,7 @@ import (
func (rt *_router) PostPhoto(w http.ResponseWriter, r *http.Request, ps httprouter.Params, ctx reqcontext.RequestContext) {
defer r.Body.Close()
//defer r.Body.Close()
uid := ps.ByName("user_id")
@ -70,14 +70,35 @@ func (rt *_router) PostPhoto(w http.ResponseWriter, r *http.Request, ps httprout
func (rt *_router) GetPhoto(w http.ResponseWriter, r *http.Request, ps httprouter.Params, ctx reqcontext.RequestContext) {
uid := ps.ByName("user_id")
photo_id := ps.ByName("photo_id")
if !helpers.VerifyUserOrNotFound(rt.db, uid, w, rt.baseLogger) {
if !authorization.SendErrorIfNotLoggedIn(ctx.Auth.Authorized, rt.db, w, rt.baseLogger) {
// We want the user to be authenticated
return
}
path := rt.dataPath + "/photos/" + uid + "/" + photo_id + ".jpg"
uid := ps.ByName("user_id")
photo_id_str := ps.ByName("photo_id")
photo_id, err := strconv.ParseInt(photo_id_str, 10, 64)
if err != nil {
helpers.SendBadRequest(w, "Invalid photo id", rt.baseLogger)
return
}
// This is also checking if the requesting user is banned by the author of the photo
exists, err := rt.db.PhotoExists(uid, photo_id, ctx.Auth.GetUserID())
if err != nil {
helpers.SendInternalError(err, "Database error: PhotoExists", w, rt.baseLogger)
return
}
if !exists {
helpers.SendNotFound(w, "Resource not found", rt.baseLogger)
return
}
path := rt.dataPath + "/photos/" + uid + "/" + photo_id_str + ".jpg"
file, err := os.Open(path)