Merge pull request #2303 from mkmccarty/mm-branch-1

✨ fix: include eeid & improve misc settings dump

Author: mkmccarty

main.go

@@ -145,6 +145,11 @@ func init() {
 	// Load status messages
 	ei.LoadStatusMessages(statusMessagesFileName)
 
+	// Wire the coop status fix check to avoid import cycle in ei package
+	ei.CoopStatusFixEnabled = func() bool {
+		return guildstate.GetGuildSettingString("DEFAULT", "coop_status_fix") == "1"
+	}
+
 	// Read application parameters
 	flag.Parse()
 

src/boost/contract_report.go

@@ -452,7 +452,7 @@ func ContractReport(
 
 	// Get coop status; validate response
 	// Using GetCoopStatusForCompletedContracts to ensure we cache completed contract data locally
-	coopStatus, nowTime, _, err := ei.GetCoopStatusForCompletedContracts(contractID, coopID)
+	coopStatus, nowTime, _, err := ei.GetCoopStatusForCompletedContracts(contractID, coopID, "")
 	if err != nil {
 		return fmt.Errorf("%w: %v", ErrCoopStatusFetch, err)
 	}

src/boost/replay.go

@@ -281,6 +281,7 @@ func printArchivedContracts(userID string, archive []*ei.LocalContract, percent
 	var components []discordgo.MessageComponent
 	tvalFooterMessage := false
 	eiUserName := farmerstate.GetMiscSettingString(userID, "ei_ign")
+	eiID := farmerstate.GetMiscSettingString(userID, "encrypted_ei_id")
 	divider := true
 	spacing := discordgo.SeparatorSpacingSizeSmall
 	builder := strings.Builder{}
@@ -425,7 +426,7 @@ func printArchivedContracts(userID string, archive []*ei.LocalContract, percent
 
 				log.Printf("Evaluating contract %s coop %s for user %s\n", contractID, coopID, eiUserName)
 				if coopID != "[solo]" {
-					coopStatus, _, _, err := ei.GetCoopStatusForCompletedContracts(contractID, a.GetCoopIdentifier())
+					coopStatus, _, _, err := ei.GetCoopStatusForCompletedContracts(contractID, a.GetCoopIdentifier(), eiID)
 					if err == nil {
 						builder.Reset()
 						for _, c := range coopStatus.GetContributors() {

src/boost/stones.go

@@ -251,7 +251,7 @@ func DownloadCoopStatusStones(contractID string, coopID string, details bool, so
 	var builderURL strings.Builder
 	var field []*discordgo.MessageEmbedField
 
-	coopStatus, _, dataTimestampStr, err := ei.GetCoopStatus(contractID, coopID)
+	coopStatus, _, dataTimestampStr, err := ei.GetCoopStatus(contractID, coopID, "")
 	if err != nil {
 		return err.Error(), "", field
 	}

src/boost/teamwork.go

@@ -275,7 +275,7 @@ func DownloadCoopStatusTeamwork(contractID string, coopID string, setContractEst
 		return fmt.Sprintf("Filenames:\n%s", strings.Join(fileNames, "\n")), nil, ContractScore{}
 	}
 
-	coopStatus, nowTime, dataTimestampStr, err := ei.GetCoopStatus(contractID, coopID)
+	coopStatus, nowTime, dataTimestampStr, err := ei.GetCoopStatus(contractID, coopID, "")
 	if err != nil {
 		return err.Error(), nil, ContractScore{}
 	}

src/ei/coop_status.go

@@ -30,16 +30,25 @@ type eiData struct {
 var (
 	// Contracts is a map of contracts and is saved to disk
 	eiDatas map[string]*eiData
+
+	// CoopStatusFixEnabled is a callback set from outside the ei package (to avoid import
+	// cycles) that returns true when the alternate coop_status endpoint and eeid override
+	// should be used. It is wired up in main.
+	CoopStatusFixEnabled func() bool
 )
 
 func init() {
 	eiDatas = make(map[string]*eiData)
 }
 
 // GetCoopStatus retrieves the coop status for a given contract and coop
-func GetCoopStatus(contractID string, coopID string) (*ContractCoopStatusResponse, time.Time, string, error) {
+func GetCoopStatus(contractID string, coopID string, eeidOverride string) (*ContractCoopStatusResponse, time.Time, string, error) {
 	eggIncID := config.EIUserIDBasic
 	reqURL := "https://www.auxbrain.com/ei/coop_status_bot"
+	if eeidOverride != "" && CoopStatusFixEnabled != nil && CoopStatusFixEnabled() {
+		eggIncID = DecryptEID(eeidOverride)
+		reqURL = "https://www.auxbrain.com/ei/coop_status"
+	}
 	enc := base64.StdEncoding
 	timestamp := time.Now()
 
@@ -205,9 +214,13 @@ func ClearCoopStatusCachedData() {
 
 // GetCoopStatusForCompletedContracts retrieves the coop status for a given contract and coop, but is intended for completed contracts
 // This saves the data in compressed form without a timestamp in the filename
-func GetCoopStatusForCompletedContracts(contractID string, coopID string) (*ContractCoopStatusResponse, time.Time, string, error) {
+func GetCoopStatusForCompletedContracts(contractID string, coopID string, eeidOverride string) (*ContractCoopStatusResponse, time.Time, string, error) {
 	eggIncID := config.EIUserIDBasic
 	reqURL := "https://www.auxbrain.com/ei/coop_status_bot"
+	if eeidOverride != "" && CoopStatusFixEnabled != nil && CoopStatusFixEnabled() {
+		eggIncID = DecryptEID(eeidOverride)
+		reqURL = "https://www.auxbrain.com/ei/coop_status"
+	}
 	enc := base64.StdEncoding
 	timestamp := time.Now()
 

src/guildstate/slashcmd.go

@@ -312,21 +312,19 @@ func GetGuildSettingsForGuild(s *discordgo.Session, i *discordgo.InteractionCrea
 		for _, key := range keys {
 			value := guild.MiscSettingsString[key]
 			items := splitCSV(value)
+			fmt.Fprintf(&builder, "- %s = %s\n", key, value)
 			if len(items) > 1 {
-				fmt.Fprintf(&builder, "- %s (%d items)\n", key, len(items))
+				fmt.Fprintf(&builder, "  - parsed items (%d):\n", len(items))
 				for _, item := range items {
-					details := getSnowflakeDetails(s, guildID, item)
-					if len(details) == 1 {
-						fmt.Fprintf(&builder, "  - %s\n", details[0])
-					} else {
-						fmt.Fprintf(&builder, "  - %s\n", item)
+					fmt.Fprintf(&builder, "    - %s\n", item)
+					for _, detail := range getSnowflakeDetails(s, guildID, item) {
+						fmt.Fprintf(&builder, "      - resolved: %s\n", detail)
 					}
 				}
-			} else {
-				fmt.Fprintf(&builder, "- %s = %s\n", key, value)
-				for _, detail := range getSnowflakeDetails(s, guildID, value) {
-					fmt.Fprintf(&builder, "  - resolved: %s\n", detail)
-				}
+				continue
+			}
+			for _, detail := range getSnowflakeDetails(s, guildID, value) {
+				fmt.Fprintf(&builder, "  - resolved: %s\n", detail)
 			}
 		}
 	}

src/track/track_update.go

@@ -68,7 +68,7 @@ func DownloadCoopStatusTracker(contractID string, coopID string) (time.Time, flo
 		return time.Time{}, 0, fmt.Errorf("invalid contract ID")
 	}
 
-	coopStatus, _, _, err := ei.GetCoopStatus(contractID, coopID)
+	coopStatus, _, _, err := ei.GetCoopStatus(contractID, coopID, "")
 	if err != nil {
 		return time.Time{}, 0, err
 	}