feat: filter html at competition intro page

sdutacm · Nov 26, 2024 · 498469d · 498469d
1 parent 490de15
commit 498469d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 27 deletions.
diff --git a/src/components/ProblemContent.tsx b/src/components/ProblemContent.tsx
@@ -11,7 +11,7 @@ import { loadCustomFont, getCustomFontStyleForReact } from '@/utils/customFont';
 import ReactPlayer from 'react-player/file';
 import { userActiveEmitter, UserActiveEvents } from '@/events/userActive';
 import { pickGenshinAudioUrlFromConf } from '@/utils/spGenshin';
-import { replaceString } from '@/utils/misc';
+import { simpleFilterHTML } from '@/utils/filter';
 
 export interface Props {
   loading: boolean;
@@ -93,15 +93,6 @@ class ProblemContent extends React.Component<Props, State> {
     });
   };
 
-  simpleFilterHTML = (html: string) => {
-    let res = (html || '').replace(/^&nbsp;/, '').trim();
-    if (res === '<p></p>') {
-      res = '';
-    }
-    process.env.CDN_PROXY && (res = replaceString(res, [process.env.CDN_RAW_URL_BEFORE_PROXY], process.env.CDN_PROXY));
-    return res;
-  };
-
   renderContent = (html: string) => {
     return (
       <div style={this.getFontStyle()}>
@@ -129,10 +120,10 @@ class ProblemContent extends React.Component<Props, State> {
     }
 
     const spConfig = (data.spConfig || {}) as IProblemSpConfig;
-    const description = this.simpleFilterHTML(data.description);
-    const input = this.simpleFilterHTML(data.input || '');
-    const output = this.simpleFilterHTML(data.output || '');
-    const hint = this.simpleFilterHTML(data.hint || '');
+    const description = simpleFilterHTML(data.description);
+    const input = simpleFilterHTML(data.input || '');
+    const output = simpleFilterHTML(data.output || '');
+    const hint = simpleFilterHTML(data.hint || '');
     const titlePrefix =
       typeof problemAlias === 'string'
         ? `${problemAlias} - `

diff --git a/src/pages/competitions-public/$id/intro.tsx b/src/pages/competitions-public/$id/intro.tsx
@@ -29,6 +29,7 @@ import getSetTimeStatus from '@/utils/getSetTimeStatus';
 import TimeStatusBadge from '@/components/TimeStatusBadge';
 import PageLoading from '@/components/PageLoading';
 import { genshinCharacters } from '@/configs/genshin';
+import { simpleFilterHTML } from '@/utils/filter';
 
 const CLOTHING_SIZES = ['S', 'M', 'L', 'XL', 'XXL', 'XXXL'];
 
@@ -502,7 +503,7 @@ class CompetitionIntro extends React.Component<Props, State> {
             <div className="competition-intro-content content-view">
               {/* <h2 className="competition-intro-header">{detail.title}</h2> */}
               <div
-                dangerouslySetInnerHTML={{ __html: xss(detail.introduction) }}
+                dangerouslySetInnerHTML={{ __html: xss(simpleFilterHTML(detail.introduction)) }}
                 className="content-area"
                 style={{ marginTop: '48px' }}
               />

diff --git a/src/pages/competitions/$id/overview.tsx b/src/pages/competitions/$id/overview.tsx
@@ -42,8 +42,9 @@ import ProblemTitle from '@/components/ProblemTitle';
 import { Howl } from 'howler';
 import GeneralForm from '@/components/GeneralForm';
 import constants from '@/configs/constants';
-import { sleep, replaceString } from '@/utils/misc';
+import { sleep } from '@/utils/misc';
 import GenshinTable from '@/components/GenshinTable';
+import { simpleFilterHTML } from '@/utils/filter';
 
 export interface Props extends ReduxProps, FormProps {
   id: number;
@@ -505,16 +506,6 @@ class CompetitionOverview extends React.Component<Props, State> {
     });
   };
 
-  simpleFilterHTML = (html: string) => {
-    let res = (html || '').replace(/^&nbsp;/, '').trim();
-    if (res === '<p></p>') {
-      res = '';
-    }
-    process.env.CDN_PROXY &&
-      (res = replaceString(res, [process.env.CDN_RAW_URL_BEFORE_PROXY], process.env.CDN_PROXY));
-    return res;
-  };
-
   renderNormalBody() {
     const {
       id,
@@ -546,7 +537,7 @@ class CompetitionOverview extends React.Component<Props, State> {
       timeStatus === "Ended" &&
       detail.ended &&
       [ECompetitionUserRole.admin, ECompetitionUserRole.principal].includes(selfUserDetail?.role);
-    const announcement = this.simpleFilterHTML(detail.announcement);
+    const announcement = simpleFilterHTML(detail.announcement);
 
     return (
       <Row gutter={16} className="content-view" style={{ marginTop: '84px', marginBottom: '32px' }}>

diff --git a/src/utils/filter.ts b/src/utils/filter.ts
@@ -0,0 +1,11 @@
+import { replaceString } from '@/utils/misc';
+
+export function simpleFilterHTML(html: string) {
+  let res = (html || '').replace(/^&nbsp;/, '').trim();
+  if (res === '<p></p>') {
+    res = '';
+  }
+  process.env.CDN_PROXY &&
+    (res = replaceString(res, [process.env.CDN_RAW_URL_BEFORE_PROXY], process.env.CDN_PROXY));
+  return res;
+}