Merge pull request 'chore(deps): update ghcr.io/siesta-cat/2chi-api docker tag to v1.1.0' (#62) from renovate/ghcr.io-siesta-cat-2chi-api-1.x into main

Reviewed-on: #62

.gitea/workflows/02_build.yaml

@@ -1,4 +1,8 @@
 name: Build image
+permissions:
+  contents: write
+  packages: write
+
 on:
   pull_request:
     paths:
@@ -9,41 +13,32 @@ on:
 
 jobs:
   build:
-    container:
-      image: docker:dind
-      volumes:
-        - /data/.cache/act:/data/.cache/act
-        - /var/lib/docker/image:/var/lib/docker/image
-        - /var/lib/docker/overlay2:/var/lib/docker/overlay2
+    runs-on: ubuntu-latest
     steps:
-      - name: Starting docker daemon
-        run: docker-init -- dockerd --host=unix:///var/run/docker.sock &
-      - name: Installing necessary packages
-        run: apk add nodejs git curl bash
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Docker meta
         id: meta
-        uses: https://github.com/docker/metadata-action@v5
+        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5
         with:
           # list of Docker images to use as base name for tags
           images: |
-            git.fai.st/fedi-image-bot/moderation-fe
+            git.fai.st/${{ github.repository }}
           # generate Docker tags based on the following events/attributes
           tags: |
             type=raw,value=latest
             type=ref,event=branch
             type=semver,pattern={{raw}}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3
       - name: Login to fai.st docker registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
         with:
           registry: git.fai.st
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6
         with:
           platforms: linux/amd64,linux/arm64
           context: .

.tool-versions

@@ -0,0 +1 @@
+nodejs 23.8.0

Dockerfile

@@ -1,9 +1,9 @@
-FROM --platform=$BUILDPLATFORM node:23-alpine AS install
+FROM --platform=$BUILDPLATFORM node:23.8.0-alpine AS install
 RUN mkdir -p /temp/prod
 COPY package*.json /temp/prod/
 RUN cd /temp/prod && npm install --frozen-lockfile
 COPY . /temp/prod/
 RUN cd /temp/prod && npm run build
 
-FROM nginx AS release
+FROM nginx:1.27.3-alpine3.20-slim AS release
 COPY --from=install /temp/prod/dist /usr/share/nginx/html

compose.yaml

@@ -1,7 +1,7 @@
 services:
   mongodb:
     image: mongo:bionic
-    container_name: mongodb
+    container_name: fe-mongodb
     ports:
       - "27017:27017"
     environment:
@@ -10,32 +10,34 @@ services:
       MONGO_INITDB_DATABASE: bot
     volumes:
       - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
-      - mongodb_data:/data/db
 
   bot-api:
-    image: git.fai.st/fedi-image-bot/bot-api:latest
-    container_name: bot-api
+    image: ghcr.io/siesta-cat/2chi-api:v1.1.0
+    container_name: fe-2chi-api
+    restart: on-failure
     ports:
-      - "8080:8080"
+      - 8080:8080
     depends_on:
       - mongodb
     environment:
       PORT: 8080
-      MONGODB_URI: "mongodb://mongodb:27017/bot"
-      MONGODB_USER: "root"
-      MONGODB_PASS: "password"
-      JWTSECRET: "cooljwtsecret"
+      DB_HOST: "mongodb"
+      DB_NAME: "bot"
+      DB_USER: "root"
+      DB_PASS: "password"
 
   fe-middleware:
-    image: git.fai.st/fedi-image-bot/fe-middleware:latest
-    container_name: fe-middleware
+    image: ghcr.io/siesta-cat/2chi-verifier-be:v2.1.3
+    container_name: fe-2chi-verifier-be
+    stop_signal: sigkill
     ports:
-      - "8081:8081"
+      - 8081:8081
     depends_on:
       - bot-api
     environment:
       PORT: 8081
-      BOT_API_URI: "http://bot-api:8080"
+      BOT_API_BASE_URL: "http://bot-api:8080"
+      TOKEN_SECRET: Y2hpY2FzZWNyZXQK
       GELBOORU_IMAGES_PER_REQUEST: 100 # Number of images per request, maximum 100
       GELBOORU_TAGS: "2girls sleeping" # Tags of the images. The images will have all of these tags
 
@@ -43,13 +45,12 @@ services:
     build: .
     container_name: bot-image-moderation-fe
     ports:
-      - "80:80"
+      - 80:80
+    environment:
+      VITE_BACKEND_URL: "http://localhost:8081"
     develop:
       watch:
         - action: rebuild
           path: .
           ignore:
             - node_modules/
-
-volumes:
-  mongodb_data:

package.json

@@ -8,14 +8,12 @@
     "build": "tsc && vite build"
   },
   "dependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "typescript": "^5.2.2",
-    "vite": "^6.0.0"
+    "react-dom": "19.0.0",
+    "typescript": "5.7.3",
+    "vite": "6.1.1"
   },
   "devDependencies": {
-    "@types/react": "^18.2.43",
-    "@types/react-dom": "^18.2.17",
-    "@vitejs/plugin-react-swc": "^3.5.0"
+    "@types/react-dom": "19.0.4",
+    "@vitejs/plugin-react-swc": "3.8.0"
   }
 }

renovate.json

@@ -1,3 +1,5 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended", "helpers:pinGitHubActionDigests"],
+  "rangeStrategy": "pin"
+}

src/App.tsx

@@ -1,30 +1,14 @@
 import { useState } from "react";
+import GetBackendUrl from "./components/ImageModerator/GetBackendUrl";
 import ImageModerator from "./components/ImageModerator/ImageModerator";
-import Login from "./components/Login/Login";
 
 function App() {
-  const [{ apiUrl, middlewareUrl, token }, setRemote] = useState({
-    apiUrl: "",
-    middlewareUrl: "",
-    token: "",
-  });
+  const [backendUrl, setBackendUrl] = useState("");
 
-  if (token) {
-    return (
-      <>
-        <ImageModerator
-          token={token}
-          apiUrl={apiUrl}
-          middlewareUrl={middlewareUrl}
-        />
-      </>
-    );
+  if (backendUrl) {
+    return <ImageModerator backendUrl={backendUrl} />;
   } else {
-    return (
-      <>
-        <Login setRemote={setRemote} />
-      </>
-    );
+    return <GetBackendUrl setRemote={setBackendUrl} />;
   }
 }
 

src/components/ImageModerator/GetBackendUrl.tsx

@@ -0,0 +1,64 @@
+import { useEffect, useState } from "react";
+
+export default function GetBackendUrl({ setRemote }: { setRemote: Function }) {
+  const sendLabel = "Input Backend URL";
+  const [backendUrl, setBackendUrl] = useState("");
+
+  function sendAction() {
+    event?.preventDefault();
+    try {
+      if (backendUrl) {
+        localStorage.setItem("backendUrl", backendUrl);
+      }
+    } catch (error) {
+      console.error(error);
+    }
+    setRemote(backendUrl);
+  }
+
+  function handleChange(
+    e: {
+      target: { value: React.SetStateAction<string> };
+    },
+    setter: React.Dispatch<React.SetStateAction<string>>
+  ): void {
+    setter(e.target.value);
+  }
+
+  useEffect(() => {
+    const savedRemote = localStorage.getItem("backendUrl");
+
+    if (savedRemote) {
+      setRemote(savedRemote);
+    }
+  }, []);
+
+  return (
+    <div
+      style={{
+        height: "100vh",
+        width: "100vw",
+      }}>
+      <form
+        style={{
+          height: "100%",
+          width: "100%",
+          display: "flex",
+          flexDirection: "column",
+          justifyContent: "center",
+          alignItems: "center",
+        }}
+        onSubmit={sendAction}>
+        <label>Backend URL: </label>
+        <input
+          type="url"
+          id="backend"
+          name="backend"
+          value={backendUrl}
+          onChange={(e) => handleChange(e, setBackendUrl)}
+        />
+        <button type="submit">{sendLabel}</button>
+      </form>
+    </div>
+  );
+}

src/components/ImageModerator/ImageModerator.tsx

@@ -2,50 +2,45 @@ import { useEffect, useState } from "react";
 import Button from "../Button/Button";
 
 interface ImageModeratorProps {
-  token: string;
-  apiUrl: string;
-  middlewareUrl: string;
+  backendUrl: string;
 }
 
-export default function ImageModerator({
-  token,
-  apiUrl,
-  middlewareUrl,
-}: ImageModeratorProps) {
+export default function ImageModerator({ backendUrl }: ImageModeratorProps) {
   const acceptLabel = "Accept";
   const discardLabel = "Discard";
 
   const [isLoading, setIsLoading] = useState(true);
-  const [imageData, setImageData] = useState({ url: "", tags: [] });
-  const [imageAlt, setImageAlt] = useState("No image");
+  const [imageData, setImageData] = useState({
+    url: "",
+    token: "",
+    alt: "No image",
+  });
 
   function acceptAction() {
-    fetch(`${apiUrl}/images`, {
+    fetch(`${backendUrl}/image/review`, {
       method: "POST",
       body: JSON.stringify({
         url: imageData.url,
-        status: "available",
-        tags: imageData.tags,
+        token: imageData.token,
+        is_accepted: true,
       }),
       headers: {
         "Content-type": "application/json",
-        Authorization: `Bearer ${token}`,
       },
     });
     setIsLoading(true);
   }
 
   function discardAction() {
-    fetch(`${apiUrl}/images`, {
+    fetch(`${backendUrl}/image/review`, {
       method: "POST",
       body: JSON.stringify({
         url: imageData.url,
-        status: "unavailable",
-        tags: imageData.tags,
+        token: imageData.token,
+        is_accepted: false,
       }),
       headers: {
         "Content-type": "application/json",
-        Authorization: `Bearer ${token}`,
       },
     });
     setIsLoading(true);
@@ -53,8 +48,8 @@ export default function ImageModerator({
 
   const getNewImage = () => {
     if (isLoading) {
-      setImageData({ url: "", tags: [] });
-      fetch(`${middlewareUrl}/image`, {
+      setImageData({ url: "", token: "", alt: "Loading..." });
+      fetch(`${backendUrl}/image`, {
         method: "GET",
       })
         .then((response) => {
@@ -62,12 +57,10 @@ export default function ImageModerator({
           return response.json();
         })
         .then((data) => {
-          const url = data.url;
-          const tags = data.tags;
-          setImageData({ url, tags });
+          setImageData({ url: data.url, token: data.token, alt: data.url });
         })
         .catch((error) => {
-          setImageAlt("Error");
+          setImageData({ url: "", token: "", alt: "Error" });
           console.error(error);
         })
         .finally(() => {
@@ -93,7 +86,7 @@ export default function ImageModerator({
       ) : (
         <img
           src={imageData.url}
-          alt={imageAlt}
+          alt={imageData.alt}
           style={{
             width: "100%",
             height: "100%",

src/components/Login/Login.tsx

@@ -1,111 +0,0 @@
-import { useEffect, useState } from "react";
-
-export default function Login({ setRemote }: { setRemote: Function }) {
-  const sendLabel = "Login";
-  const [middlewareUrl, setMiddlewareUrl] = useState("");
-  const [apiUrl, setApiUrl] = useState("");
-  const [app, setApp] = useState("");
-  const [secret, setSecret] = useState("");
-
-  function sendAction() {
-    event?.preventDefault();
-    try {
-      if (apiUrl && middlewareUrl && app && secret) {
-        localStorage.setItem(
-          "credentials",
-          JSON.stringify({ apiUrl, middlewareUrl, app, secret })
-        );
-      }
-    } catch (error) {
-      console.error(error);
-    }
-    fetch(`${apiUrl}/login`, {
-      method: "POST",
-      body: JSON.stringify({ app, secret }),
-      headers: { "Content-type": "application/json" },
-    })
-      .then((response) => {
-        return response.json();
-      })
-      .then((body) => {
-        setRemote({ apiUrl, middlewareUrl, token: body.token });
-      });
-  }
-
-  function handleChange(
-    e: {
-      target: { value: React.SetStateAction<string> };
-    },
-    setter: React.Dispatch<React.SetStateAction<string>>
-  ): void {
-    setter(e.target.value);
-  }
-  useEffect(() => {
-    const savedRemote = localStorage.getItem("credentials");
-
-    if (savedRemote) {
-      const savedData = JSON.parse(savedRemote);
-      setApiUrl(savedData.apiUrl);
-      setMiddlewareUrl(savedData.middlewareUrl);
-      setApp(savedData.app);
-      setSecret(savedData.secret);
-    }
-  }, []);
-
-  useEffect(() => {
-    if (secret) {
-      sendAction();
-    }
-  }, [secret]);
-
-  return (
-    <div
-      style={{
-        height: "100vh",
-        width: "100vw",
-      }}>
-      <form
-        style={{
-          height: "100%",
-          width: "100%",
-          display: "flex",
-          flexDirection: "column",
-          justifyContent: "center",
-          alignItems: "center",
-        }}
-        onSubmit={sendAction}>
-        <label>API URL: </label>
-        <input
-          type="url"
-          id="api"
-          name="api"
-          value={apiUrl}
-          onChange={(e) => handleChange(e, setApiUrl)}
-        />
-        <label>Source URL: </label>
-        <input
-          type="url"
-          id="middleware"
-          name="middleware"
-          value={middlewareUrl}
-          onChange={(e) => handleChange(e, setMiddlewareUrl)}
-        />
-        <label>App name: </label>
-        <input
-          type="text"
-          id="username"
-          name="username"
-          value={app}
-          onChange={(e) => handleChange(e, setApp)}
-        />
-        <label>Secret: </label>
-        <input
-          type="password"
-          value={secret}
-          onChange={(e) => handleChange(e, setSecret)}
-        />
-        <button type="submit">{sendLabel}</button>
-      </form>
-    </div>
-  );
-}