Skip to content

Let's use AI to Earn!

feat: 添加 Instagram 图文 4:5 图片警告 Add an Instagram image 4:5 warning

gaoSir02b22f63c11a
diff --git a/@types/resources.d.ts b/@types/resources.d.ts
index 71d78811..4c314db9 100644
--- a/@types/resources.d.ts
+++ b/@types/resources.d.ts
@@ -2044,7 +2044,6 @@ interface Resources {
"titleMaxExceeded": "{{platformName}}标题最多{{maxCount}}字",
"descriptionMaxExceeded": "{{platformName}}描述最多{{maxCount}}字",
"descriptionRequired": "描述是必须的",
- "imageMaxExceeded": "图片上传数量不能大于{{maxCount}}",
"uploadImageOrVideo": "请上传图片或视频",
"uploadImage": "请上传图片",
"uploadVideo": "请上传视频",
@@ -2061,7 +2060,9 @@ interface Resources {
"videoOnly": "已有视频,仅可继续上传视频,不能上传图片!",
"imageVideoMixed": "图片和视频不能混合上传!",
"onlyImageOrVideo": "只能上传图片或视频文件!",
- "videoMaxExceeded": "视频上传数量不能大于{{maxCount}}"
+ "videoMaxExceeded": "视频上传数量不能大于{{maxCount}}",
+ "imageMaxExceeded": "图片上传数量不能大于{{maxCount}}",
+ "instagramImageValidation": "在 Instagram 网格和动态中获得最佳效果,建议上传 4:5 比例的图片。"
},
"preview": {
"title": "预览",
diff --git a/src/app/i18n/locales/en/publish.json b/src/app/i18n/locales/en/publish.json
index a4ddadbd..87f7ebbe 100644
--- a/src/app/i18n/locales/en/publish.json
+++ b/src/app/i18n/locales/en/publish.json
@@ -89,7 +89,7 @@
"imageVideoMixed": "Images and videos cannot be uploaded together!",
"onlyImageOrVideo": "Only image or video files can be uploaded!",
"videoMaxExceeded": "The number of videos uploaded cannot exceed {{maxCount}}",
- "imageMaxExceeded": "The number of images uploaded cannot exceed {{maxCount}}"
+ "instagramImageValidation": "For best results on your Instagram Grid and Feed, we recommend uploading images with a 4:5 aspect ratio."
},
"preview": {
"title": "Preview",
diff --git a/src/app/i18n/locales/zh-CN/publish.json b/src/app/i18n/locales/zh-CN/publish.json
index daf97654..59537fe4 100644
--- a/src/app/i18n/locales/zh-CN/publish.json
+++ b/src/app/i18n/locales/zh-CN/publish.json
@@ -72,7 +72,6 @@
"titleMaxExceeded": "{{platformName}}标题最多{{maxCount}}字",
"descriptionMaxExceeded": "{{platformName}}描述最多{{maxCount}}字",
"descriptionRequired": "描述是必须的",
- "imageMaxExceeded": "{{platformName}}图片最多不能超过{{maxCount}}张",
"uploadImageOrVideo": "请上传图片或视频",
"uploadImage": "请上传图片",
"uploadVideo": "请上传视频",
@@ -90,7 +89,8 @@
"imageVideoMixed": "图片和视频不能混合上传!",
"onlyImageOrVideo": "只能上传图片或视频文件!",
"videoMaxExceeded": "视频上传数量不能大于{{maxCount}}",
- "imageMaxExceeded": "图片上传数量不能大于{{maxCount}}"
+ "imageMaxExceeded": "图片上传数量不能大于{{maxCount}}",
+ "instagramImageValidation": "在 Instagram 网格和动态中获得最佳效果,建议上传 4:5 比例的图片。"
},
"preview": {
"title": "预览",
diff --git a/src/components/ImageEditorModal/index.tsx b/src/components/ImageEditorModal/index.tsx
index 5fbacda0..af8f7dcc 100644
--- a/src/components/ImageEditorModal/index.tsx
+++ b/src/components/ImageEditorModal/index.tsx
@@ -37,6 +37,7 @@ const ImageEditorModal = memo(
) => {
const lng = useGetClientLng();
const { t } = useTransClient("imageEditor");
+ const account = useTransClient("account");
const imageEditorRef = useRef<any>();
const [uploadLoading, setUploadLoading] = useState(false);
const isInit = useRef(false);
@@ -113,7 +114,7 @@ const ImageEditorModal = memo(
footer={
<>
<Button size="large" onClick={onCancel}>
- 取消
+ {account.t("deleteConfirm.cancel")}
</Button>
<Button
type="primary"
@@ -137,9 +138,10 @@ const ImageEditorModal = memo(
image["ossUrl"] = `${OSS_URL}${uploadCoverRes}`;
setUploadLoading(false);
onOk(image);
+ onCancel();
}}
>
- 保存
+ {account.t("createSpace.cancel")}
</Button>
</>
}
diff --git a/src/components/PublishDialog/PublishDialog.util.ts b/src/components/PublishDialog/PublishDialog.util.ts
index 3d3333a5..985a5bf3 100644
--- a/src/components/PublishDialog/PublishDialog.util.ts
+++ b/src/components/PublishDialog/PublishDialog.util.ts
@@ -108,3 +108,21 @@ export const formatImg = async ({
img.src = imgUrl;
});
};
+
+/**
+ * 判断宽高是否属于指定比例(带缓冲阈值)
+ * @param width 宽
+ * @param height 高
+ * @param ratio 目标比例(宽/高)
+ * @param threshold 缓冲阈值,默认0.02
+ */
+export function isAspectRatioMatch(
+ width: number,
+ height: number,
+ ratio: number,
+ threshold: number = 0.02,
+): boolean {
+ if (height === 0) return false;
+ const actualRatio = width / height;
+ return Math.abs(actualRatio - ratio) <= threshold;
+}
diff --git a/src/components/PublishDialog/compoents/PlatParamsSetting/hooks/usePlatParamsCoomon.tsx b/src/components/PublishDialog/compoents/PlatParamsSetting/hooks/usePlatParamsCoomon.tsx
index 7941e81f..8b33d01f 100644
--- a/src/components/PublishDialog/compoents/PlatParamsSetting/hooks/usePlatParamsCoomon.tsx
+++ b/src/components/PublishDialog/compoents/PlatParamsSetting/hooks/usePlatParamsCoomon.tsx
@@ -1,28 +1,36 @@
import { usePublishDialog } from "@/components/PublishDialog/usePublishDialog";
import { useShallow } from "zustand/react/shallow";
-import { useCallback, useEffect, useMemo } from "react";
+import { useCallback, useMemo } from "react";
import {
IChangeParams,
IPubParmasTextareaProps,
} from "@/components/PublishDialog/compoents/PubParmasTextarea";
import { PubItem } from "@/components/PublishDialog/publishDialog.type";
import { PubParamsVerifyInfo } from "@/components/PublishDialog/hooks/usePubParamsVerify";
+import { Alert } from "antd";
export default function usePlatParamsCommon(pubItem: PubItem) {
- const { setOnePubParams, errParamsMap, pubListChoosed } = usePublishDialog(
- useShallow((state) => ({
- setOnePubParams: state.setOnePubParams,
- step: state.step,
- errParamsMap: state.errParamsMap,
- pubListChoosed: state.pubListChoosed,
- })),
- );
+ const { setOnePubParams, errParamsMap, pubListChoosed, warningParamsMap } =
+ usePublishDialog(
+ useShallow((state) => ({
+ setOnePubParams: state.setOnePubParams,
+ step: state.step,
+ errParamsMap: state.errParamsMap,
+ pubListChoosed: state.pubListChoosed,
+ warningParamsMap: state.warningParamsMap,
+ })),
+ );
// 当前组件的错误消息
const currErrItem = useMemo(() => {
return errParamsMap?.get(pubItem.account.id);
}, [errParamsMap, pubItem, pubListChoosed]);
+ // 当前组件的警告消息
+ const currWarningItem = useMemo(() => {
+ return warningParamsMap?.get(pubItem.account.id);
+ }, [warningParamsMap, pubItem, pubListChoosed]);
+
const onChange = useCallback(
(values: IChangeParams) => {
setOnePubParams(
@@ -49,9 +57,23 @@ export default function usePlatParamsCommon(pubItem: PubItem) {
<PubParamsVerifyInfo errItem={currErrItem} />
</>
),
+ centerExtend: currWarningItem && (
+ <Alert
+ type="info"
+ showIcon
+ message={
+ <p style={{ textAlign: "left" }}>{currWarningItem?.parErrMsg}</p>
+ }
+ style={{
+ fontSize: "12px",
+ borderRadius: 0,
+ border: "none",
+ }}
+ />
+ ),
};
return props;
- }, [currErrItem, onChange, pubItem]);
+ }, [currErrItem, onChange, pubItem, currWarningItem]);
return { pubParmasTextareaCommonParams, setOnePubParams };
}
diff --git a/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx b/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx
index ceb61f89..95fcaf7f 100644
--- a/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx
+++ b/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx
@@ -49,6 +49,8 @@ export interface IPubParmasTextareaProps {
extend?: React.ReactNode;
// 在前面的扩展元素
beforeExtend?: React.ReactNode;
+ // 在中间的扩展元素
+ centerExtend?: React.ReactNode;
// 平台类型
platType: PlatType;
style?: CSSProperties;
@@ -71,6 +73,7 @@ const PubParmasTextarea = memo(
rows = 12,
videoMax = 1,
extend,
+ centerExtend,
imageFileListValue = [],
videoFileValue,
desValue = "",
@@ -462,6 +465,7 @@ const PubParmasTextarea = memo(
</div>
</div>
+ {centerExtend}
{extend && <div className="pubParmasTextarea-other">{extend}</div>}
</div>
</>
diff --git a/src/components/PublishDialog/hooks/usePubParamsVerify.tsx b/src/components/PublishDialog/hooks/usePubParamsVerify.tsx
index 7ef13e18..9501ec8d 100644
--- a/src/components/PublishDialog/hooks/usePubParamsVerify.tsx
+++ b/src/components/PublishDialog/hooks/usePubParamsVerify.tsx
@@ -5,6 +5,7 @@ import { PubItem } from "@/components/PublishDialog/publishDialog.type";
import { Alert } from "antd";
import { useTransClient } from "@/app/i18n/client";
import { PubType } from "@/app/config/publishConfig";
+import { isAspectRatioMatch } from "@/components/PublishDialog/PublishDialog.util";
export interface ErrPubParamsItem {
// 参数错误提示消息
@@ -98,15 +99,18 @@ export default function usePubParamsVerify(data: PubItem[]) {
v.params.images?.length === 0 &&
!v.params.video
) {
- let msgs:any = t("validation.uploadImageOrVideo");
- if (platInfo.pubTypes.has(PubType.ImageText) && platInfo.pubTypes.has(PubType.VIDEO)) {
+ let msgs: any = t("validation.uploadImageOrVideo");
+ if (
+ platInfo.pubTypes.has(PubType.ImageText) &&
+ platInfo.pubTypes.has(PubType.VIDEO)
+ ) {
msgs = t("validation.uploadImageOrVideo");
} else if (platInfo.pubTypes.has(PubType.ImageText)) {
msgs = t("validation.uploadImage");
} else if (platInfo.pubTypes.has(PubType.VIDEO)) {
msgs = t("validation.uploadVideo");
}
- return setErrorMsg(msgs);
+ return setErrorMsg(msgs);
}
// 话题数量校验
@@ -189,7 +193,7 @@ export default function usePubParamsVerify(data: PubItem[]) {
}
}
- // Pinterest 的强制校验
+ // Pinterest 的强制校验
if (v.account.type === PlatType.Pinterest) {
// 强制需要标题
if (!v.params.title) {
@@ -205,8 +209,36 @@ export default function usePubParamsVerify(data: PubItem[]) {
return errParamsMapTemp;
}, [data, t]);
+ // 警告参数,警告参数不会阻止发布,只是提示用户可能存在的问题
+ const warningParamsMap = useMemo(() => {
+ const warningParamsMapTemp: ErrPubParamsMapType = new Map();
+
+ for (const v of data) {
+ const setWarningMsg = (msg: string) => {
+ warningParamsMapTemp.set(v.account.id, {
+ parErrMsg: msg,
+ });
+ };
+
+ // Instagram 警告消息
+ if (v.account.type === PlatType.Instagram) {
+ // 图片比例判断
+ if (v.params.images && v.params.images.length > 0) {
+ for (const img of v.params.images) {
+ if (!isAspectRatioMatch(img.width, img.height, 4 / 5)) {
+ setWarningMsg(t("validation.instagramImageValidation"));
+ break;
+ }
+ }
+ }
+ }
+ }
+ return warningParamsMapTemp;
+ }, [data, t]);
+
return {
errParamsMap,
+ warningParamsMap,
};
}
diff --git a/src/components/PublishDialog/index.tsx b/src/components/PublishDialog/index.tsx
index ef8403d7..d4b7cde1 100644
--- a/src/components/PublishDialog/index.tsx
+++ b/src/components/PublishDialog/index.tsx
@@ -112,6 +112,7 @@ const PublishDialog = memo(
setPubTime,
pubTime,
setOnePubParams,
+ setWarningParamsMap,
} = usePublishDialog(
useShallow((state) => ({
pubListChoosed: state.pubListChoosed,
@@ -126,12 +127,14 @@ const PublishDialog = memo(
setExpandedPubItem: state.setExpandedPubItem,
expandedPubItem: state.expandedPubItem,
setErrParamsMap: state.setErrParamsMap,
+ setWarningParamsMap: state.setWarningParamsMap,
setPubTime: state.setPubTime,
pubTime: state.pubTime,
setOnePubParams: state.setOnePubParams,
})),
);
- const { errParamsMap } = usePubParamsVerify(pubListChoosed);
+ const { errParamsMap, warningParamsMap } =
+ usePubParamsVerify(pubListChoosed);
const [createLoading, setCreateLoading] = useState(false);
// 内容安全检测状态
const [moderationLoading, setModerationLoading] = useState(false);
@@ -621,6 +624,9 @@ const PublishDialog = memo(
useEffect(() => {
setErrParamsMap(errParamsMap);
}, [errParamsMap]);
+ useEffect(() => {
+ setWarningParamsMap(warningParamsMap);
+ }, [warningParamsMap]);
const pubClick = useCallback(async () => {
setCreateLoading(true);
diff --git a/src/components/PublishDialog/usePublishDialog.ts b/src/components/PublishDialog/usePublishDialog.ts
index 23c78ccd..e91ed5a6 100644
--- a/src/components/PublishDialog/usePublishDialog.ts
+++ b/src/components/PublishDialog/usePublishDialog.ts
@@ -23,6 +23,7 @@ export interface IPublishDialogStore {
expandedPubItem?: PubItem;
// 错误提示
errParamsMap?: ErrPubParamsMapType;
+ warningParamsMap?: ErrPubParamsMapType;
// 发布时间
pubTime?: string;
}
@@ -53,6 +54,7 @@ const store: IPublishDialogStore = {
},
expandedPubItem: undefined,
errParamsMap: undefined,
+ warningParamsMap: undefined,
};
const getStore = () => {
@@ -81,6 +83,11 @@ export const usePublishDialog = create(
errParamsMap,
});
},
+ setWarningParamsMap(warningParamsMap: ErrPubParamsMapType) {
+ set({
+ warningParamsMap,
+ });
+ },
setStep(step: number) {
set({ step });
},
@@ -143,30 +150,40 @@ export const usePublishDialog = create(
for (let i = 0; i < pubList.length; i++) {
const v = pubList[i];
const platConfig = AccountPlatInfoMap.get(v.account.type)!;
-
+
// 更新描述
if (pubParmas.des !== undefined) {
v.params.des = pubParmas.des;
}
-
+
// 更新标题
if (pubParmas.title !== undefined) {
v.params.title = pubParmas.title;
}
-
+
// 更新视频(如果平台支持)
- if (pubParmas.video !== undefined && platConfig.pubTypes.has(PubType.VIDEO)) {
+ if (
+ pubParmas.video !== undefined &&
+ platConfig.pubTypes.has(PubType.VIDEO)
+ ) {
v.params.video = pubParmas.video;
}
-
+
// 更新图片(如果平台支持)
- if (pubParmas.images !== undefined && platConfig.pubTypes.has(PubType.ImageText)) {
+ if (
+ pubParmas.images !== undefined &&
+ platConfig.pubTypes.has(PubType.ImageText)
+ ) {
v.params.images = pubParmas.images;
}
-
+
// 更新选项
if (pubParmas.option) {
- v.params.option = lodash.merge({}, v.params.option, pubParmas.option);
+ v.params.option = lodash.merge(
+ {},
+ v.params.option,
+ pubParmas.option,
+ );
}
}