Compare commits
20 Commits
721c9b4e71
...
v0.1.5
Author | SHA1 | Date | |
---|---|---|---|
095f6ec386
|
|||
c12d42882c
|
|||
67b241f1e8
|
|||
4206b2195d
|
|||
b3c1b01e9e
|
|||
ffa4fa0846
|
|||
0e75d4c0e6
|
|||
b7f62e729a
|
|||
3b2c53fc97
|
|||
13f1785081
|
|||
bb6d51a602
|
|||
a4114c5be3
|
|||
5c13dc0a1c
|
|||
cef0675a88
|
|||
fd223290df
|
|||
5f4382911b
|
|||
95cee69482
|
|||
33c166fa0c
|
|||
36863e4d9f
|
|||
fb0e5107cf
|
@@ -34,7 +34,20 @@
|
|||||||
"Bash(./run.zsh:*)",
|
"Bash(./run.zsh:*)",
|
||||||
"Bash(npm run dev:*)",
|
"Bash(npm run dev:*)",
|
||||||
"Bash(./target/release/ailog:*)",
|
"Bash(./target/release/ailog:*)",
|
||||||
"Bash(rg:*)"
|
"Bash(rg:*)",
|
||||||
|
"Bash(../target/release/ailog build)",
|
||||||
|
"Bash(zsh run.zsh:*)",
|
||||||
|
"Bash(hugo:*)",
|
||||||
|
"WebFetch(domain:docs.bsky.app)",
|
||||||
|
"WebFetch(domain:syui.ai)",
|
||||||
|
"Bash(rustup target list:*)",
|
||||||
|
"Bash(rustup target:*)",
|
||||||
|
"Bash(git add:*)",
|
||||||
|
"Bash(git commit:*)",
|
||||||
|
"Bash(git push:*)",
|
||||||
|
"Bash(git tag:*)",
|
||||||
|
"Bash(../bin/ailog:*)",
|
||||||
|
"Bash(../target/release/ailog oauth build:*)"
|
||||||
],
|
],
|
||||||
"deny": []
|
"deny": []
|
||||||
}
|
}
|
||||||
|
53
.gitea/workflows/deploy.yml
Normal file
53
.gitea/workflows/deploy.yml
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
name: Deploy to Cloudflare Pages
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-and-deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Rust
|
||||||
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
override: true
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
|
||||||
|
- name: Build ailog
|
||||||
|
run: |
|
||||||
|
cargo build --release
|
||||||
|
|
||||||
|
- name: Build OAuth app
|
||||||
|
run: |
|
||||||
|
cd oauth
|
||||||
|
npm install
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
- name: Copy OAuth assets
|
||||||
|
run: |
|
||||||
|
cp -r oauth/dist/* my-blog/static/
|
||||||
|
|
||||||
|
- name: Generate site with ailog
|
||||||
|
run: |
|
||||||
|
./target/release/ailog generate --input content --output my-blog/public
|
||||||
|
|
||||||
|
- name: Deploy to Cloudflare Pages
|
||||||
|
uses: cloudflare/pages-action@v1
|
||||||
|
with:
|
||||||
|
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
|
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
projectName: syui-ai
|
||||||
|
directory: my-blog/public
|
||||||
|
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
|
28
.gitea/workflows/example-usage.yml
Normal file
28
.gitea/workflows/example-usage.yml
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
name: Example ailog usage
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch: # Manual trigger for testing
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-with-ailog-action:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Build with ailog action
|
||||||
|
uses: ai/log@v1 # This will reference this repository
|
||||||
|
with:
|
||||||
|
content-dir: 'content'
|
||||||
|
output-dir: 'public'
|
||||||
|
ai-integration: true
|
||||||
|
atproto-integration: true
|
||||||
|
|
||||||
|
- name: Deploy to Cloudflare Pages
|
||||||
|
uses: cloudflare/pages-action@v1
|
||||||
|
with:
|
||||||
|
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
|
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
projectName: my-blog
|
||||||
|
directory: public
|
111
.github/workflows/cloudflare-pages.yml
vendored
Normal file
111
.github/workflows/cloudflare-pages.yml
vendored
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
name: Deploy to Cloudflare Pages
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
deployments: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '21'
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
cd oauth
|
||||||
|
npm install
|
||||||
|
|
||||||
|
- name: Build OAuth app
|
||||||
|
run: |
|
||||||
|
cd oauth
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
- name: Copy OAuth build to static
|
||||||
|
run: |
|
||||||
|
# Remove old assets (following run.zsh pattern)
|
||||||
|
rm -rf my-blog/static/assets
|
||||||
|
# Copy all dist files to static
|
||||||
|
cp -rf oauth/dist/* my-blog/static/
|
||||||
|
# Copy index.html to oauth-assets.html template
|
||||||
|
cp oauth/dist/index.html my-blog/templates/oauth-assets.html
|
||||||
|
|
||||||
|
- name: Cache ailog binary
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ./bin
|
||||||
|
key: ailog-bin-${{ runner.os }}
|
||||||
|
restore-keys: |
|
||||||
|
ailog-bin-${{ runner.os }}
|
||||||
|
|
||||||
|
- name: Setup ailog binary
|
||||||
|
run: |
|
||||||
|
# Get expected version from Cargo.toml
|
||||||
|
EXPECTED_VERSION=$(grep '^version' Cargo.toml | cut -d'"' -f2)
|
||||||
|
echo "Expected version from Cargo.toml: $EXPECTED_VERSION"
|
||||||
|
|
||||||
|
# Check current binary version if exists
|
||||||
|
if [ -f "./bin/ailog" ]; then
|
||||||
|
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
||||||
|
echo "Current binary version: $CURRENT_VERSION"
|
||||||
|
else
|
||||||
|
CURRENT_VERSION="none"
|
||||||
|
echo "No binary found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check OS
|
||||||
|
OS="${{ runner.os }}"
|
||||||
|
echo "Runner OS: $OS"
|
||||||
|
|
||||||
|
# Use pre-packaged binary if version matches or extract from tar.gz
|
||||||
|
if [ "$CURRENT_VERSION" = "$EXPECTED_VERSION" ]; then
|
||||||
|
echo "Binary is up to date"
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
elif [ "$OS" = "Linux" ] && [ -f "./bin/ailog-linux-x86_64.tar.gz" ]; then
|
||||||
|
echo "Extracting ailog from pre-packaged tar.gz..."
|
||||||
|
cd bin
|
||||||
|
tar -xzf ailog-linux-x86_64.tar.gz
|
||||||
|
chmod +x ailog
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
# Verify extracted version
|
||||||
|
EXTRACTED_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
||||||
|
echo "Extracted binary version: $EXTRACTED_VERSION"
|
||||||
|
|
||||||
|
if [ "$EXTRACTED_VERSION" != "$EXPECTED_VERSION" ]; then
|
||||||
|
echo "Warning: Binary version mismatch. Expected $EXPECTED_VERSION but got $EXTRACTED_VERSION"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Error: No suitable binary found for OS: $OS"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Build site with ailog
|
||||||
|
run: |
|
||||||
|
cd my-blog
|
||||||
|
../bin/ailog build
|
||||||
|
|
||||||
|
- name: List public directory
|
||||||
|
run: |
|
||||||
|
ls -la my-blog/public/
|
||||||
|
|
||||||
|
- name: Deploy to Cloudflare Pages
|
||||||
|
uses: cloudflare/pages-action@v1
|
||||||
|
with:
|
||||||
|
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
|
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
|
||||||
|
directory: my-blog/public
|
||||||
|
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
wranglerVersion: '3'
|
62
.github/workflows/deploy.yml
vendored
62
.github/workflows/deploy.yml
vendored
@@ -1,62 +0,0 @@
|
|||||||
name: Deploy ailog
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ main ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ main ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install Rust
|
|
||||||
uses: actions-rs/toolchain@v1
|
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
profile: minimal
|
|
||||||
override: true
|
|
||||||
|
|
||||||
- name: Cache cargo registry
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: ~/.cargo/registry
|
|
||||||
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
|
|
||||||
|
|
||||||
- name: Cache cargo index
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: ~/.cargo/git
|
|
||||||
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
|
|
||||||
|
|
||||||
- name: Cache cargo build
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: target
|
|
||||||
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
|
|
||||||
|
|
||||||
- name: Build ailog
|
|
||||||
run: cargo build --release
|
|
||||||
|
|
||||||
- name: Generate static site
|
|
||||||
run: |
|
|
||||||
./target/release/ailog build my-blog
|
|
||||||
touch my-blog/public/.nojekyll
|
|
||||||
|
|
||||||
- name: Setup Cloudflare Pages
|
|
||||||
run: |
|
|
||||||
# Cloudflare Pages用の設定
|
|
||||||
echo '/* /index.html 200' > my-blog/public/_redirects
|
|
||||||
echo 'X-Frame-Options: DENY' > my-blog/public/_headers
|
|
||||||
echo 'X-Content-Type-Options: nosniff' >> my-blog/public/_headers
|
|
||||||
|
|
||||||
- name: Deploy to GitHub Pages
|
|
||||||
uses: peaceiris/actions-gh-pages@v3
|
|
||||||
if: github.ref == 'refs/heads/main'
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
publish_dir: ./my-blog/public
|
|
||||||
publish_branch: gh-pages
|
|
92
.github/workflows/disabled/gh-pages-fast.yml
vendored
Normal file
92
.github/workflows/disabled/gh-pages-fast.yml
vendored
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
name: github pages (fast)
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths-ignore:
|
||||||
|
- 'src/**'
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pages: write
|
||||||
|
id-token: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Cache ailog binary
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ./bin
|
||||||
|
key: ailog-bin-${{ runner.os }}
|
||||||
|
restore-keys: |
|
||||||
|
ailog-bin-${{ runner.os }}
|
||||||
|
|
||||||
|
- name: Setup ailog binary
|
||||||
|
run: |
|
||||||
|
# Get expected version from Cargo.toml
|
||||||
|
EXPECTED_VERSION=$(grep '^version' Cargo.toml | cut -d'"' -f2)
|
||||||
|
echo "Expected version from Cargo.toml: $EXPECTED_VERSION"
|
||||||
|
|
||||||
|
# Check current binary version if exists
|
||||||
|
if [ -f "./bin/ailog" ]; then
|
||||||
|
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
||||||
|
echo "Current binary version: $CURRENT_VERSION"
|
||||||
|
else
|
||||||
|
CURRENT_VERSION="none"
|
||||||
|
echo "No binary found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check OS
|
||||||
|
OS="${{ runner.os }}"
|
||||||
|
echo "Runner OS: $OS"
|
||||||
|
|
||||||
|
# Use pre-packaged binary if version matches or extract from tar.gz
|
||||||
|
if [ "$CURRENT_VERSION" = "$EXPECTED_VERSION" ]; then
|
||||||
|
echo "Binary is up to date"
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
elif [ "$OS" = "Linux" ] && [ -f "./bin/ailog-linux-x86_64.tar.gz" ]; then
|
||||||
|
echo "Extracting ailog from pre-packaged tar.gz..."
|
||||||
|
cd bin
|
||||||
|
tar -xzf ailog-linux-x86_64.tar.gz
|
||||||
|
chmod +x ailog
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
# Verify extracted version
|
||||||
|
EXTRACTED_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
||||||
|
echo "Extracted binary version: $EXTRACTED_VERSION"
|
||||||
|
|
||||||
|
if [ "$EXTRACTED_VERSION" != "$EXPECTED_VERSION" ]; then
|
||||||
|
echo "Warning: Binary version mismatch. Expected $EXPECTED_VERSION but got $EXTRACTED_VERSION"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Error: No suitable binary found for OS: $OS"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Setup Hugo
|
||||||
|
uses: peaceiris/actions-hugo@v3
|
||||||
|
with:
|
||||||
|
hugo-version: "0.139.2"
|
||||||
|
extended: true
|
||||||
|
|
||||||
|
- name: Build with ailog
|
||||||
|
env:
|
||||||
|
TZ: "Asia/Tokyo"
|
||||||
|
run: |
|
||||||
|
# Use pre-built ailog binary instead of cargo build
|
||||||
|
cd my-blog
|
||||||
|
../bin/ailog build
|
||||||
|
touch ./public/.nojekyll
|
||||||
|
|
||||||
|
- name: Deploy
|
||||||
|
uses: peaceiris/actions-gh-pages@v3
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
publish_dir: ./my-blog/public
|
||||||
|
publish_branch: gh-pages
|
169
.github/workflows/release.yml
vendored
Normal file
169
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,169 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
tag:
|
||||||
|
description: 'Release tag (e.g., v1.0.0)'
|
||||||
|
required: true
|
||||||
|
default: 'v0.1.0'
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
actions: read
|
||||||
|
|
||||||
|
env:
|
||||||
|
CARGO_TERM_COLOR: always
|
||||||
|
OPENSSL_STATIC: true
|
||||||
|
OPENSSL_VENDOR: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: Build ${{ matrix.target }}
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
timeout-minutes: 60
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- target: x86_64-unknown-linux-gnu
|
||||||
|
os: ubuntu-latest
|
||||||
|
artifact_name: ailog
|
||||||
|
asset_name: ailog-linux-x86_64
|
||||||
|
- target: aarch64-unknown-linux-gnu
|
||||||
|
os: ubuntu-latest
|
||||||
|
artifact_name: ailog
|
||||||
|
asset_name: ailog-linux-aarch64
|
||||||
|
- target: x86_64-apple-darwin
|
||||||
|
os: macos-latest
|
||||||
|
artifact_name: ailog
|
||||||
|
asset_name: ailog-macos-x86_64
|
||||||
|
- target: aarch64-apple-darwin
|
||||||
|
os: macos-latest
|
||||||
|
artifact_name: ailog
|
||||||
|
asset_name: ailog-macos-aarch64
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Rust
|
||||||
|
uses: dtolnay/rust-toolchain@stable
|
||||||
|
with:
|
||||||
|
targets: ${{ matrix.target }}
|
||||||
|
|
||||||
|
- name: Install cross-compilation tools (Linux)
|
||||||
|
if: matrix.os == 'ubuntu-latest' && matrix.target == 'aarch64-unknown-linux-gnu'
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
|
||||||
|
|
||||||
|
- name: Configure cross-compilation (Linux ARM64)
|
||||||
|
if: matrix.target == 'aarch64-unknown-linux-gnu'
|
||||||
|
run: |
|
||||||
|
echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config.toml
|
||||||
|
echo 'linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config.toml
|
||||||
|
|
||||||
|
- name: Cache cargo registry
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.cargo/registry
|
||||||
|
~/.cargo/git
|
||||||
|
key: ${{ runner.os }}-${{ matrix.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Cache target directory
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: target
|
||||||
|
key: ${{ runner.os }}-${{ matrix.target }}-target-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: cargo build --release --target ${{ matrix.target }}
|
||||||
|
|
||||||
|
- name: Prepare binary
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
cd target/${{ matrix.target }}/release
|
||||||
|
|
||||||
|
# Use appropriate strip command for cross-compilation
|
||||||
|
if [[ "${{ matrix.target }}" == "aarch64-unknown-linux-gnu" ]]; then
|
||||||
|
aarch64-linux-gnu-strip ${{ matrix.artifact_name }} || echo "Strip failed, continuing..."
|
||||||
|
elif [[ "${{ matrix.os }}" == "windows-latest" ]]; then
|
||||||
|
strip ${{ matrix.artifact_name }} || echo "Strip failed, continuing..."
|
||||||
|
else
|
||||||
|
strip ${{ matrix.artifact_name }} || echo "Strip failed, continuing..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create archive
|
||||||
|
if [[ "${{ matrix.target }}" == *"windows"* ]]; then
|
||||||
|
7z a ../../../${{ matrix.asset_name }}.zip ${{ matrix.artifact_name }}
|
||||||
|
else
|
||||||
|
tar czvf ../../../${{ matrix.asset_name }}.tar.gz ${{ matrix.artifact_name }}
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Upload binary
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: ${{ matrix.asset_name }}
|
||||||
|
path: ${{ matrix.asset_name }}.tar.gz
|
||||||
|
|
||||||
|
release:
|
||||||
|
name: Create Release
|
||||||
|
needs: build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
actions: read
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Download all artifacts
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
path: artifacts
|
||||||
|
|
||||||
|
- name: Generate release notes
|
||||||
|
run: |
|
||||||
|
echo "## What's Changed" > release_notes.md
|
||||||
|
echo "" >> release_notes.md
|
||||||
|
echo "### Features" >> release_notes.md
|
||||||
|
echo "- AI-powered static blog generator" >> release_notes.md
|
||||||
|
echo "- AtProto OAuth integration" >> release_notes.md
|
||||||
|
echo "- Automatic translation support" >> release_notes.md
|
||||||
|
echo "- AI comment system" >> release_notes.md
|
||||||
|
echo "" >> release_notes.md
|
||||||
|
echo "### Platforms" >> release_notes.md
|
||||||
|
echo "- Linux (x86_64, aarch64)" >> release_notes.md
|
||||||
|
echo "- macOS (Intel, Apple Silicon)" >> release_notes.md
|
||||||
|
echo "" >> release_notes.md
|
||||||
|
echo "### Installation" >> release_notes.md
|
||||||
|
echo "\`\`\`bash" >> release_notes.md
|
||||||
|
echo "# Linux/macOS" >> release_notes.md
|
||||||
|
echo "tar -xzf ailog-linux-x86_64.tar.gz" >> release_notes.md
|
||||||
|
echo "chmod +x ailog" >> release_notes.md
|
||||||
|
echo "sudo mv ailog /usr/local/bin/" >> release_notes.md
|
||||||
|
echo "" >> release_notes.md
|
||||||
|
echo "\`\`\`" >> release_notes.md
|
||||||
|
|
||||||
|
- name: Get tag name
|
||||||
|
id: tag_name
|
||||||
|
run: |
|
||||||
|
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
|
||||||
|
echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Create Release
|
||||||
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
tag_name: ${{ steps.tag_name.outputs.tag }}
|
||||||
|
name: ailog ${{ steps.tag_name.outputs.tag }}
|
||||||
|
body_path: release_notes.md
|
||||||
|
draft: false
|
||||||
|
prerelease: ${{ contains(steps.tag_name.outputs.tag, 'alpha') || contains(steps.tag_name.outputs.tag, 'beta') || contains(steps.tag_name.outputs.tag, 'rc') }}
|
||||||
|
files: artifacts/*/ailog-*.tar.gz
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
8
.gitignore
vendored
8
.gitignore
vendored
@@ -5,8 +5,10 @@
|
|||||||
*.swo
|
*.swo
|
||||||
*~
|
*~
|
||||||
.DS_Store
|
.DS_Store
|
||||||
cloudflare*
|
cloudflare-config.yml
|
||||||
my-blog
|
my-blog/public/
|
||||||
dist
|
dist
|
||||||
package-lock.json
|
|
||||||
node_modules
|
node_modules
|
||||||
|
package-lock.json
|
||||||
|
my-blog/static/assets/comment-atproto-*
|
||||||
|
bin/ailog
|
||||||
|
40
Cargo.toml
40
Cargo.toml
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "ailog"
|
name = "ailog"
|
||||||
version = "0.1.0"
|
version = "0.1.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["syui"]
|
authors = ["syui"]
|
||||||
description = "A static blog generator with AI features"
|
description = "A static blog generator with AI features"
|
||||||
@@ -15,7 +15,7 @@ clap = { version = "4.5", features = ["derive"] }
|
|||||||
pulldown-cmark = "0.11"
|
pulldown-cmark = "0.11"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
tokio = { version = "1.40", features = ["full"] }
|
tokio = { version = "1.40", features = ["rt-multi-thread", "macros", "fs", "net", "io-util", "sync", "time", "process", "signal"] }
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
toml = "0.8"
|
toml = "0.8"
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
@@ -26,7 +26,7 @@ fs_extra = "1.3"
|
|||||||
colored = "2.1"
|
colored = "2.1"
|
||||||
serde_yaml = "0.9"
|
serde_yaml = "0.9"
|
||||||
syntect = "5.2"
|
syntect = "5.2"
|
||||||
reqwest = { version = "0.12", features = ["json"] }
|
reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false }
|
||||||
rand = "0.8"
|
rand = "0.8"
|
||||||
sha2 = "0.10"
|
sha2 = "0.10"
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
@@ -43,12 +43,38 @@ cookie = "0.18"
|
|||||||
syn = { version = "2.0", features = ["full", "parsing", "visit"] }
|
syn = { version = "2.0", features = ["full", "parsing", "visit"] }
|
||||||
quote = "1.0"
|
quote = "1.0"
|
||||||
ignore = "0.4"
|
ignore = "0.4"
|
||||||
git2 = "0.18"
|
git2 = { version = "0.18", features = ["vendored-openssl", "vendored-libgit2", "ssh"], default-features = false }
|
||||||
regex = "1.0"
|
regex = "1.0"
|
||||||
# ATProto and stream monitoring dependencies
|
# ATProto and stream monitoring dependencies
|
||||||
tokio-tungstenite = { version = "0.21", features = ["native-tls"] }
|
tokio-tungstenite = { version = "0.21", features = ["rustls-tls-webpki-roots", "connect"], default-features = false }
|
||||||
futures-util = "0.3"
|
futures-util = "0.3"
|
||||||
tungstenite = { version = "0.21", features = ["native-tls"] }
|
tungstenite = { version = "0.21", features = ["rustls-tls-webpki-roots"], default-features = false }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3.14"
|
tempfile = "3.14"
|
||||||
|
|
||||||
|
[profile.dev]
|
||||||
|
# Speed up development builds
|
||||||
|
opt-level = 0
|
||||||
|
debug = true
|
||||||
|
debug-assertions = true
|
||||||
|
overflow-checks = true
|
||||||
|
lto = false
|
||||||
|
panic = 'unwind'
|
||||||
|
incremental = true
|
||||||
|
codegen-units = 256
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
# Optimize release builds for speed and size
|
||||||
|
opt-level = 3
|
||||||
|
debug = false
|
||||||
|
debug-assertions = false
|
||||||
|
overflow-checks = false
|
||||||
|
lto = true
|
||||||
|
panic = 'abort'
|
||||||
|
incremental = false
|
||||||
|
codegen-units = 1
|
||||||
|
|
||||||
|
[profile.dev.package."*"]
|
||||||
|
# Optimize dependencies in dev builds
|
||||||
|
opt-level = 3
|
150
DEPLOYMENT.md
150
DEPLOYMENT.md
@@ -1,150 +0,0 @@
|
|||||||
# ai.log Deployment Guide
|
|
||||||
|
|
||||||
## 🌐 Cloudflare Tunnel Setup
|
|
||||||
|
|
||||||
ATProto OAuth requires HTTPS for proper CORS handling. Use Cloudflare Tunnel for secure deployment.
|
|
||||||
|
|
||||||
### Prerequisites
|
|
||||||
|
|
||||||
1. **Install cloudflared**:
|
|
||||||
```bash
|
|
||||||
brew install cloudflared
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Login and create tunnel** (if not already done):
|
|
||||||
```bash
|
|
||||||
cloudflared tunnel login
|
|
||||||
cloudflared tunnel create ailog
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Configure DNS**:
|
|
||||||
- Add a CNAME record: `log.syui.ai` → `[tunnel-id].cfargotunnel.com`
|
|
||||||
|
|
||||||
### Configuration Files
|
|
||||||
|
|
||||||
#### `cloudflared-config.yml`
|
|
||||||
```yaml
|
|
||||||
tunnel: a6813327-f880-485d-a9d1-376e6e3df8ad
|
|
||||||
credentials-file: /Users/syui/.cloudflared/a6813327-f880-485d-a9d1-376e6e3df8ad.json
|
|
||||||
|
|
||||||
ingress:
|
|
||||||
- hostname: log.syui.ai
|
|
||||||
service: http://localhost:8080
|
|
||||||
originRequest:
|
|
||||||
noHappyEyeballs: true
|
|
||||||
- service: http_status:404
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Production Client Metadata
|
|
||||||
`static/client-metadata-prod.json`:
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"client_id": "https://log.syui.ai/client-metadata.json",
|
|
||||||
"client_name": "ai.log Blog Comment System",
|
|
||||||
"client_uri": "https://log.syui.ai",
|
|
||||||
"redirect_uris": ["https://log.syui.ai/"],
|
|
||||||
"grant_types": ["authorization_code"],
|
|
||||||
"response_types": ["code"],
|
|
||||||
"token_endpoint_auth_method": "none",
|
|
||||||
"application_type": "web"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Deployment Commands
|
|
||||||
|
|
||||||
#### Quick Start
|
|
||||||
```bash
|
|
||||||
# All-in-one deployment
|
|
||||||
./scripts/tunnel.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Manual Steps
|
|
||||||
```bash
|
|
||||||
# 1. Build for production
|
|
||||||
PRODUCTION=true cargo run -- build
|
|
||||||
|
|
||||||
# 2. Start local server
|
|
||||||
cargo run -- serve --port 8080 &
|
|
||||||
|
|
||||||
# 3. Start tunnel
|
|
||||||
cloudflared tunnel --config cloudflared-config.yml run
|
|
||||||
```
|
|
||||||
|
|
||||||
### Environment Detection
|
|
||||||
|
|
||||||
The system automatically detects environment:
|
|
||||||
|
|
||||||
- **Development** (`localhost:8080`): Uses local client-metadata.json
|
|
||||||
- **Production** (`log.syui.ai`): Uses HTTPS client-metadata.json
|
|
||||||
|
|
||||||
### CORS Resolution
|
|
||||||
|
|
||||||
✅ **With Cloudflare Tunnel**:
|
|
||||||
- HTTPS domain: `https://log.syui.ai`
|
|
||||||
- Valid SSL certificate
|
|
||||||
- Proper CORS headers
|
|
||||||
- ATProto OAuth works correctly
|
|
||||||
|
|
||||||
❌ **With localhost**:
|
|
||||||
- HTTP only: `http://localhost:8080`
|
|
||||||
- CORS restrictions
|
|
||||||
- ATProto OAuth may fail
|
|
||||||
|
|
||||||
### Troubleshooting
|
|
||||||
|
|
||||||
#### ATProto OAuth Errors
|
|
||||||
```javascript
|
|
||||||
// Check client metadata URL in browser console
|
|
||||||
console.log('Environment:', window.location.hostname);
|
|
||||||
console.log('Client ID:', clientId);
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Tunnel Connection Issues
|
|
||||||
```bash
|
|
||||||
# Check tunnel status
|
|
||||||
cloudflared tunnel info ailog
|
|
||||||
|
|
||||||
# Test local server
|
|
||||||
curl http://localhost:8080/client-metadata.json
|
|
||||||
```
|
|
||||||
|
|
||||||
#### DNS Propagation
|
|
||||||
```bash
|
|
||||||
# Check DNS resolution
|
|
||||||
dig log.syui.ai
|
|
||||||
nslookup log.syui.ai
|
|
||||||
```
|
|
||||||
|
|
||||||
### Security Notes
|
|
||||||
|
|
||||||
- **Client metadata** is publicly accessible (required by ATProto)
|
|
||||||
- **Credentials file** contains tunnel secrets (keep secure)
|
|
||||||
- **HTTPS only** for production OAuth
|
|
||||||
- **Domain validation** by ATProto servers
|
|
||||||
|
|
||||||
### Integration with ai.ai Ecosystem
|
|
||||||
|
|
||||||
This deployment enables:
|
|
||||||
- **ai.log**: Comment system with ATProto authentication
|
|
||||||
- **ai.card**: Shared OAuth widget
|
|
||||||
- **ai.gpt**: Memory synchronization via ATProto
|
|
||||||
- **ai.verse**: Future 3D world integration
|
|
||||||
|
|
||||||
### Monitoring
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Monitor tunnel logs
|
|
||||||
cloudflared tunnel --config cloudflared-config.yml run --loglevel debug
|
|
||||||
|
|
||||||
# Monitor blog server
|
|
||||||
tail -f /path/to/blog/logs
|
|
||||||
|
|
||||||
# Check ATProto connectivity
|
|
||||||
curl -I https://log.syui.ai/client-metadata.json
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**🔗 Live URL**: https://log.syui.ai
|
|
||||||
**📊 Status**: Production Ready
|
|
||||||
**🌐 ATProto**: OAuth Enabled
|
|
@@ -1,205 +0,0 @@
|
|||||||
# OAuth Integration Changes for ai.log
|
|
||||||
|
|
||||||
## 概要
|
|
||||||
ailogブログシステムにATProto/Bluesky OAuth認証を使用したコメントシステムを統合しました。
|
|
||||||
|
|
||||||
## 実装された機能
|
|
||||||
|
|
||||||
### 1. OAuth認証システム
|
|
||||||
- **ATProto BrowserOAuthClient** を使用した完全なOAuth 2.1フロー
|
|
||||||
- Blueskyアカウントでのワンクリック認証
|
|
||||||
- セッション永続化とリフレッシュトークン対応
|
|
||||||
|
|
||||||
### 2. コメントシステム
|
|
||||||
- 認証済みユーザーによるコメント投稿
|
|
||||||
- ATProto collection (`ai.syui.log`) への直接保存
|
|
||||||
- リアルタイムコメント表示と削除機能
|
|
||||||
- 複数PDS対応のコメント取得
|
|
||||||
|
|
||||||
### 3. 管理機能
|
|
||||||
- 管理者用ユーザーリスト管理
|
|
||||||
- DID解決とプロフィール情報の自動取得
|
|
||||||
- JSON形式でのレコード表示・編集
|
|
||||||
|
|
||||||
## 技術的変更点
|
|
||||||
|
|
||||||
### aicard-web-oauth (React OAuth App)
|
|
||||||
|
|
||||||
#### 新規ファイル
|
|
||||||
```
|
|
||||||
aicard-web-oauth/
|
|
||||||
├── src/
|
|
||||||
│ ├── services/
|
|
||||||
│ │ ├── atproto-oauth.ts # BrowserOAuthClient wrapper
|
|
||||||
│ │ └── auth.ts # Legacy auth service
|
|
||||||
│ ├── components/
|
|
||||||
│ │ ├── OAuthCallback.tsx # OAuth callback handler
|
|
||||||
│ │ └── OAuthCallbackPage.tsx
|
|
||||||
│ └── utils/
|
|
||||||
│ ├── oauth-endpoints.ts # OAuth endpoint utilities
|
|
||||||
│ └── oauth-keys.ts # OAuth configuration
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 主要な変更
|
|
||||||
- **App.tsx**: URL parameter/hash detection, 詳細デバッグログ追加
|
|
||||||
- **vite.config.ts**: 固定ファイル名出力 (`comment-atproto.js/css`)
|
|
||||||
- **main.tsx**: React mount点を `comment-atproto` に変更
|
|
||||||
|
|
||||||
#### OAuthCallback.tsx の機能
|
|
||||||
- Query parameters と hash parameters の両方を検出
|
|
||||||
- 認証完了後の自動URL cleanup (`window.history.replaceState`)
|
|
||||||
- Popup/direct navigation 両対応
|
|
||||||
- Fallback認証とエラーハンドリング
|
|
||||||
|
|
||||||
### ailog (Rust Static Site Generator)
|
|
||||||
|
|
||||||
#### OAuth Callback Route
|
|
||||||
**src/commands/serve.rs**:
|
|
||||||
```rust
|
|
||||||
} else if path.starts_with("/oauth/callback") {
|
|
||||||
// Handle OAuth callback - serve the callback HTML page
|
|
||||||
match serve_oauth_callback().await {
|
|
||||||
Ok((ct, data, cc)) => ("200 OK", ct, data, cc),
|
|
||||||
Err(e) => // Error handling
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### OAuth Callback HTML
|
|
||||||
- ATProto認証パラメータの検出・処理
|
|
||||||
- Hash parameters でのリダイレクト (`#code=...&state=...`)
|
|
||||||
- Popup/window間通信対応
|
|
||||||
- localStorage を使った一時的なデータ保存
|
|
||||||
|
|
||||||
### Template Integration
|
|
||||||
|
|
||||||
#### base.html (ailog templates)
|
|
||||||
```html
|
|
||||||
<!-- OAuth Comment System - Load in head for early initialization -->
|
|
||||||
<script type="module" crossorigin src="/assets/comment-atproto.js"></script>
|
|
||||||
<link rel="stylesheet" crossorigin href="/assets/comment-atproto.css">
|
|
||||||
```
|
|
||||||
|
|
||||||
#### index.html / post.html
|
|
||||||
```html
|
|
||||||
<!-- OAuth Comment System -->
|
|
||||||
<div id="comment-atproto"></div>
|
|
||||||
```
|
|
||||||
|
|
||||||
### OAuth Configuration
|
|
||||||
|
|
||||||
#### client-metadata.json
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"client_id": "https://log.syui.ai/client-metadata.json",
|
|
||||||
"redirect_uris": [
|
|
||||||
"https://log.syui.ai/oauth/callback",
|
|
||||||
"https://log.syui.ai/"
|
|
||||||
],
|
|
||||||
"scope": "atproto transition:generic",
|
|
||||||
"dpop_bound_access_tokens": true
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## インフラストラクチャ
|
|
||||||
|
|
||||||
### Cloudflare Tunnel
|
|
||||||
```yaml
|
|
||||||
# cloudflared-config.yml
|
|
||||||
ingress:
|
|
||||||
- hostname: log.syui.ai
|
|
||||||
service: http://localhost:4173 # ailog serve
|
|
||||||
```
|
|
||||||
|
|
||||||
### Build Process
|
|
||||||
1. **aicard-web-oauth**: `npm run build` → `dist/assets/`
|
|
||||||
2. **Asset copy**: `dist/assets/*` → `my-blog/public/assets/`
|
|
||||||
3. **ailog build**: Template processing + static file serving
|
|
||||||
|
|
||||||
## データフロー
|
|
||||||
|
|
||||||
### OAuth認証フロー
|
|
||||||
```
|
|
||||||
1. User clicks "atproto" button
|
|
||||||
2. BrowserOAuthClient initiates OAuth flow
|
|
||||||
3. Redirect to Bluesky authorization server
|
|
||||||
4. Callback to https://log.syui.ai/oauth/callback
|
|
||||||
5. ailog serves OAuth callback HTML
|
|
||||||
6. JavaScript processes parameters and redirects with hash
|
|
||||||
7. React app detects hash parameters and completes authentication
|
|
||||||
8. URL cleanup removes OAuth parameters
|
|
||||||
```
|
|
||||||
|
|
||||||
### コメント投稿フロー
|
|
||||||
```
|
|
||||||
1. Authenticated user writes comment
|
|
||||||
2. React app calls ATProto API
|
|
||||||
3. Record saved to ai.syui.log collection
|
|
||||||
4. Comments reloaded from all configured PDS endpoints
|
|
||||||
5. Real-time display update
|
|
||||||
```
|
|
||||||
|
|
||||||
## 設定ファイル
|
|
||||||
|
|
||||||
### 必須ファイル
|
|
||||||
- `my-blog/static/client-metadata.json` - OAuth client configuration
|
|
||||||
- `aicard-web-oauth/.env.production` - Production environment variables
|
|
||||||
- `cloudflared-config.yml` - Tunnel routing configuration
|
|
||||||
|
|
||||||
### 開発用ファイル
|
|
||||||
- `aicard-web-oauth/.env.development` - Development settings
|
|
||||||
- `aicard-web-oauth/public/client-metadata.json` - Local OAuth metadata
|
|
||||||
|
|
||||||
## 主要な修正点
|
|
||||||
|
|
||||||
### 1. Build System
|
|
||||||
- Vite output ファイル名を固定 (`comment-atproto.js/css`)
|
|
||||||
- Build時のclient-metadata.json更新自動化
|
|
||||||
|
|
||||||
### 2. OAuth Callback処理
|
|
||||||
- Hash parameters 対応でSPA architectureに最適化
|
|
||||||
- URL cleanup でクリーンなユーザー体験
|
|
||||||
- Popup/direct navigation 両対応
|
|
||||||
|
|
||||||
### 3. Error Handling
|
|
||||||
- Network エラー時のfallback認証
|
|
||||||
- セッション期限切れ時の再認証
|
|
||||||
- OAuth parameter不足時の適切なエラー表示
|
|
||||||
|
|
||||||
### 4. Session Management
|
|
||||||
- localStorage + sessionStorage 併用
|
|
||||||
- OAuth state/code verifier の適切な管理
|
|
||||||
- Cross-tab session sharing
|
|
||||||
|
|
||||||
## テスト済み機能
|
|
||||||
|
|
||||||
✅ **動作確認済み**
|
|
||||||
- OAuth認証 (Bluesky)
|
|
||||||
- コメント投稿・削除
|
|
||||||
- セッション永続化
|
|
||||||
- URL parameter cleanup
|
|
||||||
- 複数PDS対応
|
|
||||||
- 管理者機能
|
|
||||||
|
|
||||||
⏳ **今後のテスト項目**
|
|
||||||
- Incognito/private mode での動作
|
|
||||||
- 複数タブでの同時使用
|
|
||||||
- Long-term session の動作確認
|
|
||||||
|
|
||||||
## 運用メモ
|
|
||||||
|
|
||||||
### デプロイ手順
|
|
||||||
1. `cd aicard-web-oauth && npm run build`
|
|
||||||
2. `cp -r dist/assets/* ../my-blog/public/assets/`
|
|
||||||
3. `cd my-blog && cargo build --release`
|
|
||||||
4. ailog serve でテスト確認
|
|
||||||
|
|
||||||
### トラブルシューティング
|
|
||||||
- OAuth エラー: client-metadata.json のredirect_uris確認
|
|
||||||
- コメント表示されない: Network tab でAPI response確認
|
|
||||||
- Build エラー: Node.js/npm version, dependencies確認
|
|
||||||
|
|
||||||
## 関連リンク
|
|
||||||
- [ATProto OAuth Specification](https://atproto.com/specs/oauth)
|
|
||||||
- [Bluesky OAuth Documentation](https://github.com/bluesky-social/atproto/blob/main/packages/api/OAUTH.md)
|
|
||||||
- [BrowserOAuthClient API](https://github.com/bluesky-social/atproto/tree/main/packages/oauth-client-browser)
|
|
128
action.yml
Normal file
128
action.yml
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
name: 'ailog Static Site Generator'
|
||||||
|
description: 'AI-powered static blog generator with atproto integration'
|
||||||
|
author: 'syui'
|
||||||
|
|
||||||
|
branding:
|
||||||
|
icon: 'book-open'
|
||||||
|
color: 'orange'
|
||||||
|
|
||||||
|
inputs:
|
||||||
|
content-dir:
|
||||||
|
description: 'Content directory containing markdown files'
|
||||||
|
required: false
|
||||||
|
default: 'content'
|
||||||
|
output-dir:
|
||||||
|
description: 'Output directory for generated site'
|
||||||
|
required: false
|
||||||
|
default: 'public'
|
||||||
|
template-dir:
|
||||||
|
description: 'Template directory'
|
||||||
|
required: false
|
||||||
|
default: 'templates'
|
||||||
|
static-dir:
|
||||||
|
description: 'Static assets directory'
|
||||||
|
required: false
|
||||||
|
default: 'static'
|
||||||
|
config-file:
|
||||||
|
description: 'Configuration file path'
|
||||||
|
required: false
|
||||||
|
default: 'ailog.toml'
|
||||||
|
ai-integration:
|
||||||
|
description: 'Enable AI features'
|
||||||
|
required: false
|
||||||
|
default: 'true'
|
||||||
|
atproto-integration:
|
||||||
|
description: 'Enable atproto/OAuth features'
|
||||||
|
required: false
|
||||||
|
default: 'true'
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
site-url:
|
||||||
|
description: 'Generated site URL'
|
||||||
|
value: ${{ steps.generate.outputs.site-url }}
|
||||||
|
build-time:
|
||||||
|
description: 'Build time in seconds'
|
||||||
|
value: ${{ steps.generate.outputs.build-time }}
|
||||||
|
|
||||||
|
runs:
|
||||||
|
using: 'composite'
|
||||||
|
steps:
|
||||||
|
- name: Cache ailog binary
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ./bin
|
||||||
|
key: ailog-bin-${{ runner.os }}
|
||||||
|
restore-keys: |
|
||||||
|
ailog-bin-${{ runner.os }}
|
||||||
|
|
||||||
|
- name: Setup ailog binary
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
# Check if pre-built binary exists
|
||||||
|
if [ -f "./bin/ailog-linux-x86_64" ]; then
|
||||||
|
echo "Using pre-built binary from repository"
|
||||||
|
chmod +x ./bin/ailog-linux-x86_64
|
||||||
|
CURRENT_VERSION=$(./bin/ailog-linux-x86_64 --version 2>/dev/null || echo "unknown")
|
||||||
|
echo "Binary version: $CURRENT_VERSION"
|
||||||
|
else
|
||||||
|
echo "No pre-built binary found, trying to build from source..."
|
||||||
|
if command -v cargo >/dev/null 2>&1; then
|
||||||
|
cargo build --release
|
||||||
|
mkdir -p ./bin
|
||||||
|
cp ./target/release/ailog ./bin/ailog-linux-x86_64
|
||||||
|
echo "Built from source: $(./bin/ailog-linux-x86_64 --version 2>/dev/null)"
|
||||||
|
else
|
||||||
|
echo "Error: No binary found and cargo not available"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Setup Node.js for OAuth app
|
||||||
|
if: ${{ inputs.atproto-integration == 'true' }}
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
|
||||||
|
- name: Build OAuth app
|
||||||
|
if: ${{ inputs.atproto-integration == 'true' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -d "oauth" ]; then
|
||||||
|
cd oauth
|
||||||
|
npm install
|
||||||
|
npm run build
|
||||||
|
cp -r dist/* ../${{ inputs.static-dir }}/
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Generate site
|
||||||
|
id: generate
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
start_time=$(date +%s)
|
||||||
|
|
||||||
|
# Change to blog directory and run build
|
||||||
|
# Note: ailog build only takes a path argument, not options
|
||||||
|
if [ -d "my-blog" ]; then
|
||||||
|
cd my-blog
|
||||||
|
../bin/ailog-linux-x86_64 build
|
||||||
|
else
|
||||||
|
# If no my-blog directory, use current directory
|
||||||
|
./bin/ailog-linux-x86_64 build .
|
||||||
|
fi
|
||||||
|
|
||||||
|
end_time=$(date +%s)
|
||||||
|
build_time=$((end_time - start_time))
|
||||||
|
|
||||||
|
echo "build-time=${build_time}" >> $GITHUB_OUTPUT
|
||||||
|
echo "site-url=file://$(pwd)/${{ inputs.output-dir }}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Display build summary
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo "✅ ailog build completed successfully"
|
||||||
|
echo "📁 Output directory: ${{ inputs.output-dir }}"
|
||||||
|
echo "⏱️ Build time: ${{ steps.generate.outputs.build-time }}s"
|
||||||
|
if [ -d "${{ inputs.output-dir }}" ]; then
|
||||||
|
echo "📄 Generated files:"
|
||||||
|
find ${{ inputs.output-dir }} -type f | head -10
|
||||||
|
fi
|
1
ai_prompt.txt
Normal file
1
ai_prompt.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。
|
173
bin/ailog-generate.zsh
Executable file
173
bin/ailog-generate.zsh
Executable file
@@ -0,0 +1,173 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
|
||||||
|
# Generate AI content for blog posts
|
||||||
|
# Usage: ./bin/ailog-generate.zsh [md-file]
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Load configuration
|
||||||
|
f=~/.config/syui/ai/bot/token.json
|
||||||
|
|
||||||
|
# Default values
|
||||||
|
default_pds="bsky.social"
|
||||||
|
default_did=`cat $f|jq -r .did`
|
||||||
|
default_token=`cat $f|jq -r .accessJwt`
|
||||||
|
default_refresh=`cat $f|jq -r .refreshJwt`
|
||||||
|
|
||||||
|
# Refresh token if needed
|
||||||
|
curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $default_refresh" https://$default_pds/xrpc/com.atproto.server.refreshSession >! $f
|
||||||
|
default_token=`cat $f|jq -r .accessJwt`
|
||||||
|
|
||||||
|
# Set variables
|
||||||
|
admin_did=$default_did
|
||||||
|
admin_token=$default_token
|
||||||
|
ai_did="did:plc:4hqjfn7m6n5hno3doamuhgef"
|
||||||
|
ollama_host="https://ollama.syui.ai"
|
||||||
|
blog_host="https://syui.ai"
|
||||||
|
pds=$default_pds
|
||||||
|
|
||||||
|
# Parse arguments
|
||||||
|
md_file=$1
|
||||||
|
|
||||||
|
# Function to generate content using Ollama
|
||||||
|
generate_ai_content() {
|
||||||
|
local content=$1
|
||||||
|
local prompt_type=$2
|
||||||
|
local model="gemma3:4b"
|
||||||
|
|
||||||
|
case $prompt_type in
|
||||||
|
"translate")
|
||||||
|
prompt="Translate the following Japanese blog post to English. Keep the technical terms and code blocks intact:\n\n$content"
|
||||||
|
;;
|
||||||
|
"comment")
|
||||||
|
prompt="Read this blog post and provide an insightful comment about it. Focus on the key points and add your perspective:\n\n$content"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
response=$(curl -sL -X POST "$ollama_host/api/generate" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "{
|
||||||
|
\"model\": \"$model\",
|
||||||
|
\"prompt\": \"$prompt\",
|
||||||
|
\"stream\": false,
|
||||||
|
\"options\": {
|
||||||
|
\"temperature\": 0.9,
|
||||||
|
\"top_p\": 0.9,
|
||||||
|
\"num_predict\": 500
|
||||||
|
}
|
||||||
|
}")
|
||||||
|
|
||||||
|
echo "$response" | jq -r '.response'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function to put record to ATProto
|
||||||
|
put_record() {
|
||||||
|
local collection=$1
|
||||||
|
local rkey=$2
|
||||||
|
local record=$3
|
||||||
|
|
||||||
|
curl -sL -X POST "https://$pds/xrpc/com.atproto.repo.putRecord" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "Authorization: Bearer $admin_token" \
|
||||||
|
-d "{
|
||||||
|
\"repo\": \"$admin_did\",
|
||||||
|
\"collection\": \"$collection\",
|
||||||
|
\"rkey\": \"$rkey\",
|
||||||
|
\"record\": $record
|
||||||
|
}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function to process a single markdown file
|
||||||
|
process_md_file() {
|
||||||
|
local md_path=$1
|
||||||
|
local filename=$(basename "$md_path" .md)
|
||||||
|
local content=$(cat "$md_path")
|
||||||
|
local post_url="$blog_host/posts/$filename"
|
||||||
|
local rkey=$filename
|
||||||
|
local now=$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")
|
||||||
|
|
||||||
|
echo "Processing: $md_path"
|
||||||
|
echo "Post URL: $post_url"
|
||||||
|
|
||||||
|
# Generate English translation
|
||||||
|
echo "Generating English translation..."
|
||||||
|
en_translation=$(generate_ai_content "$content" "translate")
|
||||||
|
|
||||||
|
if [ -n "$en_translation" ]; then
|
||||||
|
lang_record="{
|
||||||
|
\"\$type\": \"ai.syui.log.chat.lang\",
|
||||||
|
\"type\": \"en\",
|
||||||
|
\"body\": $(echo "$en_translation" | jq -Rs .),
|
||||||
|
\"url\": \"$post_url\",
|
||||||
|
\"createdAt\": \"$now\",
|
||||||
|
\"author\": {
|
||||||
|
\"did\": \"$ai_did\",
|
||||||
|
\"handle\": \"yui.syui.ai\",
|
||||||
|
\"displayName\": \"AI Translator\"
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
|
||||||
|
echo "Saving translation to ATProto..."
|
||||||
|
put_record "ai.syui.log.chat.lang" "$rkey" "$lang_record"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Generate AI comment
|
||||||
|
echo "Generating AI comment..."
|
||||||
|
ai_comment=$(generate_ai_content "$content" "comment")
|
||||||
|
|
||||||
|
if [ -n "$ai_comment" ]; then
|
||||||
|
comment_record="{
|
||||||
|
\"\$type\": \"ai.syui.log.chat.comment\",
|
||||||
|
\"type\": \"push\",
|
||||||
|
\"body\": $(echo "$ai_comment" | jq -Rs .),
|
||||||
|
\"url\": \"$post_url\",
|
||||||
|
\"createdAt\": \"$now\",
|
||||||
|
\"author\": {
|
||||||
|
\"did\": \"$ai_did\",
|
||||||
|
\"handle\": \"yui.syui.ai\",
|
||||||
|
\"displayName\": \"AI Commenter\"
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
|
||||||
|
echo "Saving comment to ATProto..."
|
||||||
|
put_record "ai.syui.log.chat.comment" "$rkey" "$comment_record"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Completed: $filename"
|
||||||
|
echo
|
||||||
|
}
|
||||||
|
|
||||||
|
# Main logic
|
||||||
|
if [ -n "$md_file" ]; then
|
||||||
|
# Process specific file
|
||||||
|
if [ -f "$md_file" ]; then
|
||||||
|
process_md_file "$md_file"
|
||||||
|
else
|
||||||
|
echo "Error: File not found: $md_file"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Process all new posts
|
||||||
|
echo "Checking for posts without AI content..."
|
||||||
|
|
||||||
|
# Get existing records
|
||||||
|
existing_langs=$(curl -sL "https://$pds/xrpc/com.atproto.repo.listRecords?repo=$admin_did&collection=ai.syui.log.chat.lang&limit=100" | jq -r '.records[]?.value.url' | sort | uniq)
|
||||||
|
|
||||||
|
# Process each markdown file
|
||||||
|
for md in my-blog/content/posts/*.md; do
|
||||||
|
if [ -f "$md" ]; then
|
||||||
|
filename=$(basename "$md" .md)
|
||||||
|
post_url="$blog_host/posts/$filename"
|
||||||
|
|
||||||
|
# Check if already processed
|
||||||
|
if echo "$existing_langs" | grep -q "$post_url"; then
|
||||||
|
echo "Skip (already processed): $filename"
|
||||||
|
else
|
||||||
|
process_md_file "$md"
|
||||||
|
sleep 2 # Rate limiting
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "All done!"
|
BIN
bin/ailog-linux-x86_64.tar.gz
Normal file
BIN
bin/ailog-linux-x86_64.tar.gz
Normal file
Binary file not shown.
42
bin/delete-chat-records.zsh
Executable file
42
bin/delete-chat-records.zsh
Executable file
@@ -0,0 +1,42 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
|
||||||
|
#[collection] [pds] [did] [token]
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
f=~/.config/syui/ai/bot/token.json
|
||||||
|
default_collection="ai.syui.log.chat"
|
||||||
|
default_pds="bsky.social"
|
||||||
|
default_did=`cat $f|jq -r .did`
|
||||||
|
default_token=`cat $f|jq -r .accessJwt`
|
||||||
|
default_refresh=`cat $f|jq -r .refreshJwt`
|
||||||
|
curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $default_refresh" https://$default_pds/xrpc/com.atproto.server.refreshSession >! $f
|
||||||
|
default_token=`cat $f|jq -r .accessJwt`
|
||||||
|
collection=${1:-$default_collection}
|
||||||
|
pds=${2:-$default_pds}
|
||||||
|
did=${3:-$default_did}
|
||||||
|
token=${4:-$default_token}
|
||||||
|
|
||||||
|
delete_record() {
|
||||||
|
local rkey=$1
|
||||||
|
local req="com.atproto.repo.deleteRecord"
|
||||||
|
local url="https://$pds/xrpc/$req"
|
||||||
|
local json="{\"collection\":\"$collection\", \"rkey\":\"$rkey\", \"repo\":\"$did\"}"
|
||||||
|
curl -sL -X POST \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "Authorization: Bearer $token" \
|
||||||
|
-d "$json" \
|
||||||
|
"$url"
|
||||||
|
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
echo " ✓ Deleted: $rkey"
|
||||||
|
else
|
||||||
|
echo " ✗ Failed: $rkey"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
rkeys=($(curl -sL "https://$default_pds/xrpc/com.atproto.repo.listRecords?repo=$did&collection=$collection&limit=100"|jq -r ".records[]?.uri"|cut -d '/' -f 5))
|
||||||
|
for rkey in "${rkeys[@]}"; do
|
||||||
|
echo $rkey
|
||||||
|
delete_record $rkey
|
||||||
|
done
|
18
cloudflared-config.yml
Normal file
18
cloudflared-config.yml
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
tunnel: ec5a422d-7678-4e73-bf38-6105ffd4766a
|
||||||
|
credentials-file: /Users/syui/.cloudflared/ec5a422d-7678-4e73-bf38-6105ffd4766a.json
|
||||||
|
|
||||||
|
ingress:
|
||||||
|
- hostname: log.syui.ai
|
||||||
|
service: http://localhost:4173
|
||||||
|
originRequest:
|
||||||
|
noHappyEyeballs: true
|
||||||
|
|
||||||
|
- hostname: ollama.syui.ai
|
||||||
|
service: http://localhost:11434
|
||||||
|
originRequest:
|
||||||
|
noHappyEyeballs: true
|
||||||
|
httpHostHeader: "localhost:11434"
|
||||||
|
# Cloudflare Accessを無効化する場合は以下をコメントアウト
|
||||||
|
# accessPolicy: bypass
|
||||||
|
|
||||||
|
- service: http_status:404
|
29
my-blog/config.toml
Normal file
29
my-blog/config.toml
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
[site]
|
||||||
|
title = "syui.ai"
|
||||||
|
description = "a blog powered by ailog"
|
||||||
|
base_url = "https://syui.ai"
|
||||||
|
language = "ja"
|
||||||
|
author = "syui"
|
||||||
|
|
||||||
|
[build]
|
||||||
|
highlight_code = true
|
||||||
|
highlight_theme = "Monokai"
|
||||||
|
minify = false
|
||||||
|
|
||||||
|
[ai]
|
||||||
|
enabled = true
|
||||||
|
auto_translate = false
|
||||||
|
comment_moderation = false
|
||||||
|
ask_ai = true
|
||||||
|
provider = "ollama"
|
||||||
|
model = "gemma3:4b"
|
||||||
|
host = "https://ollama.syui.ai"
|
||||||
|
system_prompt = "あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"
|
||||||
|
ai_did = "did:plc:4hqjfn7m6n5hno3doamuhgef"
|
||||||
|
|
||||||
|
[oauth]
|
||||||
|
json = "client-metadata.json"
|
||||||
|
redirect = "oauth/callback"
|
||||||
|
admin = "did:plc:uqzpqmrjnptsxezjx4xuh2mn"
|
||||||
|
collection = "ai.syui.log"
|
||||||
|
bsky_api = "https://public.api.bsky.app"
|
159
my-blog/content/posts/2025-06-06-ailog.md
Normal file
159
my-blog/content/posts/2025-06-06-ailog.md
Normal file
@@ -0,0 +1,159 @@
|
|||||||
|
---
|
||||||
|
title: "静的サイトジェネレータを作った"
|
||||||
|
slug: "ailog"
|
||||||
|
date: "2025-06-12"
|
||||||
|
tags: ["blog", "rust", "mcp", "atp"]
|
||||||
|
language: ["ja", "en"]
|
||||||
|
---
|
||||||
|
|
||||||
|
rustで静的サイトジェネレータを作りました。[ailog](https://git.syui.ai/ai/log)といいます。`hugo`からの移行になります。
|
||||||
|
|
||||||
|
`ailog`は、最初にatproto-comment-system(oauth)とask-AIという機能をつけました。
|
||||||
|
|
||||||
|
## quick start
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ git clone https://git.syui.ai/ai/log
|
||||||
|
$ cd log
|
||||||
|
$ cargo build
|
||||||
|
$ ./target/debug/ailog init my-blog
|
||||||
|
$ ./target/debug/ailog serve my-blog
|
||||||
|
```
|
||||||
|
|
||||||
|
## install
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ cargo install --path .
|
||||||
|
---
|
||||||
|
$ export CARGO_HOME="$HOME/.cargo"
|
||||||
|
$ export RUSTUP_HOME="$HOME/.rustup"
|
||||||
|
$ export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
---
|
||||||
|
$ which ailog
|
||||||
|
$ ailog -h
|
||||||
|
```
|
||||||
|
|
||||||
|
## build deploy
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ cd my-blog
|
||||||
|
$ vim config.toml
|
||||||
|
$ ailog new test
|
||||||
|
$ vim content/posts/`date +"%Y-%m-%d"`.md
|
||||||
|
$ ailog build
|
||||||
|
|
||||||
|
# publicの中身をweb-serverにdeploy
|
||||||
|
$ cp -rf ./public/* ./web-server/root/
|
||||||
|
```
|
||||||
|
|
||||||
|
## atproto-comment-system
|
||||||
|
|
||||||
|
### example
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ cd ./oauth
|
||||||
|
$ npm i
|
||||||
|
$ npm run build
|
||||||
|
$ npm run preview
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh
|
||||||
|
# Production environment variables
|
||||||
|
VITE_APP_HOST=https://example.com
|
||||||
|
VITE_OAUTH_CLIENT_ID=https://example.com/client-metadata.json
|
||||||
|
VITE_OAUTH_REDIRECT_URI=https://example.com/oauth/callback
|
||||||
|
VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn
|
||||||
|
|
||||||
|
# Collection names for OAuth app
|
||||||
|
VITE_COLLECTION_COMMENT=ai.syui.log
|
||||||
|
VITE_COLLECTION_USER=ai.syui.log.user
|
||||||
|
VITE_COLLECTION_CHAT=ai.syui.log.chat
|
||||||
|
|
||||||
|
# Collection names for ailog (backward compatibility)
|
||||||
|
AILOG_COLLECTION_COMMENT=ai.syui.log
|
||||||
|
AILOG_COLLECTION_USER=ai.syui.log.user
|
||||||
|
|
||||||
|
# API Configuration
|
||||||
|
VITE_BSKY_PUBLIC_API=https://public.api.bsky.app
|
||||||
|
```
|
||||||
|
|
||||||
|
これは`ailog oauth build my-blog`で`./my-blog/config.toml`から`./oauth/.env.production`が生成されます。
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ ailog oauth build my-blog
|
||||||
|
```
|
||||||
|
|
||||||
|
### use
|
||||||
|
|
||||||
|
簡単に説明すると、`./oauth`で生成するのが`atproto-comment-system`です。
|
||||||
|
|
||||||
|
```html
|
||||||
|
<script type="module" crossorigin src="/assets/comment-atproto-${hash}}.js"></script>
|
||||||
|
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-${hash}.css">
|
||||||
|
<section class="comment-section"> <div id="comment-atproto"></div> </section>
|
||||||
|
```
|
||||||
|
|
||||||
|
ただし、oauthであるため、色々と大変です。本番環境(もしくは近い形)でテストを行いましょう。cf, tailscale, ngrokなど。
|
||||||
|
|
||||||
|
```yml:cloudflared-config.yml
|
||||||
|
tunnel: ${hash}
|
||||||
|
credentials-file: ${path}.json
|
||||||
|
|
||||||
|
ingress:
|
||||||
|
- hostname: example.com
|
||||||
|
service: http://localhost:4173
|
||||||
|
originRequest:
|
||||||
|
noHappyEyeballs: true
|
||||||
|
|
||||||
|
- service: http_status:404
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh
|
||||||
|
# tunnel list, dnsに登録が必要です
|
||||||
|
$ cloudflared tunnel list
|
||||||
|
$ cloudflared tunnel --config cloudflared-config.yml run
|
||||||
|
$ cloudflared tunnel route dns ${uuid} example.com
|
||||||
|
```
|
||||||
|
|
||||||
|
以下の2つのcollection recordを生成します。ユーザーには`ai.syui.log`が生成され、ここにコメントが記録されます。それを取得して表示しています。`ai.syui.log.user`は管理者である`VITE_ADMIN_DID`用です。
|
||||||
|
|
||||||
|
```sh
|
||||||
|
VITE_COLLECTION_COMMENT=ai.syui.log
|
||||||
|
VITE_COLLECTION_USER=ai.syui.log.user
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ ailog auth login
|
||||||
|
$ ailog stream server
|
||||||
|
```
|
||||||
|
|
||||||
|
このコマンドで`ai.syui.log`を`jetstream`から監視して、書き込みがあれば、管理者の`ai.syui.log.user`に記録され、そのuser-listに基づいて、コメント一覧を取得します。
|
||||||
|
|
||||||
|
つまり、コメント表示のアカウントを手動で設定するか、自動化するか。自動化するならserverで`ailog stream server`を動かさなければいけません。
|
||||||
|
|
||||||
|
## ask-AI
|
||||||
|
|
||||||
|
`ask-AI`の仕組みは割愛します。後に変更される可能性が高いと思います。
|
||||||
|
|
||||||
|
local llm, mcp, atprotoと組み合わせです。
|
||||||
|
|
||||||
|
|
||||||
|
## code syntax
|
||||||
|
|
||||||
|
```zsh:/path/to/test.zsh
|
||||||
|
# comment
|
||||||
|
d=${0:a:h}
|
||||||
|
```
|
||||||
|
|
||||||
|
```rust:/path/to/test.rs
|
||||||
|
// This is a comment
|
||||||
|
fn main() {
|
||||||
|
println!("Hello, world!");
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
```js:/path/to/test.js
|
||||||
|
// This is a comment
|
||||||
|
console.log("Hello, world!");
|
||||||
|
```
|
||||||
|
|
66
my-blog/content/posts/2025-06-14-blog.md
Normal file
66
my-blog/content/posts/2025-06-14-blog.md
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
---
|
||||||
|
title: "ブログを移行した"
|
||||||
|
slug: "blog"
|
||||||
|
date: 2025-06-14
|
||||||
|
tags: ["blog", "cloudflare", "github"]
|
||||||
|
draft: false
|
||||||
|
---
|
||||||
|
|
||||||
|
ブログを移行しました。過去のブログは[syui.github.io](https://syui.github.io)にありあます。
|
||||||
|
|
||||||
|
1. `gh-pages`から`cf-pages`への移行になります。
|
||||||
|
2. 自作の`ailog`でbuildしています。
|
||||||
|
3. 特徴としては、`atproto`, `AI`との連携です。
|
||||||
|
|
||||||
|
```yml:.github/workflows/cloudflare-pages.yml
|
||||||
|
name: Deploy to Cloudflare Pages
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
deployments: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Rust
|
||||||
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
|
||||||
|
- name: Build ailog
|
||||||
|
run: cargo build --release
|
||||||
|
|
||||||
|
- name: Build site with ailog
|
||||||
|
run: |
|
||||||
|
cd my-blog
|
||||||
|
../target/release/ailog build
|
||||||
|
|
||||||
|
- name: List public directory
|
||||||
|
run: |
|
||||||
|
ls -la my-blog/public/
|
||||||
|
|
||||||
|
- name: Deploy to Cloudflare Pages
|
||||||
|
uses: cloudflare/pages-action@v1
|
||||||
|
with:
|
||||||
|
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||||
|
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
|
||||||
|
directory: my-blog/public
|
||||||
|
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
wranglerVersion: '3'
|
||||||
|
```
|
||||||
|
|
||||||
|
## url
|
||||||
|
|
||||||
|
- [https://syui.pages.dev](https://syui.pages.dev)
|
||||||
|
- [https://syui.github.io](https://syui.github.io)
|
7
my-blog/layouts/_default/index.json
Normal file
7
my-blog/layouts/_default/index.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{{ $dateFormat := default "Mon Jan 2, 2006" (index .Site.Params "date_format") }}
|
||||||
|
{{ $utcFormat := "2006-01-02T15:04:05Z07:00" }}
|
||||||
|
{{- $.Scratch.Add "index" slice -}}
|
||||||
|
{{- range .Site.RegularPages -}}
|
||||||
|
{{- $.Scratch.Add "index" (dict "title" .Title "tags" .Params.tags "description" .Description "categories" .Params.categories "contents" .Plain "href" .Permalink "utc_time" (.Date.Format $utcFormat) "formated_time" (.Date.Format $dateFormat)) -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- $.Scratch.Get "index" | jsonify -}}
|
14
my-blog/static/.well-known/jwks.json
Normal file
14
my-blog/static/.well-known/jwks.json
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"keys": [
|
||||||
|
{
|
||||||
|
"kty": "EC",
|
||||||
|
"crv": "P-256",
|
||||||
|
"x": "mock_x_coordinate_base64url",
|
||||||
|
"y": "mock_y_coordinate_base64url",
|
||||||
|
"d": "mock_private_key_base64url",
|
||||||
|
"use": "sig",
|
||||||
|
"kid": "ai-card-oauth-key-1",
|
||||||
|
"alg": "ES256"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
51
my-blog/static/_headers
Normal file
51
my-blog/static/_headers
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
X-Frame-Options: DENY
|
||||||
|
X-Content-Type-Options: nosniff
|
||||||
|
Referrer-Policy: strict-origin-when-cross-origin
|
||||||
|
X-XSS-Protection: 1; mode=block
|
||||||
|
Permissions-Policy: camera=(), microphone=(), geolocation=()
|
||||||
|
|
||||||
|
# OAuth specific headers
|
||||||
|
/oauth/*
|
||||||
|
Access-Control-Allow-Origin: https://bsky.social
|
||||||
|
Access-Control-Allow-Methods: GET, POST, OPTIONS
|
||||||
|
Access-Control-Allow-Headers: Content-Type, Authorization
|
||||||
|
|
||||||
|
# Static assets caching
|
||||||
|
/assets/*
|
||||||
|
Cache-Control: public, max-age=31536000, immutable
|
||||||
|
|
||||||
|
/css/*
|
||||||
|
Content-Type: text/css
|
||||||
|
Cache-Control: no-cache
|
||||||
|
|
||||||
|
/*.js
|
||||||
|
Content-Type: application/javascript
|
||||||
|
Cache-Control: public, max-age=31536000, immutable
|
||||||
|
|
||||||
|
/assets/*.js
|
||||||
|
Content-Type: application/javascript
|
||||||
|
Cache-Control: public, max-age=31536000, immutable
|
||||||
|
|
||||||
|
# Ensure ES6 modules are served correctly
|
||||||
|
/assets/comment-atproto-*.js
|
||||||
|
Content-Type: text/javascript; charset=utf-8
|
||||||
|
Cache-Control: public, max-age=31536000, immutable
|
||||||
|
|
||||||
|
# All JS assets
|
||||||
|
/assets/*-*.js
|
||||||
|
Content-Type: text/javascript; charset=utf-8
|
||||||
|
Cache-Control: public, max-age=31536000, immutable
|
||||||
|
|
||||||
|
# CSS assets
|
||||||
|
/assets/*.css
|
||||||
|
Content-Type: text/css
|
||||||
|
Cache-Control: public, max-age=60
|
||||||
|
|
||||||
|
/posts/*
|
||||||
|
Cache-Control: public, max-age=3600
|
||||||
|
|
||||||
|
# Client metadata for OAuth
|
||||||
|
/client-metadata.json
|
||||||
|
Content-Type: application/json
|
||||||
|
Cache-Control: public, max-age=3600
|
5
my-blog/static/_redirects
Normal file
5
my-blog/static/_redirects
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# OAuth routes
|
||||||
|
/oauth/* /oauth/index.html 200
|
||||||
|
|
||||||
|
# SPA routing support
|
||||||
|
/* /index.html 200
|
BIN
my-blog/static/apple-touch-icon.png
Normal file
BIN
my-blog/static/apple-touch-icon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
24
my-blog/static/client-metadata.json
Normal file
24
my-blog/static/client-metadata.json
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"client_id": "https://syui.ai/client-metadata.json",
|
||||||
|
"client_name": "ai.card",
|
||||||
|
"client_uri": "https://syui.ai",
|
||||||
|
"logo_uri": "https://syui.ai/favicon.ico",
|
||||||
|
"tos_uri": "https://syui.ai/terms",
|
||||||
|
"policy_uri": "https://syui.ai/privacy",
|
||||||
|
"redirect_uris": [
|
||||||
|
"https://syui.ai/oauth/callback",
|
||||||
|
"https://syui.ai/"
|
||||||
|
],
|
||||||
|
"response_types": [
|
||||||
|
"code"
|
||||||
|
],
|
||||||
|
"grant_types": [
|
||||||
|
"authorization_code",
|
||||||
|
"refresh_token"
|
||||||
|
],
|
||||||
|
"token_endpoint_auth_method": "none",
|
||||||
|
"scope": "atproto transition:generic",
|
||||||
|
"subject_type": "public",
|
||||||
|
"application_type": "web",
|
||||||
|
"dpop_bound_access_tokens": true
|
||||||
|
}
|
956
my-blog/static/css/style.css
Normal file
956
my-blog/static/css/style.css
Normal file
@@ -0,0 +1,956 @@
|
|||||||
|
/* Theme Colors */
|
||||||
|
:root {
|
||||||
|
--theme-color: #f40;
|
||||||
|
--ai-color: #ff7;
|
||||||
|
--white: #fff;
|
||||||
|
--light-white: #f5f5f5;
|
||||||
|
--dark-white: #d1d9e0;
|
||||||
|
--light-gray: #f6f8fa;
|
||||||
|
--dark-gray: #666;
|
||||||
|
--background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Base styles */
|
||||||
|
* {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
|
||||||
|
line-height: 1.6;
|
||||||
|
color: #1f2328;
|
||||||
|
background-color: #ffffff;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Buttons */
|
||||||
|
button {
|
||||||
|
background: linear-gradient(135deg, #667eea, #764ba2);
|
||||||
|
color: #fff;
|
||||||
|
border: none;
|
||||||
|
padding: 10px 20px;
|
||||||
|
border-radius: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Links */
|
||||||
|
a:any-link {
|
||||||
|
color: var(--theme-color);
|
||||||
|
text-decoration-line: unset;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover {
|
||||||
|
color: var(--theme-color);
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Override link color for specific buttons */
|
||||||
|
a.view-markdown,
|
||||||
|
a.view-markdown:any-link {
|
||||||
|
color: #ffffff !important;
|
||||||
|
text-decoration: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Layout */
|
||||||
|
.container {
|
||||||
|
min-height: 100vh;
|
||||||
|
display: grid;
|
||||||
|
grid-template-rows: auto 0fr 1fr auto;
|
||||||
|
grid-template-areas:
|
||||||
|
"header"
|
||||||
|
"ask-ai"
|
||||||
|
"main"
|
||||||
|
"footer";
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header */
|
||||||
|
.main-header {
|
||||||
|
grid-area: header;
|
||||||
|
background: #ffffff;
|
||||||
|
border-bottom: 1px solid #d1d9e0;
|
||||||
|
padding: 16px 24px;
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
z-index: 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-content {
|
||||||
|
max-width: 1000px;
|
||||||
|
margin: 0 auto;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr auto 1fr;
|
||||||
|
align-items: center;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.site-title {
|
||||||
|
color: var(--theme-color);
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: 20px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo {
|
||||||
|
grid-column: 2;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo .likeButton {
|
||||||
|
height: 60px;
|
||||||
|
width: auto;
|
||||||
|
cursor: pointer;
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-actions {
|
||||||
|
grid-column: 3;
|
||||||
|
justify-self: end;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ask AI Button */
|
||||||
|
.ask-ai-btn {
|
||||||
|
background: var(--theme-color);
|
||||||
|
color: var(--white);
|
||||||
|
padding: 8px 16px;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
transition: background-color 0.2s;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-btn:hover {
|
||||||
|
filter: brightness(1.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-icon {
|
||||||
|
font-size: 16px;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
color: var(--ai-color);
|
||||||
|
display: inline-block;
|
||||||
|
font-family: 'icomoon' !important;
|
||||||
|
speak: none;
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: normal;
|
||||||
|
font-variant: normal;
|
||||||
|
text-transform: none;
|
||||||
|
line-height: 1;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Ask AI Panel */
|
||||||
|
.ask-ai-panel {
|
||||||
|
grid-area: ask-ai;
|
||||||
|
background: #f6f8fa;
|
||||||
|
border-bottom: 1px solid #d1d9e0;
|
||||||
|
padding: 24px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-panel[style*="block"] {
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.container:has(.ask-ai-panel[style*="block"]) {
|
||||||
|
grid-template-rows: auto auto 1fr auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-content {
|
||||||
|
max-width: 1000px;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-form {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-form input {
|
||||||
|
flex: 1;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-check {
|
||||||
|
background: #f6f8fa;
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 16px;
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Main Content */
|
||||||
|
.main-content {
|
||||||
|
grid-area: main;
|
||||||
|
max-width: 1000px;
|
||||||
|
margin: 0 auto;
|
||||||
|
/* padding: 24px; */
|
||||||
|
padding-top: 80px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1000px) {
|
||||||
|
.main-content {
|
||||||
|
/* padding: 20px; */
|
||||||
|
padding: 0px;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Timeline */
|
||||||
|
.timeline-container {
|
||||||
|
max-width: 600px;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-header h2 {
|
||||||
|
color: #1f2328;
|
||||||
|
font-size: 24px;
|
||||||
|
font-weight: 600;
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-feed {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-post {
|
||||||
|
background: #ffffff;
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 20px;
|
||||||
|
transition: box-shadow 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-post:hover {
|
||||||
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-title a {
|
||||||
|
color: #1f2328;
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-title a:hover {
|
||||||
|
color: var(--theme-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-date {
|
||||||
|
color: #656d76;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-excerpt {
|
||||||
|
color: #656d76;
|
||||||
|
margin: 16px 0;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 16px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.read-more {
|
||||||
|
color: var(--theme-color);
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.read-more:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.view-markdown, .view-translation {
|
||||||
|
color: #656d76;
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: 14px;
|
||||||
|
padding: 4px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
transition: all 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.view-markdown {
|
||||||
|
background: var(--theme-color) !important;
|
||||||
|
color: #ffffff !important;
|
||||||
|
border: 1px solid var(--theme-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.view-markdown:hover {
|
||||||
|
filter: brightness(1.1);
|
||||||
|
color: #ffffff !important;
|
||||||
|
background: var(--theme-color) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.view-translation:hover {
|
||||||
|
background: #f6f8fa;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-meta {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-lang {
|
||||||
|
background: #f6f8fa;
|
||||||
|
color: #656d76;
|
||||||
|
padding: 2px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Article */
|
||||||
|
.article-container {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr 240px;
|
||||||
|
gap: 40px;
|
||||||
|
max-width: 1000px;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
article.article-content {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-meta {
|
||||||
|
display: flex;
|
||||||
|
gap: 16px;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-date {
|
||||||
|
color: #656d76;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-lang {
|
||||||
|
background: #f6f8fa;
|
||||||
|
color: #656d76;
|
||||||
|
padding: 4px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 15px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-btn {
|
||||||
|
color: var(--theme-color);
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: 14px;
|
||||||
|
padding: 6px 12px;
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 6px;
|
||||||
|
transition: all 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-btn:hover {
|
||||||
|
background: #f6f8fa;
|
||||||
|
border-color: var(--theme-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-btn {
|
||||||
|
background: var(--dark-white);
|
||||||
|
color: var(--white);
|
||||||
|
border-color: var(--white);
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-btn:link,
|
||||||
|
.markdown-btn:visited {
|
||||||
|
color: var(--white) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-btn:hover {
|
||||||
|
filter: brightness(0.9);
|
||||||
|
color: var(--theme-color) !important;
|
||||||
|
border-color: var(--white);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Sidebar styles */
|
||||||
|
.article-sidebar {
|
||||||
|
position: sticky;
|
||||||
|
top: 100px;
|
||||||
|
height: fit-content;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc {
|
||||||
|
background: #f6f8fa;
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc h3 {
|
||||||
|
color: #1f2328;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-list {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-item {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hierarchy indentation for TOC */
|
||||||
|
.toc-item.toc-h1 .toc-link {
|
||||||
|
padding-left: 0;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-item.toc-h2 .toc-link {
|
||||||
|
padding-left: 0;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-item.toc-h3 .toc-link {
|
||||||
|
padding-left: 16px;
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-item.toc-h4 .toc-link {
|
||||||
|
padding-left: 32px;
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 12px;
|
||||||
|
opacity: 0.9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-item.toc-h5 .toc-link {
|
||||||
|
padding-left: 48px;
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 12px;
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-item.toc-h6 .toc-link {
|
||||||
|
padding-left: 64px;
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 11px;
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-link {
|
||||||
|
color: #656d76;
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.4;
|
||||||
|
display: block;
|
||||||
|
padding: 4px 0;
|
||||||
|
transition: color 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toc-link:hover {
|
||||||
|
color: var(--theme-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-title {
|
||||||
|
color: #1f2328;
|
||||||
|
font-size: 32px;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
line-height: 1.25;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body {
|
||||||
|
color: #1f2328;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body h1, .article-body h2, .article-body h3 {
|
||||||
|
color: #1f2328;
|
||||||
|
margin-top: 24px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body p {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body ol, .article-body ul {
|
||||||
|
margin: 16px 0;
|
||||||
|
padding-left: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body li {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body ol li {
|
||||||
|
list-style-type: decimal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body ul li {
|
||||||
|
list-style-type: disc;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body pre {
|
||||||
|
background: #1B1D1E !important;
|
||||||
|
border: 1px solid #3E3D32;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
margin: 16px 0;
|
||||||
|
font-size: 14px;
|
||||||
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* File name display for code blocks - top bar style */
|
||||||
|
.article-body pre[data-filename]::before {
|
||||||
|
content: attr(data-filename);
|
||||||
|
display: block;
|
||||||
|
background: #2D2D30;
|
||||||
|
color: #AE81FF;
|
||||||
|
padding: 8px 16px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', monospace;
|
||||||
|
border-bottom: 1px solid #3E3D32;
|
||||||
|
margin: 0;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body pre code {
|
||||||
|
display: block;
|
||||||
|
background: none !important;
|
||||||
|
padding: 30px 16px;
|
||||||
|
color: #F8F8F2 !important;
|
||||||
|
font-family: 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', monospace;
|
||||||
|
overflow-x: auto;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Adjust padding when filename is present */
|
||||||
|
.article-body pre[data-filename] code {
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Inline code (not in pre blocks) */
|
||||||
|
.article-body code {
|
||||||
|
background: var(--light-white);
|
||||||
|
color: var(--dark-gray);
|
||||||
|
padding: 2px 6px;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-family: 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', monospace;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Molokai syntax highlighting */
|
||||||
|
.article-body pre code .hljs-keyword { color: #F92672; }
|
||||||
|
.article-body pre code .hljs-string { color: #E6DB74; }
|
||||||
|
.article-body pre code .hljs-comment { color: #88846F; font-style: italic; }
|
||||||
|
.article-body pre code .hljs-number { color: #AE81FF; }
|
||||||
|
.article-body pre code .hljs-variable { color: #FD971F; }
|
||||||
|
.article-body pre code .hljs-function { color: #A6E22E; }
|
||||||
|
.article-body pre code .hljs-tag { color: #F92672; }
|
||||||
|
.article-body pre code .hljs-attr { color: #A6E22E; }
|
||||||
|
.article-body pre code .hljs-value { color: #E6DB74; }
|
||||||
|
|
||||||
|
/* Fix inline span colors in code blocks */
|
||||||
|
.article-body pre code span[style*="color:#8fa1b3"] { color: #AE81FF !important; } /* $ prompt */
|
||||||
|
.article-body pre code span[style*="color:#c0c5ce"] { color: #F8F8F2 !important; } /* commands */
|
||||||
|
.article-body pre code span[style*="color:#75715E"] { color: #88846F !important; } /* real comments */
|
||||||
|
|
||||||
|
/* Shell/Bash specific fixes */
|
||||||
|
.article-body pre code span[style*="color:#65737e"] {
|
||||||
|
color: #F8F8F2 !important; /* Default to white for variables and code */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Comments in shell scripts - lines that contain # followed by text */
|
||||||
|
.article-body pre code span[style*="color:#65737e"]:has-text("#") {
|
||||||
|
color: #88846F !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Alternative approach - check content */
|
||||||
|
.article-body pre code {
|
||||||
|
/* Reset all gray colored text to white by default */
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body pre code span[style*="color:#65737e"] {
|
||||||
|
/* Check if the content starts with # */
|
||||||
|
color: #F8F8F2 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Override for actual comments - this is a workaround */
|
||||||
|
.article-body pre code span[style*="color:#65737e"]:first-child:before {
|
||||||
|
content: attr(data-comment);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Detect comments by position and content pattern */
|
||||||
|
.article-body pre code span[style*="color:#65737e"] {
|
||||||
|
color: #F8F8F2 !important; /* Environment variables = white */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Only style as comment if the line actually starts with # */
|
||||||
|
.article-body pre code > span:first-child[style*="color:#65737e"] {
|
||||||
|
color: #88846F !important; /* Real comments = gray */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Footer */
|
||||||
|
.main-footer {
|
||||||
|
grid-area: footer;
|
||||||
|
background: var(--light-white);
|
||||||
|
border-top: 1px solid #d1d9e0;
|
||||||
|
padding: 32px 24px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer-social {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 24px;
|
||||||
|
margin: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer-social a {
|
||||||
|
color: var(--dark-gray) !important;
|
||||||
|
text-decoration: none !important;
|
||||||
|
font-size: 16px;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer-social a:hover {
|
||||||
|
color: var(--theme-color) !important;
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-footer p {
|
||||||
|
color: #656d76;
|
||||||
|
font-size: 14px;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Chat Messages */
|
||||||
|
.chat-message.comment-style {
|
||||||
|
background: #ffffff;
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 16px;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-message.ai-message.comment-style {
|
||||||
|
border-left: 4px solid var(--ai-color);
|
||||||
|
background: #faf8ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-header .avatar {
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: #f6f8fa;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-size: 20px;
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.display-name {
|
||||||
|
font-weight: 600;
|
||||||
|
color: #1f2328;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handle {
|
||||||
|
color: #656d76;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timestamp {
|
||||||
|
color: #656d76;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-content {
|
||||||
|
color: #1f2328;
|
||||||
|
line-height: 1.5;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-avatar {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
border-radius: 50%;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loading Animation */
|
||||||
|
.ai-loading-simple {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 10px 15px;
|
||||||
|
background: linear-gradient(90deg, #f8f9fa 0%, #e9ecef 100%);
|
||||||
|
border-radius: 20px;
|
||||||
|
margin: 8px 0;
|
||||||
|
font-size: 14px;
|
||||||
|
color: #495057;
|
||||||
|
border: 1px solid #dee2e6;
|
||||||
|
animation: slideIn 0.3s ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideIn {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(-10px);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Comment System Styles */
|
||||||
|
.comment-section {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 0 auto;
|
||||||
|
margin-top: 48px;
|
||||||
|
padding-top: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-container {
|
||||||
|
max-width: 600px;
|
||||||
|
margin: 0 auto;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-section h3 {
|
||||||
|
color: #1f2328;
|
||||||
|
font-size: 24px;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 32px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* OAuth Comment System - Hide on homepage by default, show on post pages */
|
||||||
|
.timeline-container .comment-section {
|
||||||
|
display: block; /* Show on homepage */
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-container .comment-section .comments-list > :nth-child(n+6) {
|
||||||
|
display: none; /* Hide comments after the 5th one */
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-container .comment-section,
|
||||||
|
.article-content + .comment-section {
|
||||||
|
display: block; /* Show all comments on post pages */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Responsive */
|
||||||
|
@media (max-width: 1000px) {
|
||||||
|
.article-container {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
gap: 24px;
|
||||||
|
max-width: 100%;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1000px) {
|
||||||
|
.main-header {
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-content {
|
||||||
|
max-width: 100%;
|
||||||
|
padding: 0 20px;
|
||||||
|
grid-template-columns: auto 1fr auto;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* OAuth app mobile fixes */
|
||||||
|
.comment-item {
|
||||||
|
padding: 0px !important;
|
||||||
|
margin: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-section {
|
||||||
|
padding: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comments-list {
|
||||||
|
padding: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-section {
|
||||||
|
padding: 0px !important;
|
||||||
|
margin: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-content {
|
||||||
|
padding: 10px !important;
|
||||||
|
word-wrap: break-word !important;
|
||||||
|
overflow-wrap: break-word !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-header {
|
||||||
|
padding: 10px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fix comment-meta URI overflow */
|
||||||
|
.comment-meta {
|
||||||
|
word-break: break-all !important;
|
||||||
|
overflow-wrap: break-word !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hide site title text on mobile */
|
||||||
|
.site-title {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Left align logo on mobile */
|
||||||
|
.logo {
|
||||||
|
grid-column: 1;
|
||||||
|
justify-self: left;
|
||||||
|
padding: 5px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Reduce logo size on mobile */
|
||||||
|
.logo .likeButton {
|
||||||
|
width: 40pt;
|
||||||
|
height: 40pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Position AI button on the right */
|
||||||
|
.header-actions {
|
||||||
|
grid-column: 3;
|
||||||
|
justify-self: end;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ask AI button mobile style - icon only */
|
||||||
|
.ask-ai-btn {
|
||||||
|
padding: 8px;
|
||||||
|
min-width: 40px;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0;
|
||||||
|
font-size: 0; /* Hide all text content */
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-btn .ai-icon {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-panel {
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Article content mobile optimization */
|
||||||
|
.article-body {
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body pre {
|
||||||
|
margin: 16px 0;
|
||||||
|
border-radius: 4px;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow-x: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body pre code {
|
||||||
|
padding: 20px 12px;
|
||||||
|
word-wrap: break-word;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Mobile filename display */
|
||||||
|
.article-body pre[data-filename]::before {
|
||||||
|
padding: 6px 12px;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body pre[data-filename] code {
|
||||||
|
padding: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-body code {
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-ai-form {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-container {
|
||||||
|
max-width: 100%;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-post {
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-title {
|
||||||
|
font-size: 24px;
|
||||||
|
padding: 30px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-header .avatar {
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Center content on mobile */
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.container {
|
||||||
|
width: 100%;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
}
|
342
my-blog/static/css/svg-animation-package.css
Normal file
342
my-blog/static/css/svg-animation-package.css
Normal file
@@ -0,0 +1,342 @@
|
|||||||
|
/* SVG Animation Package - Dependency-free standalone package
|
||||||
|
* Based on svg-animation-particle-circle.css
|
||||||
|
* Theme color integration with CSS variables
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Theme-based color variables for particles */
|
||||||
|
:root {
|
||||||
|
--particle-color-1: #f40; /* theme-color base */
|
||||||
|
--particle-color-2: #f50; /* theme-color +0.1 brightness */
|
||||||
|
--particle-color-3: #f60; /* theme-color +0.2 brightness */
|
||||||
|
--particle-color-4: #f70; /* theme-color +0.3 brightness */
|
||||||
|
--particle-color-5: #f80; /* theme-color +0.4 brightness */
|
||||||
|
--explosion-color: #f30; /* theme-color -0.1 brightness */
|
||||||
|
--syui-color: #f40; /* main theme color */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Core SVG button setup */
|
||||||
|
.likeButton {
|
||||||
|
cursor: pointer;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Remove debug animation and restore hover functionality */
|
||||||
|
|
||||||
|
.likeButton .border {
|
||||||
|
fill: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Explosion circle - initially hidden */
|
||||||
|
.likeButton .explosion {
|
||||||
|
transform-origin: center center;
|
||||||
|
transform: scale(1);
|
||||||
|
stroke: var(--explosion-color);
|
||||||
|
fill: none;
|
||||||
|
opacity: 0;
|
||||||
|
stroke-width: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Particle layer - initially hidden */
|
||||||
|
.likeButton .particleLayer {
|
||||||
|
opacity: 0;
|
||||||
|
transform: scale(0); /* Ensure particles start hidden */
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton .particleLayer circle {
|
||||||
|
opacity: 0;
|
||||||
|
transform-origin: center center; /* Fixed from 250px 250px */
|
||||||
|
transform: scale(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Syui logo - main animation target */
|
||||||
|
.likeButton .syui {
|
||||||
|
fill: var(--syui-color);
|
||||||
|
transform: scale(1);
|
||||||
|
transform-origin: center center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hover trigger - replaces jQuery */
|
||||||
|
.likeButton:hover .explosion {
|
||||||
|
animation: explosionAnime 800ms forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer {
|
||||||
|
animation: particleLayerAnime 800ms forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .syui,
|
||||||
|
.likeButton:hover path.syui {
|
||||||
|
animation: syuiDeluxeAnime 400ms forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Individual particle animations */
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(1) {
|
||||||
|
animation: particleAnimate1 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(2) {
|
||||||
|
animation: particleAnimate2 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(3) {
|
||||||
|
animation: particleAnimate3 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(4) {
|
||||||
|
animation: particleAnimate4 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(5) {
|
||||||
|
animation: particleAnimate5 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(6) {
|
||||||
|
animation: particleAnimate6 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(7) {
|
||||||
|
animation: particleAnimate7 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(8) {
|
||||||
|
animation: particleAnimate8 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(9) {
|
||||||
|
animation: particleAnimate9 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(10) {
|
||||||
|
animation: particleAnimate10 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(11) {
|
||||||
|
animation: particleAnimate11 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(12) {
|
||||||
|
animation: particleAnimate12 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(13) {
|
||||||
|
animation: particleAnimate13 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer circle:nth-child(14) {
|
||||||
|
animation: particleAnimate14 800ms;
|
||||||
|
animation-fill-mode: forwards;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Keyframe animations */
|
||||||
|
@keyframes explosionAnime {
|
||||||
|
0% {
|
||||||
|
opacity: 0;
|
||||||
|
transform: scale(0.01);
|
||||||
|
}
|
||||||
|
1% {
|
||||||
|
opacity: 1;
|
||||||
|
transform: scale(0.01);
|
||||||
|
}
|
||||||
|
5% {
|
||||||
|
stroke-width: 200;
|
||||||
|
}
|
||||||
|
20% {
|
||||||
|
stroke-width: 300;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
stroke: var(--particle-color-3);
|
||||||
|
transform: scale(1.1);
|
||||||
|
stroke-width: 1;
|
||||||
|
}
|
||||||
|
50.1% {
|
||||||
|
stroke-width: 0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
stroke: var(--particle-color-3);
|
||||||
|
transform: scale(1.1);
|
||||||
|
stroke-width: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleLayerAnime {
|
||||||
|
0% {
|
||||||
|
transform: translate(0, 0);
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
30% {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
31% {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
60% {
|
||||||
|
transform: translate(0, 0);
|
||||||
|
}
|
||||||
|
70% {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translate(0, -20px);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Syui Deluxe Animation - Based on 2019 blog post */
|
||||||
|
@keyframes syuiDeluxeAnime {
|
||||||
|
0% {
|
||||||
|
fill: var(--syui-color);
|
||||||
|
transform: scale(1) translate(0%, 0%);
|
||||||
|
}
|
||||||
|
40% {
|
||||||
|
fill: color-mix(in srgb, var(--syui-color) 40%, transparent);
|
||||||
|
transform: scale(1, 0.9) translate(-9%, 9%);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
fill: color-mix(in srgb, var(--syui-color) 70%, transparent);
|
||||||
|
transform: scale(1, 0.9) translate(-7%, 7%);
|
||||||
|
}
|
||||||
|
60% {
|
||||||
|
transform: scale(1) translate(-7%, 7%);
|
||||||
|
}
|
||||||
|
70% {
|
||||||
|
transform: scale(1.04) translate(-5%, 5%);
|
||||||
|
}
|
||||||
|
80% {
|
||||||
|
fill: color-mix(in srgb, var(--syui-color) 60%, transparent);
|
||||||
|
transform: scale(1.04) translate(-5%, 5%);
|
||||||
|
}
|
||||||
|
90% {
|
||||||
|
fill: var(--particle-color-5); /* 爆発の閃光 */
|
||||||
|
transform: scale(1) translate(0%);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
fill: var(--syui-color);
|
||||||
|
transform: scale(1, 1) translate(0%, 0%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Individual particle animations */
|
||||||
|
@keyframes particleAnimate1 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-16px, -59px); }
|
||||||
|
90% { transform: translate(-16px, -59px); }
|
||||||
|
100% { opacity: 1; transform: translate(-16px, -59px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate2 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(41px, 43px); }
|
||||||
|
90% { transform: translate(41px, 43px); }
|
||||||
|
100% { opacity: 1; transform: translate(41px, 43px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate3 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(50px, -48px); }
|
||||||
|
90% { transform: translate(50px, -48px); }
|
||||||
|
100% { opacity: 1; transform: translate(50px, -48px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate4 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-39px, 36px); }
|
||||||
|
90% { transform: translate(-39px, 36px); }
|
||||||
|
100% { opacity: 1; transform: translate(-39px, 36px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate5 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-39px, 32px); }
|
||||||
|
90% { transform: translate(-39px, 32px); }
|
||||||
|
100% { opacity: 1; transform: translate(-39px, 32px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate6 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(48px, 6px); }
|
||||||
|
90% { transform: translate(48px, 6px); }
|
||||||
|
100% { opacity: 1; transform: translate(48px, 6px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate7 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-69px, -36px); }
|
||||||
|
90% { transform: translate(-69px, -36px); }
|
||||||
|
100% { opacity: 1; transform: translate(-69px, -36px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate8 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-12px, -52px); }
|
||||||
|
90% { transform: translate(-12px, -52px); }
|
||||||
|
100% { opacity: 1; transform: translate(-12px, -52px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate9 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-43px, -21px); }
|
||||||
|
90% { transform: translate(-43px, -21px); }
|
||||||
|
100% { opacity: 1; transform: translate(-43px, -21px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate10 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-10px, 47px); }
|
||||||
|
90% { transform: translate(-10px, 47px); }
|
||||||
|
100% { opacity: 1; transform: translate(-10px, 47px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate11 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(66px, -9px); }
|
||||||
|
90% { transform: translate(66px, -9px); }
|
||||||
|
100% { opacity: 1; transform: translate(66px, -9px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate12 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(40px, -45px); }
|
||||||
|
90% { transform: translate(40px, -45px); }
|
||||||
|
100% { opacity: 1; transform: translate(40px, -45px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate13 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(29px, 24px); }
|
||||||
|
90% { transform: translate(29px, 24px); }
|
||||||
|
100% { opacity: 1; transform: translate(29px, 24px); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes particleAnimate14 {
|
||||||
|
0% { transform: translate(0, 0); }
|
||||||
|
30% { opacity: 1; transform: translate(0, 0); }
|
||||||
|
80% { transform: translate(-10px, 50px); }
|
||||||
|
90% { transform: translate(-10px, 50px); }
|
||||||
|
100% { opacity: 1; transform: translate(-10px, 50px); }
|
||||||
|
}
|
BIN
my-blog/static/favicon.ico
Normal file
BIN
my-blog/static/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 84 KiB |
BIN
my-blog/static/favicon.png
Normal file
BIN
my-blog/static/favicon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
22
my-blog/static/favicon.svg
Normal file
22
my-blog/static/favicon.svg
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<svg width="77pt" height="77pt" viewBox="0 0 512 512" class="likeButton" >
|
||||||
|
<circle class="explosion" r="150" cx="250" cy="250"></circle>
|
||||||
|
<g class="particleLayer">
|
||||||
|
<circle fill="#ef454aba" cx="130" cy="126.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454acc" cx="411" cy="313.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="279" cy="86.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="155" cy="390.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="89" cy="292.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="414" cy="282.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454a91" cx="115" cy="149.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="250" cy="80.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="78" cy="261.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454a91" cx="182" cy="402.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="401.5" cy="166" r="13"/>
|
||||||
|
<circle fill="#ef454aba" cx="379" cy="141.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454a91" cx="327" cy="397.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="296" cy="392.5" r="10.5"/>
|
||||||
|
</g>
|
||||||
|
<g transform="translate(0,512) scale(0.1,-0.1)" fill="#000000" class="icon_syui">
|
||||||
|
<path class="syui" d="M3660 4460 c-11 -11 -33 -47 -48 -80 l-29 -60 -12 38 c-27 88 -58 92 -98 11 -35 -70 -73 -159 -73 -169 0 -6 -5 -10 -10 -10 -6 0 -15 -10 -21 -22 -33 -73 -52 -92 -47 -48 2 26 -1 35 -14 38 -16 3 -168 -121 -168 -138 0 -5 -13 -16 -28 -24 -24 -13 -35 -12 -87 0 -221 55 -231 56 -480 56 -219 1 -247 -1 -320 -22 -44 -12 -96 -26 -115 -30 -57 -13 -122 -39 -200 -82 -8 -4 -31 -14 -50 -23 -41 -17 -34 -13 -146 -90 -87 -59 -292 -252 -351 -330 -63 -83 -143 -209 -143 -225 0 -10 -7 -23 -15 -30 -8 -7 -15 -17 -15 -22 0 -5 -13 -37 -28 -71 -16 -34 -36 -93 -45 -132 -9 -38 -24 -104 -34 -145 -13 -60 -17 -121 -17 -300 1 -224 1 -225 36 -365 24 -94 53 -175 87 -247 28 -58 51 -108 51 -112 0 -3 13 -24 28 -48 42 -63 46 -79 22 -85 -11 -3 -20 -9 -20 -14 0 -5 -4 -9 -10 -9 -5 0 -22 -11 -37 -25 -16 -13 -75 -59 -133 -100 -58 -42 -113 -82 -123 -90 -9 -8 -22 -15 -27 -15 -6 0 -10 -6 -10 -13 0 -8 -11 -20 -25 -27 -34 -18 -34 -54 0 -48 14 3 25 2 25 -1 0 -3 -43 -31 -95 -61 -52 -30 -95 -58 -95 -62 0 -5 -5 -8 -11 -8 -19 0 -84 -33 -92 -47 -4 -7 -15 -13 -22 -13 -14 0 -17 -4 -19 -32 -1 -8 15 -15 37 -18 l38 -5 -47 -48 c-56 -59 -54 -81 9 -75 30 3 45 0 54 -11 9 -13 16 -14 43 -4 29 11 30 10 18 -5 -7 -9 -19 -23 -25 -30 -7 -7 -13 -20 -13 -29 0 -12 8 -14 38 -9 20 4 57 8 82 9 25 2 54 8 66 15 18 10 23 8 32 -13 17 -38 86 -35 152 6 27 17 50 34 50 38 0 16 62 30 85 19 33 -15 72 -2 89 30 8 15 31 43 51 62 35 34 38 35 118 35 77 0 85 2 126 33 24 17 52 32 61 32 9 0 42 18 73 40 30 22 61 40 69 40 21 0 88 -26 100 -38 7 -7 17 -12 24 -12 7 0 35 -11 62 -25 66 -33 263 -84 387 -101 189 -25 372 -12 574 41 106 27 130 37 261 97 41 20 80 37 85 39 6 2 51 31 100 64 166 111 405 372 489 534 10 20 22 43 27 51 5 8 12 22 15 30 3 8 17 40 31 70 54 115 95 313 108 520 13 200 -43 480 -134 672 -28 58 -51 108 -51 112 0 3 -13 24 -29 48 -15 24 -34 60 -40 80 -19 57 3 142 50 193 10 11 22 49 28 85 6 36 16 67 21 68 18 6 31 53 25 83 -4 18 -17 33 -36 41 -16 7 -29 15 -29 18 1 10 38 50 47 50 5 0 20 11 33 25 18 19 22 31 17 61 -3 20 -14 45 -23 55 -16 18 -16 20 6 44 15 16 21 32 18 49 -3 15 1 34 8 43 32 43 7 73 -46 55 l-30 -11 0 85 c0 74 -2 84 -18 84 -21 0 -53 -33 -103 -104 l-34 -48 -5 74 c-7 102 -35 133 -80 88z m-870 -740 c36 -7 75 -14 88 -16 21 -4 23 -9 16 -37 -3 -18 -14 -43 -24 -57 -10 -14 -20 -35 -24 -46 -4 -12 -16 -32 -27 -45 -12 -13 -37 -49 -56 -79 -20 -30 -52 -73 -72 -96 -53 -60 -114 -133 -156 -189 -21 -27 -44 -54 -52 -58 -7 -4 -13 -14 -13 -22 0 -7 -18 -33 -40 -57 -22 -23 -40 -46 -40 -50 0 -5 -19 -21 -42 -38 -47 -35 -85 -38 -188 -15 -115 25 -173 20 -264 -23 -45 -22 -106 -46 -136 -56 -48 -15 -77 -25 -140 -50 -70 -28 -100 -77 -51 -84 14 -2 34 -10 45 -17 12 -7 53 -16 91 -20 90 -9 131 -22 178 -57 20 -16 52 -35 70 -43 18 -7 40 -22 49 -32 16 -18 15 -22 -24 -88 -23 -39 -47 -74 -53 -80 -7 -5 -23 -26 -36 -45 -26 -39 -92 -113 -207 -232 -4 -4 -37 -36 -73 -71 l-66 -64 -20 41 c-58 119 -105 240 -115 301 -40 244 -35 409 20 595 8 30 21 66 28 80 7 14 24 54 38 89 15 35 35 75 46 89 11 13 20 31 20 38 0 8 3 14 8 14 4 0 16 16 27 36 24 45 221 245 278 281 23 15 44 30 47 33 20 20 138 78 250 123 61 24 167 50 250 61 60 7 302 -1 370 -14z m837 -661 c52 -101 102 -279 106 -379 2 -42 0 -45 -28 -51 -16 -4 -101 -7 -187 -8 -166 -1 -229 10 -271 49 -19 19 -19 19 14 49 22 21 44 31 65 31 41 0 84 34 84 66 0 30 12 55 56 112 19 25 37 65 44 95 11 51 53 111 74 104 6 -2 25 -32 43 -68z m-662 -810 c17 -10 40 -24 53 -30 12 -7 22 -16 22 -20 0 -4 17 -13 38 -19 20 -7 44 -18 52 -24 8 -7 33 -21 55 -31 22 -11 42 -23 45 -26 11 -14 109 -49 164 -58 62 -11 101 -7 126 14 15 14 38 18 78 16 39 -2 26 -41 -49 -146 -78 -109 -85 -118 -186 -219 -61 -61 -239 -189 -281 -203 -17 -5 -73 -29 -104 -44 -187 -92 -605 -103 -791 -21 -42 19 -47 24 -37 41 5 11 28 32 51 48 22 15 51 38 64 51 13 12 28 22 33 22 17 0 242 233 242 250 0 6 5 10 10 10 6 0 10 6 10 14 0 25 50 55 100 62 59 8 56 6 115 83 50 66 74 117 75 162 0 14 7 40 16 57 18 38 52 41 99 11z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 4.8 KiB |
3
my-blog/static/index.html
Normal file
3
my-blog/static/index.html
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<!-- OAuth Comment System - Load globally for session management -->
|
||||||
|
<script type="module" crossorigin src="/assets/comment-atproto-G86WWmu8.js"></script>
|
||||||
|
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-FS0uZjXB.css">
|
281
my-blog/static/js/ask-ai.js
Normal file
281
my-blog/static/js/ask-ai.js
Normal file
@@ -0,0 +1,281 @@
|
|||||||
|
/**
|
||||||
|
* Ask AI functionality - Based on original working implementation
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Global variables for AI functionality
|
||||||
|
let aiProfileData = null;
|
||||||
|
|
||||||
|
// Original functions from working implementation
|
||||||
|
function toggleAskAI() {
|
||||||
|
const panel = document.getElementById('askAiPanel');
|
||||||
|
const isVisible = panel.style.display !== 'none';
|
||||||
|
panel.style.display = isVisible ? 'none' : 'block';
|
||||||
|
|
||||||
|
if (!isVisible) {
|
||||||
|
checkAuthenticationStatus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkAuthenticationStatus() {
|
||||||
|
const userSections = document.querySelectorAll('.user-section');
|
||||||
|
const isAuthenticated = userSections.length > 0;
|
||||||
|
|
||||||
|
if (isAuthenticated) {
|
||||||
|
// User is authenticated - show Ask AI UI
|
||||||
|
document.getElementById('authCheck').style.display = 'none';
|
||||||
|
document.getElementById('chatForm').style.display = 'block';
|
||||||
|
document.getElementById('chatHistory').style.display = 'block';
|
||||||
|
|
||||||
|
// Show initial greeting if chat history is empty
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
if (chatHistory.children.length === 0) {
|
||||||
|
showInitialGreeting();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Focus on input
|
||||||
|
setTimeout(() => {
|
||||||
|
document.getElementById('aiQuestion').focus();
|
||||||
|
}, 50);
|
||||||
|
} else {
|
||||||
|
// User not authenticated - show auth message
|
||||||
|
document.getElementById('authCheck').style.display = 'block';
|
||||||
|
document.getElementById('chatForm').style.display = 'none';
|
||||||
|
document.getElementById('chatHistory').style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function askQuestion() {
|
||||||
|
const question = document.getElementById('aiQuestion').value;
|
||||||
|
if (!question.trim()) return;
|
||||||
|
|
||||||
|
const askButton = document.getElementById('askButton');
|
||||||
|
askButton.disabled = true;
|
||||||
|
askButton.textContent = 'Posting...';
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Add user message to chat
|
||||||
|
addUserMessage(question);
|
||||||
|
|
||||||
|
// Clear input
|
||||||
|
document.getElementById('aiQuestion').value = '';
|
||||||
|
|
||||||
|
// Show loading
|
||||||
|
showLoadingMessage();
|
||||||
|
|
||||||
|
// Post question via OAuth app
|
||||||
|
window.dispatchEvent(new CustomEvent('postAIQuestion', {
|
||||||
|
detail: { question: question }
|
||||||
|
}));
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to ask question:', error);
|
||||||
|
showErrorMessage('Sorry, I encountered an error. Please try again.');
|
||||||
|
} finally {
|
||||||
|
askButton.disabled = false;
|
||||||
|
askButton.textContent = 'Ask';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function addUserMessage(question) {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
const userSection = document.querySelector('.user-section');
|
||||||
|
|
||||||
|
let userAvatar = '👤';
|
||||||
|
let userDisplay = 'You';
|
||||||
|
let userHandle = 'user';
|
||||||
|
|
||||||
|
if (userSection) {
|
||||||
|
const avatarImg = userSection.querySelector('.user-avatar');
|
||||||
|
const displayName = userSection.querySelector('.user-display-name');
|
||||||
|
const handle = userSection.querySelector('.user-handle');
|
||||||
|
|
||||||
|
if (avatarImg && avatarImg.src) {
|
||||||
|
userAvatar = `<img src="${avatarImg.src}" alt="${displayName?.textContent || 'User'}" class="profile-avatar">`;
|
||||||
|
}
|
||||||
|
if (displayName?.textContent) {
|
||||||
|
userDisplay = displayName.textContent;
|
||||||
|
}
|
||||||
|
if (handle?.textContent) {
|
||||||
|
userHandle = handle.textContent.replace('@', '');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const questionDiv = document.createElement('div');
|
||||||
|
questionDiv.className = 'chat-message user-message comment-style';
|
||||||
|
questionDiv.innerHTML = `
|
||||||
|
<div class="message-header">
|
||||||
|
<div class="avatar">${userAvatar}</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">${userDisplay}</div>
|
||||||
|
<div class="handle">@${userHandle}</div>
|
||||||
|
<div class="timestamp">${new Date().toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">${question}</div>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(questionDiv);
|
||||||
|
}
|
||||||
|
|
||||||
|
function showLoadingMessage() {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
const loadingDiv = document.createElement('div');
|
||||||
|
loadingDiv.className = 'ai-loading-simple';
|
||||||
|
loadingDiv.innerHTML = `
|
||||||
|
<i class="fas fa-robot"></i>
|
||||||
|
<span>考えています</span>
|
||||||
|
<i class="fas fa-spinner fa-spin"></i>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(loadingDiv);
|
||||||
|
}
|
||||||
|
|
||||||
|
function showErrorMessage(message) {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
removeLoadingMessage();
|
||||||
|
|
||||||
|
const errorDiv = document.createElement('div');
|
||||||
|
errorDiv.className = 'chat-message error-message comment-style';
|
||||||
|
errorDiv.innerHTML = `
|
||||||
|
<div class="message-header">
|
||||||
|
<div class="avatar">⚠️</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">System</div>
|
||||||
|
<div class="handle">@system</div>
|
||||||
|
<div class="timestamp">${new Date().toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">${message}</div>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(errorDiv);
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeLoadingMessage() {
|
||||||
|
const loadingMsg = document.querySelector('.ai-loading-simple');
|
||||||
|
if (loadingMsg) {
|
||||||
|
loadingMsg.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showInitialGreeting() {
|
||||||
|
if (!aiProfileData) return;
|
||||||
|
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
const greetingDiv = document.createElement('div');
|
||||||
|
greetingDiv.className = 'chat-message ai-message comment-style initial-greeting';
|
||||||
|
|
||||||
|
const avatarElement = aiProfileData.avatar
|
||||||
|
? `<img src="${aiProfileData.avatar}" alt="${aiProfileData.displayName}" class="profile-avatar">`
|
||||||
|
: '🤖';
|
||||||
|
|
||||||
|
greetingDiv.innerHTML = `
|
||||||
|
<div class="message-header">
|
||||||
|
<div class="avatar">${avatarElement}</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">${aiProfileData.displayName}</div>
|
||||||
|
<div class="handle">@${aiProfileData.handle}</div>
|
||||||
|
<div class="timestamp">${new Date().toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">
|
||||||
|
Hello! I'm an AI assistant trained on this blog's content. I can answer questions about the articles, provide insights, and help you understand the topics discussed here. What would you like to know?
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(greetingDiv);
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateAskAIButton() {
|
||||||
|
const button = document.getElementById('askAiButton');
|
||||||
|
if (!button) return;
|
||||||
|
|
||||||
|
// Only update text, never modify the icon
|
||||||
|
if (aiProfileData && aiProfileData.displayName) {
|
||||||
|
const textNode = button.childNodes[2] || button.lastChild;
|
||||||
|
if (textNode && textNode.nodeType === Node.TEXT_NODE) {
|
||||||
|
textNode.textContent = aiProfileData.displayName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleAIResponse(responseData) {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
removeLoadingMessage();
|
||||||
|
|
||||||
|
const aiProfile = responseData.aiProfile;
|
||||||
|
if (!aiProfile || !aiProfile.handle || !aiProfile.displayName) {
|
||||||
|
console.error('AI profile data is missing');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const timestamp = new Date(responseData.timestamp || Date.now());
|
||||||
|
const avatarElement = aiProfile.avatar
|
||||||
|
? `<img src="${aiProfile.avatar}" alt="${aiProfile.displayName}" class="profile-avatar">`
|
||||||
|
: '🤖';
|
||||||
|
|
||||||
|
const answerDiv = document.createElement('div');
|
||||||
|
answerDiv.className = 'chat-message ai-message comment-style';
|
||||||
|
answerDiv.innerHTML = `
|
||||||
|
<div class="message-header">
|
||||||
|
<div class="avatar">${avatarElement}</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<div class="display-name">${aiProfile.displayName}</div>
|
||||||
|
<div class="handle">@${aiProfile.handle}</div>
|
||||||
|
<div class="timestamp">${timestamp.toLocaleString()}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">${responseData.answer}</div>
|
||||||
|
`;
|
||||||
|
chatHistory.appendChild(answerDiv);
|
||||||
|
|
||||||
|
// Limit chat history
|
||||||
|
limitChatHistory();
|
||||||
|
}
|
||||||
|
|
||||||
|
function limitChatHistory() {
|
||||||
|
const chatHistory = document.getElementById('chatHistory');
|
||||||
|
if (chatHistory.children.length > 10) {
|
||||||
|
chatHistory.removeChild(chatHistory.children[0]);
|
||||||
|
if (chatHistory.children.length > 0) {
|
||||||
|
chatHistory.removeChild(chatHistory.children[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Event listeners setup
|
||||||
|
function setupAskAIEventListeners() {
|
||||||
|
// Listen for AI profile updates from OAuth app
|
||||||
|
window.addEventListener('aiProfileLoaded', function(event) {
|
||||||
|
aiProfileData = event.detail;
|
||||||
|
console.log('AI profile loaded:', aiProfileData);
|
||||||
|
updateAskAIButton();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Listen for AI responses
|
||||||
|
window.addEventListener('aiResponseReceived', function(event) {
|
||||||
|
handleAIResponse(event.detail);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Keyboard shortcuts
|
||||||
|
document.addEventListener('keydown', function(e) {
|
||||||
|
if (e.key === 'Escape') {
|
||||||
|
const panel = document.getElementById('askAiPanel');
|
||||||
|
if (panel) {
|
||||||
|
panel.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enter key to send message
|
||||||
|
if (e.key === 'Enter' && e.target.id === 'aiQuestion' && !e.shiftKey) {
|
||||||
|
e.preventDefault();
|
||||||
|
askQuestion();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize Ask AI when DOM is loaded
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
setupAskAIEventListeners();
|
||||||
|
console.log('Ask AI initialized successfully');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Global functions for onclick handlers
|
||||||
|
window.toggleAskAI = toggleAskAI;
|
||||||
|
window.askQuestion = askQuestion;
|
94
my-blog/static/js/theme.js
Normal file
94
my-blog/static/js/theme.js
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
/**
|
||||||
|
* Theme and visual effects - Pure CSS animations, no jQuery
|
||||||
|
*/
|
||||||
|
class Theme {
|
||||||
|
constructor() {
|
||||||
|
this.init();
|
||||||
|
}
|
||||||
|
|
||||||
|
init() {
|
||||||
|
this.setupParticleColors();
|
||||||
|
this.setupLogoAnimations();
|
||||||
|
}
|
||||||
|
|
||||||
|
setupParticleColors() {
|
||||||
|
// Dynamic particle colors based on theme
|
||||||
|
const style = document.createElement('style');
|
||||||
|
style.textContent = `
|
||||||
|
/* Dynamic particle colors based on theme */
|
||||||
|
.likeButton .particleLayer circle:nth-child(1),
|
||||||
|
.likeButton .particleLayer circle:nth-child(2) {
|
||||||
|
fill: var(--particle-color-1) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton .particleLayer circle:nth-child(3),
|
||||||
|
.likeButton .particleLayer circle:nth-child(4) {
|
||||||
|
fill: var(--particle-color-2) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton .particleLayer circle:nth-child(5),
|
||||||
|
.likeButton .particleLayer circle:nth-child(6),
|
||||||
|
.likeButton .particleLayer circle:nth-child(7) {
|
||||||
|
fill: var(--particle-color-3) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton .particleLayer circle:nth-child(8),
|
||||||
|
.likeButton .particleLayer circle:nth-child(9),
|
||||||
|
.likeButton .particleLayer circle:nth-child(10) {
|
||||||
|
fill: var(--particle-color-4) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton .particleLayer circle:nth-child(11),
|
||||||
|
.likeButton .particleLayer circle:nth-child(12),
|
||||||
|
.likeButton .particleLayer circle:nth-child(13),
|
||||||
|
.likeButton .particleLayer circle:nth-child(14) {
|
||||||
|
fill: var(--particle-color-5) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Reset initial animations but allow hover */
|
||||||
|
.likeButton .syui {
|
||||||
|
animation: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton .particleLayer {
|
||||||
|
animation: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton .explosion {
|
||||||
|
animation: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Enable hover animations from package */
|
||||||
|
.likeButton:hover .syui,
|
||||||
|
.likeButton:hover path.syui {
|
||||||
|
animation: syuiDeluxeAnime 400ms forwards !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .particleLayer {
|
||||||
|
animation: particleLayerAnime 800ms forwards !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.likeButton:hover .explosion {
|
||||||
|
animation: explosionAnime 800ms forwards !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Logo positioning */
|
||||||
|
.logo .likeButton {
|
||||||
|
background: transparent !important;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
document.head.appendChild(style);
|
||||||
|
}
|
||||||
|
|
||||||
|
setupLogoAnimations() {
|
||||||
|
// Pure CSS animations are handled by the svg-animation-package.css
|
||||||
|
// This method is reserved for any future JavaScript-based enhancements
|
||||||
|
console.log('Logo animations initialized (CSS-based)');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize theme when DOM is loaded
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
new Theme();
|
||||||
|
});
|
165
my-blog/static/pkg/font-awesome/LICENSE.txt
Normal file
165
my-blog/static/pkg/font-awesome/LICENSE.txt
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
Fonticons, Inc. (https://fontawesome.com)
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Font Awesome Free License
|
||||||
|
|
||||||
|
Font Awesome Free is free, open source, and GPL friendly. You can use it for
|
||||||
|
commercial projects, open source projects, or really almost whatever you want.
|
||||||
|
Full Font Awesome Free license: https://fontawesome.com/license/free.
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
|
||||||
|
|
||||||
|
The Font Awesome Free download is licensed under a Creative Commons
|
||||||
|
Attribution 4.0 International License and applies to all icons packaged
|
||||||
|
as SVG and JS file types.
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Fonts: SIL OFL 1.1 License
|
||||||
|
|
||||||
|
In the Font Awesome Free download, the SIL OFL license applies to all icons
|
||||||
|
packaged as web and desktop font files.
|
||||||
|
|
||||||
|
Copyright (c) 2024 Fonticons, Inc. (https://fontawesome.com)
|
||||||
|
with Reserved Font Name: "Font Awesome".
|
||||||
|
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
This license is copied below, and is also available with a FAQ at:
|
||||||
|
http://scripts.sil.org/OFL
|
||||||
|
|
||||||
|
SIL OPEN FONT LICENSE
|
||||||
|
Version 1.1 - 26 February 2007
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting — in part or in whole — any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Code: MIT License (https://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
|
In the Font Awesome Free download, the MIT license applies to all non-font and
|
||||||
|
non-icon files.
|
||||||
|
|
||||||
|
Copyright 2024 Fonticons, Inc.
|
||||||
|
|
||||||
|
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:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
||||||
|
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||||
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Attribution
|
||||||
|
|
||||||
|
Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
|
||||||
|
Awesome Free files already contain embedded comments with sufficient
|
||||||
|
attribution, so you shouldn't need to do anything additional when using these
|
||||||
|
files normally.
|
||||||
|
|
||||||
|
We've kept attribution comments terse, so we ask that you do not actively work
|
||||||
|
to remove them from files, especially code. They're a great way for folks to
|
||||||
|
learn about Font Awesome.
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Brand Icons
|
||||||
|
|
||||||
|
All brand icons are trademarks of their respective owners. The use of these
|
||||||
|
trademarks does not indicate endorsement of the trademark holder by Font
|
||||||
|
Awesome, nor vice versa. **Please do not use brand logos for any purpose except
|
||||||
|
to represent the company, product, or service to which they refer.**
|
9
my-blog/static/pkg/font-awesome/css/all.min.css
vendored
Normal file
9
my-blog/static/pkg/font-awesome/css/all.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
6
my-blog/static/pkg/font-awesome/css/brands.min.css
vendored
Normal file
6
my-blog/static/pkg/font-awesome/css/brands.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
9
my-blog/static/pkg/font-awesome/css/fontawesome.min.css
vendored
Normal file
9
my-blog/static/pkg/font-awesome/css/fontawesome.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
6
my-blog/static/pkg/font-awesome/css/regular.min.css
vendored
Normal file
6
my-blog/static/pkg/font-awesome/css/regular.min.css
vendored
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
/*!
|
||||||
|
* Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
|
||||||
|
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
||||||
|
* Copyright 2024 Fonticons, Inc.
|
||||||
|
*/
|
||||||
|
:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-regular:normal 400 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype")}.fa-regular,.far{font-weight:400}
|
6
my-blog/static/pkg/font-awesome/css/solid.min.css
vendored
Normal file
6
my-blog/static/pkg/font-awesome/css/solid.min.css
vendored
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
/*!
|
||||||
|
* Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
|
||||||
|
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
||||||
|
* Copyright 2024 Fonticons, Inc.
|
||||||
|
*/
|
||||||
|
:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}
|
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-brands-400.ttf
Normal file
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-brands-400.ttf
Normal file
Binary file not shown.
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-brands-400.woff2
Normal file
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-brands-400.woff2
Normal file
Binary file not shown.
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-regular-400.ttf
Normal file
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-regular-400.ttf
Normal file
Binary file not shown.
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-regular-400.woff2
Normal file
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-regular-400.woff2
Normal file
Binary file not shown.
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-solid-900.ttf
Normal file
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-solid-900.ttf
Normal file
Binary file not shown.
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-solid-900.woff2
Normal file
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-solid-900.woff2
Normal file
Binary file not shown.
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-v4compatibility.ttf
Normal file
BIN
my-blog/static/pkg/font-awesome/webfonts/fa-v4compatibility.ttf
Normal file
Binary file not shown.
Binary file not shown.
BIN
my-blog/static/pkg/icomoon/fonts/icomoon.eot
Normal file
BIN
my-blog/static/pkg/icomoon/fonts/icomoon.eot
Normal file
Binary file not shown.
34
my-blog/static/pkg/icomoon/fonts/icomoon.svg
Normal file
34
my-blog/static/pkg/icomoon/fonts/icomoon.svg
Normal file
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 58 KiB |
BIN
my-blog/static/pkg/icomoon/fonts/icomoon.ttf
Normal file
BIN
my-blog/static/pkg/icomoon/fonts/icomoon.ttf
Normal file
Binary file not shown.
BIN
my-blog/static/pkg/icomoon/fonts/icomoon.woff
Normal file
BIN
my-blog/static/pkg/icomoon/fonts/icomoon.woff
Normal file
Binary file not shown.
99
my-blog/static/pkg/icomoon/style.css
Normal file
99
my-blog/static/pkg/icomoon/style.css
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
@font-face {
|
||||||
|
font-family: 'icomoon';
|
||||||
|
src: url('fonts/icomoon.eot?mxezzh');
|
||||||
|
src: url('fonts/icomoon.eot?mxezzh#iefix') format('embedded-opentype'),
|
||||||
|
url('fonts/icomoon.ttf?mxezzh') format('truetype'),
|
||||||
|
url('fonts/icomoon.woff?mxezzh') format('woff'),
|
||||||
|
url('fonts/icomoon.svg?mxezzh#icomoon') format('svg');
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
font-display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
[class^="icon-"], [class*=" icon-"] {
|
||||||
|
/* use !important to prevent issues with browser extensions that change fonts */
|
||||||
|
font-family: 'icomoon' !important;
|
||||||
|
speak: never;
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: normal;
|
||||||
|
font-variant: normal;
|
||||||
|
text-transform: none;
|
||||||
|
line-height: 1;
|
||||||
|
|
||||||
|
/* Better Font Rendering =========== */
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-git:before {
|
||||||
|
content: "\e901";
|
||||||
|
}
|
||||||
|
.icon-cube:before {
|
||||||
|
content: "\e900";
|
||||||
|
}
|
||||||
|
.icon-game:before {
|
||||||
|
content: "\e9d5";
|
||||||
|
}
|
||||||
|
.icon-card:before {
|
||||||
|
content: "\e9d6";
|
||||||
|
}
|
||||||
|
.icon-book:before {
|
||||||
|
content: "\e9d7";
|
||||||
|
}
|
||||||
|
.icon-git1:before {
|
||||||
|
content: "\e9d3";
|
||||||
|
}
|
||||||
|
.icon-moji_a:before {
|
||||||
|
content: "\e9c3";
|
||||||
|
}
|
||||||
|
.icon-archlinux:before {
|
||||||
|
content: "\e9c4";
|
||||||
|
}
|
||||||
|
.icon-archlinuxjp:before {
|
||||||
|
content: "\e9c5";
|
||||||
|
}
|
||||||
|
.icon-syui:before {
|
||||||
|
content: "\e9c6";
|
||||||
|
}
|
||||||
|
.icon-phoenix-power:before {
|
||||||
|
content: "\e9c7";
|
||||||
|
}
|
||||||
|
.icon-phoenix-world:before {
|
||||||
|
content: "\e9c8";
|
||||||
|
}
|
||||||
|
.icon-power:before {
|
||||||
|
content: "\e9c9";
|
||||||
|
}
|
||||||
|
.icon-phoenix:before {
|
||||||
|
content: "\e9ca";
|
||||||
|
}
|
||||||
|
.icon-honeycomb:before {
|
||||||
|
content: "\e9cb";
|
||||||
|
}
|
||||||
|
.icon-ai:before {
|
||||||
|
content: "\e9cc";
|
||||||
|
}
|
||||||
|
.icon-robot:before {
|
||||||
|
content: "\e9cd";
|
||||||
|
}
|
||||||
|
.icon-sandar:before {
|
||||||
|
content: "\e9ce";
|
||||||
|
}
|
||||||
|
.icon-moon:before {
|
||||||
|
content: "\e9cf";
|
||||||
|
}
|
||||||
|
.icon-home:before {
|
||||||
|
content: "\e9d0";
|
||||||
|
}
|
||||||
|
.icon-cloud:before {
|
||||||
|
content: "\e9d1";
|
||||||
|
}
|
||||||
|
.icon-api:before {
|
||||||
|
content: "\e9d2";
|
||||||
|
}
|
||||||
|
.icon-aibadge:before {
|
||||||
|
content: "\ebf8";
|
||||||
|
}
|
||||||
|
.icon-aiterm:before {
|
||||||
|
content: "\ebf7";
|
||||||
|
}
|
24
my-blog/static/syui.svg
Normal file
24
my-blog/static/syui.svg
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<svg width="77pt" height="77pt" viewBox="0 0 512 512" class="likeButton" >
|
||||||
|
<circle class="explosion" r="150" cx="250" cy="250"></circle>
|
||||||
|
<g class="particleLayer">
|
||||||
|
<circle fill="#ef454aba" cx="130" cy="126.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454acc" cx="411" cy="313.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="279" cy="86.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="155" cy="390.5" r="12.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="89" cy="292.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="414" cy="282.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454a91" cx="115" cy="149.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="250" cy="80.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="78" cy="261.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454a91" cx="182" cy="402.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="401.5" cy="166" r="13"/>
|
||||||
|
<circle fill="#ef454aba" cx="379" cy="141.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454a91" cx="327" cy="397.5" r="10.5"/>
|
||||||
|
<circle fill="#ef454aba" cx="296" cy="392.5" r="10.5"/>
|
||||||
|
</g>
|
||||||
|
<g transform="translate(0,512) scale(0.1,-0.1)" fill="#000000" class="icon_syui">
|
||||||
|
|
||||||
|
<path class="syui" d="M3660 4460 c-11 -11 -33 -47 -48 -80 l-29 -60 -12 38 c-27 88 -58 92 -98 11 -35 -70 -73 -159 -73 -169 0 -6 -5 -10 -10 -10 -6 0 -15 -10 -21 -22 -33 -73 -52 -92 -47 -48 2 26 -1 35 -14 38 -16 3 -168 -121 -168 -138 0 -5 -13 -16 -28 -24 -24 -13 -35 -12 -87 0 -221 55 -231 56 -480 56 -219 1 -247 -1 -320 -22 -44 -12 -96 -26 -115 -30 -57 -13 -122 -39 -200 -82 -8 -4 -31 -14 -50 -23 -41 -17 -34 -13 -146 -90 -87 -59 -292 -252 -351 -330 -63 -83 -143 -209 -143 -225 0 -10 -7 -23 -15 -30 -8 -7 -15 -17 -15 -22 0 -5 -13 -37 -28 -71 -16 -34 -36 -93 -45 -132 -9 -38 -24 -104 -34 -145 -13 -60 -17 -121 -17 -300 1 -224 1 -225 36 -365 24 -94 53 -175 87 -247 28 -58 51 -108 51 -112 0 -3 13 -24 28 -48 42 -63 46 -79 22 -85 -11 -3 -20 -9 -20 -14 0 -5 -4 -9 -10 -9 -5 0 -22 -11 -37 -25 -16 -13 -75 -59 -133 -100 -58 -42 -113 -82 -123 -90 -9 -8 -22 -15 -27 -15 -6 0 -10 -6 -10 -13 0 -8 -11 -20 -25 -27 -34 -18 -34 -54 0 -48 14 3 25 2 25 -1 0 -3 -43 -31 -95 -61 -52 -30 -95 -58 -95 -62 0 -5 -5 -8 -11 -8 -19 0 -84 -33 -92 -47 -4 -7 -15 -13 -22 -13 -14 0 -17 -4 -19 -32 -1 -8 15 -15 37 -18 l38 -5 -47 -48 c-56 -59 -54 -81 9 -75 30 3 45 0 54 -11 9 -13 16 -14 43 -4 29 11 30 10 18 -5 -7 -9 -19 -23 -25 -30 -7 -7 -13 -20 -13 -29 0 -12 8 -14 38 -9 20 4 57 8 82 9 25 2 54 8 66 15 18 10 23 8 32 -13 17 -38 86 -35 152 6 27 17 50 34 50 38 0 16 62 30 85 19 33 -15 72 -2 89 30 8 15 31 43 51 62 35 34 38 35 118 35 77 0 85 2 126 33 24 17 52 32 61 32 9 0 42 18 73 40 30 22 61 40 69 40 21 0 88 -26 100 -38 7 -7 17 -12 24 -12 7 0 35 -11 62 -25 66 -33 263 -84 387 -101 189 -25 372 -12 574 41 106 27 130 37 261 97 41 20 80 37 85 39 6 2 51 31 100 64 166 111 405 372 489 534 10 20 22 43 27 51 5 8 12 22 15 30 3 8 17 40 31 70 54 115 95 313 108 520 13 200 -43 480 -134 672 -28 58 -51 108 -51 112 0 3 -13 24 -29 48 -15 24 -34 60 -40 80 -19 57 3 142 50 193 10 11 22 49 28 85 6 36 16 67 21 68 18 6 31 53 25 83 -4 18 -17 33 -36 41 -16 7 -29 15 -29 18 1 10 38 50 47 50 5 0 20 11 33 25 18 19 22 31 17 61 -3 20 -14 45 -23 55 -16 18 -16 20 6 44 15 16 21 32 18 49 -3 15 1 34 8 43 32 43 7 73 -46 55 l-30 -11 0 85 c0 74 -2 84 -18 84 -21 0 -53 -33 -103 -104 l-34 -48 -5 74 c-7 102 -35 133 -80 88z m-870 -740 c36 -7 75 -14 88 -16 21 -4 23 -9 16 -37 -3 -18 -14 -43 -24 -57 -10 -14 -20 -35 -24 -46 -4 -12 -16 -32 -27 -45 -12 -13 -37 -49 -56 -79 -20 -30 -52 -73 -72 -96 -53 -60 -114 -133 -156 -189 -21 -27 -44 -54 -52 -58 -7 -4 -13 -14 -13 -22 0 -7 -18 -33 -40 -57 -22 -23 -40 -46 -40 -50 0 -5 -19 -21 -42 -38 -47 -35 -85 -38 -188 -15 -115 25 -173 20 -264 -23 -45 -22 -106 -46 -136 -56 -48 -15 -77 -25 -140 -50 -70 -28 -100 -77 -51 -84 14 -2 34 -10 45 -17 12 -7 53 -16 91 -20 90 -9 131 -22 178 -57 20 -16 52 -35 70 -43 18 -7 40 -22 49 -32 16 -18 15 -22 -24 -88 -23 -39 -47 -74 -53 -80 -7 -5 -23 -26 -36 -45 -26 -39 -92 -113 -207 -232 -4 -4 -37 -36 -73 -71 l-66 -64 -20 41 c-58 119 -105 240 -115 301 -40 244 -35 409 20 595 8 30 21 66 28 80 7 14 24 54 38 89 15 35 35 75 46 89 11 13 20 31 20 38 0 8 3 14 8 14 4 0 16 16 27 36 24 45 221 245 278 281 23 15 44 30 47 33 20 20 138 78 250 123 61 24 167 50 250 61 60 7 302 -1 370 -14z m837 -661 c52 -101 102 -279 106 -379 2 -42 0 -45 -28 -51 -16 -4 -101 -7 -187 -8 -166 -1 -229 10 -271 49 -19 19 -19 19 14 49 22 21 44 31 65 31 41 0 84 34 84 66 0 30 12 55 56 112 19 25 37 65 44 95 11 51 53 111 74 104 6 -2 25 -32 43 -68z m-662 -810 c17 -10 40 -24 53 -30 12 -7 22 -16 22 -20 0 -4 17 -13 38 -19 20 -7 44 -18 52 -24 8 -7 33 -21 55 -31 22 -11 42 -23 45 -26 11 -14 109 -49 164 -58 62 -11 101 -7 126 14 15 14 38 18 78 16 39 -2 26 -41 -49 -146 -78 -109 -85 -118 -186 -219 -61 -61 -239 -189 -281 -203 -17 -5 -73 -29 -104 -44 -187 -92 -605 -103 -791 -21 -42 19 -47 24 -37 41 5 11 28 32 51 48 22 15 51 38 64 51 13 12 28 22 33 22 17 0 242 233 242 250 0 6 5 10 10 10 6 0 10 6 10 14 0 25 50 55 100 62 59 8 56 6 115 83 50 66 74 117 75 162 0 14 7 40 16 57 18 38 52 41 99 11z"/>
|
||||||
|
</g>
|
||||||
|
|
||||||
|
</svg>
|
After Width: | Height: | Size: 4.8 KiB |
97
my-blog/templates/base.html
Normal file
97
my-blog/templates/base.html
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="{{ config.language }}">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>{% block title %}{{ config.title }}{% endblock %}</title>
|
||||||
|
|
||||||
|
<!-- Favicon -->
|
||||||
|
<link rel="icon" href="/favicon.ico" />
|
||||||
|
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
|
||||||
|
|
||||||
|
<!-- Stylesheets -->
|
||||||
|
<link rel="stylesheet" href="/css/style.css">
|
||||||
|
<link rel="stylesheet" href="/css/svg-animation-package.css">
|
||||||
|
<link rel="stylesheet" href="/pkg/icomoon/style.css">
|
||||||
|
<link rel="stylesheet" href="/pkg/font-awesome/css/all.min.css">
|
||||||
|
|
||||||
|
{% block head %}{% endblock %}
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="container">
|
||||||
|
<header class="main-header">
|
||||||
|
<div class="header-content">
|
||||||
|
<h1><a href="/" class="site-title">{{ config.title }}</a></h1>
|
||||||
|
<div class="logo">
|
||||||
|
<a href="/">
|
||||||
|
<svg width="77pt" height="77pt" viewBox="0 0 512 512" class="likeButton">
|
||||||
|
<circle class="explosion" r="150" cx="250" cy="250"></circle>
|
||||||
|
<g class="particleLayer">
|
||||||
|
<circle fill="#8CE8C3" cx="130" cy="126.5" r="12.5"></circle>
|
||||||
|
<circle fill="#8CE8C3" cx="411" cy="313.5" r="12.5"></circle>
|
||||||
|
<circle fill="#91D2FA" cx="279" cy="86.5" r="12.5"></circle>
|
||||||
|
<circle fill="#91D2FA" cx="155" cy="390.5" r="12.5"></circle>
|
||||||
|
<circle fill="#CC8EF5" cx="89" cy="292.5" r="10.5"></circle>
|
||||||
|
<circle fill="#9BDFBA" cx="414" cy="282.5" r="10.5"></circle>
|
||||||
|
<circle fill="#9BDFBA" cx="115" cy="149.5" r="10.5"></circle>
|
||||||
|
<circle fill="#9FC7FA" cx="250" cy="80.5" r="10.5"></circle>
|
||||||
|
<circle fill="#9FC7FA" cx="78" cy="261.5" r="10.5"></circle>
|
||||||
|
<circle fill="#96D8E9" cx="182" cy="402.5" r="10.5"></circle>
|
||||||
|
<circle fill="#CC8EF5" cx="401.5" cy="166" r="13"></circle>
|
||||||
|
<circle fill="#DB92D0" cx="379" cy="141.5" r="10.5"></circle>
|
||||||
|
<circle fill="#DB92D0" cx="327" cy="397.5" r="10.5"></circle>
|
||||||
|
<circle fill="#DD99B8" cx="296" cy="392.5" r="10.5"></circle>
|
||||||
|
</g>
|
||||||
|
<g transform="translate(0,512) scale(0.1,-0.1)" fill="#000000" class="icon_syui">
|
||||||
|
<path class="syui" d="M3660 4460 c-11 -11 -33 -47 -48 -80 l-29 -60 -12 38 c-27 88 -58 92 -98 11 -35 -70 -73 -159 -73 -169 0 -6 -5 -10 -10 -10 -6 0 -15 -10 -21 -22 -33 -73 -52 -92 -47 -48 2 26 -1 35 -14 38 -16 3 -168 -121 -168 -138 0 -5 -13 -16 -28 -24 -24 -13 -35 -12 -87 0 -221 55 -231 56 -480 56 -219 1 -247 -1 -320 -22 -44 -12 -96 -26 -115 -30 -57 -13 -122 -39 -200 -82 -8 -4 -31 -14 -50 -23 -41 -17 -34 -13 -146 -90 -87 -59 -292 -252 -351 -330 -63 -83 -143 -209 -143 -225 0 -10 -7 -23 -15 -30 -8 -7 -15 -17 -15 -22 0 -5 -13 -37 -28 -71 -16 -34 -36 -93 -45 -132 -9 -38 -24 -104 -34 -145 -13 -60 -17 -121 -17 -300 1 -224 1 -225 36 -365 24 -94 53 -175 87 -247 28 -58 51 -108 51 -112 0 -3 13 -24 28 -48 42 -63 46 -79 22 -85 -11 -3 -20 -9 -20 -14 0 -5 -4 -9 -10 -9 -5 0 -22 -11 -37 -25 -16 -13 -75 -59 -133 -100 -58 -42 -113 -82 -123 -90 -9 -8 -22 -15 -27 -15 -6 0 -10 -6 -10 -13 0 -8 -11 -20 -25 -27 -34 -18 -34 -54 0 -48 14 3 25 2 25 -1 0 -3 -43 -31 -95 -61 -52 -30 -95 -58 -95 -62 0 -5 -5 -8 -11 -8 -19 0 -84 -33 -92 -47 -4 -7 -15 -13 -22 -13 -14 0 -17 -4 -19 -32 -1 -8 15 -15 37 -18 l38 -5 -47 -48 c-56 -59 -54 -81 9 -75 30 3 45 0 54 -11 9 -13 16 -14 43 -4 29 11 30 10 18 -5 -7 -9 -19 -23 -25 -30 -7 -7 -13 -20 -13 -29 0 -12 8 -14 38 -9 20 4 57 8 82 9 25 2 54 8 66 15 18 10 23 8 32 -13 17 -38 86 -35 152 6 27 17 50 34 50 38 0 16 62 30 85 19 33 -15 72 -2 89 30 8 15 31 43 51 62 35 34 38 35 118 35 77 0 85 2 126 33 24 17 52 32 61 32 9 0 42 18 73 40 30 22 61 40 69 40 21 0 88 -26 100 -38 7 -7 17 -12 24 -12 7 0 35 -11 62 -25 66 -33 263 -84 387 -101 189 -25 372 -12 574 41 106 27 130 37 261 97 41 20 80 37 85 39 6 2 51 31 100 64 166 111 405 372 489 534 10 20 22 43 27 51 5 8 12 22 15 30 3 8 17 40 31 70 54 115 95 313 108 520 13 200 -43 480 -134 672 -28 58 -51 108 -51 112 0 3 -13 24 -29 48 -15 24 -34 60 -40 80 -19 57 3 142 50 193 10 11 22 49 28 85 6 36 16 67 21 68 18 6 31 53 25 83 -4 18 -17 33 -36 41 -16 7 -29 15 -29 18 1 10 38 50 47 50 5 0 20 11 33 25 18 19 22 31 17 61 -3 20 -14 45 -23 55 -16 18 -16 20 6 44 15 16 21 32 18 49 -3 15 1 34 8 43 32 43 7 73 -46 55 l-30 -11 0 85 c0 74 -2 84 -18 84 -21 0 -53 -33 -103 -104 l-34 -48 -5 74 c-7 102 -35 133 -80 88z m-870 -740 c36 -7 75 -14 88 -16 21 -4 23 -9 16 -37 -3 -18 -14 -43 -24 -57 -10 -14 -20 -35 -24 -46 -4 -12 -16 -32 -27 -45 -12 -13 -37 -49 -56 -79 -20 -30 -52 -73 -72 -96 -53 -60 -114 -133 -156 -189 -21 -27 -44 -54 -52 -58 -7 -4 -13 -14 -13 -22 0 -7 -18 -33 -40 -57 -22 -23 -40 -46 -40 -50 0 -5 -19 -21 -42 -38 -47 -35 -85 -38 -188 -15 -115 25 -173 20 -264 -23 -45 -22 -106 -46 -136 -56 -48 -15 -77 -25 -140 -50 -70 -28 -100 -77 -51 -84 14 -2 34 -10 45 -17 12 -7 53 -16 91 -20 90 -9 131 -22 178 -57 20 -16 52 -35 70 -43 18 -7 40 -22 49 -32 16 -18 15 -22 -24 -88 -23 -39 -47 -74 -53 -80 -7 -5 -23 -26 -36 -45 -26 -39 -92 -113 -207 -232 -4 -4 -37 -36 -73 -71 l-66 -64 -20 41 c-58 119 -105 240 -115 301 -40 244 -35 409 20 595 8 30 21 66 28 80 7 14 24 54 38 89 15 35 35 75 46 89 11 13 20 31 20 38 0 8 3 14 8 14 4 0 16 16 27 36 24 45 221 245 278 281 23 15 44 30 47 33 20 20 138 78 250 123 61 24 167 50 250 61 60 7 302 -1 370 -14z m837 -661 c52 -101 102 -279 106 -379 2 -42 0 -45 -28 -51 -16 -4 -101 -7 -187 -8 -166 -1 -229 10 -271 49 -19 19 -19 19 14 49 22 21 44 31 65 31 41 0 84 34 84 66 0 30 12 55 56 112 19 25 37 65 44 95 11 51 53 111 74 104 6 -2 25 -32 43 -68z m-662 -810 c17 -10 40 -24 53 -30 12 -7 22 -16 22 -20 0 -4 17 -13 38 -19 20 -7 44 -18 52 -24 8 -7 33 -21 55 -31 22 -11 42 -23 45 -26 11 -14 109 -49 164 -58 62 -11 101 -7 126 14 15 14 38 18 78 16 39 -2 26 -41 -49 -146 -78 -109 -85 -118 -186 -219 -61 -61 -239 -189 -281 -203 -17 -5 -73 -29 -104 -44 -187 -92 -605 -103 -791 -21 -42 19 -47 24 -37 41 5 11 28 32 51 48 22 15 51 38 64 51 13 12 28 22 33 22 17 0 242 233 242 250 0 6 5 10 10 10 6 0 10 6 10 14 0 25 50 55 100 62 59 8 56 6 115 83 50 66 74 117 75 162 0 14 7 40 16 57 18 38 52 41 99 11z"></path>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div class="header-actions">
|
||||||
|
<button class="ask-ai-btn" onclick="toggleAskAI()" id="askAiButton">
|
||||||
|
<span class="ai-icon icon-ai"></span>
|
||||||
|
ai
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<!-- Ask AI Panel -->
|
||||||
|
<div class="ask-ai-panel" id="askAiPanel" style="display: none;">
|
||||||
|
<div class="ask-ai-content">
|
||||||
|
<div id="authCheck" class="auth-check">
|
||||||
|
<p>🔒 Please login with ATProto to use Ask AI feature</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="chatForm" class="ask-ai-form" style="display: none;">
|
||||||
|
<input type="text" id="aiQuestion" placeholder="What would you like to know?" />
|
||||||
|
<button onclick="askQuestion()" id="askButton">Ask</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="chatHistory" class="chat-history" style="display: none;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<main class="main-content">
|
||||||
|
{% block content %}{% endblock %}
|
||||||
|
</main>
|
||||||
|
|
||||||
|
{% block sidebar %}{% endblock %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<footer class="main-footer">
|
||||||
|
<div class="footer-social">
|
||||||
|
<a href="https://web.syu.is/@syui" target="_blank"><i class="fab fa-bluesky"></i></a>
|
||||||
|
<a href="https://git.syui.ai/ai" target="_blank"><span class="icon-ai"></span></a>
|
||||||
|
<a href="https://git.syui.ai/syui" target="_blank"><span class="icon-git"></span></a>
|
||||||
|
</div>
|
||||||
|
<p>© {{ config.author }}</p>
|
||||||
|
</footer>
|
||||||
|
|
||||||
|
<script src="/js/ask-ai.js"></script>
|
||||||
|
<script src="/js/theme.js"></script>
|
||||||
|
|
||||||
|
{% include "oauth-assets.html" %}
|
||||||
|
</body>
|
||||||
|
</html>
|
52
my-blog/templates/index.html
Normal file
52
my-blog/templates/index.html
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="timeline-container">
|
||||||
|
|
||||||
|
<div class="timeline-feed">
|
||||||
|
{% for post in posts %}
|
||||||
|
<article class="timeline-post">
|
||||||
|
<div class="post-header">
|
||||||
|
<div class="post-meta">
|
||||||
|
<time class="post-date">{{ post.date }}</time>
|
||||||
|
{% if post.language %}
|
||||||
|
<span class="post-lang">{{ post.language }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="post-content">
|
||||||
|
<h3 class="post-title">
|
||||||
|
<a href="{{ post.url }}">{{ post.title }}</a>
|
||||||
|
</h3>
|
||||||
|
|
||||||
|
{% if post.excerpt %}
|
||||||
|
<p class="post-excerpt">{{ post.excerpt }}</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="post-actions">
|
||||||
|
<a href="{{ post.url }}" class="read-more">Read more</a>
|
||||||
|
{% if post.markdown_url %}
|
||||||
|
<a href="{{ post.markdown_url }}" class="view-markdown" title="View Markdown">.md</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if post.translation_url %}
|
||||||
|
<a href="{{ post.translation_url }}" class="view-translation" title="View Translation">🌐</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- OAuth Comment System -->
|
||||||
|
<section class="comment-section">
|
||||||
|
<div id="comment-atproto"></div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
{% if posts|length == 0 %}
|
||||||
|
<div class="empty-state">
|
||||||
|
<p>No posts yet. Start writing!</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
3
my-blog/templates/oauth-assets.html
Normal file
3
my-blog/templates/oauth-assets.html
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<!-- OAuth Comment System - Load globally for session management -->
|
||||||
|
<script type="module" crossorigin src="/assets/comment-atproto-G86WWmu8.js"></script>
|
||||||
|
<link rel="stylesheet" crossorigin href="/assets/comment-atproto-FS0uZjXB.css">
|
71
my-blog/templates/partials/oauth-widget.html
Normal file
71
my-blog/templates/partials/oauth-widget.html
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
<!-- OAuth authentication widget for ailog -->
|
||||||
|
<div id="oauth-widget">
|
||||||
|
<div id="status" class="status">
|
||||||
|
Login with your Bluesky account
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Login form -->
|
||||||
|
<div id="login-form">
|
||||||
|
<input type="text" id="handle-input" placeholder="Enter your handle (e.g., user.bsky.social)" style="width: 300px; padding: 10px; margin: 10px 0; border: 1px solid #ddd; border-radius: 4px;">
|
||||||
|
<br>
|
||||||
|
<button id="login-btn">🦋 Login with Bluesky</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Authenticated state -->
|
||||||
|
<div id="authenticated-state" style="display: none;">
|
||||||
|
<div id="user-info"></div>
|
||||||
|
<button id="logout-btn">Logout</button>
|
||||||
|
<button id="test-profile-btn">Get Profile</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="console-log" class="log"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script src="/oauth-widget-simple.js"></script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.status {
|
||||||
|
margin: 20px 0;
|
||||||
|
padding: 15px;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #f5f5f5;
|
||||||
|
}
|
||||||
|
.user-info {
|
||||||
|
background: #e8f5e8;
|
||||||
|
border: 1px solid #4caf50;
|
||||||
|
}
|
||||||
|
.error {
|
||||||
|
background: #ffeaea;
|
||||||
|
border: 1px solid #f44336;
|
||||||
|
color: #d32f2f;
|
||||||
|
}
|
||||||
|
#oauth-widget button {
|
||||||
|
background: #1185fe;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
padding: 12px 24px;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 16px;
|
||||||
|
cursor: pointer;
|
||||||
|
margin: 10px;
|
||||||
|
}
|
||||||
|
#oauth-widget button:hover {
|
||||||
|
background: #0d6efd;
|
||||||
|
}
|
||||||
|
#oauth-widget button:disabled {
|
||||||
|
background: #6c757d;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
.log {
|
||||||
|
text-align: left;
|
||||||
|
background: #f8f9fa;
|
||||||
|
border: 1px solid #dee2e6;
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 15px;
|
||||||
|
margin: 20px 0;
|
||||||
|
max-height: 300px;
|
||||||
|
overflow-y: auto;
|
||||||
|
font-family: monospace;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
</style>
|
373
my-blog/templates/post-complex.html
Normal file
373
my-blog/templates/post-complex.html
Normal file
@@ -0,0 +1,373 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ post.title }} - {{ config.title }}{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="article-container">
|
||||||
|
<article class="article-content">
|
||||||
|
<header class="article-header">
|
||||||
|
<h1 class="article-title">{{ post.title }}</h1>
|
||||||
|
<div class="article-meta">
|
||||||
|
<time class="article-date">{{ post.date }}</time>
|
||||||
|
{% if post.language %}
|
||||||
|
<span class="article-lang">{{ post.language }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="article-actions">
|
||||||
|
{% if post.markdown_url %}
|
||||||
|
<a href="{{ post.markdown_url }}" class="action-btn markdown-btn" title="View Markdown">
|
||||||
|
.md
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if post.translation_url %}
|
||||||
|
<a href="{{ post.translation_url }}" class="action-btn translation-btn" title="View Translation">
|
||||||
|
🌐 {% if post.language == 'ja' %}English{% else %}日本語{% endif %}
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="article-body">
|
||||||
|
{{ post.content | safe }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Comment Section -->
|
||||||
|
<section class="comment-section">
|
||||||
|
<div class="comment-container">
|
||||||
|
<h3>Comments</h3>
|
||||||
|
|
||||||
|
<!-- ATProto Auth Widget Container -->
|
||||||
|
<div id="atproto-auth-widget" class="comment-auth"></div>
|
||||||
|
|
||||||
|
<div id="commentForm" class="comment-form" style="display: none;">
|
||||||
|
<textarea id="commentText" placeholder="Share your thoughts..." rows="4"></textarea>
|
||||||
|
<button onclick="submitComment()" class="submit-btn">Post Comment</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="commentsList" class="comments-list">
|
||||||
|
<!-- Comments will be loaded here -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
|
|
||||||
|
<aside class="article-sidebar">
|
||||||
|
<nav class="toc">
|
||||||
|
<h3>Contents</h3>
|
||||||
|
<div id="toc-content">
|
||||||
|
<!-- TOC will be generated by JavaScript -->
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
</aside>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block sidebar %}
|
||||||
|
<!-- Include ATProto Libraries via script tags (more reliable than dynamic imports) -->
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/@atproto/oauth-client-browser@latest/dist/index.js"></script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/@atproto/api@latest/dist/index.js"></script>
|
||||||
|
|
||||||
|
<!-- Fallback: Try multiple CDNs -->
|
||||||
|
<script>
|
||||||
|
console.log('Checking ATProto library availability...');
|
||||||
|
|
||||||
|
// Check if libraries loaded successfully
|
||||||
|
if (typeof ATProto === 'undefined' && typeof window.ATProto === 'undefined') {
|
||||||
|
console.log('Primary CDN failed, trying fallback...');
|
||||||
|
|
||||||
|
// Create fallback script elements
|
||||||
|
const fallbackScripts = [
|
||||||
|
'https://unpkg.com/@atproto/oauth-client-browser@latest/dist/index.js',
|
||||||
|
'https://esm.sh/@atproto/oauth-client-browser',
|
||||||
|
'https://cdn.skypack.dev/@atproto/oauth-client-browser'
|
||||||
|
];
|
||||||
|
|
||||||
|
// Load fallback scripts sequentially
|
||||||
|
let scriptIndex = 0;
|
||||||
|
function loadNextScript() {
|
||||||
|
if (scriptIndex < fallbackScripts.length) {
|
||||||
|
const script = document.createElement('script');
|
||||||
|
script.src = fallbackScripts[scriptIndex];
|
||||||
|
script.onload = () => {
|
||||||
|
console.log(`Loaded from fallback CDN: ${fallbackScripts[scriptIndex]}`);
|
||||||
|
window.atprotoLibrariesReady = true;
|
||||||
|
};
|
||||||
|
script.onerror = () => {
|
||||||
|
console.log(`Failed to load from: ${fallbackScripts[scriptIndex]}`);
|
||||||
|
scriptIndex++;
|
||||||
|
loadNextScript();
|
||||||
|
};
|
||||||
|
document.head.appendChild(script);
|
||||||
|
} else {
|
||||||
|
console.error('All CDN fallbacks failed');
|
||||||
|
window.atprotoLibrariesReady = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
loadNextScript();
|
||||||
|
} else {
|
||||||
|
console.log('✅ ATProto libraries loaded from primary CDN');
|
||||||
|
window.atprotoLibrariesReady = true;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<!-- Simple ATProto Widget (no external dependency) -->
|
||||||
|
<link rel="stylesheet" href="/atproto-auth-widget/dist/atproto-auth.min.css">
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// Initialize auth widget
|
||||||
|
let authWidget = null;
|
||||||
|
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
generateTableOfContents();
|
||||||
|
initializeAuthWidget();
|
||||||
|
loadComments();
|
||||||
|
});
|
||||||
|
|
||||||
|
function generateTableOfContents() {
|
||||||
|
const tocContainer = document.getElementById('toc-content');
|
||||||
|
const headings = document.querySelectorAll('.article-body h1, .article-body h2, .article-body h3, .article-body h4, .article-body h5, .article-body h6');
|
||||||
|
|
||||||
|
if (headings.length === 0) {
|
||||||
|
tocContainer.innerHTML = '<p class="no-toc">No headings found</p>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const tocList = document.createElement('ul');
|
||||||
|
tocList.className = 'toc-list';
|
||||||
|
|
||||||
|
headings.forEach((heading, index) => {
|
||||||
|
const id = `heading-${index}`;
|
||||||
|
heading.id = id;
|
||||||
|
|
||||||
|
const listItem = document.createElement('li');
|
||||||
|
listItem.className = `toc-item toc-${heading.tagName.toLowerCase()}`;
|
||||||
|
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = `#${id}`;
|
||||||
|
link.textContent = heading.textContent;
|
||||||
|
link.className = 'toc-link';
|
||||||
|
|
||||||
|
// Smooth scroll behavior
|
||||||
|
link.addEventListener('click', function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
heading.scrollIntoView({ behavior: 'smooth' });
|
||||||
|
});
|
||||||
|
|
||||||
|
listItem.appendChild(link);
|
||||||
|
tocList.appendChild(listItem);
|
||||||
|
});
|
||||||
|
|
||||||
|
tocContainer.appendChild(tocList);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize ATProto Auth Widget
|
||||||
|
async function initializeAuthWidget() {
|
||||||
|
try {
|
||||||
|
// Check WebCrypto API availability
|
||||||
|
console.log('WebCrypto check:', {
|
||||||
|
available: !!window.crypto && !!window.crypto.subtle,
|
||||||
|
secureContext: window.isSecureContext,
|
||||||
|
protocol: window.location.protocol,
|
||||||
|
hostname: window.location.hostname
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!window.crypto || !window.crypto.subtle) {
|
||||||
|
throw new Error('WebCrypto API is not available. This requires HTTPS or localhost.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!window.isSecureContext) {
|
||||||
|
console.warn('Not in secure context - WebCrypto may not work properly');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simplified approach: Show manual OAuth form
|
||||||
|
console.log('Using simplified OAuth approach...');
|
||||||
|
showSimpleOAuthForm();
|
||||||
|
// Fallback to widget initialization
|
||||||
|
authWidget = await window.initATProtoWidget('#atproto-auth-widget', {
|
||||||
|
clientId: clientId,
|
||||||
|
onLogin: (session) => {
|
||||||
|
console.log('User logged in:', session.handle);
|
||||||
|
document.getElementById('commentForm').style.display = 'block';
|
||||||
|
},
|
||||||
|
onLogout: () => {
|
||||||
|
console.log('User logged out');
|
||||||
|
document.getElementById('commentForm').style.display = 'none';
|
||||||
|
},
|
||||||
|
onError: (error) => {
|
||||||
|
console.error('ATProto Auth Error:', error);
|
||||||
|
// Show user-friendly error message
|
||||||
|
const authContainer = document.getElementById('atproto-auth-widget');
|
||||||
|
if (authContainer) {
|
||||||
|
let errorMessage = 'Authentication service is temporarily unavailable.';
|
||||||
|
let suggestion = 'Please try refreshing the page.';
|
||||||
|
|
||||||
|
if (error.message && error.message.includes('WebCrypto')) {
|
||||||
|
errorMessage = 'This feature requires a secure HTTPS connection.';
|
||||||
|
suggestion = 'Please ensure you are accessing via https://log.syui.ai';
|
||||||
|
}
|
||||||
|
|
||||||
|
authContainer.innerHTML = `
|
||||||
|
<div class="atproto-auth__fallback">
|
||||||
|
<p>${errorMessage}</p>
|
||||||
|
<p>${suggestion}</p>
|
||||||
|
<details style="margin-top: 10px; font-size: 0.8em; color: #666;">
|
||||||
|
<summary>Technical details</summary>
|
||||||
|
<pre>${error.message || 'Unknown error'}</pre>
|
||||||
|
</details>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
theme: 'default'
|
||||||
|
});
|
||||||
|
} else if (typeof window.ATProtoAuthWidget === 'function') {
|
||||||
|
// Fallback to direct widget initialization
|
||||||
|
authWidget = new window.ATProtoAuthWidget({
|
||||||
|
containerSelector: '#atproto-auth-widget',
|
||||||
|
clientId: clientId,
|
||||||
|
onLogin: (session) => {
|
||||||
|
console.log('User logged in:', session.handle);
|
||||||
|
document.getElementById('commentForm').style.display = 'block';
|
||||||
|
},
|
||||||
|
onLogout: () => {
|
||||||
|
console.log('User logged out');
|
||||||
|
document.getElementById('commentForm').style.display = 'none';
|
||||||
|
},
|
||||||
|
onError: (error) => {
|
||||||
|
console.error('ATProto Auth Error:', error);
|
||||||
|
const authContainer = document.getElementById('atproto-auth-widget');
|
||||||
|
if (authContainer) {
|
||||||
|
authContainer.innerHTML = `
|
||||||
|
<div class="atproto-auth__fallback">
|
||||||
|
<p>Authentication service is temporarily unavailable.</p>
|
||||||
|
<p>Please try refreshing the page.</p>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
theme: 'default'
|
||||||
|
});
|
||||||
|
await authWidget.init();
|
||||||
|
} else {
|
||||||
|
throw new Error('ATProto widget not available');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to initialize auth widget:', error);
|
||||||
|
// Show fallback UI
|
||||||
|
const authContainer = document.getElementById('atproto-auth-widget');
|
||||||
|
if (authContainer) {
|
||||||
|
authContainer.innerHTML = `
|
||||||
|
<div class="atproto-auth__fallback">
|
||||||
|
<p>Authentication widget failed to load.</p>
|
||||||
|
<p>Please check your internet connection and refresh the page.</p>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitComment() {
|
||||||
|
const commentText = document.getElementById('commentText').value.trim();
|
||||||
|
if (!commentText || !authWidget.isLoggedIn()) {
|
||||||
|
alert('Please login and enter a comment');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const postSlug = '{{ post.slug }}';
|
||||||
|
const postUrl = window.location.href;
|
||||||
|
const createdAt = new Date().toISOString();
|
||||||
|
|
||||||
|
// Create comment record using the auth widget
|
||||||
|
const response = await authWidget.createRecord('ai.log.comment', {
|
||||||
|
$type: 'ai.log.comment',
|
||||||
|
text: commentText,
|
||||||
|
post_slug: postSlug,
|
||||||
|
post_url: postUrl,
|
||||||
|
createdAt: createdAt
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('Comment posted:', response);
|
||||||
|
document.getElementById('commentText').value = '';
|
||||||
|
loadComments();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Comment submission failed:', error);
|
||||||
|
alert('Failed to post comment: ' + error.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showAuthenticatedState(session) {
|
||||||
|
const authContainer = document.getElementById('atproto-auth-widget');
|
||||||
|
const agent = new window.ATProtoAgent(session);
|
||||||
|
|
||||||
|
authContainer.innerHTML = `
|
||||||
|
<div class="atproto-auth__authenticated">
|
||||||
|
<p>✅ Authenticated as: <strong>${session.did}</strong></p>
|
||||||
|
<button id="logout-btn" class="atproto-auth__button">Logout</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
document.getElementById('logout-btn').onclick = async () => {
|
||||||
|
await session.signOut();
|
||||||
|
window.location.reload();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Show comment form
|
||||||
|
document.getElementById('commentForm').style.display = 'block';
|
||||||
|
window.currentSession = session;
|
||||||
|
window.currentAgent = agent;
|
||||||
|
}
|
||||||
|
|
||||||
|
function showLoginForm(oauthClient) {
|
||||||
|
const authContainer = document.getElementById('atproto-auth-widget');
|
||||||
|
|
||||||
|
authContainer.innerHTML = `
|
||||||
|
<div class="atproto-auth__login">
|
||||||
|
<h4>Login with ATProto</h4>
|
||||||
|
<input type="text" id="handle-input" placeholder="user.bsky.social" />
|
||||||
|
<button id="login-btn" class="atproto-auth__button">Connect</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
document.getElementById('login-btn').onclick = async () => {
|
||||||
|
const handle = document.getElementById('handle-input').value.trim();
|
||||||
|
if (!handle) {
|
||||||
|
alert('Please enter your handle');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const url = await oauthClient.authorize(handle);
|
||||||
|
window.open(url, '_self', 'noopener');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('OAuth authorization failed:', error);
|
||||||
|
alert('Authentication failed: ' + error.message);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Enter key support
|
||||||
|
document.getElementById('handle-input').onkeypress = (e) => {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
document.getElementById('login-btn').click();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadComments() {
|
||||||
|
try {
|
||||||
|
const commentsList = document.getElementById('commentsList');
|
||||||
|
commentsList.innerHTML = '<p class="loading">Loading comments from ATProto network...</p>';
|
||||||
|
|
||||||
|
// In a real implementation, you would query an aggregation service
|
||||||
|
// For demo, show empty state
|
||||||
|
setTimeout(() => {
|
||||||
|
commentsList.innerHTML = '<p class="no-comments">Comments will appear here when posted via ATProto.</p>';
|
||||||
|
}, 1000);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to load comments:', error);
|
||||||
|
document.getElementById('commentsList').innerHTML = '<p class="error">Failed to load comments</p>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
196
my-blog/templates/post-simple.html
Normal file
196
my-blog/templates/post-simple.html
Normal file
@@ -0,0 +1,196 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ post.title }} - {{ config.title }}{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="article-container">
|
||||||
|
<article class="article-content">
|
||||||
|
<header class="article-header">
|
||||||
|
<h1 class="article-title">{{ post.title }}</h1>
|
||||||
|
<div class="article-meta">
|
||||||
|
<time class="article-date">{{ post.date }}</time>
|
||||||
|
{% if post.language %}
|
||||||
|
<span class="article-lang">{{ post.language }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="article-actions">
|
||||||
|
{% if post.markdown_url %}
|
||||||
|
<a href="{{ post.markdown_url }}" class="action-btn markdown-btn" title="View Markdown">
|
||||||
|
.md
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if post.translation_url %}
|
||||||
|
<a href="{{ post.translation_url }}" class="action-btn translation-btn" title="View Translation">
|
||||||
|
🌐 {% if post.language == 'ja' %}English{% else %}日本語{% endif %}
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="article-body">
|
||||||
|
{{ post.content | safe }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Simple Comment Section -->
|
||||||
|
<section class="comment-section">
|
||||||
|
<div class="comment-container">
|
||||||
|
<h3>Comments</h3>
|
||||||
|
|
||||||
|
<!-- Simple OAuth Button -->
|
||||||
|
<div class="simple-oauth">
|
||||||
|
<p>📝 To comment, authenticate with Bluesky:</p>
|
||||||
|
<button id="bluesky-auth" class="oauth-button">
|
||||||
|
🦋 Login with Bluesky
|
||||||
|
</button>
|
||||||
|
<p class="oauth-note">
|
||||||
|
<small>After authentication, you can post comments that will be stored in your ATProto PDS.</small>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="comments-list" class="comments-list">
|
||||||
|
<p class="no-comments">Comments will appear here when posted via ATProto.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
|
|
||||||
|
<aside class="article-sidebar">
|
||||||
|
<nav class="toc">
|
||||||
|
<h3>Contents</h3>
|
||||||
|
<div id="toc-content">
|
||||||
|
<!-- TOC will be generated by JavaScript -->
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
</aside>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block sidebar %}
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
generateTableOfContents();
|
||||||
|
initializeSimpleAuth();
|
||||||
|
});
|
||||||
|
|
||||||
|
function generateTableOfContents() {
|
||||||
|
const tocContainer = document.getElementById('toc-content');
|
||||||
|
const headings = document.querySelectorAll('.article-body h1, .article-body h2, .article-body h3, .article-body h4, .article-body h5, .article-body h6');
|
||||||
|
|
||||||
|
if (headings.length === 0) {
|
||||||
|
tocContainer.innerHTML = '<p class="no-toc">No headings found</p>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const tocList = document.createElement('ul');
|
||||||
|
tocList.className = 'toc-list';
|
||||||
|
|
||||||
|
headings.forEach((heading, index) => {
|
||||||
|
const id = `heading-${index}`;
|
||||||
|
heading.id = id;
|
||||||
|
|
||||||
|
const listItem = document.createElement('li');
|
||||||
|
listItem.className = `toc-item toc-${heading.tagName.toLowerCase()}`;
|
||||||
|
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = `#${id}`;
|
||||||
|
link.textContent = heading.textContent;
|
||||||
|
link.className = 'toc-link';
|
||||||
|
|
||||||
|
link.addEventListener('click', function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
heading.scrollIntoView({ behavior: 'smooth' });
|
||||||
|
});
|
||||||
|
|
||||||
|
listItem.appendChild(link);
|
||||||
|
tocList.appendChild(listItem);
|
||||||
|
});
|
||||||
|
|
||||||
|
tocContainer.appendChild(tocList);
|
||||||
|
}
|
||||||
|
|
||||||
|
function initializeSimpleAuth() {
|
||||||
|
const authButton = document.getElementById('bluesky-auth');
|
||||||
|
|
||||||
|
authButton.addEventListener('click', function() {
|
||||||
|
// Simple approach: Direct redirect to Bluesky OAuth
|
||||||
|
const isProduction = window.location.hostname === 'log.syui.ai';
|
||||||
|
const clientId = isProduction
|
||||||
|
? 'https://log.syui.ai/client-metadata.json'
|
||||||
|
: window.location.origin + '/client-metadata.json';
|
||||||
|
|
||||||
|
const authUrl = `https://bsky.social/oauth/authorize?` +
|
||||||
|
`client_id=${encodeURIComponent(clientId)}&` +
|
||||||
|
`redirect_uri=${encodeURIComponent(window.location.href)}&` +
|
||||||
|
`response_type=code&` +
|
||||||
|
`scope=atproto%20transition:generic&` +
|
||||||
|
`state=demo-state`;
|
||||||
|
|
||||||
|
console.log('Redirecting to:', authUrl);
|
||||||
|
|
||||||
|
// Open in new tab for now (safer for testing)
|
||||||
|
window.open(authUrl, '_blank');
|
||||||
|
|
||||||
|
// Show status message
|
||||||
|
authButton.innerHTML = '✅ Check the new tab for authentication';
|
||||||
|
authButton.disabled = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Check if we're returning from OAuth
|
||||||
|
const urlParams = new URLSearchParams(window.location.search);
|
||||||
|
if (urlParams.has('code')) {
|
||||||
|
console.log('OAuth callback detected:', urlParams.get('code'));
|
||||||
|
document.querySelector('.simple-oauth').innerHTML = `
|
||||||
|
<div class="oauth-success">
|
||||||
|
✅ OAuth callback received!<br>
|
||||||
|
<small>Code: ${urlParams.get('code')}</small><br>
|
||||||
|
<small>In a full implementation, this would exchange the code for tokens.</small>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.simple-oauth {
|
||||||
|
background: #f8f9fa;
|
||||||
|
border: 1px solid #e9ecef;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 20px;
|
||||||
|
margin: 20px 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oauth-button {
|
||||||
|
background: #1185fe;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
padding: 12px 24px;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 16px;
|
||||||
|
cursor: pointer;
|
||||||
|
margin: 10px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oauth-button:hover {
|
||||||
|
background: #0d6efd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oauth-button:disabled {
|
||||||
|
background: #6c757d;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oauth-note {
|
||||||
|
color: #6c757d;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oauth-success {
|
||||||
|
background: #d1edff;
|
||||||
|
border: 1px solid #b6d7ff;
|
||||||
|
border-radius: 4px;
|
||||||
|
padding: 15px;
|
||||||
|
color: #0c5460;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
{% endblock %}
|
93
my-blog/templates/post.html
Normal file
93
my-blog/templates/post.html
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ post.title }} - {{ config.title }}{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="article-container">
|
||||||
|
<article class="article-content">
|
||||||
|
<header class="article-header">
|
||||||
|
<h1 class="article-title">{{ post.title }}</h1>
|
||||||
|
<div class="article-meta">
|
||||||
|
<time class="article-date">{{ post.date }}</time>
|
||||||
|
{% if post.language %}
|
||||||
|
<span class="article-lang">{{ post.language }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="article-actions">
|
||||||
|
{% if post.markdown_url %}
|
||||||
|
<a href="{{ post.markdown_url }}" class="action-btn markdown-btn" title="View Markdown">
|
||||||
|
.md
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if post.translation_url %}
|
||||||
|
<a href="{{ post.translation_url }}" class="action-btn translation-btn" title="View Translation">
|
||||||
|
🌐 {% if post.language == 'ja' %}English{% else %}日本語{% endif %}
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="article-body">
|
||||||
|
{{ post.content | safe }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="comment-atproto"></div>
|
||||||
|
</article>
|
||||||
|
|
||||||
|
<aside class="article-sidebar">
|
||||||
|
<nav class="toc">
|
||||||
|
<h3>Contents</h3>
|
||||||
|
<div id="toc-content">
|
||||||
|
<!-- TOC will be generated by JavaScript -->
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
</aside>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// Generate table of contents
|
||||||
|
function generateTableOfContents() {
|
||||||
|
const tocContainer = document.getElementById('toc-content');
|
||||||
|
const headings = document.querySelectorAll('.article-body h1, .article-body h2, .article-body h3, .article-body h4, .article-body h5, .article-body h6');
|
||||||
|
|
||||||
|
if (headings.length === 0) {
|
||||||
|
tocContainer.innerHTML = '<p class="no-toc">No headings found</p>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const tocList = document.createElement('ul');
|
||||||
|
tocList.className = 'toc-list';
|
||||||
|
|
||||||
|
headings.forEach((heading, index) => {
|
||||||
|
const id = `heading-${index}`;
|
||||||
|
heading.id = id;
|
||||||
|
|
||||||
|
const listItem = document.createElement('li');
|
||||||
|
listItem.className = `toc-item toc-${heading.tagName.toLowerCase()}`;
|
||||||
|
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = `#${id}`;
|
||||||
|
link.textContent = heading.textContent;
|
||||||
|
link.className = 'toc-link';
|
||||||
|
|
||||||
|
link.addEventListener('click', function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
heading.scrollIntoView({ behavior: 'smooth' });
|
||||||
|
});
|
||||||
|
|
||||||
|
listItem.appendChild(link);
|
||||||
|
tocList.appendChild(listItem);
|
||||||
|
});
|
||||||
|
|
||||||
|
tocContainer.appendChild(tocList);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize on page load
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
generateTableOfContents();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block sidebar %}
|
||||||
|
{% endblock %}
|
@@ -1,13 +1,21 @@
|
|||||||
# Production environment variables
|
# Production environment variables
|
||||||
VITE_APP_HOST=https://log.syui.ai
|
VITE_APP_HOST=https://syui.ai
|
||||||
VITE_OAUTH_CLIENT_ID=https://log.syui.ai/client-metadata.json
|
VITE_OAUTH_CLIENT_ID=https://syui.ai/client-metadata.json
|
||||||
VITE_OAUTH_REDIRECT_URI=https://log.syui.ai/oauth/callback
|
VITE_OAUTH_REDIRECT_URI=https://syui.ai/oauth/callback
|
||||||
VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn
|
VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn
|
||||||
|
|
||||||
# Collection names for OAuth app
|
# Base collection for OAuth app and ailog (all others are derived)
|
||||||
VITE_COLLECTION_COMMENT=ai.syui.log
|
VITE_OAUTH_COLLECTION=ai.syui.log
|
||||||
VITE_COLLECTION_USER=ai.syui.log.user
|
# [user, chat, chat.lang, chat.comment]
|
||||||
|
|
||||||
# Collection names for ailog (backward compatibility)
|
# AI Configuration
|
||||||
AILOG_COLLECTION_COMMENT=ai.syui.log
|
VITE_AI_ENABLED=true
|
||||||
AILOG_COLLECTION_USER=ai.syui.log.user
|
VITE_AI_ASK_AI=true
|
||||||
|
VITE_AI_PROVIDER=ollama
|
||||||
|
VITE_AI_MODEL=gemma3:4b
|
||||||
|
VITE_AI_HOST=https://ollama.syui.ai
|
||||||
|
VITE_AI_SYSTEM_PROMPT="あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"
|
||||||
|
VITE_AI_DID=did:plc:4hqjfn7m6n5hno3doamuhgef
|
||||||
|
|
||||||
|
# API Configuration
|
||||||
|
VITE_BSKY_PUBLIC_API=https://public.api.bsky.app
|
||||||
|
@@ -1,7 +1,16 @@
|
|||||||
|
/* Theme Colors */
|
||||||
|
:root {
|
||||||
|
--theme-color: #FF4500;
|
||||||
|
--white: #fff;
|
||||||
|
--light-gray: #aaa;
|
||||||
|
--dark-gray: #666;
|
||||||
|
--background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
.app {
|
.app {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background: linear-gradient(180deg, #f8f9fa 0%, #ffffff 100%);
|
background: linear-gradient(180deg, #f8f9fa 0%, var(--background) 100%);
|
||||||
color: #333333;
|
color: var(--dark-gray);
|
||||||
}
|
}
|
||||||
|
|
||||||
.app-header {
|
.app-header {
|
||||||
@@ -41,15 +50,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.nav-button.active {
|
.nav-button.active {
|
||||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
background: var(--theme-color);
|
||||||
color: white;
|
color: var(--white);
|
||||||
border: 1px solid #667eea;
|
border: 1px solid var(--theme-color);
|
||||||
box-shadow: 0 4px 16px rgba(102, 126, 234, 0.4);
|
box-shadow: 0 4px 16px rgba(255, 69, 0, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-button.active:hover {
|
.nav-button.active:hover {
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 6px 20px rgba(102, 126, 234, 0.5);
|
box-shadow: 0 6px 20px rgba(255, 69, 0, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
.app-header h1 {
|
.app-header h1 {
|
||||||
@@ -99,9 +108,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.login-button {
|
.login-button {
|
||||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
background: var(--theme-color);
|
||||||
color: white;
|
color: var(--white);
|
||||||
border: 1px solid #667eea;
|
border: 1px solid var(--theme-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.backup-button {
|
.backup-button {
|
||||||
@@ -124,7 +133,7 @@
|
|||||||
|
|
||||||
.login-button:hover {
|
.login-button:hover {
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
|
box-shadow: 0 4px 12px rgba(255, 69, 0, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.backup-button:hover {
|
.backup-button:hover {
|
||||||
@@ -153,11 +162,67 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.app-main {
|
.app-main {
|
||||||
max-width: 1200px;
|
max-width: 1000px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
padding: 40px 20px;
|
padding: 40px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1000px) {
|
||||||
|
.app .app-main {
|
||||||
|
padding: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-item {
|
||||||
|
padding: 0px !important;
|
||||||
|
margin: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-section {
|
||||||
|
padding: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comments-list {
|
||||||
|
padding: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-section {
|
||||||
|
padding: 0px !important;
|
||||||
|
margin: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-content {
|
||||||
|
padding: 10px !important;
|
||||||
|
word-wrap: break-word !important;
|
||||||
|
overflow-wrap: break-word !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-header {
|
||||||
|
padding: 10px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fix overflow on article pages */
|
||||||
|
article.article-content {
|
||||||
|
overflow-x: hidden !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure full width on mobile */
|
||||||
|
.app {
|
||||||
|
max-width: 100vw !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fix button overflow */
|
||||||
|
button {
|
||||||
|
max-width: 100%;
|
||||||
|
white-space: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fix comment-meta URI overflow */
|
||||||
|
.comment-meta {
|
||||||
|
word-break: break-all !important;
|
||||||
|
overflow-wrap: break-word !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.gacha-section {
|
.gacha-section {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin-bottom: 60px;
|
margin-bottom: 60px;
|
||||||
@@ -255,7 +320,7 @@
|
|||||||
.comment-section {
|
.comment-section {
|
||||||
max-width: 800px;
|
max-width: 800px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
padding: 20px;
|
/* padding: 20px; - removed to avoid double padding */
|
||||||
}
|
}
|
||||||
|
|
||||||
.auth-section {
|
.auth-section {
|
||||||
@@ -268,8 +333,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.atproto-button {
|
.atproto-button {
|
||||||
background: #1185fe;
|
background: var(--theme-color);
|
||||||
color: white;
|
color: var(--white);
|
||||||
border: none;
|
border: none;
|
||||||
padding: 12px 24px;
|
padding: 12px 24px;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
@@ -281,9 +346,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.atproto-button:hover {
|
.atproto-button:hover {
|
||||||
background: #0d6efd;
|
filter: brightness(1.1);
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 4px 12px rgba(17, 133, 254, 0.4);
|
box-shadow: 0 4px 12px rgba(255, 69, 0, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.username-input-section {
|
.username-input-section {
|
||||||
@@ -407,8 +472,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.post-button {
|
.post-button {
|
||||||
background: #28a745;
|
background: var(--theme-color);
|
||||||
color: white;
|
color: var(--white);
|
||||||
border: none;
|
border: none;
|
||||||
padding: 10px 20px;
|
padding: 10px 20px;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
@@ -419,9 +484,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.post-button:hover:not(:disabled) {
|
.post-button:hover:not(:disabled) {
|
||||||
background: #218838;
|
filter: brightness(1.1);
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 4px 12px rgba(40, 167, 69, 0.4);
|
box-shadow: 0 4px 12px rgba(255, 69, 0, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.post-button:disabled {
|
.post-button:disabled {
|
||||||
@@ -455,8 +520,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.comments-toggle-button {
|
.comments-toggle-button {
|
||||||
background: #1185fe;
|
background: var(--theme-color);
|
||||||
color: white;
|
color: var(--white);
|
||||||
border: none;
|
border: none;
|
||||||
padding: 8px 16px;
|
padding: 8px 16px;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
@@ -467,9 +532,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.comments-toggle-button:hover {
|
.comments-toggle-button:hover {
|
||||||
background: #0d6efd;
|
filter: brightness(1.1);
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 4px 12px rgba(17, 133, 254, 0.4);
|
box-shadow: 0 4px 12px rgba(255, 69, 0, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-item {
|
.comment-item {
|
||||||
@@ -714,8 +779,8 @@
|
|||||||
|
|
||||||
/* JSON Display Styles */
|
/* JSON Display Styles */
|
||||||
.json-button {
|
.json-button {
|
||||||
background: #4caf50;
|
background: var(--theme-color);
|
||||||
color: white;
|
color: var(--white);
|
||||||
border: none;
|
border: none;
|
||||||
padding: 4px 8px;
|
padding: 4px 8px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
@@ -726,7 +791,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.json-button:hover {
|
.json-button:hover {
|
||||||
background: #45a049;
|
filter: brightness(1.1);
|
||||||
transform: scale(1.05);
|
transform: scale(1.05);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -759,4 +824,108 @@
|
|||||||
color: #333;
|
color: #333;
|
||||||
max-height: 400px;
|
max-height: 400px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Tab Navigation */
|
||||||
|
.tab-navigation {
|
||||||
|
display: flex;
|
||||||
|
border-bottom: 2px solid #e1e5e9;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-button {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
padding: 12px 20px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #656d76;
|
||||||
|
border-bottom: 2px solid transparent;
|
||||||
|
transition: all 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-button:hover {
|
||||||
|
color: var(--theme-color);
|
||||||
|
background: #f6f8fa;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab-button.active {
|
||||||
|
color: var(--theme-color);
|
||||||
|
border-bottom-color: var(--theme-color);
|
||||||
|
background: #f6f8fa;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* AI Chat History */
|
||||||
|
.ai-chat-list {
|
||||||
|
max-width: 100%;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-item {
|
||||||
|
border: 1px solid #d1d9e0;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 16px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-type-button {
|
||||||
|
background: var(--theme-color);
|
||||||
|
color: var(--white);
|
||||||
|
border: none;
|
||||||
|
padding: 4px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
cursor: default;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 500;
|
||||||
|
margin-left: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-type-text {
|
||||||
|
font-size: 16px;
|
||||||
|
margin-left: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.chat-date {
|
||||||
|
color: #656d76;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-content {
|
||||||
|
background: #f6f8fa;
|
||||||
|
padding: 12px;
|
||||||
|
border-radius: 6px;
|
||||||
|
border-left: 4px solid #d1d9e0;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-meta {
|
||||||
|
font-size: 11px;
|
||||||
|
color: #656d76;
|
||||||
|
}
|
||||||
|
|
||||||
|
.no-chat {
|
||||||
|
text-align: center;
|
||||||
|
padding: 40px 20px;
|
||||||
|
color: #656d76;
|
||||||
|
font-style: italic;
|
||||||
}
|
}
|
@@ -1,8 +1,9 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { OAuthCallback } from './components/OAuthCallback';
|
import { OAuthCallback } from './components/OAuthCallback';
|
||||||
|
import { AIChat } from './components/AIChat';
|
||||||
import { authService, User } from './services/auth';
|
import { authService, User } from './services/auth';
|
||||||
import { atprotoOAuthService } from './services/atproto-oauth';
|
import { atprotoOAuthService } from './services/atproto-oauth';
|
||||||
import { appConfig } from './config/app';
|
import { appConfig, getCollectionNames } from './config/app';
|
||||||
import './App.css';
|
import './App.css';
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
@@ -45,6 +46,10 @@ function App() {
|
|||||||
const [isPostingUserList, setIsPostingUserList] = useState(false);
|
const [isPostingUserList, setIsPostingUserList] = useState(false);
|
||||||
const [userListRecords, setUserListRecords] = useState<any[]>([]);
|
const [userListRecords, setUserListRecords] = useState<any[]>([]);
|
||||||
const [showJsonFor, setShowJsonFor] = useState<string | null>(null);
|
const [showJsonFor, setShowJsonFor] = useState<string | null>(null);
|
||||||
|
const [activeTab, setActiveTab] = useState<'comments' | 'ai-chat' | 'lang-en' | 'ai-comment'>('comments');
|
||||||
|
const [aiChatHistory, setAiChatHistory] = useState<any[]>([]);
|
||||||
|
const [langEnRecords, setLangEnRecords] = useState<any[]>([]);
|
||||||
|
const [aiCommentRecords, setAiCommentRecords] = useState<any[]>([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Setup Jetstream WebSocket for real-time comments (optional)
|
// Setup Jetstream WebSocket for real-time comments (optional)
|
||||||
@@ -52,17 +57,18 @@ function App() {
|
|||||||
try {
|
try {
|
||||||
const ws = new WebSocket('wss://jetstream2.us-east.bsky.network/subscribe');
|
const ws = new WebSocket('wss://jetstream2.us-east.bsky.network/subscribe');
|
||||||
|
|
||||||
|
const collections = getCollectionNames(appConfig.collections.base);
|
||||||
ws.onopen = () => {
|
ws.onopen = () => {
|
||||||
console.log('Jetstream connected');
|
console.log('Jetstream connected');
|
||||||
ws.send(JSON.stringify({
|
ws.send(JSON.stringify({
|
||||||
wantedCollections: [appConfig.collections.comment]
|
wantedCollections: [collections.comment]
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
ws.onmessage = (event) => {
|
ws.onmessage = (event) => {
|
||||||
try {
|
try {
|
||||||
const data = JSON.parse(event.data);
|
const data = JSON.parse(event.data);
|
||||||
if (data.collection === appConfig.collections.comment && data.commit?.operation === 'create') {
|
if (data.collection === collections.comment && data.commit?.operation === 'create') {
|
||||||
console.log('New comment detected via Jetstream:', data);
|
console.log('New comment detected via Jetstream:', data);
|
||||||
// Optionally reload comments
|
// Optionally reload comments
|
||||||
// loadAllComments(window.location.href);
|
// loadAllComments(window.location.href);
|
||||||
@@ -83,8 +89,8 @@ function App() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Jetstream + Cache example
|
// Jetstream + Cache example (disabled for now)
|
||||||
const jetstream = setupJetstream();
|
// const jetstream = setupJetstream();
|
||||||
|
|
||||||
// キャッシュからコメント読み込み
|
// キャッシュからコメント読み込み
|
||||||
const loadCachedComments = () => {
|
const loadCachedComments = () => {
|
||||||
@@ -102,7 +108,10 @@ function App() {
|
|||||||
|
|
||||||
// キャッシュがなければ、ATProtoから取得(認証状態に関係なく)
|
// キャッシュがなければ、ATProtoから取得(認証状態に関係なく)
|
||||||
if (!loadCachedComments()) {
|
if (!loadCachedComments()) {
|
||||||
|
console.log('No cached comments found, loading from ATProto...');
|
||||||
loadAllComments(); // URLフィルタリングを無効にして全コメント表示
|
loadAllComments(); // URLフィルタリングを無効にして全コメント表示
|
||||||
|
} else {
|
||||||
|
console.log('Cached comments loaded successfully');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle popstate events for mock OAuth flow
|
// Handle popstate events for mock OAuth flow
|
||||||
@@ -144,8 +153,12 @@ function App() {
|
|||||||
|
|
||||||
// Load all comments for display (this will be the default view)
|
// Load all comments for display (this will be the default view)
|
||||||
// Temporarily disable URL filtering to see all comments
|
// Temporarily disable URL filtering to see all comments
|
||||||
|
console.log('OAuth session found, loading all comments...');
|
||||||
loadAllComments();
|
loadAllComments();
|
||||||
|
|
||||||
|
// Load AI chat history
|
||||||
|
loadAiChatHistory(userProfile.did);
|
||||||
|
|
||||||
// Load user list records if admin
|
// Load user list records if admin
|
||||||
if (userProfile.did === appConfig.adminDid) {
|
if (userProfile.did === appConfig.adminDid) {
|
||||||
loadUserListRecords();
|
loadUserListRecords();
|
||||||
@@ -164,6 +177,7 @@ function App() {
|
|||||||
|
|
||||||
// Load all comments for display (this will be the default view)
|
// Load all comments for display (this will be the default view)
|
||||||
// Temporarily disable URL filtering to see all comments
|
// Temporarily disable URL filtering to see all comments
|
||||||
|
console.log('Legacy auth session found, loading all comments...');
|
||||||
loadAllComments();
|
loadAllComments();
|
||||||
|
|
||||||
// Load user list records if admin
|
// Load user list records if admin
|
||||||
@@ -174,10 +188,14 @@ function App() {
|
|||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
|
|
||||||
// 認証状態に関係なく、コメントを読み込む
|
// 認証状態に関係なく、コメントを読み込む
|
||||||
|
console.log('No auth session found, loading all comments anyway...');
|
||||||
loadAllComments();
|
loadAllComments();
|
||||||
};
|
};
|
||||||
|
|
||||||
checkAuth();
|
checkAuth();
|
||||||
|
|
||||||
|
// Load AI generated content (public)
|
||||||
|
loadAIGeneratedContent();
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
window.removeEventListener('popstate', handlePopState);
|
window.removeEventListener('popstate', handlePopState);
|
||||||
@@ -211,7 +229,94 @@ function App() {
|
|||||||
|
|
||||||
const generatePlaceholderAvatar = (handle: string): string => {
|
const generatePlaceholderAvatar = (handle: string): string => {
|
||||||
const initial = handle ? handle.charAt(0).toUpperCase() : 'U';
|
const initial = handle ? handle.charAt(0).toUpperCase() : 'U';
|
||||||
return `https://via.placeholder.com/48x48/1185fe/ffffff?text=${initial}`;
|
const svg = `<svg width="48" height="48" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<rect width="48" height="48" fill="#1185fe"/>
|
||||||
|
<text x="24" y="32" font-family="Arial, sans-serif" font-size="20" font-weight="bold" fill="white" text-anchor="middle">${initial}</text>
|
||||||
|
</svg>`;
|
||||||
|
return `data:image/svg+xml;base64,${btoa(svg)}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const loadAiChatHistory = async (did: string) => {
|
||||||
|
try {
|
||||||
|
console.log('Loading AI chat history for DID:', did);
|
||||||
|
const agent = atprotoOAuthService.getAgent();
|
||||||
|
if (!agent) {
|
||||||
|
console.log('No agent available');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get AI chat records from current user
|
||||||
|
const response = await agent.api.com.atproto.repo.listRecords({
|
||||||
|
repo: did,
|
||||||
|
collection: appConfig.collections.chat,
|
||||||
|
limit: 100,
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('AI chat history loaded:', response.data);
|
||||||
|
const chatRecords = response.data.records || [];
|
||||||
|
|
||||||
|
// Filter out old records with invalid AI profile data (temporary fix for migration)
|
||||||
|
const validRecords = chatRecords.filter(record => {
|
||||||
|
if (record.value.answer) {
|
||||||
|
// This is an AI answer - check if it has valid AI profile
|
||||||
|
return record.value.author?.handle &&
|
||||||
|
record.value.author?.handle !== 'ai-assistant' &&
|
||||||
|
record.value.author?.displayName !== 'AI Assistant';
|
||||||
|
}
|
||||||
|
return true; // Keep all questions
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(`Filtered ${chatRecords.length} records to ${validRecords.length} valid records`);
|
||||||
|
|
||||||
|
// Sort by creation time and group question-answer pairs
|
||||||
|
const sortedRecords = validRecords.sort((a, b) =>
|
||||||
|
new Date(a.value.createdAt).getTime() - new Date(b.value.createdAt).getTime()
|
||||||
|
);
|
||||||
|
|
||||||
|
setAiChatHistory(sortedRecords);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to load AI chat history:', err);
|
||||||
|
setAiChatHistory([]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Load AI generated content from admin DID
|
||||||
|
const loadAIGeneratedContent = async () => {
|
||||||
|
try {
|
||||||
|
const adminDid = appConfig.adminDid;
|
||||||
|
const bskyApi = appConfig.bskyPublicApi || 'https://public.api.bsky.app';
|
||||||
|
const collections = getCollectionNames(appConfig.collections.base);
|
||||||
|
|
||||||
|
// Load lang:en records
|
||||||
|
const langResponse = await fetch(`${bskyApi}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(adminDid)}&collection=${encodeURIComponent(collections.chatLang)}&limit=100`);
|
||||||
|
if (langResponse.ok) {
|
||||||
|
const langData = await langResponse.json();
|
||||||
|
const langRecords = langData.records || [];
|
||||||
|
|
||||||
|
// Filter by current page URL if on post page
|
||||||
|
const filteredLangRecords = appConfig.rkey
|
||||||
|
? langRecords.filter(record => record.value.url === window.location.href)
|
||||||
|
: langRecords.slice(0, 3); // Top page: latest 3
|
||||||
|
|
||||||
|
setLangEnRecords(filteredLangRecords);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load AI comment records
|
||||||
|
const commentResponse = await fetch(`${bskyApi}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(adminDid)}&collection=${encodeURIComponent(collections.chatComment)}&limit=100`);
|
||||||
|
if (commentResponse.ok) {
|
||||||
|
const commentData = await commentResponse.json();
|
||||||
|
const commentRecords = commentData.records || [];
|
||||||
|
|
||||||
|
// Filter by current page URL if on post page
|
||||||
|
const filteredCommentRecords = appConfig.rkey
|
||||||
|
? commentRecords.filter(record => record.value.url === window.location.href)
|
||||||
|
: commentRecords.slice(0, 3); // Top page: latest 3
|
||||||
|
|
||||||
|
setAiCommentRecords(filteredCommentRecords);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to load AI generated content:', err);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const loadUserComments = async (did: string) => {
|
const loadUserComments = async (did: string) => {
|
||||||
@@ -298,7 +403,7 @@ function App() {
|
|||||||
if (user.did && user.did.includes('-placeholder')) {
|
if (user.did && user.did.includes('-placeholder')) {
|
||||||
console.log(`Resolving placeholder DID for ${user.handle}`);
|
console.log(`Resolving placeholder DID for ${user.handle}`);
|
||||||
try {
|
try {
|
||||||
const profileResponse = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(user.handle)}`);
|
const profileResponse = await fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(user.handle)}`);
|
||||||
if (profileResponse.ok) {
|
if (profileResponse.ok) {
|
||||||
const profileData = await profileResponse.json();
|
const profileData = await profileResponse.json();
|
||||||
if (profileData.did) {
|
if (profileData.did) {
|
||||||
@@ -394,7 +499,8 @@ function App() {
|
|||||||
console.log(`Fetching comments from user: ${user.handle} (${user.did}) at ${user.pds}`);
|
console.log(`Fetching comments from user: ${user.handle} (${user.did}) at ${user.pds}`);
|
||||||
|
|
||||||
// Public API使用(認証不要)
|
// Public API使用(認証不要)
|
||||||
const response = await fetch(`${user.pds}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(user.did)}&collection=${encodeURIComponent(appConfig.collections.comment)}&limit=100`);
|
const collections = getCollectionNames(appConfig.collections.base);
|
||||||
|
const response = await fetch(`${user.pds}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(user.did)}&collection=${encodeURIComponent(collections.comment)}&limit=100`);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
console.warn(`Failed to fetch from ${user.handle} (${response.status}): ${response.statusText}`);
|
console.warn(`Failed to fetch from ${user.handle} (${response.status}): ${response.statusText}`);
|
||||||
@@ -449,7 +555,7 @@ function App() {
|
|||||||
if (!record.value.author?.avatar && record.value.author?.handle) {
|
if (!record.value.author?.avatar && record.value.author?.handle) {
|
||||||
try {
|
try {
|
||||||
// Public API でプロフィール取得
|
// Public API でプロフィール取得
|
||||||
const profileResponse = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(record.value.author.handle)}`);
|
const profileResponse = await fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(record.value.author.handle)}`);
|
||||||
|
|
||||||
if (profileResponse.ok) {
|
if (profileResponse.ok) {
|
||||||
const profileData = await profileResponse.json();
|
const profileData = await profileResponse.json();
|
||||||
@@ -480,6 +586,7 @@ function App() {
|
|||||||
console.log('Known users used:', knownUsers);
|
console.log('Known users used:', knownUsers);
|
||||||
|
|
||||||
setComments(enhancedComments);
|
setComments(enhancedComments);
|
||||||
|
console.log('Comments state updated with', enhancedComments.length, 'comments');
|
||||||
|
|
||||||
// キャッシュに保存(5分間有効)
|
// キャッシュに保存(5分間有効)
|
||||||
if (pageUrl) {
|
if (pageUrl) {
|
||||||
@@ -675,7 +782,7 @@ function App() {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
// Public APIでプロフィールを取得してDIDを解決
|
// Public APIでプロフィールを取得してDIDを解決
|
||||||
const profileResponse = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(handle)}`);
|
const profileResponse = await fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(handle)}`);
|
||||||
if (profileResponse.ok) {
|
if (profileResponse.ok) {
|
||||||
const profileData = await profileResponse.json();
|
const profileData = await profileResponse.json();
|
||||||
if (profileData.did) {
|
if (profileData.did) {
|
||||||
@@ -966,11 +1073,39 @@ function App() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Tab Navigation */}
|
||||||
|
<div className="tab-navigation">
|
||||||
|
<button
|
||||||
|
className={`tab-button ${activeTab === 'comments' ? 'active' : ''}`}
|
||||||
|
onClick={() => setActiveTab('comments')}
|
||||||
|
>
|
||||||
|
Comments ({comments.filter(shouldShowComment).length})
|
||||||
|
</button>
|
||||||
|
{user && (
|
||||||
|
<button
|
||||||
|
className={`tab-button ${activeTab === 'ai-chat' ? 'active' : ''}`}
|
||||||
|
onClick={() => setActiveTab('ai-chat')}
|
||||||
|
>
|
||||||
|
AI Chat History ({aiChatHistory.length})
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
className={`tab-button ${activeTab === 'lang-en' ? 'active' : ''}`}
|
||||||
|
onClick={() => setActiveTab('lang-en')}
|
||||||
|
>
|
||||||
|
Lang: EN ({langEnRecords.length})
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
className={`tab-button ${activeTab === 'ai-comment' ? 'active' : ''}`}
|
||||||
|
onClick={() => setActiveTab('ai-comment')}
|
||||||
|
>
|
||||||
|
AI Comment ({aiCommentRecords.length})
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Comments List */}
|
{/* Comments List */}
|
||||||
<div className="comments-list">
|
{activeTab === 'comments' && (
|
||||||
<div className="comments-header">
|
<div className="comments-list">
|
||||||
<h3>Comments</h3>
|
|
||||||
</div>
|
|
||||||
{comments.filter(shouldShowComment).length === 0 ? (
|
{comments.filter(shouldShowComment).length === 0 ? (
|
||||||
<p className="no-comments">
|
<p className="no-comments">
|
||||||
{appConfig.rkey ? `No comments for this post yet` : `No comments yet`}
|
{appConfig.rkey ? `No comments for this post yet` : `No comments yet`}
|
||||||
@@ -980,9 +1115,25 @@ function App() {
|
|||||||
<div key={index} className="comment-item">
|
<div key={index} className="comment-item">
|
||||||
<div className="comment-header">
|
<div className="comment-header">
|
||||||
<img
|
<img
|
||||||
src={record.value.author?.avatar || generatePlaceholderAvatar(record.value.author?.handle || 'unknown')}
|
src={generatePlaceholderAvatar(record.value.author?.handle || 'unknown')}
|
||||||
alt="User Avatar"
|
alt="User Avatar"
|
||||||
className="comment-avatar"
|
className="comment-avatar"
|
||||||
|
ref={(img) => {
|
||||||
|
// Fetch fresh avatar from API when component mounts
|
||||||
|
if (img && record.value.author?.did) {
|
||||||
|
fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(record.value.author.did)}`)
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.avatar && img) {
|
||||||
|
img.src = data.avatar;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(err => {
|
||||||
|
console.warn('Failed to fetch fresh avatar:', err);
|
||||||
|
// Keep placeholder on error
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
<div className="comment-author-info">
|
<div className="comment-author-info">
|
||||||
<span className="comment-author">
|
<span className="comment-author">
|
||||||
@@ -1024,7 +1175,9 @@ function App() {
|
|||||||
{record.value.text}
|
{record.value.text}
|
||||||
</div>
|
</div>
|
||||||
<div className="comment-meta">
|
<div className="comment-meta">
|
||||||
<small>{record.uri}</small>
|
{record.value.url && (
|
||||||
|
<small><a href={record.value.url}>{record.value.url}</a></small>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* JSON Display */}
|
{/* JSON Display */}
|
||||||
@@ -1039,7 +1192,176 @@ function App() {
|
|||||||
</div>
|
</div>
|
||||||
))
|
))
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* AI Chat History List */}
|
||||||
|
{activeTab === 'ai-chat' && user && (
|
||||||
|
<div className="ai-chat-list">
|
||||||
|
<div className="chat-header">
|
||||||
|
<h3>AI Chat History</h3>
|
||||||
|
</div>
|
||||||
|
{aiChatHistory.length === 0 ? (
|
||||||
|
<p className="no-chat">No AI conversations yet. Start chatting with Ask AI!</p>
|
||||||
|
) : (
|
||||||
|
aiChatHistory.map((record, index) => (
|
||||||
|
<div key={index} className="chat-item">
|
||||||
|
<div className="chat-header">
|
||||||
|
<img
|
||||||
|
src={generatePlaceholderAvatar(record.value.author?.handle || 'unknown')}
|
||||||
|
alt="User Avatar"
|
||||||
|
className="comment-avatar"
|
||||||
|
ref={(img) => {
|
||||||
|
// Fetch fresh avatar from API when component mounts
|
||||||
|
if (img && record.value.author?.did) {
|
||||||
|
fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(record.value.author.did)}`)
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.avatar && img) {
|
||||||
|
img.src = data.avatar;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(err => {
|
||||||
|
console.warn('Failed to fetch fresh avatar:', err);
|
||||||
|
// Keep placeholder on error
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<div className="comment-author-info">
|
||||||
|
<span className="comment-author">
|
||||||
|
{record.value.author?.displayName || record.value.author?.handle || 'unknown'}
|
||||||
|
</span>
|
||||||
|
<a
|
||||||
|
href={generateProfileUrl(record.value.author?.handle || '', record.value.author?.did || '')}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="comment-handle"
|
||||||
|
>
|
||||||
|
@{record.value.author?.handle || 'unknown'}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<span className="comment-date">
|
||||||
|
{new Date(record.value.createdAt).toLocaleString()}
|
||||||
|
</span>
|
||||||
|
<div className="comment-actions">
|
||||||
|
<button
|
||||||
|
onClick={() => toggleJsonDisplay(record.uri)}
|
||||||
|
className="json-button"
|
||||||
|
title="Show/Hide JSON"
|
||||||
|
>
|
||||||
|
{showJsonFor === record.uri ? 'Hide' : 'JSON'}
|
||||||
|
</button>
|
||||||
|
<button className="chat-type-button">
|
||||||
|
{record.value.question ? 'Question' : 'Answer'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="comment-content">
|
||||||
|
{record.value.question || record.value.answer}
|
||||||
|
</div>
|
||||||
|
<div className="comment-meta">
|
||||||
|
{record.value.url && (
|
||||||
|
<small><a href={record.value.url}>{record.value.url}</a></small>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* JSON Display */}
|
||||||
|
{showJsonFor === record.uri && (
|
||||||
|
<div className="json-display">
|
||||||
|
<h5>JSON Record:</h5>
|
||||||
|
<pre className="json-content">
|
||||||
|
{JSON.stringify(record, null, 2)}
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Lang: EN List */}
|
||||||
|
{activeTab === 'lang-en' && (
|
||||||
|
<div className="lang-en-list">
|
||||||
|
{langEnRecords.length === 0 ? (
|
||||||
|
<p className="no-content">No English translations yet</p>
|
||||||
|
) : (
|
||||||
|
langEnRecords.map((record, index) => (
|
||||||
|
<div key={index} className="lang-item">
|
||||||
|
<div className="lang-header">
|
||||||
|
<img
|
||||||
|
src={record.value.author?.avatar || generatePlaceholderAvatar(record.value.author?.handle || 'AI')}
|
||||||
|
alt="AI Avatar"
|
||||||
|
className="comment-avatar"
|
||||||
|
/>
|
||||||
|
<div className="comment-author-info">
|
||||||
|
<span className="comment-author">
|
||||||
|
{record.value.author?.displayName || 'AI Translator'}
|
||||||
|
</span>
|
||||||
|
<span className="comment-handle">
|
||||||
|
@{record.value.author?.handle || 'ai'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<span className="comment-date">
|
||||||
|
{new Date(record.value.createdAt).toLocaleString()}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="lang-content">
|
||||||
|
<div className="lang-type">Type: {record.value.type || 'en'}</div>
|
||||||
|
<div className="lang-body">{record.value.body}</div>
|
||||||
|
</div>
|
||||||
|
<div className="comment-meta">
|
||||||
|
{record.value.url && (
|
||||||
|
<small><a href={record.value.url}>{record.value.url}</a></small>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* AI Comment List */}
|
||||||
|
{activeTab === 'ai-comment' && (
|
||||||
|
<div className="ai-comment-list">
|
||||||
|
{aiCommentRecords.length === 0 ? (
|
||||||
|
<p className="no-content">No AI comments yet</p>
|
||||||
|
) : (
|
||||||
|
aiCommentRecords.map((record, index) => (
|
||||||
|
<div key={index} className="ai-comment-item">
|
||||||
|
<div className="ai-comment-header">
|
||||||
|
<img
|
||||||
|
src={record.value.author?.avatar || generatePlaceholderAvatar(record.value.author?.handle || 'AI')}
|
||||||
|
alt="AI Avatar"
|
||||||
|
className="comment-avatar"
|
||||||
|
/>
|
||||||
|
<div className="comment-author-info">
|
||||||
|
<span className="comment-author">
|
||||||
|
{record.value.author?.displayName || 'AI Commenter'}
|
||||||
|
</span>
|
||||||
|
<span className="comment-handle">
|
||||||
|
@{record.value.author?.handle || 'ai'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<span className="comment-date">
|
||||||
|
{new Date(record.value.createdAt).toLocaleString()}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="ai-comment-content">
|
||||||
|
<div className="ai-comment-type">Type: {record.value.type || 'comment'}</div>
|
||||||
|
<div className="ai-comment-body">{record.value.body}</div>
|
||||||
|
</div>
|
||||||
|
<div className="comment-meta">
|
||||||
|
{record.value.url && (
|
||||||
|
<small><a href={record.value.url}>{record.value.url}</a></small>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Comment Form - Only show on post pages */}
|
{/* Comment Form - Only show on post pages */}
|
||||||
{user && appConfig.rkey && (
|
{user && appConfig.rkey && (
|
||||||
@@ -1076,6 +1398,8 @@ function App() {
|
|||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
{/* AI Chat Component - handles all AI functionality */}
|
||||||
|
<AIChat user={user} isEnabled={appConfig.aiEnabled && appConfig.aiAskAi} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
21
oauth/src/components/AIChat-access.tsx
Normal file
21
oauth/src/components/AIChat-access.tsx
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
// Cloudflare Access対応版の例
|
||||||
|
const response = await fetch(`${aiConfig.host}/api/generate`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
// Cloudflare Access Service Token
|
||||||
|
'CF-Access-Client-Id': import.meta.env.VITE_CF_ACCESS_CLIENT_ID,
|
||||||
|
'CF-Access-Client-Secret': import.meta.env.VITE_CF_ACCESS_CLIENT_SECRET,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
model: aiConfig.model,
|
||||||
|
prompt: prompt,
|
||||||
|
stream: false,
|
||||||
|
options: {
|
||||||
|
temperature: 0.9,
|
||||||
|
top_p: 0.9,
|
||||||
|
num_predict: 80,
|
||||||
|
repeat_penalty: 1.1,
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
});
|
279
oauth/src/components/AIChat.tsx
Normal file
279
oauth/src/components/AIChat.tsx
Normal file
@@ -0,0 +1,279 @@
|
|||||||
|
import React, { useState, useEffect } from 'react';
|
||||||
|
import { User } from '../services/auth';
|
||||||
|
import { atprotoOAuthService } from '../services/atproto-oauth';
|
||||||
|
import { appConfig } from '../config/app';
|
||||||
|
|
||||||
|
interface AIChatProps {
|
||||||
|
user: User | null;
|
||||||
|
isEnabled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AIChat: React.FC<AIChatProps> = ({ user, isEnabled }) => {
|
||||||
|
const [chatHistory, setChatHistory] = useState<any[]>([]);
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
const [isProcessing, setIsProcessing] = useState(false);
|
||||||
|
const [aiProfile, setAiProfile] = useState<any>(null);
|
||||||
|
|
||||||
|
// Get AI settings from environment variables
|
||||||
|
const aiConfig = {
|
||||||
|
enabled: import.meta.env.VITE_AI_ENABLED === 'true',
|
||||||
|
askAi: import.meta.env.VITE_AI_ASK_AI === 'true',
|
||||||
|
provider: import.meta.env.VITE_AI_PROVIDER || 'ollama',
|
||||||
|
model: import.meta.env.VITE_AI_MODEL || 'gemma3:4b',
|
||||||
|
host: import.meta.env.VITE_AI_HOST || 'https://ollama.syui.ai',
|
||||||
|
systemPrompt: import.meta.env.VITE_AI_SYSTEM_PROMPT || 'You are a helpful AI assistant trained on this blog\'s content.',
|
||||||
|
aiDid: import.meta.env.VITE_AI_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn',
|
||||||
|
bskyPublicApi: import.meta.env.VITE_BSKY_PUBLIC_API || 'https://public.api.bsky.app',
|
||||||
|
};
|
||||||
|
|
||||||
|
// Fetch AI profile on load
|
||||||
|
useEffect(() => {
|
||||||
|
const fetchAIProfile = async () => {
|
||||||
|
console.log('=== AI PROFILE FETCH START ===');
|
||||||
|
console.log('AI DID:', aiConfig.aiDid);
|
||||||
|
|
||||||
|
if (!aiConfig.aiDid) {
|
||||||
|
console.log('No AI DID configured');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Try with agent first
|
||||||
|
const agent = atprotoOAuthService.getAgent();
|
||||||
|
if (agent) {
|
||||||
|
console.log('Fetching AI profile with agent for DID:', aiConfig.aiDid);
|
||||||
|
const profile = await agent.getProfile({ actor: aiConfig.aiDid });
|
||||||
|
console.log('AI profile fetched successfully:', profile.data);
|
||||||
|
const profileData = {
|
||||||
|
did: aiConfig.aiDid,
|
||||||
|
handle: profile.data.handle,
|
||||||
|
displayName: profile.data.displayName,
|
||||||
|
avatar: profile.data.avatar,
|
||||||
|
description: profile.data.description
|
||||||
|
};
|
||||||
|
console.log('Setting aiProfile to:', profileData);
|
||||||
|
setAiProfile(profileData);
|
||||||
|
|
||||||
|
// Dispatch event to update Ask AI button
|
||||||
|
window.dispatchEvent(new CustomEvent('aiProfileLoaded', { detail: profileData }));
|
||||||
|
console.log('=== AI PROFILE FETCH SUCCESS (AGENT) ===');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to public API
|
||||||
|
console.log('No agent available, trying public API for AI profile');
|
||||||
|
const response = await fetch(`${aiConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(aiConfig.aiDid)}`);
|
||||||
|
if (response.ok) {
|
||||||
|
const profileData = await response.json();
|
||||||
|
console.log('AI profile fetched via public API:', profileData);
|
||||||
|
const profile = {
|
||||||
|
did: aiConfig.aiDid,
|
||||||
|
handle: profileData.handle,
|
||||||
|
displayName: profileData.displayName,
|
||||||
|
avatar: profileData.avatar,
|
||||||
|
description: profileData.description
|
||||||
|
};
|
||||||
|
console.log('Setting aiProfile to:', profile);
|
||||||
|
setAiProfile(profile);
|
||||||
|
|
||||||
|
// Dispatch event to update Ask AI button
|
||||||
|
window.dispatchEvent(new CustomEvent('aiProfileLoaded', { detail: profile }));
|
||||||
|
console.log('=== AI PROFILE FETCH SUCCESS (PUBLIC API) ===');
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
console.error('Public API failed with status:', response.status);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch AI profile:', error);
|
||||||
|
setAiProfile(null);
|
||||||
|
}
|
||||||
|
console.log('=== AI PROFILE FETCH FAILED ===');
|
||||||
|
};
|
||||||
|
|
||||||
|
fetchAIProfile();
|
||||||
|
}, [aiConfig.aiDid]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isEnabled || !aiConfig.askAi) return;
|
||||||
|
|
||||||
|
// Listen for AI question posts from base.html
|
||||||
|
const handleAIQuestion = async (event: any) => {
|
||||||
|
if (!user || !event.detail || !event.detail.question || isProcessing || !aiProfile) return;
|
||||||
|
|
||||||
|
console.log('AIChat received question:', event.detail.question);
|
||||||
|
console.log('Current aiProfile state:', aiProfile);
|
||||||
|
|
||||||
|
setIsProcessing(true);
|
||||||
|
try {
|
||||||
|
await postQuestionAndGenerateResponse(event.detail.question);
|
||||||
|
} finally {
|
||||||
|
setIsProcessing(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Add listener with a small delay to ensure it's ready
|
||||||
|
setTimeout(() => {
|
||||||
|
window.addEventListener('postAIQuestion', handleAIQuestion);
|
||||||
|
console.log('AIChat event listener registered');
|
||||||
|
|
||||||
|
// Notify that AI is ready
|
||||||
|
window.dispatchEvent(new CustomEvent('aiChatReady'));
|
||||||
|
}, 100);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('postAIQuestion', handleAIQuestion);
|
||||||
|
};
|
||||||
|
}, [user, isEnabled, isProcessing, aiProfile]);
|
||||||
|
|
||||||
|
const postQuestionAndGenerateResponse = async (question: string) => {
|
||||||
|
if (!user || !aiConfig.askAi || !aiProfile) return;
|
||||||
|
|
||||||
|
setIsLoading(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const agent = atprotoOAuthService.getAgent();
|
||||||
|
if (!agent) throw new Error('No agent available');
|
||||||
|
|
||||||
|
// 1. Post question to ATProto
|
||||||
|
const now = new Date();
|
||||||
|
const rkey = now.toISOString().replace(/[:.]/g, '-');
|
||||||
|
|
||||||
|
const questionRecord = {
|
||||||
|
$type: appConfig.collections.chat,
|
||||||
|
question: question,
|
||||||
|
url: window.location.href,
|
||||||
|
createdAt: now.toISOString(),
|
||||||
|
author: {
|
||||||
|
did: user.did,
|
||||||
|
handle: user.handle,
|
||||||
|
avatar: user.avatar,
|
||||||
|
displayName: user.displayName || user.handle,
|
||||||
|
},
|
||||||
|
context: {
|
||||||
|
page_title: document.title,
|
||||||
|
page_url: window.location.href,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
await agent.api.com.atproto.repo.putRecord({
|
||||||
|
repo: user.did,
|
||||||
|
collection: appConfig.collections.chat,
|
||||||
|
rkey: rkey,
|
||||||
|
record: questionRecord,
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('Question posted to ATProto');
|
||||||
|
|
||||||
|
// 2. Get chat history
|
||||||
|
const chatRecords = await agent.api.com.atproto.repo.listRecords({
|
||||||
|
repo: user.did,
|
||||||
|
collection: appConfig.collections.chat,
|
||||||
|
limit: 10,
|
||||||
|
});
|
||||||
|
|
||||||
|
let chatHistoryText = '';
|
||||||
|
if (chatRecords.data.records) {
|
||||||
|
chatHistoryText = chatRecords.data.records
|
||||||
|
.map((r: any) => {
|
||||||
|
if (r.value.question) {
|
||||||
|
return `User: ${r.value.question}`;
|
||||||
|
} else if (r.value.answer) {
|
||||||
|
return `AI: ${r.value.answer}`;
|
||||||
|
}
|
||||||
|
return '';
|
||||||
|
})
|
||||||
|
.filter(Boolean)
|
||||||
|
.join('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Generate AI response based on provider
|
||||||
|
let aiAnswer = '';
|
||||||
|
|
||||||
|
// 3. Generate AI response using Ollama via proxy
|
||||||
|
if (aiConfig.provider === 'ollama') {
|
||||||
|
const prompt = `${aiConfig.systemPrompt}
|
||||||
|
|
||||||
|
Question: ${question}
|
||||||
|
|
||||||
|
Answer:`;
|
||||||
|
|
||||||
|
const response = await fetch(`${aiConfig.host}/api/generate`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
model: aiConfig.model,
|
||||||
|
prompt: prompt,
|
||||||
|
stream: false,
|
||||||
|
options: {
|
||||||
|
temperature: 0.9,
|
||||||
|
top_p: 0.9,
|
||||||
|
num_predict: 80, // Shorter responses for faster generation
|
||||||
|
repeat_penalty: 1.1,
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('AI API request failed');
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
aiAnswer = data.response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Immediately dispatch event to update UI
|
||||||
|
window.dispatchEvent(new CustomEvent('aiResponseReceived', {
|
||||||
|
detail: {
|
||||||
|
answer: aiAnswer,
|
||||||
|
aiProfile: aiProfile,
|
||||||
|
timestamp: now.toISOString()
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
// 5. Save AI response in background
|
||||||
|
const answerRkey = now.toISOString().replace(/[:.]/g, '-') + '-answer';
|
||||||
|
|
||||||
|
console.log('=== SAVING AI ANSWER ===');
|
||||||
|
console.log('Current aiProfile:', aiProfile);
|
||||||
|
|
||||||
|
const answerRecord = {
|
||||||
|
$type: appConfig.collections.chat,
|
||||||
|
answer: aiAnswer,
|
||||||
|
question_rkey: rkey,
|
||||||
|
url: window.location.href,
|
||||||
|
createdAt: now.toISOString(),
|
||||||
|
author: {
|
||||||
|
did: aiProfile.did,
|
||||||
|
handle: aiProfile.handle,
|
||||||
|
displayName: aiProfile.displayName,
|
||||||
|
avatar: aiProfile.avatar,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log('Answer record to save:', answerRecord);
|
||||||
|
|
||||||
|
// Save to ATProto asynchronously (don't wait for it)
|
||||||
|
agent.api.com.atproto.repo.putRecord({
|
||||||
|
repo: user.did,
|
||||||
|
collection: appConfig.collections.chat,
|
||||||
|
rkey: answerRkey,
|
||||||
|
record: answerRecord,
|
||||||
|
}).catch(err => {
|
||||||
|
console.error('Failed to save AI response to ATProto:', err);
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to generate AI response:', error);
|
||||||
|
window.dispatchEvent(new CustomEvent('aiResponseError', {
|
||||||
|
detail: { error: 'AI応答の生成に失敗しました' }
|
||||||
|
}));
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// This component doesn't render anything - it just handles the logic
|
||||||
|
return null;
|
||||||
|
};
|
79
oauth/src/components/AIProfile.tsx
Normal file
79
oauth/src/components/AIProfile.tsx
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
import React, { useState, useEffect } from 'react';
|
||||||
|
import { AtprotoAgent } from '@atproto/api';
|
||||||
|
|
||||||
|
interface AIProfile {
|
||||||
|
did: string;
|
||||||
|
handle: string;
|
||||||
|
displayName?: string;
|
||||||
|
avatar?: string;
|
||||||
|
description?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface AIProfileProps {
|
||||||
|
aiDid: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AIProfile: React.FC<AIProfileProps> = ({ aiDid }) => {
|
||||||
|
const [profile, setProfile] = useState<AIProfile | null>(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const fetchAIProfile = async () => {
|
||||||
|
try {
|
||||||
|
// Use public API to get profile information
|
||||||
|
const agent = new AtprotoAgent({ service: 'https://bsky.social' });
|
||||||
|
const response = await agent.getProfile({ actor: aiDid });
|
||||||
|
|
||||||
|
setProfile({
|
||||||
|
did: response.data.did,
|
||||||
|
handle: response.data.handle,
|
||||||
|
displayName: response.data.displayName,
|
||||||
|
avatar: response.data.avatar,
|
||||||
|
description: response.data.description,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch AI profile:', error);
|
||||||
|
// Fallback to basic info
|
||||||
|
setProfile({
|
||||||
|
did: aiDid,
|
||||||
|
handle: 'ai-assistant',
|
||||||
|
displayName: 'AI Assistant',
|
||||||
|
description: 'AI assistant for this blog',
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (aiDid) {
|
||||||
|
fetchAIProfile();
|
||||||
|
}
|
||||||
|
}, [aiDid]);
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return <div className="ai-profile-loading">Loading AI profile...</div>;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!profile) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="ai-profile">
|
||||||
|
<div className="ai-avatar">
|
||||||
|
{profile.avatar ? (
|
||||||
|
<img src={profile.avatar} alt={profile.displayName || profile.handle} />
|
||||||
|
) : (
|
||||||
|
<div className="ai-avatar-placeholder">🤖</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="ai-info">
|
||||||
|
<div className="ai-name">{profile.displayName || profile.handle}</div>
|
||||||
|
<div className="ai-handle">@{profile.handle}</div>
|
||||||
|
{profile.description && (
|
||||||
|
<div className="ai-description">{profile.description}</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
@@ -2,17 +2,33 @@
|
|||||||
export interface AppConfig {
|
export interface AppConfig {
|
||||||
adminDid: string;
|
adminDid: string;
|
||||||
collections: {
|
collections: {
|
||||||
comment: string;
|
base: string; // Base collection like "ai.syui.log"
|
||||||
user: string;
|
|
||||||
};
|
};
|
||||||
host: string;
|
host: string;
|
||||||
rkey?: string; // Current post rkey if on post page
|
rkey?: string; // Current post rkey if on post page
|
||||||
|
aiEnabled: boolean;
|
||||||
|
aiAskAi: boolean;
|
||||||
|
aiProvider: string;
|
||||||
|
aiModel: string;
|
||||||
|
aiHost: string;
|
||||||
|
bskyPublicApi: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collection name builders (similar to Rust implementation)
|
||||||
|
export function getCollectionNames(base: string) {
|
||||||
|
return {
|
||||||
|
comment: base,
|
||||||
|
user: `${base}.user`,
|
||||||
|
chat: `${base}.chat`,
|
||||||
|
chatLang: `${base}.chat.lang`,
|
||||||
|
chatComment: `${base}.chat.comment`,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate collection names from host
|
// Generate collection names from host
|
||||||
// Format: ${reg}.${name}.${sub}
|
// Format: ${reg}.${name}.${sub}
|
||||||
// Example: log.syui.ai -> ai.syui.log
|
// Example: log.syui.ai -> ai.syui.log
|
||||||
function generateCollectionNames(host: string): { comment: string; user: string } {
|
function generateBaseCollectionFromHost(host: string): string {
|
||||||
try {
|
try {
|
||||||
// Remove protocol if present
|
// Remove protocol if present
|
||||||
const cleanHost = host.replace(/^https?:\/\//, '');
|
const cleanHost = host.replace(/^https?:\/\//, '');
|
||||||
@@ -27,27 +43,19 @@ function generateCollectionNames(host: string): { comment: string; user: string
|
|||||||
// Reverse the parts for collection naming
|
// Reverse the parts for collection naming
|
||||||
// log.syui.ai -> ai.syui.log
|
// log.syui.ai -> ai.syui.log
|
||||||
const reversedParts = parts.reverse();
|
const reversedParts = parts.reverse();
|
||||||
const collectionBase = reversedParts.join('.');
|
return reversedParts.join('.');
|
||||||
|
|
||||||
return {
|
|
||||||
comment: collectionBase,
|
|
||||||
user: `${collectionBase}.user`
|
|
||||||
};
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn('Failed to generate collection names from host:', host, error);
|
console.warn('Failed to generate collection base from host:', host, error);
|
||||||
// Fallback to default collections
|
// Fallback to default
|
||||||
return {
|
return 'ai.syui.log';
|
||||||
comment: 'ai.syui.log',
|
|
||||||
user: 'ai.syui.log.user'
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract rkey from current URL
|
// Extract rkey from current URL
|
||||||
// /posts/xxx.html -> xxx
|
// /posts/xxx -> xxx
|
||||||
function extractRkeyFromUrl(): string | undefined {
|
function extractRkeyFromUrl(): string | undefined {
|
||||||
const pathname = window.location.pathname;
|
const pathname = window.location.pathname;
|
||||||
const match = pathname.match(/\/posts\/([^/]+)\.html$/);
|
const match = pathname.match(/\/posts\/([^/]+)\/?$/);
|
||||||
return match ? match[1] : undefined;
|
return match ? match[1] : undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,26 +65,41 @@ export function getAppConfig(): AppConfig {
|
|||||||
const adminDid = import.meta.env.VITE_ADMIN_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn';
|
const adminDid = import.meta.env.VITE_ADMIN_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn';
|
||||||
|
|
||||||
// Priority: Environment variables > Auto-generated from host
|
// Priority: Environment variables > Auto-generated from host
|
||||||
const autoGeneratedCollections = generateCollectionNames(host);
|
const autoGeneratedBase = generateBaseCollectionFromHost(host);
|
||||||
const collections = {
|
const collections = {
|
||||||
comment: import.meta.env.VITE_COLLECTION_COMMENT || autoGeneratedCollections.comment,
|
base: import.meta.env.VITE_OAUTH_COLLECTION || autoGeneratedBase,
|
||||||
user: import.meta.env.VITE_COLLECTION_USER || autoGeneratedCollections.user,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const rkey = extractRkeyFromUrl();
|
const rkey = extractRkeyFromUrl();
|
||||||
|
|
||||||
|
// AI configuration
|
||||||
|
const aiEnabled = import.meta.env.VITE_AI_ENABLED === 'true';
|
||||||
|
const aiAskAi = import.meta.env.VITE_AI_ASK_AI === 'true';
|
||||||
|
const aiProvider = import.meta.env.VITE_AI_PROVIDER || 'ollama';
|
||||||
|
const aiModel = import.meta.env.VITE_AI_MODEL || 'gemma2:2b';
|
||||||
|
const aiHost = import.meta.env.VITE_AI_HOST || 'https://ollama.syui.ai';
|
||||||
|
const bskyPublicApi = import.meta.env.VITE_BSKY_PUBLIC_API || 'https://public.api.bsky.app';
|
||||||
|
|
||||||
console.log('App configuration:', {
|
console.log('App configuration:', {
|
||||||
host,
|
host,
|
||||||
adminDid,
|
adminDid,
|
||||||
collections,
|
collections,
|
||||||
rkey: rkey || 'none (not on post page)'
|
rkey: rkey || 'none (not on post page)',
|
||||||
|
ai: { enabled: aiEnabled, askAi: aiAskAi, provider: aiProvider, model: aiModel, host: aiHost },
|
||||||
|
bskyPublicApi
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
adminDid,
|
adminDid,
|
||||||
collections,
|
collections,
|
||||||
host,
|
host,
|
||||||
rkey
|
rkey,
|
||||||
|
aiEnabled,
|
||||||
|
aiAskAi,
|
||||||
|
aiProvider,
|
||||||
|
aiModel,
|
||||||
|
aiHost,
|
||||||
|
bskyPublicApi
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -10,14 +10,21 @@ import { OAuthEndpointHandler } from './utils/oauth-endpoints'
|
|||||||
// DISABLED: This may interfere with BrowserOAuthClient
|
// DISABLED: This may interfere with BrowserOAuthClient
|
||||||
// OAuthEndpointHandler.init()
|
// OAuthEndpointHandler.init()
|
||||||
|
|
||||||
ReactDOM.createRoot(document.getElementById('comment-atproto')!).render(
|
// Mount React app to all comment-atproto divs
|
||||||
<React.StrictMode>
|
const mountPoints = document.querySelectorAll('#comment-atproto');
|
||||||
<BrowserRouter>
|
console.log(`Found ${mountPoints.length} comment-atproto mount points`);
|
||||||
<Routes>
|
|
||||||
<Route path="/oauth/callback" element={<OAuthCallbackPage />} />
|
mountPoints.forEach((mountPoint, index) => {
|
||||||
<Route path="/list" element={<CardList />} />
|
console.log(`Mounting React app to comment-atproto #${index + 1}`);
|
||||||
<Route path="*" element={<App />} />
|
ReactDOM.createRoot(mountPoint as HTMLElement).render(
|
||||||
</Routes>
|
<React.StrictMode>
|
||||||
</BrowserRouter>
|
<BrowserRouter>
|
||||||
</React.StrictMode>,
|
<Routes>
|
||||||
)
|
<Route path="/oauth/callback" element={<OAuthCallbackPage />} />
|
||||||
|
<Route path="/list" element={<CardList />} />
|
||||||
|
<Route path="*" element={<App />} />
|
||||||
|
</Routes>
|
||||||
|
</BrowserRouter>
|
||||||
|
</React.StrictMode>,
|
||||||
|
);
|
||||||
|
});
|
17
run.zsh
17
run.zsh
@@ -17,7 +17,6 @@ function _env() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function _server() {
|
function _server() {
|
||||||
_env
|
|
||||||
lsof -ti:$port | xargs kill -9 2>/dev/null || true
|
lsof -ti:$port | xargs kill -9 2>/dev/null || true
|
||||||
cd $d/my-blog
|
cd $d/my-blog
|
||||||
cargo build --release
|
cargo build --release
|
||||||
@@ -26,12 +25,10 @@ function _server() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function _server_public() {
|
function _server_public() {
|
||||||
_env
|
|
||||||
cloudflared tunnel --config $d/cloudflared-config.yml run
|
cloudflared tunnel --config $d/cloudflared-config.yml run
|
||||||
}
|
}
|
||||||
|
|
||||||
function _oauth_build() {
|
function _oauth_build() {
|
||||||
_env
|
|
||||||
cd $oauth
|
cd $oauth
|
||||||
nvm use 21
|
nvm use 21
|
||||||
npm i
|
npm i
|
||||||
@@ -43,11 +40,18 @@ function _oauth_build() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function _server_comment() {
|
function _server_comment() {
|
||||||
_env
|
|
||||||
cargo build --release
|
cargo build --release
|
||||||
AILOG_DEBUG_ALL=1 $ailog stream start
|
AILOG_DEBUG_ALL=1 $ailog stream start my-blog
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function _server_ollama(){
|
||||||
|
lsof -ti:11434 | xargs kill -9 2>/dev/null || true
|
||||||
|
brew services stop ollama
|
||||||
|
OLLAMA_ORIGINS="https://log.syui.ai" ollama serve
|
||||||
|
}
|
||||||
|
|
||||||
|
_env
|
||||||
|
|
||||||
case "${1:-serve}" in
|
case "${1:-serve}" in
|
||||||
tunnel|c)
|
tunnel|c)
|
||||||
_server_public
|
_server_public
|
||||||
@@ -58,6 +62,9 @@ case "${1:-serve}" in
|
|||||||
comment|co)
|
comment|co)
|
||||||
_server_comment
|
_server_comment
|
||||||
;;
|
;;
|
||||||
|
ollama|ol)
|
||||||
|
_server_ollama
|
||||||
|
;;
|
||||||
serve|s|*)
|
serve|s|*)
|
||||||
_server
|
_server
|
||||||
;;
|
;;
|
||||||
|
@@ -28,8 +28,31 @@ pub struct JetstreamConfig {
|
|||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct CollectionConfig {
|
pub struct CollectionConfig {
|
||||||
pub comment: String,
|
pub base: String, // Base collection name like "ai.syui.log"
|
||||||
pub user: String,
|
}
|
||||||
|
|
||||||
|
impl CollectionConfig {
|
||||||
|
// Collection name builders
|
||||||
|
pub fn comment(&self) -> String {
|
||||||
|
self.base.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn user(&self) -> String {
|
||||||
|
format!("{}.user", self.base)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub fn chat(&self) -> String {
|
||||||
|
format!("{}.chat", self.base)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn chat_lang(&self) -> String {
|
||||||
|
format!("{}.chat.lang", self.base)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn chat_comment(&self) -> String {
|
||||||
|
format!("{}.chat.comment", self.base)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AuthConfig {
|
impl Default for AuthConfig {
|
||||||
@@ -47,8 +70,7 @@ impl Default for AuthConfig {
|
|||||||
collections: vec!["ai.syui.log".to_string()],
|
collections: vec!["ai.syui.log".to_string()],
|
||||||
},
|
},
|
||||||
collections: CollectionConfig {
|
collections: CollectionConfig {
|
||||||
comment: "ai.syui.log".to_string(),
|
base: "ai.syui.log".to_string(),
|
||||||
user: "ai.syui.log.user".to_string(),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -220,11 +242,50 @@ pub fn load_config() -> Result<AuthConfig> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let config_json = fs::read_to_string(&config_path)?;
|
let config_json = fs::read_to_string(&config_path)?;
|
||||||
let mut config: AuthConfig = serde_json::from_str(&config_json)?;
|
|
||||||
|
|
||||||
// Update collection configuration
|
// Try to load as new format first, then migrate if needed
|
||||||
|
match serde_json::from_str::<AuthConfig>(&config_json) {
|
||||||
|
Ok(mut config) => {
|
||||||
|
// Update collection configuration
|
||||||
|
update_config_collections(&mut config);
|
||||||
|
Ok(config)
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
println!("{}", format!("Parse error: {}, attempting migration...", e).yellow());
|
||||||
|
// Try to migrate from old format
|
||||||
|
migrate_config_if_needed(&config_path, &config_json)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn migrate_config_if_needed(config_path: &std::path::Path, config_json: &str) -> Result<AuthConfig> {
|
||||||
|
// Try to parse as old format and migrate to new simple format
|
||||||
|
let mut old_config: serde_json::Value = serde_json::from_str(config_json)?;
|
||||||
|
|
||||||
|
// Migrate old collections structure to new base-only structure
|
||||||
|
if let Some(collections) = old_config.get_mut("collections") {
|
||||||
|
// Extract base collection name from comment field or use default
|
||||||
|
let base_collection = collections.get("comment")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("ai.syui.log")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
// Replace entire collections structure with new format
|
||||||
|
old_config["collections"] = serde_json::json!({
|
||||||
|
"base": base_collection
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save migrated config
|
||||||
|
let migrated_config_json = serde_json::to_string_pretty(&old_config)?;
|
||||||
|
fs::write(config_path, migrated_config_json)?;
|
||||||
|
|
||||||
|
// Parse as new format
|
||||||
|
let mut config: AuthConfig = serde_json::from_value(old_config)?;
|
||||||
update_config_collections(&mut config);
|
update_config_collections(&mut config);
|
||||||
|
|
||||||
|
println!("{}", "✅ Configuration migrated to new simplified format".green());
|
||||||
|
|
||||||
Ok(config)
|
Ok(config)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,7 +320,7 @@ async fn test_api_access_with_auth(config: &AuthConfig) -> Result<()> {
|
|||||||
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=1",
|
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=1",
|
||||||
config.admin.pds,
|
config.admin.pds,
|
||||||
urlencoding::encode(&config.admin.did),
|
urlencoding::encode(&config.admin.did),
|
||||||
urlencoding::encode(&config.collections.comment));
|
urlencoding::encode(&config.collections.comment()));
|
||||||
|
|
||||||
let response = client
|
let response = client
|
||||||
.get(&url)
|
.get(&url)
|
||||||
@@ -311,23 +372,14 @@ fn save_config(config: &AuthConfig) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate collection names from admin DID or environment
|
// Generate collection config from environment
|
||||||
fn generate_collection_config() -> CollectionConfig {
|
fn generate_collection_config() -> CollectionConfig {
|
||||||
// Check environment variables first
|
// Use VITE_OAUTH_COLLECTION for unified configuration
|
||||||
if let (Ok(comment), Ok(user)) = (
|
let base = std::env::var("VITE_OAUTH_COLLECTION")
|
||||||
std::env::var("AILOG_COLLECTION_COMMENT"),
|
.unwrap_or_else(|_| "ai.syui.log".to_string());
|
||||||
std::env::var("AILOG_COLLECTION_USER")
|
|
||||||
) {
|
|
||||||
return CollectionConfig {
|
|
||||||
comment,
|
|
||||||
user,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default collections
|
|
||||||
CollectionConfig {
|
CollectionConfig {
|
||||||
comment: "ai.syui.log".to_string(),
|
base,
|
||||||
user: "ai.syui.log.user".to_string(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -335,5 +387,5 @@ fn generate_collection_config() -> CollectionConfig {
|
|||||||
pub fn update_config_collections(config: &mut AuthConfig) {
|
pub fn update_config_collections(config: &mut AuthConfig) {
|
||||||
config.collections = generate_collection_config();
|
config.collections = generate_collection_config();
|
||||||
// Also update jetstream collections to monitor the comment collection
|
// Also update jetstream collections to monitor the comment collection
|
||||||
config.jetstream.collections = vec![config.collections.comment.clone()];
|
config.jetstream.collections = vec![config.collections.comment()];
|
||||||
}
|
}
|
@@ -30,6 +30,7 @@ title = "My Blog"
|
|||||||
description = "A blog powered by ailog"
|
description = "A blog powered by ailog"
|
||||||
base_url = "https://example.com"
|
base_url = "https://example.com"
|
||||||
language = "ja"
|
language = "ja"
|
||||||
|
author = "Your Name"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
highlight_code = true
|
highlight_code = true
|
||||||
@@ -88,7 +89,7 @@ comment_moderation = false
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<footer class="main-footer">
|
<footer class="main-footer">
|
||||||
<p>© 2025 {{ config.title }}</p>
|
<p>© {{ config.author | default(value=config.title) }}</p>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
@@ -4,20 +4,32 @@ use colored::Colorize;
|
|||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
pub async fn execute(title: String, format: String) -> Result<()> {
|
pub async fn execute(title: String, slug: Option<String>, format: String) -> Result<()> {
|
||||||
println!("{} {}", "Creating new post:".green(), title);
|
println!("{} {}", "Creating new post:".green(), title);
|
||||||
|
|
||||||
let date = Local::now();
|
let date = Local::now();
|
||||||
|
|
||||||
|
// Use provided slug or generate from title
|
||||||
|
let slug_part = slug.unwrap_or_else(|| {
|
||||||
|
title
|
||||||
|
.to_lowercase()
|
||||||
|
.replace(' ', "-")
|
||||||
|
.chars()
|
||||||
|
.filter(|c| c.is_alphanumeric() || *c == '-')
|
||||||
|
.collect()
|
||||||
|
});
|
||||||
|
|
||||||
let filename = format!(
|
let filename = format!(
|
||||||
"{}-{}.{}",
|
"{}-{}.{}",
|
||||||
date.format("%Y-%m-%d"),
|
date.format("%Y-%m-%d"),
|
||||||
title.to_lowercase().replace(' ', "-"),
|
slug_part,
|
||||||
format
|
format
|
||||||
);
|
);
|
||||||
|
|
||||||
let content = format!(
|
let content = format!(
|
||||||
r#"---
|
r#"---
|
||||||
title: "{}"
|
title: "{}"
|
||||||
|
slug: "{}"
|
||||||
date: {}
|
date: {}
|
||||||
tags: []
|
tags: []
|
||||||
draft: false
|
draft: false
|
||||||
@@ -28,6 +40,7 @@ draft: false
|
|||||||
Write your content here...
|
Write your content here...
|
||||||
"#,
|
"#,
|
||||||
title,
|
title,
|
||||||
|
slug_part,
|
||||||
date.format("%Y-%m-%d"),
|
date.format("%Y-%m-%d"),
|
||||||
title
|
title
|
||||||
);
|
);
|
||||||
|
@@ -45,13 +45,53 @@ pub async fn build(project_dir: PathBuf) -> Result<()> {
|
|||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.ok_or_else(|| anyhow::anyhow!("No admin DID found in [oauth] section"))?;
|
.ok_or_else(|| anyhow::anyhow!("No admin DID found in [oauth] section"))?;
|
||||||
|
|
||||||
let collection_comment = oauth_config.get("collection_comment")
|
let collection_base = oauth_config.get("collection")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("ai.syui.log");
|
.unwrap_or("ai.syui.log");
|
||||||
|
|
||||||
let collection_user = oauth_config.get("collection_user")
|
// Extract AI config if present
|
||||||
|
let ai_config = config.get("ai")
|
||||||
|
.and_then(|v| v.as_table());
|
||||||
|
|
||||||
|
let ai_enabled = ai_config
|
||||||
|
.and_then(|ai| ai.get("enabled"))
|
||||||
|
.and_then(|v| v.as_bool())
|
||||||
|
.unwrap_or(false);
|
||||||
|
|
||||||
|
let ai_ask_ai = ai_config
|
||||||
|
.and_then(|ai| ai.get("ask_ai"))
|
||||||
|
.and_then(|v| v.as_bool())
|
||||||
|
.unwrap_or(false);
|
||||||
|
|
||||||
|
let ai_provider = ai_config
|
||||||
|
.and_then(|ai| ai.get("provider"))
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("ai.syui.log.user");
|
.unwrap_or("ollama");
|
||||||
|
|
||||||
|
let ai_model = ai_config
|
||||||
|
.and_then(|ai| ai.get("model"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("gemma2:2b");
|
||||||
|
|
||||||
|
let ai_host = ai_config
|
||||||
|
.and_then(|ai| ai.get("host"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("https://ollama.syui.ai");
|
||||||
|
|
||||||
|
let ai_system_prompt = ai_config
|
||||||
|
.and_then(|ai| ai.get("system_prompt"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("you are a helpful ai assistant");
|
||||||
|
|
||||||
|
let ai_did = ai_config
|
||||||
|
.and_then(|ai| ai.get("ai_did"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("did:plc:4hqjfn7m6n5hno3doamuhgef");
|
||||||
|
|
||||||
|
// Extract bsky_api from oauth config
|
||||||
|
let bsky_api = oauth_config.get("bsky_api")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("https://public.api.bsky.app");
|
||||||
|
|
||||||
// 4. Create .env.production content
|
// 4. Create .env.production content
|
||||||
let env_content = format!(
|
let env_content = format!(
|
||||||
@@ -61,22 +101,34 @@ VITE_OAUTH_CLIENT_ID={}/{}
|
|||||||
VITE_OAUTH_REDIRECT_URI={}/{}
|
VITE_OAUTH_REDIRECT_URI={}/{}
|
||||||
VITE_ADMIN_DID={}
|
VITE_ADMIN_DID={}
|
||||||
|
|
||||||
# Collection names for OAuth app
|
# Base collection for OAuth app and ailog (all others are derived)
|
||||||
VITE_COLLECTION_COMMENT={}
|
VITE_OAUTH_COLLECTION={}
|
||||||
VITE_COLLECTION_USER={}
|
|
||||||
|
|
||||||
# Collection names for ailog (backward compatibility)
|
# AI Configuration
|
||||||
AILOG_COLLECTION_COMMENT={}
|
VITE_AI_ENABLED={}
|
||||||
AILOG_COLLECTION_USER={}
|
VITE_AI_ASK_AI={}
|
||||||
|
VITE_AI_PROVIDER={}
|
||||||
|
VITE_AI_MODEL={}
|
||||||
|
VITE_AI_HOST={}
|
||||||
|
VITE_AI_SYSTEM_PROMPT="{}"
|
||||||
|
VITE_AI_DID={}
|
||||||
|
|
||||||
|
# API Configuration
|
||||||
|
VITE_BSKY_PUBLIC_API={}
|
||||||
"#,
|
"#,
|
||||||
base_url,
|
base_url,
|
||||||
base_url, client_id_path,
|
base_url, client_id_path,
|
||||||
base_url, redirect_path,
|
base_url, redirect_path,
|
||||||
admin_did,
|
admin_did,
|
||||||
collection_comment,
|
collection_base,
|
||||||
collection_user,
|
ai_enabled,
|
||||||
collection_comment,
|
ai_ask_ai,
|
||||||
collection_user
|
ai_provider,
|
||||||
|
ai_model,
|
||||||
|
ai_host,
|
||||||
|
ai_system_prompt,
|
||||||
|
ai_did,
|
||||||
|
bsky_api
|
||||||
);
|
);
|
||||||
|
|
||||||
// 5. Find oauth directory (relative to current working directory)
|
// 5. Find oauth directory (relative to current working directory)
|
||||||
|
@@ -10,18 +10,58 @@ use std::process::{Command, Stdio};
|
|||||||
use tokio::time::{sleep, Duration, interval};
|
use tokio::time::{sleep, Duration, interval};
|
||||||
use tokio_tungstenite::{connect_async, tungstenite::Message};
|
use tokio_tungstenite::{connect_async, tungstenite::Message};
|
||||||
use toml;
|
use toml;
|
||||||
|
use reqwest;
|
||||||
|
|
||||||
use super::auth::{load_config, load_config_with_refresh, AuthConfig};
|
use super::auth::{load_config, load_config_with_refresh, AuthConfig};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
#[allow(dead_code)]
|
||||||
|
struct BlogPost {
|
||||||
|
title: String,
|
||||||
|
href: String,
|
||||||
|
#[serde(rename = "formated_time")]
|
||||||
|
#[allow(dead_code)]
|
||||||
|
date: String,
|
||||||
|
#[allow(dead_code)]
|
||||||
|
tags: Vec<String>,
|
||||||
|
#[allow(dead_code)]
|
||||||
|
contents: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
#[allow(dead_code)]
|
||||||
|
struct BlogIndex {
|
||||||
|
#[allow(dead_code)]
|
||||||
|
posts: Vec<BlogPost>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
struct OllamaRequest {
|
||||||
|
model: String,
|
||||||
|
prompt: String,
|
||||||
|
stream: bool,
|
||||||
|
options: OllamaOptions,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
struct OllamaOptions {
|
||||||
|
temperature: f32,
|
||||||
|
top_p: f32,
|
||||||
|
num_predict: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
struct OllamaResponse {
|
||||||
|
response: String,
|
||||||
|
}
|
||||||
|
|
||||||
// Load collection config with priority: env vars > project config.toml > defaults
|
// Load collection config with priority: env vars > project config.toml > defaults
|
||||||
fn load_collection_config(project_dir: Option<&Path>) -> Result<(String, String)> {
|
fn load_collection_config(project_dir: Option<&Path>) -> Result<(String, String)> {
|
||||||
// 1. Check environment variables first (highest priority)
|
// 1. Check environment variables first (highest priority)
|
||||||
if let (Ok(comment), Ok(user)) = (
|
if let Ok(base_collection) = std::env::var("VITE_OAUTH_COLLECTION") {
|
||||||
std::env::var("AILOG_COLLECTION_COMMENT"),
|
|
||||||
std::env::var("AILOG_COLLECTION_USER")
|
|
||||||
) {
|
|
||||||
println!("{}", "📂 Using collection config from environment variables".cyan());
|
println!("{}", "📂 Using collection config from environment variables".cyan());
|
||||||
return Ok((comment, user));
|
let collection_user = format!("{}.user", base_collection);
|
||||||
|
return Ok((base_collection, collection_user));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Try to load from project config.toml (second priority)
|
// 2. Try to load from project config.toml (second priority)
|
||||||
@@ -60,17 +100,16 @@ fn load_collection_config_from_project(project_dir: &Path) -> Result<(String, St
|
|||||||
.and_then(|v| v.as_table())
|
.and_then(|v| v.as_table())
|
||||||
.ok_or_else(|| anyhow::anyhow!("No [oauth] section found in config.toml"))?;
|
.ok_or_else(|| anyhow::anyhow!("No [oauth] section found in config.toml"))?;
|
||||||
|
|
||||||
let collection_comment = oauth_config.get("collection_comment")
|
// Use new simplified collection structure (base collection)
|
||||||
|
let collection_base = oauth_config.get("collection")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("ai.syui.log")
|
.unwrap_or("ai.syui.log")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
let collection_user = oauth_config.get("collection_user")
|
// Derive user collection from base
|
||||||
.and_then(|v| v.as_str())
|
let collection_user = format!("{}.user", collection_base);
|
||||||
.unwrap_or("ai.syui.log.user")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
Ok((collection_comment, collection_user))
|
Ok((collection_base, collection_user))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
@@ -118,15 +157,14 @@ fn get_pid_file() -> Result<PathBuf> {
|
|||||||
Ok(pid_dir.join("stream.pid"))
|
Ok(pid_dir.join("stream.pid"))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn start(project_dir: Option<PathBuf>, daemon: bool) -> Result<()> {
|
pub async fn start(project_dir: Option<PathBuf>, daemon: bool, ai_generate: bool) -> Result<()> {
|
||||||
let mut config = load_config_with_refresh().await?;
|
let mut config = load_config_with_refresh().await?;
|
||||||
|
|
||||||
// Load collection config with priority: env vars > project config > defaults
|
// Load collection config with priority: env vars > project config > defaults
|
||||||
let (collection_comment, collection_user) = load_collection_config(project_dir.as_deref())?;
|
let (collection_comment, _collection_user) = load_collection_config(project_dir.as_deref())?;
|
||||||
|
|
||||||
// Update config with loaded collections
|
// Update config with loaded collections
|
||||||
config.collections.comment = collection_comment.clone();
|
config.collections.base = collection_comment.clone();
|
||||||
config.collections.user = collection_user;
|
|
||||||
config.jetstream.collections = vec![collection_comment];
|
config.jetstream.collections = vec![collection_comment];
|
||||||
|
|
||||||
let pid_file = get_pid_file()?;
|
let pid_file = get_pid_file()?;
|
||||||
@@ -151,6 +189,11 @@ pub async fn start(project_dir: Option<PathBuf>, daemon: bool) -> Result<()> {
|
|||||||
args.push(project_path.to_string_lossy().to_string());
|
args.push(project_path.to_string_lossy().to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add ai_generate flag if enabled
|
||||||
|
if ai_generate {
|
||||||
|
args.push("--ai-generate".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
let child = Command::new(current_exe)
|
let child = Command::new(current_exe)
|
||||||
.args(&args)
|
.args(&args)
|
||||||
.stdin(Stdio::null())
|
.stdin(Stdio::null())
|
||||||
@@ -192,6 +235,19 @@ pub async fn start(project_dir: Option<PathBuf>, daemon: bool) -> Result<()> {
|
|||||||
let max_reconnect_attempts = 10;
|
let max_reconnect_attempts = 10;
|
||||||
let mut config = config; // Make config mutable for token refresh
|
let mut config = config; // Make config mutable for token refresh
|
||||||
|
|
||||||
|
// Start AI generation monitor if enabled
|
||||||
|
if ai_generate {
|
||||||
|
let ai_config = config.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
loop {
|
||||||
|
if let Err(e) = run_ai_generation_monitor(&ai_config).await {
|
||||||
|
println!("{}", format!("❌ AI generation monitor error: {}", e).red());
|
||||||
|
sleep(Duration::from_secs(60)).await; // Wait 1 minute before retry
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
match run_monitor(&mut config).await {
|
match run_monitor(&mut config).await {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
@@ -344,7 +400,7 @@ async fn handle_message(text: &str, config: &mut AuthConfig) -> Result<()> {
|
|||||||
if let (Some(collection), Some(commit), Some(did)) =
|
if let (Some(collection), Some(commit), Some(did)) =
|
||||||
(&message.collection, &message.commit, &message.did) {
|
(&message.collection, &message.commit, &message.did) {
|
||||||
|
|
||||||
if collection == &config.collections.comment && commit.operation.as_deref() == Some("create") {
|
if collection == &config.collections.comment() && commit.operation.as_deref() == Some("create") {
|
||||||
let unknown_uri = "unknown".to_string();
|
let unknown_uri = "unknown".to_string();
|
||||||
let uri = commit.uri.as_ref().unwrap_or(&unknown_uri);
|
let uri = commit.uri.as_ref().unwrap_or(&unknown_uri);
|
||||||
|
|
||||||
@@ -438,7 +494,7 @@ async fn get_current_user_list(config: &mut AuthConfig) -> Result<Vec<UserRecord
|
|||||||
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=10",
|
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=10",
|
||||||
config.admin.pds,
|
config.admin.pds,
|
||||||
urlencoding::encode(&config.admin.did),
|
urlencoding::encode(&config.admin.did),
|
||||||
urlencoding::encode(&config.collections.user));
|
urlencoding::encode(&config.collections.user()));
|
||||||
|
|
||||||
let response = client
|
let response = client
|
||||||
.get(&url)
|
.get(&url)
|
||||||
@@ -501,7 +557,7 @@ async fn post_user_list(config: &mut AuthConfig, users: &[UserRecord], metadata:
|
|||||||
let rkey = format!("{}-{}", short_did, now.format("%Y-%m-%dT%H-%M-%S-%3fZ").to_string().replace(".", "-"));
|
let rkey = format!("{}-{}", short_did, now.format("%Y-%m-%dT%H-%M-%S-%3fZ").to_string().replace(".", "-"));
|
||||||
|
|
||||||
let record = UserListRecord {
|
let record = UserListRecord {
|
||||||
record_type: config.collections.user.clone(),
|
record_type: config.collections.user(),
|
||||||
users: users.to_vec(),
|
users: users.to_vec(),
|
||||||
created_at: now.to_rfc3339(),
|
created_at: now.to_rfc3339(),
|
||||||
updated_by: UserInfo {
|
updated_by: UserInfo {
|
||||||
@@ -515,7 +571,7 @@ async fn post_user_list(config: &mut AuthConfig, users: &[UserRecord], metadata:
|
|||||||
|
|
||||||
let request_body = json!({
|
let request_body = json!({
|
||||||
"repo": config.admin.did,
|
"repo": config.admin.did,
|
||||||
"collection": config.collections.user,
|
"collection": config.collections.user(),
|
||||||
"rkey": rkey,
|
"rkey": rkey,
|
||||||
"record": record
|
"record": record
|
||||||
});
|
});
|
||||||
@@ -759,7 +815,7 @@ async fn get_recent_comments(config: &mut AuthConfig) -> Result<Vec<Value>> {
|
|||||||
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=20",
|
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=20",
|
||||||
config.admin.pds,
|
config.admin.pds,
|
||||||
urlencoding::encode(&config.admin.did),
|
urlencoding::encode(&config.admin.did),
|
||||||
urlencoding::encode(&config.collections.comment));
|
urlencoding::encode(&config.collections.comment()));
|
||||||
|
|
||||||
if std::env::var("AILOG_DEBUG").is_ok() {
|
if std::env::var("AILOG_DEBUG").is_ok() {
|
||||||
println!("{}", format!("🌐 API Request URL: {}", url).yellow());
|
println!("{}", format!("🌐 API Request URL: {}", url).yellow());
|
||||||
@@ -840,7 +896,7 @@ pub async fn test_api() -> Result<()> {
|
|||||||
println!("{}", format!("✅ Successfully retrieved {} comments", comments.len()).green());
|
println!("{}", format!("✅ Successfully retrieved {} comments", comments.len()).green());
|
||||||
|
|
||||||
if comments.is_empty() {
|
if comments.is_empty() {
|
||||||
println!("{}", format!("ℹ️ No comments found in {} collection", config.collections.comment).blue());
|
println!("{}", format!("ℹ️ No comments found in {} collection", config.collections.comment()).blue());
|
||||||
println!("💡 Try posting a comment first using the web interface");
|
println!("💡 Try posting a comment first using the web interface");
|
||||||
} else {
|
} else {
|
||||||
println!("{}", "📝 Comment details:".cyan());
|
println!("{}", "📝 Comment details:".cyan());
|
||||||
@@ -871,5 +927,273 @@ pub async fn test_api() -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// AI content generation functions
|
||||||
|
async fn generate_ai_content(content: &str, prompt_type: &str, ollama_host: &str) -> Result<String> {
|
||||||
|
let model = "gemma3:4b";
|
||||||
|
|
||||||
|
let prompt = match prompt_type {
|
||||||
|
"translate" => format!("Translate the following Japanese blog post to English. Keep the technical terms and code blocks intact:\n\n{}", content),
|
||||||
|
"comment" => format!("Read this blog post and provide an insightful comment about it. Focus on the key points and add your perspective:\n\n{}", content),
|
||||||
|
_ => return Err(anyhow::anyhow!("Unknown prompt type: {}", prompt_type)),
|
||||||
|
};
|
||||||
|
|
||||||
|
let request = OllamaRequest {
|
||||||
|
model: model.to_string(),
|
||||||
|
prompt,
|
||||||
|
stream: false,
|
||||||
|
options: OllamaOptions {
|
||||||
|
temperature: 0.9,
|
||||||
|
top_p: 0.9,
|
||||||
|
num_predict: 500,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
|
||||||
|
// Try localhost first (for same-server deployment)
|
||||||
|
let localhost_url = "http://localhost:11434/api/generate";
|
||||||
|
match client.post(localhost_url).json(&request).send().await {
|
||||||
|
Ok(response) if response.status().is_success() => {
|
||||||
|
let ollama_response: OllamaResponse = response.json().await?;
|
||||||
|
println!("{}", "✅ Used localhost Ollama".green());
|
||||||
|
return Ok(ollama_response.response);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
println!("{}", "⚠️ Localhost Ollama not available, trying remote...".yellow());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to remote host
|
||||||
|
let remote_url = format!("{}/api/generate", ollama_host);
|
||||||
|
let response = client.post(&remote_url).json(&request).send().await?;
|
||||||
|
|
||||||
|
if !response.status().is_success() {
|
||||||
|
return Err(anyhow::anyhow!("Ollama API request failed: {}", response.status()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let ollama_response: OllamaResponse = response.json().await?;
|
||||||
|
println!("{}", "✅ Used remote Ollama".green());
|
||||||
|
Ok(ollama_response.response)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run_ai_generation_monitor(config: &AuthConfig) -> Result<()> {
|
||||||
|
let blog_host = "https://syui.ai"; // TODO: Load from config
|
||||||
|
let ollama_host = "https://ollama.syui.ai"; // TODO: Load from config
|
||||||
|
let ai_did = "did:plc:4hqjfn7m6n5hno3doamuhgef"; // TODO: Load from config
|
||||||
|
|
||||||
|
println!("{}", "🤖 Starting AI content generation monitor...".cyan());
|
||||||
|
println!("📡 Blog host: {}", blog_host);
|
||||||
|
println!("🧠 Ollama host: {}", ollama_host);
|
||||||
|
println!("🤖 AI DID: {}", ai_did);
|
||||||
|
println!();
|
||||||
|
|
||||||
|
let mut interval = interval(Duration::from_secs(300)); // Check every 5 minutes
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
|
||||||
|
loop {
|
||||||
|
interval.tick().await;
|
||||||
|
|
||||||
|
println!("{}", "🔍 Checking for new blog posts...".blue());
|
||||||
|
|
||||||
|
match check_and_process_new_posts(&client, config, blog_host, ollama_host, ai_did).await {
|
||||||
|
Ok(count) => {
|
||||||
|
if count > 0 {
|
||||||
|
println!("{}", format!("✅ Processed {} new posts", count).green());
|
||||||
|
} else {
|
||||||
|
println!("{}", "ℹ️ No new posts found".blue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
println!("{}", format!("❌ Error processing posts: {}", e).red());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("{}", "⏰ Waiting for next check...".cyan());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn check_and_process_new_posts(
|
||||||
|
client: &reqwest::Client,
|
||||||
|
config: &AuthConfig,
|
||||||
|
blog_host: &str,
|
||||||
|
ollama_host: &str,
|
||||||
|
ai_did: &str,
|
||||||
|
) -> Result<usize> {
|
||||||
|
// Fetch blog index
|
||||||
|
let index_url = format!("{}/index.json", blog_host);
|
||||||
|
let response = client.get(&index_url).send().await?;
|
||||||
|
|
||||||
|
if !response.status().is_success() {
|
||||||
|
return Err(anyhow::anyhow!("Failed to fetch blog index: {}", response.status()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let blog_posts: Vec<BlogPost> = response.json().await?;
|
||||||
|
println!("{}", format!("📄 Found {} posts in blog index", blog_posts.len()).cyan());
|
||||||
|
|
||||||
|
// Get existing AI generated content from collections
|
||||||
|
let existing_lang_records = get_existing_records(config, &config.collections.chat_lang()).await?;
|
||||||
|
let existing_comment_records = get_existing_records(config, &config.collections.chat_comment()).await?;
|
||||||
|
|
||||||
|
let mut processed_count = 0;
|
||||||
|
|
||||||
|
for post in blog_posts {
|
||||||
|
let post_slug = extract_slug_from_url(&post.href);
|
||||||
|
|
||||||
|
// Check if translation already exists
|
||||||
|
let translation_exists = existing_lang_records.iter().any(|record| {
|
||||||
|
record.get("value")
|
||||||
|
.and_then(|v| v.get("post_slug"))
|
||||||
|
.and_then(|s| s.as_str())
|
||||||
|
== Some(&post_slug)
|
||||||
|
});
|
||||||
|
|
||||||
|
// Check if comment already exists
|
||||||
|
let comment_exists = existing_comment_records.iter().any(|record| {
|
||||||
|
record.get("value")
|
||||||
|
.and_then(|v| v.get("post_slug"))
|
||||||
|
.and_then(|s| s.as_str())
|
||||||
|
== Some(&post_slug)
|
||||||
|
});
|
||||||
|
|
||||||
|
// Generate translation if not exists
|
||||||
|
if !translation_exists {
|
||||||
|
match generate_and_store_translation(client, config, &post, ollama_host, ai_did).await {
|
||||||
|
Ok(_) => {
|
||||||
|
println!("{}", format!("✅ Generated translation for: {}", post.title).green());
|
||||||
|
processed_count += 1;
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
println!("{}", format!("❌ Failed to generate translation for {}: {}", post.title, e).red());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate comment if not exists
|
||||||
|
if !comment_exists {
|
||||||
|
match generate_and_store_comment(client, config, &post, ollama_host, ai_did).await {
|
||||||
|
Ok(_) => {
|
||||||
|
println!("{}", format!("✅ Generated comment for: {}", post.title).green());
|
||||||
|
processed_count += 1;
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
println!("{}", format!("❌ Failed to generate comment for {}: {}", post.title, e).red());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(processed_count)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_existing_records(config: &AuthConfig, collection: &str) -> Result<Vec<serde_json::Value>> {
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
let url = format!("{}/xrpc/com.atproto.repo.listRecords?repo={}&collection={}&limit=100",
|
||||||
|
config.admin.pds,
|
||||||
|
urlencoding::encode(&config.admin.did),
|
||||||
|
urlencoding::encode(collection));
|
||||||
|
|
||||||
|
let response = client
|
||||||
|
.get(&url)
|
||||||
|
.header("Authorization", format!("Bearer {}", config.admin.access_jwt))
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
if !response.status().is_success() {
|
||||||
|
return Ok(Vec::new()); // Return empty if collection doesn't exist yet
|
||||||
|
}
|
||||||
|
|
||||||
|
let list_response: serde_json::Value = response.json().await?;
|
||||||
|
let records = list_response["records"].as_array().unwrap_or(&Vec::new()).clone();
|
||||||
|
|
||||||
|
Ok(records)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_slug_from_url(url: &str) -> String {
|
||||||
|
// Extract slug from URL like "/posts/2025-06-06-ailog.html"
|
||||||
|
url.split('/')
|
||||||
|
.last()
|
||||||
|
.unwrap_or("")
|
||||||
|
.trim_end_matches(".html")
|
||||||
|
.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn generate_and_store_translation(
|
||||||
|
client: &reqwest::Client,
|
||||||
|
config: &AuthConfig,
|
||||||
|
post: &BlogPost,
|
||||||
|
ollama_host: &str,
|
||||||
|
ai_did: &str,
|
||||||
|
) -> Result<()> {
|
||||||
|
// Generate translation
|
||||||
|
let translation = generate_ai_content(&post.title, "translate", ollama_host).await?;
|
||||||
|
|
||||||
|
// Store in ai.syui.log.chat.lang collection
|
||||||
|
let record_data = serde_json::json!({
|
||||||
|
"post_slug": extract_slug_from_url(&post.href),
|
||||||
|
"post_title": post.title,
|
||||||
|
"post_url": post.href,
|
||||||
|
"lang": "en",
|
||||||
|
"content": translation,
|
||||||
|
"generated_at": chrono::Utc::now().to_rfc3339(),
|
||||||
|
"ai_did": ai_did
|
||||||
|
});
|
||||||
|
|
||||||
|
store_atproto_record(client, config, &config.collections.chat_lang(), &record_data).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn generate_and_store_comment(
|
||||||
|
client: &reqwest::Client,
|
||||||
|
config: &AuthConfig,
|
||||||
|
post: &BlogPost,
|
||||||
|
ollama_host: &str,
|
||||||
|
ai_did: &str,
|
||||||
|
) -> Result<()> {
|
||||||
|
// Generate comment
|
||||||
|
let comment = generate_ai_content(&post.title, "comment", ollama_host).await?;
|
||||||
|
|
||||||
|
// Store in ai.syui.log.chat.comment collection
|
||||||
|
let record_data = serde_json::json!({
|
||||||
|
"post_slug": extract_slug_from_url(&post.href),
|
||||||
|
"post_title": post.title,
|
||||||
|
"post_url": post.href,
|
||||||
|
"content": comment,
|
||||||
|
"generated_at": chrono::Utc::now().to_rfc3339(),
|
||||||
|
"ai_did": ai_did
|
||||||
|
});
|
||||||
|
|
||||||
|
store_atproto_record(client, config, &config.collections.chat_comment(), &record_data).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn store_atproto_record(
|
||||||
|
client: &reqwest::Client,
|
||||||
|
config: &AuthConfig,
|
||||||
|
collection: &str,
|
||||||
|
record_data: &serde_json::Value,
|
||||||
|
) -> Result<()> {
|
||||||
|
let url = format!("{}/xrpc/com.atproto.repo.putRecord", config.admin.pds);
|
||||||
|
|
||||||
|
let put_request = serde_json::json!({
|
||||||
|
"repo": config.admin.did,
|
||||||
|
"collection": collection,
|
||||||
|
"rkey": uuid::Uuid::new_v4().to_string(),
|
||||||
|
"record": record_data
|
||||||
|
});
|
||||||
|
|
||||||
|
let response = client
|
||||||
|
.post(&url)
|
||||||
|
.header("Authorization", format!("Bearer {}", config.admin.access_jwt))
|
||||||
|
.header("Content-Type", "application/json")
|
||||||
|
.json(&put_request)
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
if !response.status().is_success() {
|
||||||
|
let error_text = response.text().await?;
|
||||||
|
return Err(anyhow::anyhow!("Failed to store record: {}", error_text));
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
@@ -17,11 +17,13 @@ pub struct SiteConfig {
|
|||||||
pub description: String,
|
pub description: String,
|
||||||
pub base_url: String,
|
pub base_url: String,
|
||||||
pub language: String,
|
pub language: String,
|
||||||
|
pub author: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
pub struct BuildConfig {
|
pub struct BuildConfig {
|
||||||
pub highlight_code: bool,
|
pub highlight_code: bool,
|
||||||
|
pub highlight_theme: Option<String>,
|
||||||
pub minify: bool,
|
pub minify: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,6 +32,12 @@ pub struct AiConfig {
|
|||||||
pub enabled: bool,
|
pub enabled: bool,
|
||||||
pub auto_translate: bool,
|
pub auto_translate: bool,
|
||||||
pub comment_moderation: bool,
|
pub comment_moderation: bool,
|
||||||
|
pub ask_ai: Option<bool>,
|
||||||
|
pub provider: Option<String>,
|
||||||
|
pub model: Option<String>,
|
||||||
|
pub host: Option<String>,
|
||||||
|
pub system_prompt: Option<String>,
|
||||||
|
pub ai_did: Option<String>,
|
||||||
pub api_key: Option<String>,
|
pub api_key: Option<String>,
|
||||||
pub gpt_endpoint: Option<String>,
|
pub gpt_endpoint: Option<String>,
|
||||||
pub atproto_config: Option<AtprotoConfig>,
|
pub atproto_config: Option<AtprotoConfig>,
|
||||||
@@ -135,15 +143,23 @@ impl Default for Config {
|
|||||||
description: "A blog powered by ailog".to_string(),
|
description: "A blog powered by ailog".to_string(),
|
||||||
base_url: "https://example.com".to_string(),
|
base_url: "https://example.com".to_string(),
|
||||||
language: "ja".to_string(),
|
language: "ja".to_string(),
|
||||||
|
author: None,
|
||||||
},
|
},
|
||||||
build: BuildConfig {
|
build: BuildConfig {
|
||||||
highlight_code: true,
|
highlight_code: true,
|
||||||
|
highlight_theme: Some("Monokai".to_string()),
|
||||||
minify: false,
|
minify: false,
|
||||||
},
|
},
|
||||||
ai: Some(AiConfig {
|
ai: Some(AiConfig {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
auto_translate: false,
|
auto_translate: false,
|
||||||
comment_moderation: false,
|
comment_moderation: false,
|
||||||
|
ask_ai: Some(false),
|
||||||
|
provider: Some("ollama".to_string()),
|
||||||
|
model: Some("gemma3:4b".to_string()),
|
||||||
|
host: None,
|
||||||
|
system_prompt: Some("You are a helpful AI assistant trained on this blog's content.".to_string()),
|
||||||
|
ai_did: None,
|
||||||
api_key: None,
|
api_key: None,
|
||||||
gpt_endpoint: None,
|
gpt_endpoint: None,
|
||||||
atproto_config: None,
|
atproto_config: None,
|
||||||
|
141
src/generator.rs
141
src/generator.rs
@@ -18,7 +18,7 @@ pub struct Generator {
|
|||||||
|
|
||||||
impl Generator {
|
impl Generator {
|
||||||
pub fn new(base_path: PathBuf, config: Config) -> Result<Self> {
|
pub fn new(base_path: PathBuf, config: Config) -> Result<Self> {
|
||||||
let markdown_processor = MarkdownProcessor::new(config.build.highlight_code);
|
let markdown_processor = MarkdownProcessor::new(config.build.highlight_code, config.build.highlight_theme.clone());
|
||||||
let template_engine = TemplateEngine::new(base_path.join("templates"))?;
|
let template_engine = TemplateEngine::new(base_path.join("templates"))?;
|
||||||
|
|
||||||
let ai_manager = if let Some(ref ai_config) = config.ai {
|
let ai_manager = if let Some(ref ai_config) = config.ai {
|
||||||
@@ -39,6 +39,20 @@ impl Generator {
|
|||||||
ai_manager,
|
ai_manager,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn create_config_with_timestamp(&self) -> Result<serde_json::Value> {
|
||||||
|
let mut config_with_timestamp = serde_json::to_value(&self.config.site)?;
|
||||||
|
if let Some(config_obj) = config_with_timestamp.as_object_mut() {
|
||||||
|
config_obj.insert("build_timestamp".to_string(), serde_json::Value::String(
|
||||||
|
std::time::SystemTime::now()
|
||||||
|
.duration_since(std::time::UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_secs()
|
||||||
|
.to_string()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Ok(config_with_timestamp)
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn build(&self) -> Result<()> {
|
pub async fn build(&self) -> Result<()> {
|
||||||
// Clean public directory
|
// Clean public directory
|
||||||
@@ -57,6 +71,9 @@ impl Generator {
|
|||||||
// Generate index page
|
// Generate index page
|
||||||
self.generate_index(&posts).await?;
|
self.generate_index(&posts).await?;
|
||||||
|
|
||||||
|
// Generate JSON index for API access
|
||||||
|
self.generate_json_index(&posts).await?;
|
||||||
|
|
||||||
// Generate post pages
|
// Generate post pages
|
||||||
for post in &posts {
|
for post in &posts {
|
||||||
self.generate_post_page(post).await?;
|
self.generate_post_page(post).await?;
|
||||||
@@ -184,16 +201,17 @@ impl Generator {
|
|||||||
|
|
||||||
let html_content = self.markdown_processor.render(&content)?;
|
let html_content = self.markdown_processor.render(&content)?;
|
||||||
|
|
||||||
// Use slug from frontmatter if available, otherwise derive from filename
|
// Use filename (without extension) as URL slug to include date
|
||||||
let slug = frontmatter.get("slug")
|
let filename_slug = path.file_stem()
|
||||||
|
.and_then(|s| s.to_str())
|
||||||
|
.unwrap_or("post")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
// Still keep the slug field from frontmatter for other purposes
|
||||||
|
let frontmatter_slug = frontmatter.get("slug")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.map(|s| s.to_string())
|
.map(|s| s.to_string())
|
||||||
.unwrap_or_else(|| {
|
.unwrap_or_else(|| filename_slug.clone());
|
||||||
path.file_stem()
|
|
||||||
.and_then(|s| s.to_str())
|
|
||||||
.unwrap_or("post")
|
|
||||||
.to_string()
|
|
||||||
});
|
|
||||||
|
|
||||||
let mut post = Post {
|
let mut post = Post {
|
||||||
title: frontmatter.get("title")
|
title: frontmatter.get("title")
|
||||||
@@ -205,8 +223,9 @@ impl Generator {
|
|||||||
.unwrap_or("")
|
.unwrap_or("")
|
||||||
.to_string(),
|
.to_string(),
|
||||||
content: html_content,
|
content: html_content,
|
||||||
slug: slug.clone(),
|
slug: frontmatter_slug.clone(),
|
||||||
url: format!("/posts/{}.html", slug),
|
filename_slug: filename_slug.clone(),
|
||||||
|
url: format!("/posts/{}.html", filename_slug),
|
||||||
tags: frontmatter.get("tags")
|
tags: frontmatter.get("tags")
|
||||||
.and_then(|v| v.as_array())
|
.and_then(|v| v.as_array())
|
||||||
.map(|arr| arr.iter()
|
.map(|arr| arr.iter()
|
||||||
@@ -233,7 +252,7 @@ impl Generator {
|
|||||||
lang: "en".to_string(),
|
lang: "en".to_string(),
|
||||||
title: translated_title,
|
title: translated_title,
|
||||||
content: translated_html,
|
content: translated_html,
|
||||||
url: format!("/posts/{}-en.html", post.slug),
|
url: format!("/posts/{}-en.html", post.filename_slug),
|
||||||
}]);
|
}]);
|
||||||
}
|
}
|
||||||
Err(e) => eprintln!("Translation failed: {}", e),
|
Err(e) => eprintln!("Translation failed: {}", e),
|
||||||
@@ -259,7 +278,7 @@ impl Generator {
|
|||||||
// Enhance posts with additional metadata for timeline view
|
// Enhance posts with additional metadata for timeline view
|
||||||
let enhanced_posts: Vec<serde_json::Value> = posts.iter().map(|post| {
|
let enhanced_posts: Vec<serde_json::Value> = posts.iter().map(|post| {
|
||||||
let excerpt = self.extract_excerpt(&post.content);
|
let excerpt = self.extract_excerpt(&post.content);
|
||||||
let markdown_url = format!("/posts/{}.md", post.slug);
|
let markdown_url = format!("/posts/{}.md", post.filename_slug);
|
||||||
let translation_url = if let Some(ref translations) = post.translations {
|
let translation_url = if let Some(ref translations) = post.translations {
|
||||||
translations.first().map(|t| t.url.clone())
|
translations.first().map(|t| t.url.clone())
|
||||||
} else {
|
} else {
|
||||||
@@ -281,7 +300,8 @@ impl Generator {
|
|||||||
}).collect();
|
}).collect();
|
||||||
|
|
||||||
let mut context = tera::Context::new();
|
let mut context = tera::Context::new();
|
||||||
context.insert("config", &self.config.site);
|
let config_with_timestamp = self.create_config_with_timestamp()?;
|
||||||
|
context.insert("config", &config_with_timestamp);
|
||||||
context.insert("posts", &enhanced_posts);
|
context.insert("posts", &enhanced_posts);
|
||||||
|
|
||||||
let html = self.template_engine.render("index.html", &context)?;
|
let html = self.template_engine.render("index.html", &context)?;
|
||||||
@@ -294,14 +314,15 @@ impl Generator {
|
|||||||
|
|
||||||
async fn generate_post_page(&self, post: &Post) -> Result<()> {
|
async fn generate_post_page(&self, post: &Post) -> Result<()> {
|
||||||
let mut context = tera::Context::new();
|
let mut context = tera::Context::new();
|
||||||
context.insert("config", &self.config.site);
|
let config_with_timestamp = self.create_config_with_timestamp()?;
|
||||||
|
context.insert("config", &config_with_timestamp);
|
||||||
|
|
||||||
// Create enhanced post with additional URLs
|
// Create enhanced post with additional URLs
|
||||||
let mut enhanced_post = post.clone();
|
let mut enhanced_post = post.clone();
|
||||||
enhanced_post.url = format!("/posts/{}.html", post.slug);
|
enhanced_post.url = format!("/posts/{}.html", post.filename_slug);
|
||||||
|
|
||||||
// Add markdown view URL
|
// Add markdown view URL
|
||||||
let markdown_url = format!("/posts/{}.md", post.slug);
|
let markdown_url = format!("/posts/{}.md", post.filename_slug);
|
||||||
|
|
||||||
// Add translation URLs if available
|
// Add translation URLs if available
|
||||||
let translation_urls: Vec<String> = if let Some(ref translations) = post.translations {
|
let translation_urls: Vec<String> = if let Some(ref translations) = post.translations {
|
||||||
@@ -328,7 +349,7 @@ impl Generator {
|
|||||||
let output_dir = self.base_path.join("public/posts");
|
let output_dir = self.base_path.join("public/posts");
|
||||||
fs::create_dir_all(&output_dir)?;
|
fs::create_dir_all(&output_dir)?;
|
||||||
|
|
||||||
let output_path = output_dir.join(format!("{}.html", post.slug));
|
let output_path = output_dir.join(format!("{}.html", post.filename_slug));
|
||||||
fs::write(output_path, html)?;
|
fs::write(output_path, html)?;
|
||||||
|
|
||||||
// Generate markdown view
|
// Generate markdown view
|
||||||
@@ -339,7 +360,8 @@ impl Generator {
|
|||||||
|
|
||||||
async fn generate_translation_page(&self, post: &Post, translation: &Translation) -> Result<()> {
|
async fn generate_translation_page(&self, post: &Post, translation: &Translation) -> Result<()> {
|
||||||
let mut context = tera::Context::new();
|
let mut context = tera::Context::new();
|
||||||
context.insert("config", &self.config.site);
|
let config_with_timestamp = self.create_config_with_timestamp()?;
|
||||||
|
context.insert("config", &config_with_timestamp);
|
||||||
context.insert("post", &TranslatedPost {
|
context.insert("post", &TranslatedPost {
|
||||||
title: translation.title.clone(),
|
title: translation.title.clone(),
|
||||||
date: post.date.clone(),
|
date: post.date.clone(),
|
||||||
@@ -356,7 +378,7 @@ impl Generator {
|
|||||||
let output_dir = self.base_path.join("public/posts");
|
let output_dir = self.base_path.join("public/posts");
|
||||||
fs::create_dir_all(&output_dir)?;
|
fs::create_dir_all(&output_dir)?;
|
||||||
|
|
||||||
let output_path = output_dir.join(format!("{}-{}.html", post.slug, translation.lang));
|
let output_path = output_dir.join(format!("{}-{}.html", post.filename_slug, translation.lang));
|
||||||
fs::write(output_path, html)?;
|
fs::write(output_path, html)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -413,11 +435,11 @@ impl Generator {
|
|||||||
.unwrap_or("")
|
.unwrap_or("")
|
||||||
});
|
});
|
||||||
|
|
||||||
if file_slug == post.slug {
|
if file_slug == post.slug || path.file_stem().and_then(|s| s.to_str()).unwrap_or("") == post.filename_slug {
|
||||||
let output_dir = self.base_path.join("public/posts");
|
let output_dir = self.base_path.join("public/posts");
|
||||||
fs::create_dir_all(&output_dir)?;
|
fs::create_dir_all(&output_dir)?;
|
||||||
|
|
||||||
let output_path = output_dir.join(format!("{}.md", post.slug));
|
let output_path = output_dir.join(format!("{}.md", post.filename_slug));
|
||||||
fs::write(output_path, content)?;
|
fs::write(output_path, content)?;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -427,6 +449,63 @@ impl Generator {
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn generate_json_index(&self, posts: &[Post]) -> Result<()> {
|
||||||
|
let index_data: Vec<serde_json::Value> = posts.iter().map(|post| {
|
||||||
|
// Parse date for proper formatting
|
||||||
|
let parsed_date = chrono::NaiveDate::parse_from_str(&post.date, "%Y-%m-%d")
|
||||||
|
.unwrap_or_else(|_| chrono::Utc::now().naive_utc().date());
|
||||||
|
|
||||||
|
// Format to Hugo-style date format (Mon Jan 2, 2006)
|
||||||
|
let formatted_date = parsed_date.format("%a %b %-d, %Y").to_string();
|
||||||
|
|
||||||
|
// Create UTC datetime for utc_time field
|
||||||
|
let utc_datetime = parsed_date.and_hms_opt(0, 0, 0)
|
||||||
|
.unwrap_or_else(|| chrono::Utc::now().naive_utc());
|
||||||
|
let utc_time = format!("{}Z", utc_datetime.format("%Y-%m-%dT%H:%M:%S"));
|
||||||
|
|
||||||
|
// Extract plain text content from HTML
|
||||||
|
let contents = self.extract_plain_text(&post.content);
|
||||||
|
|
||||||
|
serde_json::json!({
|
||||||
|
"title": post.title,
|
||||||
|
"tags": post.tags,
|
||||||
|
"description": self.extract_excerpt(&post.content),
|
||||||
|
"categories": [],
|
||||||
|
"contents": contents,
|
||||||
|
"href": format!("{}{}", self.config.site.base_url.trim_end_matches('/'), post.url),
|
||||||
|
"utc_time": utc_time,
|
||||||
|
"formated_time": formatted_date
|
||||||
|
})
|
||||||
|
}).collect();
|
||||||
|
|
||||||
|
// Write JSON index to public directory
|
||||||
|
let output_path = self.base_path.join("public/index.json");
|
||||||
|
let json_content = serde_json::to_string_pretty(&index_data)?;
|
||||||
|
fs::write(output_path, json_content)?;
|
||||||
|
|
||||||
|
println!("{} JSON index with {} posts", "Generated".cyan(), posts.len());
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_plain_text(&self, html_content: &str) -> String {
|
||||||
|
// Remove HTML tags and extract plain text
|
||||||
|
let mut text = String::new();
|
||||||
|
let mut in_tag = false;
|
||||||
|
|
||||||
|
for ch in html_content.chars() {
|
||||||
|
match ch {
|
||||||
|
'<' => in_tag = true,
|
||||||
|
'>' => in_tag = false,
|
||||||
|
_ if !in_tag => text.push(ch),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean up whitespace
|
||||||
|
text.split_whitespace().collect::<Vec<_>>().join(" ")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, serde::Serialize)]
|
#[derive(Debug, Clone, serde::Serialize)]
|
||||||
@@ -447,6 +526,7 @@ pub struct Post {
|
|||||||
pub date: String,
|
pub date: String,
|
||||||
pub content: String,
|
pub content: String,
|
||||||
pub slug: String,
|
pub slug: String,
|
||||||
|
pub filename_slug: String, // Added for URL generation
|
||||||
pub url: String,
|
pub url: String,
|
||||||
pub tags: Vec<String>,
|
pub tags: Vec<String>,
|
||||||
pub translations: Option<Vec<Translation>>,
|
pub translations: Option<Vec<Translation>>,
|
||||||
@@ -459,4 +539,19 @@ pub struct Translation {
|
|||||||
pub title: String,
|
pub title: String,
|
||||||
pub content: String,
|
pub content: String,
|
||||||
pub url: String,
|
pub url: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, serde::Serialize)]
|
||||||
|
#[allow(dead_code)]
|
||||||
|
struct BlogPost {
|
||||||
|
title: String,
|
||||||
|
url: String,
|
||||||
|
date: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, serde::Serialize)]
|
||||||
|
#[allow(dead_code)]
|
||||||
|
struct BlogIndex {
|
||||||
|
posts: Vec<BlogPost>,
|
||||||
|
}
|
||||||
|
|
||||||
|
35
src/main.rs
35
src/main.rs
@@ -18,10 +18,14 @@ mod mcp;
|
|||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
#[command(name = "ailog")]
|
#[command(name = "ailog")]
|
||||||
#[command(about = "A static blog generator with AI features")]
|
#[command(about = "A static blog generator with AI features")]
|
||||||
#[command(version)]
|
#[command(disable_version_flag = true)]
|
||||||
struct Cli {
|
struct Cli {
|
||||||
|
/// Print version information
|
||||||
|
#[arg(short = 'V', long = "version")]
|
||||||
|
version: bool,
|
||||||
|
|
||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
command: Commands,
|
command: Option<Commands>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Subcommand)]
|
#[derive(Subcommand)]
|
||||||
@@ -42,6 +46,9 @@ enum Commands {
|
|||||||
New {
|
New {
|
||||||
/// Title of the post
|
/// Title of the post
|
||||||
title: String,
|
title: String,
|
||||||
|
/// Slug for the post (optional, derived from title if not provided)
|
||||||
|
#[arg(short, long)]
|
||||||
|
slug: Option<String>,
|
||||||
/// Post format
|
/// Post format
|
||||||
#[arg(short, long, default_value = "md")]
|
#[arg(short, long, default_value = "md")]
|
||||||
format: String,
|
format: String,
|
||||||
@@ -111,6 +118,9 @@ enum StreamCommands {
|
|||||||
/// Run as daemon
|
/// Run as daemon
|
||||||
#[arg(short, long)]
|
#[arg(short, long)]
|
||||||
daemon: bool,
|
daemon: bool,
|
||||||
|
/// Enable AI content generation
|
||||||
|
#[arg(long)]
|
||||||
|
ai_generate: bool,
|
||||||
},
|
},
|
||||||
/// Stop monitoring
|
/// Stop monitoring
|
||||||
Stop,
|
Stop,
|
||||||
@@ -132,17 +142,28 @@ enum OauthCommands {
|
|||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<()> {
|
async fn main() -> Result<()> {
|
||||||
let cli = Cli::parse();
|
let cli = Cli::parse();
|
||||||
|
|
||||||
|
// Handle version flag
|
||||||
|
if cli.version {
|
||||||
|
println!("{}", env!("CARGO_PKG_VERSION"));
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Require subcommand if no version flag
|
||||||
|
let command = cli.command.ok_or_else(|| {
|
||||||
|
anyhow::anyhow!("No subcommand provided. Use --help for usage information.")
|
||||||
|
})?;
|
||||||
|
|
||||||
match cli.command {
|
match command {
|
||||||
Commands::Init { path } => {
|
Commands::Init { path } => {
|
||||||
commands::init::execute(path).await?;
|
commands::init::execute(path).await?;
|
||||||
}
|
}
|
||||||
Commands::Build { path } => {
|
Commands::Build { path } => {
|
||||||
commands::build::execute(path).await?;
|
commands::build::execute(path).await?;
|
||||||
}
|
}
|
||||||
Commands::New { title, format, path } => {
|
Commands::New { title, slug, format, path } => {
|
||||||
std::env::set_current_dir(path)?;
|
std::env::set_current_dir(path)?;
|
||||||
commands::new::execute(title, format).await?;
|
commands::new::execute(title, slug, format).await?;
|
||||||
}
|
}
|
||||||
Commands::Serve { port, path } => {
|
Commands::Serve { port, path } => {
|
||||||
std::env::set_current_dir(path)?;
|
std::env::set_current_dir(path)?;
|
||||||
@@ -175,8 +196,8 @@ async fn main() -> Result<()> {
|
|||||||
}
|
}
|
||||||
Commands::Stream { command } => {
|
Commands::Stream { command } => {
|
||||||
match command {
|
match command {
|
||||||
StreamCommands::Start { project_dir, daemon } => {
|
StreamCommands::Start { project_dir, daemon, ai_generate } => {
|
||||||
commands::stream::start(project_dir, daemon).await?;
|
commands::stream::start(project_dir, daemon, ai_generate).await?;
|
||||||
}
|
}
|
||||||
StreamCommands::Stop => {
|
StreamCommands::Stop => {
|
||||||
commands::stream::stop().await?;
|
commands::stream::stop().await?;
|
||||||
|
@@ -9,14 +9,16 @@ use serde_json::Value;
|
|||||||
|
|
||||||
pub struct MarkdownProcessor {
|
pub struct MarkdownProcessor {
|
||||||
highlight_code: bool,
|
highlight_code: bool,
|
||||||
|
highlight_theme: String,
|
||||||
syntax_set: SyntaxSet,
|
syntax_set: SyntaxSet,
|
||||||
theme_set: ThemeSet,
|
theme_set: ThemeSet,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MarkdownProcessor {
|
impl MarkdownProcessor {
|
||||||
pub fn new(highlight_code: bool) -> Self {
|
pub fn new(highlight_code: bool, highlight_theme: Option<String>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
highlight_code,
|
highlight_code,
|
||||||
|
highlight_theme: highlight_theme.unwrap_or_else(|| "Monokai".to_string()),
|
||||||
syntax_set: SyntaxSet::load_defaults_newlines(),
|
syntax_set: SyntaxSet::load_defaults_newlines(),
|
||||||
theme_set: ThemeSet::load_defaults(),
|
theme_set: ThemeSet::load_defaults(),
|
||||||
}
|
}
|
||||||
@@ -86,14 +88,19 @@ impl MarkdownProcessor {
|
|||||||
let parser = Parser::new_ext(content, options);
|
let parser = Parser::new_ext(content, options);
|
||||||
let mut html_output = String::new();
|
let mut html_output = String::new();
|
||||||
let mut code_block = None;
|
let mut code_block = None;
|
||||||
let theme = &self.theme_set.themes["base16-ocean.dark"];
|
// Force use dark theme for better visibility on dark background
|
||||||
|
let theme = self.theme_set.themes.get("base16-monokai.dark")
|
||||||
|
.or_else(|| self.theme_set.themes.get("base16-ocean.dark"))
|
||||||
|
.or_else(|| self.theme_set.themes.get("Solarized (dark)"))
|
||||||
|
.or_else(|| self.theme_set.themes.get(&self.highlight_theme))
|
||||||
|
.unwrap_or_else(|| self.theme_set.themes.values().next().unwrap());
|
||||||
|
|
||||||
let mut events = Vec::new();
|
let mut events = Vec::new();
|
||||||
for event in parser {
|
for event in parser {
|
||||||
match event {
|
match event {
|
||||||
pulldown_cmark::Event::Start(pulldown_cmark::Tag::CodeBlock(kind)) => {
|
pulldown_cmark::Event::Start(pulldown_cmark::Tag::CodeBlock(kind)) => {
|
||||||
if let CodeBlockKind::Fenced(lang) = &kind {
|
if let CodeBlockKind::Fenced(lang_info) = &kind {
|
||||||
code_block = Some((String::new(), lang.to_string()));
|
code_block = Some((String::new(), lang_info.to_string()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pulldown_cmark::Event::Text(text) => {
|
pulldown_cmark::Event::Text(text) => {
|
||||||
@@ -104,8 +111,8 @@ impl MarkdownProcessor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
pulldown_cmark::Event::End(pulldown_cmark::TagEnd::CodeBlock) => {
|
pulldown_cmark::Event::End(pulldown_cmark::TagEnd::CodeBlock) => {
|
||||||
if let Some((code, lang)) = code_block.take() {
|
if let Some((code, lang_info)) = code_block.take() {
|
||||||
let highlighted = self.highlight_code_block(&code, &lang, theme);
|
let highlighted = self.highlight_code_block(&code, &lang_info, theme);
|
||||||
events.push(pulldown_cmark::Event::Html(highlighted.into()));
|
events.push(pulldown_cmark::Event::Html(highlighted.into()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -117,13 +124,41 @@ impl MarkdownProcessor {
|
|||||||
Ok(html_output)
|
Ok(html_output)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn highlight_code_block(&self, code: &str, lang: &str, theme: &syntect::highlighting::Theme) -> String {
|
fn highlight_code_block(&self, code: &str, lang_info: &str, theme: &syntect::highlighting::Theme) -> String {
|
||||||
|
// Parse language and filename from lang_info (e.g., "sh:/path/to/file" or "rust:main.rs")
|
||||||
|
let (lang, filename) = if lang_info.contains(':') {
|
||||||
|
let parts: Vec<&str> = lang_info.splitn(2, ':').collect();
|
||||||
|
(parts[0], Some(parts[1]))
|
||||||
|
} else {
|
||||||
|
(lang_info, None)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Map short language names to full names
|
||||||
|
let lang = match lang {
|
||||||
|
"rs" => "rust",
|
||||||
|
"js" => "javascript",
|
||||||
|
"ts" => "typescript",
|
||||||
|
"sh" => "bash",
|
||||||
|
"yml" => "yaml",
|
||||||
|
"md" => "markdown",
|
||||||
|
"py" => "python",
|
||||||
|
_ => lang,
|
||||||
|
};
|
||||||
|
|
||||||
let syntax = self.syntax_set
|
let syntax = self.syntax_set
|
||||||
.find_syntax_by_token(lang)
|
.find_syntax_by_token(lang)
|
||||||
.unwrap_or_else(|| self.syntax_set.find_syntax_plain_text());
|
.unwrap_or_else(|| self.syntax_set.find_syntax_plain_text());
|
||||||
|
|
||||||
let mut highlighter = syntect::easy::HighlightLines::new(syntax, theme);
|
let mut highlighter = syntect::easy::HighlightLines::new(syntax, theme);
|
||||||
let mut output = String::from("<pre><code>");
|
|
||||||
|
// Create pre tag with optional filename attribute
|
||||||
|
let pre_tag = if let Some(filename) = filename {
|
||||||
|
format!("<pre data-filename=\"{}\">", filename)
|
||||||
|
} else {
|
||||||
|
"<pre>".to_string()
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut output = format!("{}<code>", pre_tag);
|
||||||
|
|
||||||
for line in code.lines() {
|
for line in code.lines() {
|
||||||
let ranges = highlighter.highlight_line(line, &self.syntax_set).unwrap();
|
let ranges = highlighter.highlight_line(line, &self.syntax_set).unwrap();
|
||||||
|
96
src/ollama_proxy.rs
Normal file
96
src/ollama_proxy.rs
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
use actix_web::{web, App, HttpResponse, HttpServer, middleware};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::Mutex;
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct RateLimiter {
|
||||||
|
requests: Arc<Mutex<HashMap<String, Vec<DateTime<Utc>>>>>,
|
||||||
|
limit_per_hour: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RateLimiter {
|
||||||
|
fn new(limit: usize) -> Self {
|
||||||
|
Self {
|
||||||
|
requests: Arc::new(Mutex::new(HashMap::new())),
|
||||||
|
limit_per_hour: limit,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn check_limit(&self, user_id: &str) -> bool {
|
||||||
|
let mut requests = self.requests.lock().unwrap();
|
||||||
|
let now = Utc::now();
|
||||||
|
let hour_ago = now - chrono::Duration::hours(1);
|
||||||
|
|
||||||
|
let user_requests = requests.entry(user_id.to_string()).or_insert(Vec::new());
|
||||||
|
user_requests.retain(|&time| time > hour_ago);
|
||||||
|
|
||||||
|
if user_requests.len() < self.limit_per_hour {
|
||||||
|
user_requests.push(now);
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct GenerateRequest {
|
||||||
|
model: String,
|
||||||
|
prompt: String,
|
||||||
|
stream: bool,
|
||||||
|
options: Option<serde_json::Value>,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn proxy_generate(
|
||||||
|
req: web::Json<GenerateRequest>,
|
||||||
|
data: web::Data<AppState>,
|
||||||
|
user_info: web::ReqData<UserInfo>, // ATProto認証から取得
|
||||||
|
) -> Result<HttpResponse, actix_web::Error> {
|
||||||
|
// レート制限チェック
|
||||||
|
if !data.rate_limiter.check_limit(&user_info.did) {
|
||||||
|
return Ok(HttpResponse::TooManyRequests()
|
||||||
|
.json(serde_json::json!({
|
||||||
|
"error": "Rate limit exceeded. Please try again later."
|
||||||
|
})));
|
||||||
|
}
|
||||||
|
|
||||||
|
// プロンプトサイズ制限
|
||||||
|
if req.prompt.len() > 500 {
|
||||||
|
return Ok(HttpResponse::BadRequest()
|
||||||
|
.json(serde_json::json!({
|
||||||
|
"error": "Prompt too long. Maximum 500 characters."
|
||||||
|
})));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ollamaへのリクエスト転送
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
let response = client
|
||||||
|
.post("http://localhost:11434/api/generate")
|
||||||
|
.json(&req.into_inner())
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let body = response.bytes().await?;
|
||||||
|
Ok(HttpResponse::Ok()
|
||||||
|
.content_type("application/json")
|
||||||
|
.body(body))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::main]
|
||||||
|
async fn main() -> std::io::Result<()> {
|
||||||
|
let rate_limiter = RateLimiter::new(20); // 1時間に20リクエスト
|
||||||
|
|
||||||
|
HttpServer::new(move || {
|
||||||
|
App::new()
|
||||||
|
.app_data(web::Data::new(AppState {
|
||||||
|
rate_limiter: rate_limiter.clone(),
|
||||||
|
}))
|
||||||
|
.wrap(middleware::Logger::default())
|
||||||
|
.route("/api/generate", web::post().to(proxy_generate))
|
||||||
|
})
|
||||||
|
.bind("127.0.0.1:8080")?
|
||||||
|
.run()
|
||||||
|
.await
|
||||||
|
}
|
22
systemd/system/ailog-stream.service
Normal file
22
systemd/system/ailog-stream.service
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=ailog stream monitoring service
|
||||||
|
After=network.target
|
||||||
|
Wants=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=syui
|
||||||
|
Group=syui
|
||||||
|
WorkingDirectory=/home/syui/git/log
|
||||||
|
ExecStart=/home/syui/.cargo/bin/ailog stream start my-blog
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
# Environment variables if needed
|
||||||
|
Environment=RUST_LOG=info
|
||||||
|
Environment=AILOG_DEBUG_ALL=1
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
25
systemd/system/cloudflared-log.service
Normal file
25
systemd/system/cloudflared-log.service
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Cloudflared tunnel for log.syui.ai
|
||||||
|
After=network.target
|
||||||
|
Wants=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=syui
|
||||||
|
Group=syui
|
||||||
|
WorkingDirectory=/home/syui/git/log
|
||||||
|
ExecStart=/usr/bin/cloudflared tunnel --config /home/syui/git/log/cloudflared-config.yml run
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
# Security hardening
|
||||||
|
NoNewPrivileges=true
|
||||||
|
ProtectSystem=strict
|
||||||
|
ProtectHome=read-only
|
||||||
|
ReadWritePaths=/home/syui/git/log
|
||||||
|
PrivateTmp=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
93
workers/ollama-proxy.js
Normal file
93
workers/ollama-proxy.js
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
// Cloudflare Worker for secure Ollama proxy
|
||||||
|
export default {
|
||||||
|
async fetch(request, env, ctx) {
|
||||||
|
// CORS preflight
|
||||||
|
if (request.method === 'OPTIONS') {
|
||||||
|
return new Response(null, {
|
||||||
|
headers: {
|
||||||
|
'Access-Control-Allow-Origin': 'https://log.syui.ai',
|
||||||
|
'Access-Control-Allow-Methods': 'POST, OPTIONS',
|
||||||
|
'Access-Control-Allow-Headers': 'Content-Type, X-User-Token',
|
||||||
|
'Access-Control-Max-Age': '86400',
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify origin
|
||||||
|
const origin = request.headers.get('Origin');
|
||||||
|
const referer = request.headers.get('Referer');
|
||||||
|
|
||||||
|
// 許可されたオリジンのみ
|
||||||
|
const allowedOrigins = [
|
||||||
|
'https://log.syui.ai',
|
||||||
|
'https://log.pages.dev' // Cloudflare Pages preview
|
||||||
|
];
|
||||||
|
|
||||||
|
if (!origin || !allowedOrigins.some(allowed => origin.startsWith(allowed))) {
|
||||||
|
return new Response('Forbidden', { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// ユーザー認証トークン検証(オプション)
|
||||||
|
const userToken = request.headers.get('X-User-Token');
|
||||||
|
if (env.REQUIRE_AUTH && !userToken) {
|
||||||
|
return new Response('Unauthorized', { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// リクエストボディを取得
|
||||||
|
const body = await request.json();
|
||||||
|
|
||||||
|
// プロンプトサイズ制限
|
||||||
|
if (body.prompt && body.prompt.length > 1000) {
|
||||||
|
return new Response(JSON.stringify({
|
||||||
|
error: 'Prompt too long. Maximum 1000 characters.'
|
||||||
|
}), {
|
||||||
|
status: 400,
|
||||||
|
headers: { 'Content-Type': 'application/json' }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// レート制限(CF Workers KV使用)
|
||||||
|
if (env.RATE_LIMITER) {
|
||||||
|
const clientIP = request.headers.get('CF-Connecting-IP');
|
||||||
|
const rateLimitKey = `rate:${clientIP}`;
|
||||||
|
const currentCount = await env.RATE_LIMITER.get(rateLimitKey) || 0;
|
||||||
|
|
||||||
|
if (currentCount >= 20) {
|
||||||
|
return new Response(JSON.stringify({
|
||||||
|
error: 'Rate limit exceeded. Try again later.'
|
||||||
|
}), {
|
||||||
|
status: 429,
|
||||||
|
headers: { 'Content-Type': 'application/json' }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// カウント増加(1時間TTL)
|
||||||
|
await env.RATE_LIMITER.put(rateLimitKey, currentCount + 1, {
|
||||||
|
expirationTtl: 3600
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ollamaへプロキシ
|
||||||
|
const ollamaResponse = await fetch(env.OLLAMA_API_URL || 'https://ollama.syui.ai/api/generate', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
// 内部認証ヘッダー(必要に応じて)
|
||||||
|
'X-Internal-Token': env.OLLAMA_INTERNAL_TOKEN || ''
|
||||||
|
},
|
||||||
|
body: JSON.stringify(body)
|
||||||
|
});
|
||||||
|
|
||||||
|
// レスポンスを返す
|
||||||
|
const responseData = await ollamaResponse.text();
|
||||||
|
|
||||||
|
return new Response(responseData, {
|
||||||
|
status: ollamaResponse.status,
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Access-Control-Allow-Origin': origin,
|
||||||
|
'Cache-Control': 'no-store'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
20
workers/wrangler.toml
Normal file
20
workers/wrangler.toml
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
name = "ollama-proxy"
|
||||||
|
main = "ollama-proxy.js"
|
||||||
|
compatibility_date = "2024-01-01"
|
||||||
|
|
||||||
|
# 環境変数
|
||||||
|
[vars]
|
||||||
|
REQUIRE_AUTH = false
|
||||||
|
|
||||||
|
# 本番環境
|
||||||
|
[env.production.vars]
|
||||||
|
OLLAMA_API_URL = "https://ollama.syui.ai/api/generate"
|
||||||
|
REQUIRE_AUTH = true
|
||||||
|
|
||||||
|
# KVネームスペース(レート制限用)
|
||||||
|
[[kv_namespaces]]
|
||||||
|
binding = "RATE_LIMITER"
|
||||||
|
id = "your-kv-namespace-id"
|
||||||
|
|
||||||
|
# シークレット(wrangler secret putで設定)
|
||||||
|
# OLLAMA_INTERNAL_TOKEN = "your-internal-token"
|
Reference in New Issue
Block a user