diff --git a/packages/globals/globals.go b/packages/globals/globals.go index 7501453..7f8b626 100644 --- a/packages/globals/globals.go +++ b/packages/globals/globals.go @@ -3,7 +3,11 @@ package globals import "time" const ( - MaxDirectMsgCache uint32 = 12 - FileStorageBucketName string = "communicator" - FileDownloadLinkTtl time.Duration = 24 * time.Hour + MaxDirectMsgCache uint32 = 12 + FileStorageBucketName string = "communicator" + MaxPostBytes uint32 = 4 << 10 + MaxPostWithFileBytes uint32 = 1 << 30 + FileProcessingPartSize uint64 = 24 << 10 + FileProcessingThreads uint = 3 + FileDownloadLinkTtl time.Duration = 24 * time.Hour ) diff --git a/packages/http/helper.go b/packages/http/helper.go index f0de069..3101a6d 100644 --- a/packages/http/helper.go +++ b/packages/http/helper.go @@ -4,7 +4,7 @@ import ( "net/http" ) -func requestValidCheck(response *http.ResponseWriter, request *http.Request) bool { +func postValidCheckWithResponseOnFail(response *http.ResponseWriter, request *http.Request) bool { if request.Method != http.MethodPost { http.Error(*response, "POST only", http.StatusMethodNotAllowed) return false diff --git a/packages/http/httpConnectionAndDm.go b/packages/http/httpConnectionAndDm.go index ce98fa6..4e7ccac 100644 --- a/packages/http/httpConnectionAndDm.go +++ b/packages/http/httpConnectionAndDm.go @@ -20,7 +20,7 @@ import ( ) func HandleDm(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } @@ -86,7 +86,7 @@ func HandleDm(response http.ResponseWriter, request *http.Request) { } func HandleUserGetConnectionMessages(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } ctx := request.Context() @@ -162,7 +162,7 @@ func HandleUserGetConnectionMessages(response http.ResponseWriter, request *http } func HandleUserNewConnection(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } ctx := request.Context() @@ -221,7 +221,7 @@ func HandleUserNewConnection(response http.ResponseWriter, request *http.Request } func HandleUserDeleteConnection(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } ctx := request.Context() @@ -280,7 +280,7 @@ func HandleUserDeleteConnection(response http.ResponseWriter, request *http.Requ } func HandleUserElevateConnection(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } ctx := request.Context() @@ -349,7 +349,7 @@ func HandleUserElevateConnection(response http.ResponseWriter, request *http.Req } func HandleUserGetConnections(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } ctx := request.Context() diff --git a/packages/http/httpUser.go b/packages/http/httpUser.go index ec1db10..f9302c0 100644 --- a/packages/http/httpUser.go +++ b/packages/http/httpUser.go @@ -16,7 +16,7 @@ import ( ) func HandleUserNewToken(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } @@ -75,7 +75,7 @@ func HandleUserNewToken(response http.ResponseWriter, request *http.Request) { } func HandleUserNew(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } @@ -116,7 +116,7 @@ func HandleUserNew(response http.ResponseWriter, request *http.Request) { } func HandleUserDelete(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } ctx := request.Context() @@ -139,7 +139,7 @@ func HandleUserDelete(response http.ResponseWriter, request *http.Request) { // HandleUserModifyAppearance currently just color func HandleUserModifyAppearance(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } @@ -166,7 +166,7 @@ func HandleUserModifyAppearance(response http.ResponseWriter, request *http.Requ // HandleUserModifyAbout currently just pronouns func HandleUserModifyAbout(response http.ResponseWriter, request *http.Request) { - if !requestValidCheck(&response, request) { + if !postValidCheckWithResponseOnFail(&response, request) { return } diff --git a/packages/minio/minio.go b/packages/minio/minio.go index 3844620..028f1f8 100644 --- a/packages/minio/minio.go +++ b/packages/minio/minio.go @@ -68,6 +68,8 @@ func upload(ctx context.Context, key string, body io.Reader, size int64, content _, err := minClient.PutObject(ctx, globals.FileStorageBucketName, key, body, size, minio.PutObjectOptions{ ContentType: contentType, + PartSize: globals.FileProcessingPartSize, + NumThreads: globals.FileProcessingThreads, }) return err }