[GH-129] MS Graph error is shown when selecting acceptance (#138)

* Change HasPrefix for Contains * Use helpers functions Co-authored-by: Ben Schumacher <[email protected]>
mattermost · May 28, 2020 · 8e4fd89 · 8e4fd89
1 parent 95ad6b1
commit 8e4fd89
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/server/api/post_action.go b/server/api/post_action.go
@@ -86,7 +86,7 @@ func (api *api) postActionRespond(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 	err := calendar.RespondToEvent(user, eventID, option)
-	if err != nil && !strings.HasPrefix(err.Error(), "202") && !strings.HasPrefix(err.Error(), "404") {
+	if err != nil && !isAcceptedError(err) && !isNotFoundError(err) {
 		utils.SlackAttachmentError(w, "Error: Failed to respond to event: "+err.Error())
 		return
 	}
@@ -105,7 +105,7 @@ func (api *api) postActionRespond(w http.ResponseWriter, req *http.Request) {
 
 	sa := sas[0]
 
-	if err == nil || strings.HasPrefix(err.Error(), "202") {
+	if err == nil || isAcceptedError(err) {
 		sa.Fields = append(sa.Fields, &model.SlackAttachmentField{
 			Title: "Response",
 			Value: fmt.Sprintf("You have %s this event", prettyOption(option)),
@@ -119,7 +119,7 @@ func (api *api) postActionRespond(w http.ResponseWriter, req *http.Request) {
 
 	postResponse.Update = p
 
-	if err != nil && strings.HasPrefix(err.Error(), "404") {
+	if err != nil && isNotFoundError(err) {
 		postResponse.EphemeralText = "Event has changed since this message. Please change your status directly on MS Calendar."
 	}
 	w.Header().Set("Content-Type", "application/json")
@@ -229,3 +229,11 @@ func getEventInfo(ctx map[string]interface{}) (string, error) {
 
 	return views.RenderEventWillStartLine(subject, weblink, startTime), nil
 }
+
+func isAcceptedError(err error) bool {
+	return strings.Contains(err.Error(), "202 Accepted")
+}
+
+func isNotFoundError(err error) bool {
+	return strings.Contains(err.Error(), "404 Not Found")
+}