Address PR feedback: Make status sync opt-in and fix issues

- Add EnableStatusSync config option (opt-in, default: false)
- Check if GitHub status is already busy before overwriting
- Clear stored GitHub status from KV store on account disconnect
- Fix misleading post type name (remove "ephemeral")
- Add error wrapping for better traceability in GraphQL client
- Format code with gofmt

Addresses feedback from reviewers:
- System-wide opt-in configuration
- Respects manually set GitHub OOO statuses
- Proper cleanup on disconnect
- Improved error messages

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: Akshat Khosya

plugin.json

@@ -134,6 +134,13 @@
                 "type": "bool",
                 "help_text": "When set to 'true' you will get a notification with less details when a draft pull request is created and a notification with complete details when they are marked as ready for review. When set to 'false' no notifications are delivered for draft pull requests.",
                 "default": false
+            },
+            {
+                "key": "EnableStatusSync",
+                "display_name": "Enable Status Synchronization:",
+                "type": "bool",
+                "help_text": "(Optional) When enabled, users can opt-in to automatically sync their Mattermost 'Out of Office' status to GitHub. When a user sets their status to OOO in Mattermost, their GitHub status will be updated to 'Out of office' with busy indicator. The status is restored when they return. The feature respects manually set GitHub statuses and will not overwrite them.",
+                "default": false
             }
         ],
         "footer": "* To report an issue, make a suggestion or a contribution, [check the repository](https://github.com/mattermost/mattermost-plugin-github)."

server/plugin/configuration.go

@@ -43,6 +43,7 @@ type Configuration struct {
 	UsePreregisteredApplication    bool   `json:"usepreregisteredapplication"`
 	ShowAuthorInCommitNotification bool   `json:"showauthorincommitnotification"`
 	GetNotificationForDraftPRs     bool   `json:"getnotificationfordraftprs"`
+	EnableStatusSync               bool   `json:"enablestatussync"`
 }
 
 func (c *Configuration) ToMap() (map[string]interface{}, error) {

server/plugin/graphql/client.go

@@ -77,14 +77,14 @@ type changeUserStatusMutation struct {
 func (c *Client) UpdateUserStatus(ctx context.Context, emoji, message string, busy bool) (string, error) {
 	var mutation changeUserStatusMutation
 	input := githubv4.ChangeUserStatusInput{
-		Emoji:   githubv4.NewString(githubv4.String(emoji)),
-		Message: githubv4.NewString(githubv4.String(message)),
+		Emoji:               githubv4.NewString(githubv4.String(emoji)),
+		Message:             githubv4.NewString(githubv4.String(message)),
 		LimitedAvailability: githubv4.NewBoolean(githubv4.Boolean(busy)),
 	}
 
 	err := c.client.Mutate(ctx, &mutation, input, nil)
 	if err != nil {
-		return "", err
+		return "", errors.Wrap(err, "UpdateUserStatus mutate failed")
 	}
 
 	return string(mutation.ChangeUserStatus.Status.Message), nil
@@ -108,7 +108,7 @@ func (c *Client) GetUserStatus(ctx context.Context, login string) (string, strin
 
 	err := c.client.Query(ctx, &query, variables)
 	if err != nil {
-		return "", "", false, err
+		return "", "", false, errors.Wrap(err, "GetUserStatus query failed")
 	}
 
 	return string(query.User.Status.Message), string(query.User.Status.Emoji), bool(query.User.Status.LimitedAvailability), nil

server/plugin/plugin.go

@@ -717,6 +717,10 @@ func (p *Plugin) disconnectGitHubAccount(userID string) {
 		p.client.Log.Warn("Failed to delete github token from KV store", "userID", userID, "error", err.Error())
 	}
 
+	if err := p.store.Delete(userID + "_github_status"); err != nil {
+		p.client.Log.Warn("Failed to delete github status from KV store", "userID", userID, "error", err.Error())
+	}
+
 	user, err := p.client.User.Get(userID)
 	if err != nil {
 		p.client.Log.Warn("Failed to get user props", "userID", userID, "error", err.Error())
@@ -1200,6 +1204,12 @@ func (p *Plugin) handleRevokedToken(info *GitHubUserInfo) {
 }
 
 func (p *Plugin) UserStatusHasChanged(c *plugin.Context, userStatus *model.Status) {
+	// Check if status sync is enabled in configuration
+	config := p.getConfiguration()
+	if !config.EnableStatusSync {
+		return
+	}
+
 	userInfo, apiErr := p.getGitHubUserInfo(userStatus.UserId)
 	if apiErr != nil {
 		return
@@ -1213,6 +1223,12 @@ func (p *Plugin) UserStatusHasChanged(c *plugin.Context, userStatus *model.Statu
 			return
 		}
 
+		// Don't overwrite if GitHub status is already set to "out of office" (busy)
+		if busy {
+			p.client.Log.Debug("GitHub status is already set to busy/OOO, skipping update")
+			return
+		}
+
 		githubStatus := &GithubStatus{
 			Message: message,
 			Emoji:   emoji,
@@ -1233,7 +1249,7 @@ func (p *Plugin) UserStatusHasChanged(c *plugin.Context, userStatus *model.Statu
 			return
 		}
 
-		p.CreateBotDMPost(userInfo.UserID, "Your GitHub status has been updated to Out of office.", "custom_git_ooo_ephemeral")
+		p.CreateBotDMPost(userInfo.UserID, "Your GitHub status has been updated to Out of office.", "custom_git_status_sync")
 	} else {
 		var oldStatus []byte
 		if err := p.store.Get(userInfo.UserID+"_github_status", &oldStatus); err == nil && len(oldStatus) > 0 {
@@ -1250,7 +1266,7 @@ func (p *Plugin) UserStatusHasChanged(c *plugin.Context, userStatus *model.Statu
 				return
 			}
 			p.store.Delete(userInfo.UserID + "_github_status")
-			p.CreateBotDMPost(userInfo.UserID, "Your GitHub status has been restored.", "custom_git_ooo_ephemeral")
+			p.CreateBotDMPost(userInfo.UserID, "Your GitHub status has been restored.", "custom_git_status_sync")
 		}
 	}
 }