[pull] main from KudoAI:main

.gitattributes

@@ -1 +1,2 @@
 * text=auto eol=lf
+greasemonkey/duckduckgpt.user.js linguist-generated=false

.github/dependabot.yml

@@ -1,6 +1,15 @@
 version: 2
 updates:
+
+  - package-ecosystem: 'github-actions'
+    directory: /
+    schedule:
+      interval: daily
+
   - package-ecosystem: npm
     directory: /
     schedule:
       interval: daily
+    groups:
+      dev-dependencies:
+        dependency-type: development

.github/workflows/lint-on-push-pr.yml

@@ -0,0 +1,26 @@
+name: Lint pushes + PRs
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+
+  js-json-md-yaml-lint:
+    name: JavaScript + JSON + Markdown + YAML
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run ESLint
+        run: npm run lint

.github/workflows/sync-changes.yml → .github/workflows/sync-changes-to-repos.yml

@@ -1,40 +1,45 @@
-name: Sync (/ to adamlui/chatgpt-apps/duckduckgpt/) && (/greasemonkey/ to adamlui/userscripts/chatgpt/duckduckgpt/)
+name: Sync ** to adamlui/ai-web-extensions/duckduckgpt/, then greasemonkey/ to adamlui/userscripts/chatgpt/duckduckgpt/
 
 on:
   push:
-    branches: main
-    paths: "**"
+    branches: [main]
+    paths: ["**", "!.*"]
+
+permissions:
+  contents: read
 
 jobs:
   build:
     if: (github.repository == 'KudoAI/duckduckgpt') && (github.event.commits[0].committer.username != 'kudo-sync-bot')
     runs-on: ubuntu-latest
+    env:
+      TZ: PST8PDT
+
     steps:
 
       - name: Checkout KudoAI/duckduckgpt
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.REPO_SYNC_PAT }}
           repository: KudoAI/duckduckgpt
           path: KudoAI/duckduckgpt
           fetch-depth: 2
 
-      - name: Checkout adamlui/chatgpt-apps
-        uses: actions/checkout@v2
+      - name: Checkout adamlui/ai-web-extensions
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.REPO_SYNC_PAT }}
-          repository: adamlui/chatgpt-apps
-          path: adamlui/chatgpt-apps
+          repository: adamlui/ai-web-extensions
+          path: adamlui/ai-web-extensions
 
       - name: Checkout adamlui/userscripts
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.REPO_SYNC_PAT }}
           repository: adamlui/userscripts
           path: adamlui/userscripts
 
-      - name: Sync docs between root & /greasemonkey
-        id: sync_docs
+      - name: Sync docs between root & greasemonkey/
         run: |
           shopt -s globstar
           cd ${{ github.workspace }}/KudoAI/duckduckgpt
@@ -67,47 +72,55 @@ jobs:
                 cp -f "$gm_doc_path" "$root_doc_path" ; sync_src="greasemonkey" ; fi ; fi
           done
 
-          # Store sync src for commit msg in self-push step
-          echo "sync_src=$sync_src" >> $GITHUB_OUTPUT
+          # Expose sync src for commit msg in self-push step
+          echo "SYNC_SRC=$sync_src" >> $GITHUB_ENV
 
-      - name: Sync / to adamlui/chatgpt-apps/duckduckgpt/
+      - name: Sync ** to adamlui/ai-web-extensions/duckduckgpt/
         run: |
-          rsync -avhr --delete --exclude={'.*','package*json'} \
+          rsync -avhr --delete --exclude '.*' \
             ${{ github.workspace }}/KudoAI/duckduckgpt/ \
-            ${{ github.workspace }}/adamlui/chatgpt-apps/duckduckgpt/
+            ${{ github.workspace }}/adamlui/ai-web-extensions/duckduckgpt/
 
-      - name: Sync /greasemonkey/ to adamlui/userscripts/chatgpt/duckduckgpt/
+      - name: Sync greasemonkey/ to adamlui/userscripts/chatgpt/duckduckgpt/
         run: |
           rsync -avhr --delete \
             ${{ github.workspace }}/KudoAI/duckduckgpt/greasemonkey/ \
             ${{ github.workspace }}/adamlui/userscripts/chatgpt/duckduckgpt/
 
-      - name: Push to KudoAI/duckduckgpt
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          push_options: --force
-          add_options: --all
-          commit_user_email: [email protected]
-          commit_message: "${{ github.event.head_commit.message }} ↞ [auto-sync from `${{ steps.sync_docs.outputs.sync_src }}`]"
-          file_pattern: "**"
-          repository: KudoAI/duckduckgpt
+      - name: Escape backticks in commit msg
+        env:
+          COMMIT_MSG: ${{ github.event.head_commit.message }}
+        run: |
+          echo "ESCAPED_MSG<<EOF" >> $GITHUB_ENV
+          echo "$COMMIT_MSG" | sed 's/`/\`/g' >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: Config committer
+        run: |
+          gpg --batch --import <(echo "${{ secrets.GPG_PRIVATE_KEY }}")
+          git config --global commit.gpgsign true
+          git config --global user.name "kudo-sync-bot"
+          git config --global user.email "[email protected]"
+          git config --global user.signingkey "${{ secrets.GPG_PRIVATE_ID }}"
 
-      - name: Push to adamlui/chatgpt-apps
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          push_options: --force
-          add_options: --all
-          commit_user_email: [email protected]
-          commit_message: "${{ github.event.head_commit.message }} ↞ [auto-sync from `KudoAI/duckduckgpt`]"
-          file_pattern: "duckduckgpt/**"
-          repository: adamlui/chatgpt-apps
-
-      - name: Push to adamlui/userscripts
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          push_options: --force
-          add_options: --all
-          commit_user_email: [email protected]
-          commit_message: "${{ github.event.head_commit.message }} ↞ [auto-sync from `KudoAI/duckduckgpt`]"
-          file_pattern: "chatgpt/duckduckgpt/**"
-          repository: adamlui/userscripts
+      - name: Push changes to KudoAI/duckduckgpt
+        if: env.SYNC_SRC
+        run: |
+          cd ${{ github.workspace }}/KudoAI/duckduckgpt
+          git add .
+          git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from ${{ env.SYNC_SRC }}/]" || true
+          git push
+
+      - name: Push changes to adamlui/ai-web-extensions
+        run: |
+          cd ${{ github.workspace }}/adamlui/ai-web-extensions
+          git add .
+          git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/duckduckgpt]" || true
+          git push
+
+      - name: Push changes to adamlui/userscripts
+        run: |
+          cd ${{ github.workspace }}/adamlui/userscripts
+          git add .
+          git commit -n -m "$ESCAPED_MSG ↞ [auto-sync from https://github.com/KudoAI/duckduckgpt]" || true
+          git push

.husky/pre-commit

@@ -1,15 +1,20 @@
 #!/bin/bash
 
-RED="\033[1;31m" ; NC="\033[0m"
+# Init UI colors
+NC="\033[0m"    # no color
+BR="\033[1;91m" # bright red
+BY="\033[1;33m" # bright yellow
 
+# Run ESLint for JavaScript + JSON + Markdown + YAML
+echo -e "\n${BY}Running ESLint...${NC}"
 if npm ls -g eslint &> /dev/null || npm ls eslint &> /dev/null ; then
     npm run lint
 else
     PROJECT_ROOT=$(
         cd "$(dirname "$0")/.." && # nav to root
         [ "$OSTYPE" == "msys" ] && pwd -W || pwd # get absolute path
     )
-    echo -e "\n${RED}Warning: eslint not installed${NC}"
+    echo -e "\n${BR}Warning: ESLint not installed${NC}"
     echo -e " To add missing dependencies, run 'npm install' from"
     echo -e " $PROJECT_ROOT\n"
 fi

LICENSE.md

@@ -1,8 +1,8 @@
 <div align="right">
     <h6>
         <picture>
-            <source type="image/svg+xml" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/KudoAI/chatgpt.js/main/media/images/icons/earth-americas-white-icon32.svg">
-            <img height=14 src="https://raw.githubusercontent.com/KudoAI/chatgpt.js/main/media/images/icons/earth-americas-icon32.svg">
+            <source type="image/svg+xml" media="(prefers-color-scheme: dark)" srcset="https://assets.ddgpt.com/images/icons/earth/white/icon32.svg">
+            <img height=14 src="https://assets.ddgpt.com/images/icons/earth/black/icon32.svg">
         </picture>
         &nbsp;English |
         <a href="docs/zh-cn/LICENSE.md">简体中文</a> |
@@ -12,7 +12,7 @@
 
 # 🏛️ MIT License
 
-**Copyright © 2023–2024 [KudoAI](https://github.com/KudoAI) & [contributors](.#-contributors)**
+**Copyright © 2023–2025 [KudoAI](https://github.com/KudoAI) & [contributors](.#-contributors).**
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: