Merge pull request #183 from iszcz/patch-1

清除mj prompt里的--mode

constant/midjourney.go

@@ -2,6 +2,8 @@ package constant
 
 
 var MjNotifyEnabled = false
 var MjNotifyEnabled = false
 
 
+var MjModeClearEnabled = false
+
 const (
 const (
 	MjErrorUnknown = 5
 	MjErrorUnknown = 5
 	MjRequestError = 4
 	MjRequestError = 4

model/option.go

@@ -92,6 +92,7 @@ func InitOptionMap() {
 	common.OptionMap["DataExportDefaultTime"] = common.DataExportDefaultTime
 	common.OptionMap["DataExportDefaultTime"] = common.DataExportDefaultTime
 	common.OptionMap["DefaultCollapseSidebar"] = strconv.FormatBool(common.DefaultCollapseSidebar)
 	common.OptionMap["DefaultCollapseSidebar"] = strconv.FormatBool(common.DefaultCollapseSidebar)
 	common.OptionMap["MjNotifyEnabled"] = strconv.FormatBool(constant.MjNotifyEnabled)
 	common.OptionMap["MjNotifyEnabled"] = strconv.FormatBool(constant.MjNotifyEnabled)
+	common.OptionMap["MjModeClearEnabled"] = strconv.FormatBool(constant.MjModeClearEnabled)
 	common.OptionMap["CheckSensitiveEnabled"] = strconv.FormatBool(constant.CheckSensitiveEnabled)
 	common.OptionMap["CheckSensitiveEnabled"] = strconv.FormatBool(constant.CheckSensitiveEnabled)
 	common.OptionMap["CheckSensitiveOnPromptEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnPromptEnabled)
 	common.OptionMap["CheckSensitiveOnPromptEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnPromptEnabled)
 	//common.OptionMap["CheckSensitiveOnCompletionEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnCompletionEnabled)
 	//common.OptionMap["CheckSensitiveOnCompletionEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnCompletionEnabled)
@@ -195,6 +196,8 @@ func updateOptionMap(key string, value string) (err error) {
 			common.DefaultCollapseSidebar = boolValue
 			common.DefaultCollapseSidebar = boolValue
 		case "MjNotifyEnabled":
 		case "MjNotifyEnabled":
 			constant.MjNotifyEnabled = boolValue
 			constant.MjNotifyEnabled = boolValue
+		case "MjModeClearEnabled":
+			constant.MjModeClearEnabled = boolValue
 		case "CheckSensitiveEnabled":
 		case "CheckSensitiveEnabled":
 			constant.CheckSensitiveEnabled = boolValue
 			constant.CheckSensitiveEnabled = boolValue
 		case "CheckSensitiveOnPromptEnabled":
 		case "CheckSensitiveOnPromptEnabled":

service/midjourney.go

@@ -172,6 +172,15 @@ func DoMidjourneyHttpRequest(c *gin.Context, timeout time.Duration, fullRequestU
 		//req, err := http.NewRequest(c.Request.Method, fullRequestURL, requestBody)
 		//req, err := http.NewRequest(c.Request.Method, fullRequestURL, requestBody)
 		// make new request with mapResult
 		// make new request with mapResult
 	}
 	}
+	if constant.MjModeClearEnabled {
+		if prompt, ok := mapResult["prompt"].(string); ok {
+		    prompt = strings.Replace(prompt, "--fast", "", -1)
+		    prompt = strings.Replace(prompt, "--relax", "", -1)
+		    prompt = strings.Replace(prompt, "--turbo", "", -1)
+		    
+		    mapResult["prompt"] = prompt
+		}
+	}
 	reqBody, err := json.Marshal(mapResult)
 	reqBody, err := json.Marshal(mapResult)
 	if err != nil {
 	if err != nil {
 		return MidjourneyErrorWithStatusCodeWrapper(constant.MjErrorUnknown, "marshal_request_body_failed", http.StatusInternalServerError), nullBytes, err
 		return MidjourneyErrorWithStatusCodeWrapper(constant.MjErrorUnknown, "marshal_request_body_failed", http.StatusInternalServerError), nullBytes, err

web/src/components/OperationSetting.js

@@ -36,6 +36,7 @@ const OperationSetting = () => {
     StopOnSensitiveEnabled: '',
     StopOnSensitiveEnabled: '',
     SensitiveWords: '',
     SensitiveWords: '',
     MjNotifyEnabled: '',
     MjNotifyEnabled: '',
+    MjModeClearEnabled: '',
     DrawingEnabled: '',
     DrawingEnabled: '',
     DataExportEnabled: '',
     DataExportEnabled: '',
     DataExportDefaultTime: 'hour',
     DataExportDefaultTime: 'hour',
@@ -312,6 +313,12 @@ const OperationSetting = () => {
               name='MjNotifyEnabled'
               name='MjNotifyEnabled'
               onChange={handleInputChange}
               onChange={handleInputChange}
             />
             />
+            <Form.Checkbox
+              checked={inputs.MjModeClearEnabled === 'true'}
+              label='开启之后会清除用户提示词中的--fast、--relax以及--turbo参数'
+              name='MjModeClearEnabled'
+              onChange={handleInputChange}
+            />
           </Form.Group>
           </Form.Group>
           <Divider />
           <Divider />
           <Header as='h3'>屏蔽词过滤设置</Header>
           <Header as='h3'>屏蔽词过滤设置</Header>