Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup dead code #12929

Merged
merged 4 commits into from
Oct 28, 2019
Merged

Cleanup dead code #12929

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c893d20
Cleanup dead code
hanzei Oct 25, 2019
3cc1c94
Remove unneeded translation string
hanzei Oct 25, 2019
55fa6a9
Merge remote-tracking branch 'origin/master' into deadcode
hanzei Oct 28, 2019
0b64f4b
Merge remote-tracking branch 'origin/master' into deadcode
hanzei Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
86 changes: 0 additions & 86 deletions api4/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,92 +65,6 @@ func (api *API) InitFile() {

}

func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got replaced by uploadFileStream

defer io.Copy(ioutil.Discard, r.Body)

if !*c.App.Config().FileSettings.EnableFileAttachments {
c.Err = model.NewAppError("uploadFile", "api.file.attachments.disabled.app_error", nil, "", http.StatusNotImplemented)
return
}

if r.ContentLength > *c.App.Config().FileSettings.MaxFileSize {
c.Err = model.NewAppError("uploadFile", "api.file.upload_file.too_large.app_error", nil, "", http.StatusRequestEntityTooLarge)
return
}

now := time.Now()
var resStruct *model.FileUploadResponse
var appErr *model.AppError

if err := r.ParseMultipartForm(*c.App.Config().FileSettings.MaxFileSize); err != nil && err != http.ErrNotMultipart {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
} else if err == http.ErrNotMultipart {
defer r.Body.Close()

c.RequireChannelId()
c.RequireFilename()

if c.Err != nil {
return
}

channelId := c.Params.ChannelId
filename := c.Params.Filename

if !c.App.SessionHasPermissionToChannel(c.App.Session, channelId, model.PERMISSION_UPLOAD_FILE) {
c.SetPermissionError(model.PERMISSION_UPLOAD_FILE)
return
}

resStruct, appErr = c.App.UploadFiles(
FILE_TEAM_ID,
channelId,
c.App.Session.UserId,
[]io.ReadCloser{r.Body},
[]string{filename},
[]string{},
now,
)
} else {
m := r.MultipartForm

props := m.Value
if len(props["channel_id"]) == 0 {
c.SetInvalidParam("channel_id")
return
}
channelId := props["channel_id"][0]
c.Params.ChannelId = channelId
c.RequireChannelId()
if c.Err != nil {
return
}

if !c.App.SessionHasPermissionToChannel(c.App.Session, channelId, model.PERMISSION_UPLOAD_FILE) {
c.SetPermissionError(model.PERMISSION_UPLOAD_FILE)
return
}

resStruct, appErr = c.App.UploadMultipartFiles(
FILE_TEAM_ID,
channelId,
c.App.Session.UserId,
m.File["files"],
m.Value["client_ids"],
now,
)
}

if appErr != nil {
c.Err = appErr
return
}

w.WriteHeader(http.StatusCreated)
w.Write([]byte(resStruct.ToJson()))
}

func parseMultipartRequestHeader(req *http.Request) (boundary string, err error) {
v := req.Header.Get("Content-Type")
if v == "" {
Expand Down
4 changes: 0 additions & 4 deletions config/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,3 @@ func sToP(s string) *string {
func bToP(b bool) *bool {
return &b
}

func iToP(i int) *int {
return &i
}