diff --git a/.github/workflows/Issue_Noti.yml b/.github/workflows/Issue_Noti.yml index 457ae734..0ce01b0c 100644 --- a/.github/workflows/Issue_Noti.yml +++ b/.github/workflows/Issue_Noti.yml @@ -14,7 +14,7 @@ jobs: TITLE: ${{ github.event.issue.title }} run: | echo "AVATAR_URL=${{ secrets.DISCORD_AVATAR_URL }}" >> $GITHUB_ENV - echo "COMMENT_BODY=${{ github.event.issue.body }}" >> $GITHUB_ENV + echo "COMMENT_BODY=$(echo "${{ github.event.issue.body }}" | base64)" >> $GITHUB_ENV echo "USERNAME=망곰" >> $GITHUB_ENV echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV @@ -30,8 +30,9 @@ jobs: WEB_HOOK: ${{ env.WEB_HOOK }} run: | if [ -n "$WEB_HOOK" ]; then + DECODED_COMMENT_BODY=$(echo "$COMMENT_BODY" | base64 --decode) JSON_PAYLOAD=$(jq -n \ - --arg comment_body "$COMMENT_BODY" \ + --arg comment_body "$(echo "$DECODED_COMMENT_BODY" | jq -R @json)" \ --arg username "$USERNAME" \ --arg avatar_url "$AVATAR_URL" \ --arg issue_title "$ISSUE_TITLE" \ diff --git a/.github/workflows/PR_Comment_Noti.yml b/.github/workflows/PR_Comment_Noti.yml index d6e31341..7a70289f 100644 --- a/.github/workflows/PR_Comment_Noti.yml +++ b/.github/workflows/PR_Comment_Noti.yml @@ -13,7 +13,7 @@ jobs: - name: Set Environment Variables run: | echo "AVATAR_URL=${{ secrets.DISCORD_AVATAR_URL }}" >> $GITHUB_ENV - echo "COMMENT_BODY=$(echo '${{ github.event.comment.body }}' | jq -Rs .)" >> $GITHUB_ENV + echo "COMMENT_BODY=$(echo '${{ github.event.comment.body }}' | base64)" >> $GITHUB_ENV echo "USERNAME=망곰" >> $GITHUB_ENV echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV @@ -29,8 +29,9 @@ jobs: WEB_HOOK: ${{ env.WEB_HOOK }} run: | if [ -n "$WEB_HOOK" ]; then + DECODED_COMMENT_BODY=$(echo "$COMMENT_BODY" | base64 --decode) JSON_PAYLOAD=$(jq -n \ - --arg comment_body "$COMMENT_BODY" \ + --arg comment_body "$(echo "$DECODED_COMMENT_BODY" | jq -R @json)" \ --arg username "$USERNAME" \ --arg avatar_url "$AVATAR_URL" \ --arg pr_title "$PR_TITLE" \ diff --git a/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx b/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx index d544eccb..d9930ed8 100644 --- a/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx +++ b/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx @@ -40,9 +40,15 @@ export default function TimerCreationContent({ const [minutes, setMinutes] = useState(initMinutes); const [seconds, setSeconds] = useState(initSeconds); const [speakerNumber, setSpeakerNumber] = useState( - (beforeData?.speakerNumber ?? initData?.stance === 'NEUTRAL') - ? null - : (initData?.speakerNumber ?? 1), + beforeData?.speakerNumber + ? beforeData.speakerNumber + : initData + ? initData.stance === 'NEUTRAL' + ? null + : initData.speakerNumber + ? initData.speakerNumber + : null + : 1, ); const handleSubmit = () => {