mirror of
https://github.com/v0l/route96.git
synced 2025-06-14 15:46:32 +00:00
Compare commits
12 Commits
0554f1220f
...
main
Author | SHA1 | Date | |
---|---|---|---|
b6c12de685
|
|||
470af79a24
|
|||
5048c4104a
|
|||
6b6e0d4dec
|
|||
2576f75bc4
|
|||
ec271f4109
|
|||
21cc1ed714
|
|||
dd6b35380b
|
|||
c4a519afb4 | |||
fe263e9a46
|
|||
d3711ff52c | |||
fc080b5cd0 |
18
.drone.yml
18
.drone.yml
@ -5,17 +5,24 @@ metadata:
|
||||
namespace: git
|
||||
concurrency:
|
||||
limit: 1
|
||||
volumes:
|
||||
- name: cache
|
||||
claim:
|
||||
name: storage2
|
||||
steps:
|
||||
- name: build
|
||||
image: docker
|
||||
privileged: true
|
||||
volumes:
|
||||
- name: cache
|
||||
path: /cache
|
||||
environment:
|
||||
TOKEN:
|
||||
from_secret: gitea
|
||||
TOKEN_DOCKER:
|
||||
from_secret: docker_hub
|
||||
commands:
|
||||
- dockerd &
|
||||
- dockerd --data-root /cache/dockerd &
|
||||
- docker login -u voidic -p $TOKEN_DOCKER
|
||||
- docker buildx build --push -t voidic/route96:latest .
|
||||
- kill $(cat /var/run/docker.pid)
|
||||
@ -30,17 +37,24 @@ trigger:
|
||||
- tag
|
||||
metadata:
|
||||
namespace: git
|
||||
volumes:
|
||||
- name: cache
|
||||
claim:
|
||||
name: storage2
|
||||
steps:
|
||||
- name: build
|
||||
image: docker
|
||||
privileged: true
|
||||
volumes:
|
||||
- name: cache
|
||||
path: /cache
|
||||
environment:
|
||||
TOKEN:
|
||||
from_secret: gitea
|
||||
TOKEN_DOCKER:
|
||||
from_secret: docker_hub
|
||||
commands:
|
||||
- dockerd &
|
||||
- dockerd --data-root /cache/dockerd &
|
||||
- docker login -u voidic -p $TOKEN_DOCKER
|
||||
- docker buildx build --push voidic/route96:$DRONE_TAG .
|
||||
- kill $(cat /var/run/docker.pid)
|
829
Cargo.lock
generated
829
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -44,7 +44,7 @@ http-range-header = { version = "0.4.2" }
|
||||
base58 = "0.2.0"
|
||||
|
||||
libc = { version = "0.2.153", optional = true }
|
||||
ffmpeg-rs-raw = { git = "https://git.v0l.io/Kieran/ffmpeg-rs-raw.git", rev = "a63b88ef3c8f58c7c0ac57d361d06ff0bb3ed385", optional = true }
|
||||
ffmpeg-rs-raw = { git = "https://git.v0l.io/Kieran/ffmpeg-rs-raw.git", rev = "aa1ce3edcad0fcd286d39b3e0c2fdc610c3988e7", optional = true }
|
||||
candle-core = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
|
||||
candle-nn = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
|
||||
candle-transformers = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
|
||||
|
@ -12,10 +12,12 @@ RUN apt update && \
|
||||
apt install -y \
|
||||
build-essential \
|
||||
libx264-dev \
|
||||
libx265-dev \
|
||||
libwebp-dev \
|
||||
libvpx-dev \
|
||||
nasm \
|
||||
libclang-dev && \
|
||||
libclang-dev \
|
||||
protobuf-compiler && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
RUN git clone --single-branch --branch release/7.1 https://git.v0l.io/ffmpeg/FFmpeg.git && \
|
||||
cd FFmpeg && \
|
||||
@ -26,6 +28,7 @@ RUN git clone --single-branch --branch release/7.1 https://git.v0l.io/ffmpeg/FFm
|
||||
--disable-network \
|
||||
--enable-gpl \
|
||||
--enable-libx264 \
|
||||
--enable-libx265 \
|
||||
--enable-libwebp \
|
||||
--enable-libvpx \
|
||||
--disable-static \
|
||||
|
153
README.md
153
README.md
@ -1,26 +1,143 @@
|
||||
# route96
|
||||
# Route96
|
||||
|
||||
Image hosting service
|
||||
Decentralized blob storage server with Nostr integration, supporting multiple protocols and advanced media processing capabilities.
|
||||
|
||||
## Features
|
||||
## Core Features
|
||||
|
||||
- [NIP-96 Support](https://github.com/nostr-protocol/nips/blob/master/96.md)
|
||||
- [Blossom Support](https://github.com/hzrd149/blossom/blob/master/buds/01.md)
|
||||
- [BUD-01](https://github.com/hzrd149/blossom/blob/master/buds/01.md)
|
||||
- [BUD-02](https://github.com/hzrd149/blossom/blob/master/buds/02.md)
|
||||
- [BUD-04](https://github.com/hzrd149/blossom/blob/master/buds/04.md)
|
||||
- [BUD-05](https://github.com/hzrd149/blossom/blob/master/buds/05.md)
|
||||
- [BUD-06](https://github.com/hzrd149/blossom/blob/master/buds/06.md)
|
||||
- [BUD-08](https://github.com/hzrd149/blossom/blob/master/buds/08.md)
|
||||
- Image compression to WebP
|
||||
- Blurhash calculation
|
||||
- AI image labeling ([ViT224](https://huggingface.co/google/vit-base-patch16-224))
|
||||
- Plausible analytics
|
||||
### Protocol Support
|
||||
- **[NIP-96](https://github.com/nostr-protocol/nips/blob/master/96.md)** - Nostr file storage with media processing
|
||||
- **[Blossom Protocol](https://github.com/hzrd149/blossom)** - Complete BUD specification compliance:
|
||||
- [BUD-01](https://github.com/hzrd149/blossom/blob/master/buds/01.md) - Blob retrieval (GET/HEAD)
|
||||
- [BUD-02](https://github.com/hzrd149/blossom/blob/master/buds/02.md) - Upload, delete, list operations
|
||||
- [BUD-04](https://github.com/hzrd149/blossom/blob/master/buds/04.md) - Blob mirroring from remote servers
|
||||
- [BUD-05](https://github.com/hzrd149/blossom/blob/master/buds/05.md) - Media optimization endpoints
|
||||
- [BUD-06](https://github.com/hzrd149/blossom/blob/master/buds/06.md) - Upload requirement validation
|
||||
- [BUD-08](https://github.com/hzrd149/blossom/blob/master/buds/08.md) - NIP-94 metadata support
|
||||
- [BUD-09](https://github.com/hzrd149/blossom/blob/master/buds/09.md) - Content reporting system
|
||||
|
||||
## Planned
|
||||
### Media Processing
|
||||
- **Image & Video Compression** - Automatic WebP conversion and optimization
|
||||
- **Thumbnail Generation** - Auto-generated thumbnails for images and videos
|
||||
- **Blurhash Calculation** - Progressive image loading with blur previews
|
||||
- **AI Content Labeling** - Automated tagging using [ViT-224](https://huggingface.co/google/vit-base-patch16-224) model
|
||||
- **Media Metadata** - Automatic extraction of dimensions, duration, bitrate
|
||||
- **Range Request Support** - RFC 7233 compliant partial content delivery
|
||||
|
||||
- Torrent seed V2
|
||||
- Payment system
|
||||
### Security & Administration
|
||||
- **Nostr Authentication** - Cryptographic identity with kind 24242 events
|
||||
- **Whitelist Support** - Restrict uploads to approved public keys
|
||||
- **Quota Management** - Per-user storage limits with payment integration
|
||||
- **Content Reporting** - Community-driven moderation via NIP-56 reports
|
||||
- **Admin Dashboard** - Web interface for content and user management
|
||||
- **CORS Support** - Full cross-origin resource sharing compliance
|
||||
|
||||
### Payment System
|
||||
- **Lightning Network** - Bitcoin payments via LND integration
|
||||
- **Fiat Tracking** - Multi-currency support (USD/EUR/GBP/JPY/etc.)
|
||||
- **Flexible Billing** - Usage-based pricing (storage, egress, time-based)
|
||||
- **Free Quotas** - Configurable free tier for new users
|
||||
|
||||
### Analytics & Monitoring
|
||||
- **Plausible Integration** - Privacy-focused usage analytics
|
||||
- **Comprehensive Logging** - Detailed operation tracking
|
||||
- **Health Monitoring** - Service status and performance metrics
|
||||
|
||||
## API Endpoints
|
||||
|
||||
### Blossom Protocol
|
||||
- `GET /<sha256>` - Retrieve blob by hash
|
||||
- `HEAD /<sha256>` - Check blob existence
|
||||
- `PUT /upload` - Upload new blob
|
||||
- `DELETE /<sha256>` - Delete owned blob
|
||||
- `GET /list/<pubkey>` - List user's blobs
|
||||
- `PUT /mirror` - Mirror blob from remote URL
|
||||
- `PUT /media` - Upload with media optimization
|
||||
- `HEAD /upload` - Validate upload requirements
|
||||
- `PUT /report` - Submit content reports
|
||||
|
||||
### NIP-96 Protocol
|
||||
- `GET /.well-known/nostr/nip96.json` - Server information
|
||||
- `POST /nip96` - File upload with Nostr auth
|
||||
- `DELETE /nip96/<sha256>` - Delete with Nostr auth
|
||||
|
||||
### Admin Interface
|
||||
- `GET /admin/*` - Web dashboard for content management
|
||||
- Admin API endpoints for reports and user management
|
||||
|
||||
## Configuration
|
||||
|
||||
Route96 uses YAML configuration. See [config.yaml](config.yaml) for a complete example:
|
||||
|
||||
```yaml
|
||||
listen: "127.0.0.1:8000"
|
||||
database: "mysql://user:pass@localhost:3306/route96"
|
||||
storage_dir: "./data"
|
||||
max_upload_bytes: 104857600 # 100MB
|
||||
public_url: "https://your-domain.com"
|
||||
|
||||
# Optional: Restrict to specific pubkeys
|
||||
whitelist: ["pubkey1", "pubkey2"]
|
||||
|
||||
# Optional: Payment system
|
||||
payments:
|
||||
free_quota_bytes: 104857600
|
||||
cost:
|
||||
currency: "BTC"
|
||||
amount: 0.00000100
|
||||
unit: "GBSpace"
|
||||
interval:
|
||||
month: 1
|
||||
```
|
||||
|
||||
## Quick Start Examples
|
||||
|
||||
### Upload a file (Blossom)
|
||||
```bash
|
||||
# Create authorization event (kind 24242)
|
||||
auth_event='{"kind":24242,"tags":[["t","upload"],["expiration","1234567890"]],"content":"Upload file"}'
|
||||
auth_b64=$(echo $auth_event | base64 -w 0)
|
||||
|
||||
curl -X PUT http://localhost:8000/upload \
|
||||
-H "Authorization: Nostr $auth_b64" \
|
||||
-H "Content-Type: image/jpeg" \
|
||||
--data-binary @image.jpg
|
||||
```
|
||||
|
||||
### Retrieve a file
|
||||
```bash
|
||||
curl http://localhost:8000/abc123def456...789
|
||||
```
|
||||
|
||||
### List user's files
|
||||
```bash
|
||||
curl http://localhost:8000/list/user_pubkey_hex
|
||||
```
|
||||
|
||||
## Feature Flags
|
||||
|
||||
Route96 supports optional features that can be enabled at compile time:
|
||||
|
||||
- `nip96` (default) - NIP-96 protocol support
|
||||
- `blossom` (default) - Blossom protocol support
|
||||
- `media-compression` - WebP conversion and thumbnails
|
||||
- `labels` - AI-powered content labeling
|
||||
- `payments` (default) - Lightning payment integration
|
||||
- `analytics` (default) - Plausible analytics
|
||||
- `react-ui` (default) - Web dashboard interface
|
||||
|
||||
```bash
|
||||
# Build with specific features
|
||||
cargo build --features "blossom,payments,media-compression"
|
||||
```
|
||||
|
||||
## Requirements
|
||||
|
||||
- **Rust** 1.70+
|
||||
- **MySQL/MariaDB** - Database storage
|
||||
- **FFmpeg libraries** - Media processing (optional)
|
||||
- **Node.js** - UI building (optional)
|
||||
|
||||
See [docs/debian.md](docs/debian.md) for detailed installation instructions.
|
||||
|
||||
## Running
|
||||
|
||||
|
@ -38,8 +38,8 @@ payments:
|
||||
# LND node config
|
||||
lnd:
|
||||
endpoint: "https://127.0.0.1:10001"
|
||||
tls: "/home/kieran/.polar/networks/3/volumes/lnd/alice/tls.cert"
|
||||
macaroon: "/home/kieran/.polar/networks/3/volumes/lnd/alice/data/chain/bitcoin/regtest/admin.macaroon"
|
||||
tls: "/home/kieran/.polar/networks/1/volumes/lnd/alice/tls.cert"
|
||||
macaroon: "/home/kieran/.polar/networks/1/volumes/lnd/alice/data/chain/bitcoin/regtest/admin.macaroon"
|
||||
# Cost per unit (BTC/USD/EUR/AUD/CAD/JPY/GBP)
|
||||
cost:
|
||||
currency: "BTC"
|
||||
|
@ -1,7 +1,7 @@
|
||||
-- Add migration script here
|
||||
alter table users
|
||||
add column paid_until timestamp,
|
||||
add column paid_size integer unsigned not null;
|
||||
add column paid_size bigint unsigned not null;
|
||||
|
||||
create table payments
|
||||
(
|
||||
@ -11,7 +11,7 @@ create table payments
|
||||
amount integer unsigned not null,
|
||||
is_paid bit(1) not null default 0,
|
||||
days_value integer unsigned not null,
|
||||
size_value integer unsigned not null,
|
||||
size_value bigint unsigned not null,
|
||||
settle_index integer unsigned,
|
||||
rate float,
|
||||
|
||||
|
28
migrations/20250610135841_reports.sql
Normal file
28
migrations/20250610135841_reports.sql
Normal file
@ -0,0 +1,28 @@
|
||||
-- Create reports table for file reporting functionality
|
||||
create table reports
|
||||
(
|
||||
id integer unsigned not null auto_increment primary key,
|
||||
file_id binary(32) not null,
|
||||
reporter_id integer unsigned not null,
|
||||
event_json text not null,
|
||||
created timestamp default current_timestamp,
|
||||
|
||||
constraint fk_reports_file
|
||||
foreign key (file_id) references uploads (id)
|
||||
on delete cascade
|
||||
on update restrict,
|
||||
|
||||
constraint fk_reports_reporter
|
||||
foreign key (reporter_id) references users (id)
|
||||
on delete cascade
|
||||
on update restrict
|
||||
);
|
||||
|
||||
-- Unique index to prevent duplicate reports from same user for same file
|
||||
create unique index ix_reports_file_reporter on reports (file_id, reporter_id);
|
||||
|
||||
-- Index for efficient lookups by file
|
||||
create index ix_reports_file_id on reports (file_id);
|
||||
|
||||
-- Index for efficient lookups by reporter
|
||||
create index ix_reports_reporter_id on reports (reporter_id);
|
5
migrations/20250610140000_add_reviewed_flag.sql
Normal file
5
migrations/20250610140000_add_reviewed_flag.sql
Normal file
@ -0,0 +1,5 @@
|
||||
-- Add reviewed flag to reports table
|
||||
alter table reports add column reviewed boolean not null default false;
|
||||
|
||||
-- Index for efficient filtering of non-reviewed reports
|
||||
create index ix_reports_reviewed on reports (reviewed);
|
@ -3,6 +3,7 @@ use crate::filesystem::FileStore;
|
||||
use crate::processing::probe_file;
|
||||
use anyhow::Result;
|
||||
use log::{error, info, warn};
|
||||
use tokio::sync::broadcast::Receiver;
|
||||
|
||||
pub struct MediaMetadata {
|
||||
db: Database,
|
||||
@ -14,12 +15,15 @@ impl MediaMetadata {
|
||||
Self { db, fs }
|
||||
}
|
||||
|
||||
pub async fn process(&mut self) -> Result<()> {
|
||||
pub async fn process(&mut self, mut shutdown: Receiver<()>) -> Result<()> {
|
||||
let to_migrate = self.db.get_missing_media_metadata().await?;
|
||||
|
||||
info!("{} files are missing metadata", to_migrate.len());
|
||||
|
||||
for file in to_migrate {
|
||||
if shutdown.try_recv().is_ok() {
|
||||
break;
|
||||
}
|
||||
// probe file and update metadata
|
||||
let path = self.fs.get(&file.id);
|
||||
match probe_file(&path) {
|
||||
|
@ -79,9 +79,7 @@ async fn main() -> Result<(), Error> {
|
||||
routes![
|
||||
root,
|
||||
get_blob,
|
||||
head_blob,
|
||||
routes::void_cat_redirect,
|
||||
routes::void_cat_redirect_head
|
||||
head_blob
|
||||
],
|
||||
)
|
||||
.mount("/admin", routes::admin_routes());
|
||||
|
@ -1,228 +0,0 @@
|
||||
use anyhow::{Context, Error, Result};
|
||||
use clap::{Parser, Subcommand};
|
||||
use config::Config;
|
||||
use indicatif::{ProgressBar, ProgressStyle};
|
||||
use log::{error, info};
|
||||
use route96::db::{Database, FileUpload};
|
||||
use route96::filesystem::{FileStore, FileSystemResult};
|
||||
use route96::processing::probe_file;
|
||||
use route96::settings::Settings;
|
||||
use std::future::Future;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::pin::Pin;
|
||||
use std::sync::Arc;
|
||||
use std::time::SystemTime;
|
||||
use tokio::sync::Semaphore;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about)]
|
||||
struct Args {
|
||||
#[arg(long)]
|
||||
pub config: Option<String>,
|
||||
|
||||
#[clap(subcommand)]
|
||||
pub command: Commands,
|
||||
}
|
||||
|
||||
#[derive(Debug, Subcommand)]
|
||||
enum Commands {
|
||||
/// Check file hash matches filename / path
|
||||
Check {
|
||||
#[arg(long)]
|
||||
delete: Option<bool>,
|
||||
},
|
||||
|
||||
/// Import a directory into the filesystem
|
||||
/// (does NOT import files into the database, use database-import command for that)
|
||||
Import {
|
||||
#[arg(long)]
|
||||
from: PathBuf,
|
||||
#[arg(long, default_missing_value = "true", num_args = 0..=1)]
|
||||
probe_media: Option<bool>,
|
||||
},
|
||||
|
||||
/// Import files from filesystem into database
|
||||
DatabaseImport {
|
||||
/// Don't actually import data and just print which files WOULD be imported
|
||||
#[arg(long, default_missing_value = "true", num_args = 0..=1)]
|
||||
dry_run: Option<bool>,
|
||||
},
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Error> {
|
||||
if std::env::var("RUST_LOG").is_err() {
|
||||
std::env::set_var("RUST_LOG", "info");
|
||||
}
|
||||
env_logger::init();
|
||||
|
||||
let args: Args = Args::parse();
|
||||
|
||||
let builder = Config::builder()
|
||||
.add_source(config::File::with_name(if let Some(ref c) = args.config {
|
||||
c.as_str()
|
||||
} else {
|
||||
"config.yaml"
|
||||
}))
|
||||
.add_source(config::Environment::with_prefix("APP"))
|
||||
.build()?;
|
||||
|
||||
let settings: Settings = builder.try_deserialize()?;
|
||||
|
||||
match args.command {
|
||||
Commands::Check { delete } => {
|
||||
info!("Checking files in: {}", settings.storage_dir);
|
||||
let fs = FileStore::new(settings.clone());
|
||||
iter_files(&fs.storage_dir(), 4, |entry, p| {
|
||||
let p = p.clone();
|
||||
Box::pin(async move {
|
||||
let id = if let Some(i) = id_from_path(&entry) {
|
||||
i
|
||||
} else {
|
||||
p.set_message(format!("Skipping invalid file: {}", &entry.display()));
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
let hash = FileStore::hash_file(&entry).await?;
|
||||
if hash != id {
|
||||
if delete.unwrap_or(false) {
|
||||
p.set_message(format!("Deleting corrupt file: {}", &entry.display()));
|
||||
tokio::fs::remove_file(&entry).await?;
|
||||
} else {
|
||||
p.set_message(format!("File is corrupted: {}", &entry.display()));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
})
|
||||
})
|
||||
.await?;
|
||||
}
|
||||
Commands::Import { from, probe_media } => {
|
||||
let fs = FileStore::new(settings.clone());
|
||||
let db = Database::new(&settings.database).await?;
|
||||
db.migrate().await?;
|
||||
info!("Importing from: {}", fs.storage_dir().display());
|
||||
iter_files(&from, 4, |entry, p| {
|
||||
let fs = fs.clone();
|
||||
let p = p.clone();
|
||||
Box::pin(async move {
|
||||
let mime = infer::get_from_path(&entry)?
|
||||
.map(|m| m.mime_type())
|
||||
.unwrap_or("application/octet-stream");
|
||||
|
||||
// test media is not corrupt
|
||||
if probe_media.unwrap_or(true)
|
||||
&& (mime.starts_with("image/") || mime.starts_with("video/"))
|
||||
&& probe_file(&entry).is_err()
|
||||
{
|
||||
p.set_message(format!("Skipping media invalid file: {}", &entry.display()));
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let file = tokio::fs::File::open(&entry).await?;
|
||||
let dst = fs.put(file, mime, false).await?;
|
||||
match dst {
|
||||
FileSystemResult::AlreadyExists(_) => {
|
||||
p.set_message(format!("Duplicate file: {}", &entry.display()));
|
||||
}
|
||||
FileSystemResult::NewFile(_) => {
|
||||
p.set_message(format!("Imported: {}", &entry.display()));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
})
|
||||
})
|
||||
.await?;
|
||||
}
|
||||
Commands::DatabaseImport { dry_run } => {
|
||||
let fs = FileStore::new(settings.clone());
|
||||
let db = Database::new(&settings.database).await?;
|
||||
db.migrate().await?;
|
||||
info!("Importing to DB from: {}", fs.storage_dir().display());
|
||||
iter_files(&fs.storage_dir(), 4, |entry, p| {
|
||||
let db = db.clone();
|
||||
let p = p.clone();
|
||||
Box::pin(async move {
|
||||
let id = if let Some(i) = id_from_path(&entry) {
|
||||
i
|
||||
} else {
|
||||
p.set_message(format!("Skipping invalid file: {}", &entry.display()));
|
||||
return Ok(());
|
||||
};
|
||||
let u = db.get_file(&id).await.context("db get_file")?;
|
||||
if u.is_none() {
|
||||
if !dry_run.unwrap_or(false) {
|
||||
p.set_message(format!("Importing file: {}", &entry.display()));
|
||||
let mime = infer::get_from_path(&entry)
|
||||
.context("infer")?
|
||||
.map(|m| m.mime_type())
|
||||
.unwrap_or("application/octet-stream")
|
||||
.to_string();
|
||||
let meta = entry.metadata().context("file metadata")?;
|
||||
let entry = FileUpload {
|
||||
id,
|
||||
name: None,
|
||||
size: meta.len(),
|
||||
mime_type: mime,
|
||||
created: meta.created().unwrap_or(SystemTime::now()).into(),
|
||||
width: None,
|
||||
height: None,
|
||||
blur_hash: None,
|
||||
alt: None,
|
||||
duration: None,
|
||||
bitrate: None,
|
||||
};
|
||||
db.add_file(&entry, None).await.context("db add_file")?;
|
||||
} else {
|
||||
p.set_message(format!(
|
||||
"[DRY-RUN] Importing file: {}",
|
||||
&entry.display()
|
||||
));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
})
|
||||
})
|
||||
.await?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn id_from_path(path: &Path) -> Option<Vec<u8>> {
|
||||
hex::decode(path.file_name()?.to_str()?).ok()
|
||||
}
|
||||
|
||||
async fn iter_files<F>(p: &Path, threads: usize, mut op: F) -> Result<()>
|
||||
where
|
||||
F: FnMut(PathBuf, ProgressBar) -> Pin<Box<dyn Future<Output = Result<()>> + Send>>,
|
||||
{
|
||||
let semaphore = Arc::new(Semaphore::new(threads));
|
||||
info!("Scanning files: {}", p.display());
|
||||
let entries = walkdir::WalkDir::new(p);
|
||||
let dir = entries
|
||||
.into_iter()
|
||||
.filter_map(Result::ok)
|
||||
.filter(|e| e.file_type().is_file())
|
||||
.collect::<Vec<_>>();
|
||||
let p = ProgressBar::new(dir.len() as u64).with_style(ProgressStyle::with_template(
|
||||
"{spinner} [{pos}/{len}] {msg}",
|
||||
)?);
|
||||
let mut all_tasks = vec![];
|
||||
for entry in dir {
|
||||
let _lock = semaphore.clone().acquire_owned().await?;
|
||||
p.inc(1);
|
||||
let fut = op(entry.path().to_path_buf(), p.clone());
|
||||
all_tasks.push(tokio::spawn(async move {
|
||||
if let Err(e) = fut.await {
|
||||
error!("Error processing file: {} {}", entry.path().display(), e);
|
||||
}
|
||||
drop(_lock);
|
||||
}));
|
||||
}
|
||||
for task in all_tasks {
|
||||
task.await?;
|
||||
}
|
||||
p.finish_with_message("Done!");
|
||||
Ok(())
|
||||
}
|
@ -1,70 +0,0 @@
|
||||
use clap::Parser;
|
||||
use log::{info, warn};
|
||||
use nostr::serde_json;
|
||||
use nostr_cursor::cursor::NostrCursor;
|
||||
use regex::Regex;
|
||||
use rocket::futures::StreamExt;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::path::PathBuf;
|
||||
use tokio::fs::File;
|
||||
use tokio::io::AsyncWriteExt;
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about)]
|
||||
struct ProgramArgs {
|
||||
/// Directory pointing to archives to scan
|
||||
#[arg(short, long)]
|
||||
pub archive: PathBuf,
|
||||
|
||||
/// Output path .csv
|
||||
#[arg(short, long)]
|
||||
pub output: PathBuf,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), anyhow::Error> {
|
||||
env_logger::init();
|
||||
|
||||
let args: ProgramArgs = ProgramArgs::parse();
|
||||
|
||||
let mut report: HashMap<String, HashSet<String>> = HashMap::new();
|
||||
|
||||
let mut binding = NostrCursor::new(args.archive);
|
||||
let mut cursor = Box::pin(binding.walk());
|
||||
let matcher = Regex::new(r"void\.cat/d/(\w+)")?;
|
||||
while let Some(Ok(e)) = cursor.next().await {
|
||||
if e.content.contains("void.cat") {
|
||||
let links = matcher.captures_iter(&e.content).collect::<Vec<_>>();
|
||||
for link in links {
|
||||
let g = link.get(1).unwrap().as_str();
|
||||
let base58 = if let Ok(b) = nostr::bitcoin::base58::decode(g) {
|
||||
b
|
||||
} else {
|
||||
warn!("Invalid base58 id {}", g);
|
||||
continue;
|
||||
};
|
||||
let _uuid = if let Ok(u) = Uuid::from_slice_le(base58.as_slice()) {
|
||||
u
|
||||
} else {
|
||||
warn!("Invalid uuid {}", g);
|
||||
continue;
|
||||
};
|
||||
info!("Got link: {} => {}", g, e.pubkey);
|
||||
if let Some(ur) = report.get_mut(&e.pubkey) {
|
||||
ur.insert(g.to_string());
|
||||
} else {
|
||||
report.insert(e.pubkey.clone(), HashSet::from([g.to_string()]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let json = serde_json::to_string(&report)?;
|
||||
File::create(args.output)
|
||||
.await?
|
||||
.write_all(json.as_bytes())
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
@ -1,147 +0,0 @@
|
||||
use anyhow::Error;
|
||||
use clap::Parser;
|
||||
use config::Config;
|
||||
use log::{info, warn};
|
||||
use nostr::bitcoin::base58;
|
||||
use route96::db::{Database, FileUpload};
|
||||
use route96::filesystem::FileStore;
|
||||
use route96::settings::Settings;
|
||||
use route96::void_db::VoidCatDb;
|
||||
use route96::void_file::VoidFile;
|
||||
use std::path::PathBuf;
|
||||
use tokio::io::{AsyncWriteExt, BufWriter};
|
||||
|
||||
#[derive(Debug, Clone, clap::ValueEnum)]
|
||||
enum ArgOperation {
|
||||
Migrate,
|
||||
ExportNginxRedirects,
|
||||
}
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about)]
|
||||
struct Args {
|
||||
/// Database connection string for void.cat DB
|
||||
#[arg(long)]
|
||||
pub database: String,
|
||||
|
||||
/// Path to filestore on void.cat
|
||||
#[arg(long)]
|
||||
pub data_path: String,
|
||||
|
||||
#[arg(long)]
|
||||
pub operation: ArgOperation,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Error> {
|
||||
env_logger::init();
|
||||
|
||||
let builder = Config::builder()
|
||||
.add_source(config::File::with_name("config.yaml"))
|
||||
.add_source(config::Environment::with_prefix("APP"))
|
||||
.build()?;
|
||||
|
||||
let settings: Settings = builder.try_deserialize()?;
|
||||
|
||||
let db = Database::new(&settings.database).await?;
|
||||
let fs = FileStore::new(settings.clone());
|
||||
|
||||
let args: Args = Args::parse();
|
||||
|
||||
let db_void = VoidCatDb::connect(&args.database).await?;
|
||||
|
||||
match args.operation {
|
||||
ArgOperation::Migrate => {
|
||||
let mut page = 0;
|
||||
loop {
|
||||
let files = db_void.list_files(page).await?;
|
||||
if files.is_empty() {
|
||||
break;
|
||||
}
|
||||
for f in files {
|
||||
if let Err(e) = migrate_file(&f, &db, &fs, &args).await {
|
||||
warn!("Failed to migrate file: {}, {}", &f.id, e);
|
||||
}
|
||||
}
|
||||
page += 1;
|
||||
}
|
||||
}
|
||||
ArgOperation::ExportNginxRedirects => {
|
||||
let path: PathBuf = args.data_path.parse()?;
|
||||
let conf_path = &path.join("nginx.conf");
|
||||
info!("Writing redirects to {}", conf_path.to_str().unwrap());
|
||||
let mut fout = BufWriter::new(tokio::fs::File::create(conf_path).await?);
|
||||
let mut page = 0;
|
||||
loop {
|
||||
let files = db_void.list_files(page).await?;
|
||||
if files.is_empty() {
|
||||
break;
|
||||
}
|
||||
for f in files {
|
||||
let legacy_id = base58::encode(f.id.to_bytes_le().as_slice());
|
||||
let redirect = format!("location ^\\/d\\/{}(?:\\.\\w+)?$ {{\n\treturn 301 https://nostr.download/{};\n}}\n", &legacy_id, &f.digest);
|
||||
fout.write_all(redirect.as_bytes()).await?;
|
||||
}
|
||||
page += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn migrate_file(
|
||||
f: &VoidFile,
|
||||
db: &Database,
|
||||
fs: &FileStore,
|
||||
args: &Args,
|
||||
) -> Result<(), Error> {
|
||||
let pubkey_vec = hex::decode(&f.email)?;
|
||||
let id_vec = hex::decode(&f.digest)?;
|
||||
|
||||
// copy file
|
||||
let src_path = PathBuf::new()
|
||||
.join(&args.data_path)
|
||||
.join(VoidFile::map_to_path(&f.id));
|
||||
let dst_path = fs.get(&id_vec);
|
||||
if src_path.exists() && !dst_path.exists() {
|
||||
info!(
|
||||
"Copying file: {} from {} => {}",
|
||||
&f.id,
|
||||
src_path.to_str().unwrap(),
|
||||
dst_path.to_str().unwrap()
|
||||
);
|
||||
|
||||
tokio::fs::create_dir_all(dst_path.parent().unwrap()).await?;
|
||||
tokio::fs::copy(src_path, dst_path).await?;
|
||||
} else if dst_path.exists() {
|
||||
info!("File already exists {}, continuing...", &f.id);
|
||||
} else {
|
||||
anyhow::bail!("Source file not found {}", src_path.to_str().unwrap());
|
||||
}
|
||||
let uid = db.upsert_user(&pubkey_vec).await?;
|
||||
info!("Mapped user {} => {}", &f.email, uid);
|
||||
|
||||
let md: Option<Vec<&str>> = f.media_dimensions.as_ref().map(|s| s.split("x").collect());
|
||||
let fu = FileUpload {
|
||||
id: id_vec,
|
||||
name: f.name.clone(),
|
||||
size: f.size as u64,
|
||||
mime_type: f.mime_type.clone(),
|
||||
created: f.uploaded,
|
||||
width: match &md {
|
||||
Some(s) => Some(s[0].parse::<u32>()?),
|
||||
None => None,
|
||||
},
|
||||
height: match &md {
|
||||
Some(s) => Some(s[1].parse::<u32>()?),
|
||||
None => None,
|
||||
},
|
||||
blur_hash: None,
|
||||
alt: f.description.clone(),
|
||||
duration: None,
|
||||
bitrate: None,
|
||||
};
|
||||
db.add_file(&fu, Some(uid)).await?;
|
||||
Ok(())
|
||||
}
|
132
src/db.rs
132
src/db.rs
@ -108,6 +108,17 @@ pub struct Payment {
|
||||
pub rate: Option<f32>,
|
||||
}
|
||||
|
||||
#[derive(Clone, FromRow, Serialize)]
|
||||
pub struct Report {
|
||||
pub id: u64,
|
||||
#[serde(with = "hex")]
|
||||
pub file_id: Vec<u8>,
|
||||
pub reporter_id: u64,
|
||||
pub event_json: String,
|
||||
pub created: DateTime<Utc>,
|
||||
pub reviewed: bool,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Database {
|
||||
pub(crate) pool: sqlx::pool::Pool<sqlx::mysql::MySql>,
|
||||
@ -128,14 +139,23 @@ impl Database {
|
||||
.bind(pubkey)
|
||||
.fetch_optional(&self.pool)
|
||||
.await?;
|
||||
match res {
|
||||
let user_id = match res {
|
||||
None => sqlx::query("select id from users where pubkey = ?")
|
||||
.bind(pubkey)
|
||||
.fetch_one(&self.pool)
|
||||
.await?
|
||||
.try_get(0),
|
||||
Some(res) => res.try_get(0),
|
||||
.try_get(0)?,
|
||||
Some(res) => res.try_get(0)?,
|
||||
};
|
||||
|
||||
// Make the first user (ID 1) an admin
|
||||
if user_id == 1 {
|
||||
sqlx::query("update users set is_admin = 1 where id = 1")
|
||||
.execute(&self.pool)
|
||||
.await?;
|
||||
}
|
||||
|
||||
Ok(user_id)
|
||||
}
|
||||
|
||||
pub async fn get_user(&self, pubkey: &Vec<u8>) -> Result<User, Error> {
|
||||
@ -145,6 +165,13 @@ impl Database {
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn get_user_by_id(&self, user_id: u64) -> Result<User, Error> {
|
||||
sqlx::query_as("select * from users where id = ?")
|
||||
.bind(user_id)
|
||||
.fetch_one(&self.pool)
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn get_user_stats(&self, id: u64) -> Result<UserStats, Error> {
|
||||
sqlx::query_as(
|
||||
"select cast(count(user_uploads.file) as unsigned integer) as file_count, \
|
||||
@ -327,14 +354,49 @@ impl Database {
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
|
||||
// TODO: check space is not downgraded
|
||||
|
||||
sqlx::query("update users set paid_until = TIMESTAMPADD(DAY, ?, IFNULL(paid_until, current_timestamp)), paid_size = ? where id = ?")
|
||||
.bind(payment.days_value)
|
||||
.bind(payment.size_value)
|
||||
.bind(payment.user_id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
// Calculate time extension based on fractional quota value
|
||||
// If user upgrades from 5GB to 10GB, their remaining time gets halved
|
||||
// If user pays for 1GB on a 5GB plan, they get 1/5 of the normal time
|
||||
let current_user = self.get_user_by_id(payment.user_id).await?;
|
||||
|
||||
if let Some(paid_until) = current_user.paid_until {
|
||||
if paid_until > chrono::Utc::now() {
|
||||
// User has active subscription - calculate fractional time extension
|
||||
let time_fraction = if current_user.paid_size > 0 {
|
||||
payment.size_value as f64 / current_user.paid_size as f64
|
||||
} else {
|
||||
1.0 // If no existing quota, treat as 100%
|
||||
};
|
||||
|
||||
let adjusted_days = (payment.days_value as f64 * time_fraction) as u64;
|
||||
|
||||
// Extend subscription time and upgrade quota if larger
|
||||
let new_quota_size = std::cmp::max(current_user.paid_size, payment.size_value);
|
||||
|
||||
sqlx::query("update users set paid_until = TIMESTAMPADD(DAY, ?, paid_until), paid_size = ? where id = ?")
|
||||
.bind(adjusted_days)
|
||||
.bind(new_quota_size)
|
||||
.bind(payment.user_id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
} else {
|
||||
// Expired subscription - set new quota and time
|
||||
sqlx::query("update users set paid_until = TIMESTAMPADD(DAY, ?, current_timestamp), paid_size = ? where id = ?")
|
||||
.bind(payment.days_value)
|
||||
.bind(payment.size_value)
|
||||
.bind(payment.user_id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
}
|
||||
} else {
|
||||
// No existing subscription - set new quota
|
||||
sqlx::query("update users set paid_until = TIMESTAMPADD(DAY, ?, current_timestamp), paid_size = ? where id = ?")
|
||||
.bind(payment.days_value)
|
||||
.bind(payment.size_value)
|
||||
.bind(payment.user_id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
}
|
||||
|
||||
tx.commit().await?;
|
||||
|
||||
@ -369,4 +431,52 @@ impl Database {
|
||||
// Check if upload would exceed quota
|
||||
Ok(user_stats.total_size + upload_size <= available_quota)
|
||||
}
|
||||
|
||||
/// Add a new report to the database
|
||||
pub async fn add_report(&self, file_id: &[u8], reporter_id: u64, event_json: &str) -> Result<(), Error> {
|
||||
sqlx::query("insert into reports (file_id, reporter_id, event_json) values (?, ?, ?)")
|
||||
.bind(file_id)
|
||||
.bind(reporter_id)
|
||||
.bind(event_json)
|
||||
.execute(&self.pool)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// List reports with pagination for admin view
|
||||
pub async fn list_reports(&self, offset: u32, limit: u32) -> Result<(Vec<Report>, i64), Error> {
|
||||
let reports: Vec<Report> = sqlx::query_as(
|
||||
"select id, file_id, reporter_id, event_json, created, reviewed from reports where reviewed = false order by created desc limit ? offset ?"
|
||||
)
|
||||
.bind(limit)
|
||||
.bind(offset)
|
||||
.fetch_all(&self.pool)
|
||||
.await?;
|
||||
|
||||
let count: i64 = sqlx::query("select count(id) from reports where reviewed = false")
|
||||
.fetch_one(&self.pool)
|
||||
.await?
|
||||
.try_get(0)?;
|
||||
|
||||
Ok((reports, count))
|
||||
}
|
||||
|
||||
/// Get reports for a specific file
|
||||
pub async fn get_file_reports(&self, file_id: &[u8]) -> Result<Vec<Report>, Error> {
|
||||
sqlx::query_as(
|
||||
"select id, file_id, reporter_id, event_json, created, reviewed from reports where file_id = ? order by created desc"
|
||||
)
|
||||
.bind(file_id)
|
||||
.fetch_all(&self.pool)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Mark a report as reviewed (used for acknowledging)
|
||||
pub async fn mark_report_reviewed(&self, report_id: u64) -> Result<(), Error> {
|
||||
sqlx::query("update reports set reviewed = true where id = ?")
|
||||
.bind(report_id)
|
||||
.execute(&self.pool)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ pub enum PaymentUnit {
|
||||
impl PaymentUnit {
|
||||
/// Get the total size from a number of units
|
||||
pub fn to_size(&self, units: f32) -> u64 {
|
||||
(1000f32 * 1000f32 * 1000f32 * units) as u64
|
||||
(1024f32 * 1024f32 * 1024f32 * units) as u64
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -105,7 +105,12 @@ impl WebpProcessor {
|
||||
let mut decoder = Decoder::new();
|
||||
decoder.setup_decoder(image_stream, None)?;
|
||||
|
||||
while let Ok((mut pkt, _stream)) = input.get_packet() {
|
||||
while let Ok((mut pkt, _)) = input.get_packet() {
|
||||
// skip packets not in the image stream
|
||||
if (*pkt).stream_index != image_stream.index as i32 {
|
||||
av_packet_free(&mut pkt);
|
||||
continue;
|
||||
}
|
||||
let mut frame_save: *mut AVFrame = ptr::null_mut();
|
||||
for (mut frame, _stream) in decoder.decode_pkt(pkt)? {
|
||||
if frame_save.is_null() {
|
||||
|
@ -1,5 +1,5 @@
|
||||
use crate::auth::nip98::Nip98Auth;
|
||||
use crate::db::{Database, FileUpload, User};
|
||||
use crate::db::{Database, FileUpload, User, Report};
|
||||
use crate::routes::{Nip94Event, PagedResult};
|
||||
use crate::settings::Settings;
|
||||
use rocket::serde::json::Json;
|
||||
@ -8,7 +8,7 @@ use rocket::{routes, Responder, Route, State};
|
||||
use sqlx::{Error, QueryBuilder, Row};
|
||||
|
||||
pub fn admin_routes() -> Vec<Route> {
|
||||
routes![admin_list_files, admin_get_self]
|
||||
routes![admin_list_files, admin_get_self, admin_list_reports, admin_acknowledge_report]
|
||||
}
|
||||
|
||||
#[derive(Serialize, Default)]
|
||||
@ -161,6 +161,59 @@ async fn admin_list_files(
|
||||
}
|
||||
}
|
||||
|
||||
#[rocket::get("/reports?<page>&<count>")]
|
||||
async fn admin_list_reports(
|
||||
auth: Nip98Auth,
|
||||
page: u32,
|
||||
count: u32,
|
||||
db: &State<Database>,
|
||||
) -> AdminResponse<PagedResult<Report>> {
|
||||
let pubkey_vec = auth.event.pubkey.to_bytes().to_vec();
|
||||
let server_count = count.clamp(1, 5_000);
|
||||
|
||||
let user = match db.get_user(&pubkey_vec).await {
|
||||
Ok(user) => user,
|
||||
Err(_) => return AdminResponse::error("User not found"),
|
||||
};
|
||||
|
||||
if !user.is_admin {
|
||||
return AdminResponse::error("User is not an admin");
|
||||
}
|
||||
|
||||
match db.list_reports(page * server_count, server_count).await {
|
||||
Ok((reports, total_count)) => AdminResponse::success(PagedResult {
|
||||
count: reports.len() as u32,
|
||||
page,
|
||||
total: total_count as u32,
|
||||
files: reports,
|
||||
}),
|
||||
Err(e) => AdminResponse::error(&format!("Could not list reports: {}", e)),
|
||||
}
|
||||
}
|
||||
|
||||
#[rocket::delete("/reports/<report_id>")]
|
||||
async fn admin_acknowledge_report(
|
||||
auth: Nip98Auth,
|
||||
report_id: u64,
|
||||
db: &State<Database>,
|
||||
) -> AdminResponse<()> {
|
||||
let pubkey_vec = auth.event.pubkey.to_bytes().to_vec();
|
||||
|
||||
let user = match db.get_user(&pubkey_vec).await {
|
||||
Ok(user) => user,
|
||||
Err(_) => return AdminResponse::error("User not found"),
|
||||
};
|
||||
|
||||
if !user.is_admin {
|
||||
return AdminResponse::error("User is not an admin");
|
||||
}
|
||||
|
||||
match db.mark_report_reviewed(report_id).await {
|
||||
Ok(()) => AdminResponse::success(()),
|
||||
Err(e) => AdminResponse::error(&format!("Could not acknowledge report: {}", e)),
|
||||
}
|
||||
}
|
||||
|
||||
impl Database {
|
||||
pub async fn list_all_files(
|
||||
&self,
|
||||
|
@ -5,7 +5,7 @@ use crate::routes::{delete_file, Nip94Event};
|
||||
use crate::settings::Settings;
|
||||
use log::error;
|
||||
use nostr::prelude::hex;
|
||||
use nostr::{Alphabet, SingleLetterTag, TagKind};
|
||||
use nostr::{Alphabet, JsonUtil, SingleLetterTag, TagKind};
|
||||
use rocket::data::ByteUnit;
|
||||
use rocket::futures::StreamExt;
|
||||
use rocket::http::{Header, Status};
|
||||
@ -24,7 +24,7 @@ pub struct BlobDescriptor {
|
||||
pub size: u64,
|
||||
#[serde(rename = "type", skip_serializing_if = "Option::is_none")]
|
||||
pub mime_type: Option<String>,
|
||||
pub created: u64,
|
||||
pub uploaded: u64,
|
||||
#[serde(rename = "nip94", skip_serializing_if = "Option::is_none")]
|
||||
pub nip94: Option<Vec<Vec<String>>>,
|
||||
}
|
||||
@ -44,8 +44,9 @@ impl BlobDescriptor {
|
||||
sha256: id_hex,
|
||||
size: value.size,
|
||||
mime_type: Some(value.mime_type.clone()),
|
||||
created: value.created.timestamp() as u64,
|
||||
uploaded: value.created.timestamp() as u64,
|
||||
nip94: Some(Nip94Event::from_upload(settings, value).tags),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,13 +64,21 @@ pub fn blossom_routes() -> Vec<Route> {
|
||||
upload_head,
|
||||
upload_media,
|
||||
head_media,
|
||||
mirror
|
||||
mirror,
|
||||
report_file
|
||||
]
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "media-compression"))]
|
||||
pub fn blossom_routes() -> Vec<Route> {
|
||||
routes![delete_blob, upload, list_files, upload_head, mirror]
|
||||
routes![
|
||||
delete_blob,
|
||||
upload,
|
||||
list_files,
|
||||
upload_head,
|
||||
mirror,
|
||||
report_file
|
||||
]
|
||||
}
|
||||
|
||||
/// Generic holder response, mostly for errors
|
||||
@ -242,12 +251,13 @@ async fn mirror(
|
||||
|
||||
process_stream(
|
||||
StreamReader::new(rsp.bytes_stream().map(|result| {
|
||||
result.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))
|
||||
result.map_err(std::io::Error::other)
|
||||
})),
|
||||
&mime_type,
|
||||
&None,
|
||||
&pubkey,
|
||||
false,
|
||||
0, // No size info for mirror
|
||||
fs,
|
||||
db,
|
||||
settings,
|
||||
@ -336,17 +346,17 @@ async fn process_upload(
|
||||
None
|
||||
}
|
||||
});
|
||||
let size = auth.event.tags.iter().find_map(|t| {
|
||||
let size_tag = auth.event.tags.iter().find_map(|t| {
|
||||
if t.kind() == TagKind::Size {
|
||||
t.content().and_then(|v| v.parse::<u64>().ok())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
});
|
||||
if let Some(z) = size {
|
||||
if z > settings.max_upload_bytes {
|
||||
return BlossomResponse::error("File too large");
|
||||
}
|
||||
|
||||
let size = size_tag.or(auth.x_content_length).unwrap_or(0);
|
||||
if size > 0 && size > settings.max_upload_bytes {
|
||||
return BlossomResponse::error("File too large");
|
||||
}
|
||||
|
||||
// check whitelist
|
||||
@ -354,18 +364,22 @@ async fn process_upload(
|
||||
return e;
|
||||
}
|
||||
|
||||
// check quota
|
||||
// check quota (only if payments are configured)
|
||||
#[cfg(feature = "payments")]
|
||||
if let Some(upload_size) = size {
|
||||
let free_quota = settings.payments.as_ref()
|
||||
.and_then(|p| p.free_quota_bytes)
|
||||
if let Some(payment_config) = &settings.payments {
|
||||
let free_quota = payment_config.free_quota_bytes
|
||||
.unwrap_or(104857600); // Default to 100MB
|
||||
let pubkey_vec = auth.event.pubkey.to_bytes().to_vec();
|
||||
|
||||
match db.check_user_quota(&pubkey_vec, upload_size, free_quota).await {
|
||||
Ok(false) => return BlossomResponse::error("Upload would exceed quota"),
|
||||
Err(_) => return BlossomResponse::error("Failed to check quota"),
|
||||
Ok(true) => {} // Quota check passed
|
||||
|
||||
if size > 0 {
|
||||
match db
|
||||
.check_user_quota(&pubkey_vec, size, free_quota)
|
||||
.await
|
||||
{
|
||||
Ok(false) => return BlossomResponse::error("Upload would exceed quota"),
|
||||
Err(_) => return BlossomResponse::error("Failed to check quota"),
|
||||
Ok(true) => {} // Quota check passed
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -377,6 +391,7 @@ async fn process_upload(
|
||||
&name,
|
||||
&auth.event.pubkey.to_bytes().to_vec(),
|
||||
compress,
|
||||
size,
|
||||
fs,
|
||||
db,
|
||||
settings,
|
||||
@ -390,6 +405,7 @@ async fn process_stream<'p, S>(
|
||||
name: &Option<&str>,
|
||||
pubkey: &Vec<u8>,
|
||||
compress: bool,
|
||||
size: u64,
|
||||
fs: &State<FileStore>,
|
||||
db: &State<Database>,
|
||||
settings: &State<Settings>,
|
||||
@ -411,7 +427,7 @@ where
|
||||
_ => return BlossomResponse::error("File not found"),
|
||||
},
|
||||
Err(e) => {
|
||||
error!("{}", e.to_string());
|
||||
error!("{}", e);
|
||||
return BlossomResponse::error(format!("Error saving file (disk): {}", e));
|
||||
}
|
||||
};
|
||||
@ -422,10 +438,102 @@ where
|
||||
return BlossomResponse::error(format!("Failed to save file (db): {}", e));
|
||||
}
|
||||
};
|
||||
|
||||
// Post-upload quota check if we didn't have size information before upload (only if payments are configured)
|
||||
#[cfg(feature = "payments")]
|
||||
if size == 0 {
|
||||
if let Some(payment_config) = &settings.payments {
|
||||
let free_quota = payment_config.free_quota_bytes
|
||||
.unwrap_or(104857600); // Default to 100MB
|
||||
|
||||
match db.check_user_quota(pubkey, upload.size, free_quota).await {
|
||||
Ok(false) => {
|
||||
// Clean up the uploaded file if quota exceeded
|
||||
if let Err(e) = tokio::fs::remove_file(fs.get(&upload.id)).await {
|
||||
log::warn!("Failed to cleanup quota-exceeding file: {}", e);
|
||||
}
|
||||
return BlossomResponse::error("Upload would exceed quota");
|
||||
}
|
||||
Err(_) => {
|
||||
// Clean up on quota check error
|
||||
if let Err(e) = tokio::fs::remove_file(fs.get(&upload.id)).await {
|
||||
log::warn!("Failed to cleanup file after quota check error: {}", e);
|
||||
}
|
||||
return BlossomResponse::error("Failed to check quota");
|
||||
}
|
||||
Ok(true) => {} // Quota check passed
|
||||
}
|
||||
}
|
||||
}
|
||||
if let Err(e) = db.add_file(&upload, user_id).await {
|
||||
error!("{}", e.to_string());
|
||||
error!("{}", e);
|
||||
BlossomResponse::error(format!("Error saving file (db): {}", e))
|
||||
} else {
|
||||
BlossomResponse::BlobDescriptor(Json(BlobDescriptor::from_upload(settings, &upload)))
|
||||
}
|
||||
}
|
||||
|
||||
#[rocket::put("/report", data = "<data>", format = "json")]
|
||||
async fn report_file(
|
||||
auth: BlossomAuth,
|
||||
db: &State<Database>,
|
||||
settings: &State<Settings>,
|
||||
data: Json<nostr::Event>,
|
||||
) -> BlossomResponse {
|
||||
// Check if the request has the correct method tag
|
||||
if !check_method(&auth.event, "report") {
|
||||
return BlossomResponse::error("Invalid request method tag");
|
||||
}
|
||||
|
||||
// Check whitelist
|
||||
if let Some(e) = check_whitelist(&auth, settings) {
|
||||
return e;
|
||||
}
|
||||
|
||||
// Extract file SHA256 from the "x" tag in the report event
|
||||
let file_sha256 = if let Some(x_tag) = data.tags.iter().find_map(|t| {
|
||||
if t.kind() == TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::X)) {
|
||||
t.content()
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}) {
|
||||
match hex::decode(x_tag) {
|
||||
Ok(hash) => hash,
|
||||
Err(_) => return BlossomResponse::error("Invalid file hash in x tag"),
|
||||
}
|
||||
} else {
|
||||
return BlossomResponse::error("Missing file hash in x tag");
|
||||
};
|
||||
|
||||
// Verify the reported file exists
|
||||
match db.get_file(&file_sha256).await {
|
||||
Ok(Some(_)) => {} // File exists, continue
|
||||
Ok(None) => return BlossomResponse::error("File not found"),
|
||||
Err(e) => return BlossomResponse::error(format!("Failed to check file: {}", e)),
|
||||
}
|
||||
|
||||
// Get or create the reporter user
|
||||
let reporter_id = match db.upsert_user(&auth.event.pubkey.to_bytes().to_vec()).await {
|
||||
Ok(user_id) => user_id,
|
||||
Err(e) => return BlossomResponse::error(format!("Failed to get user: {}", e)),
|
||||
};
|
||||
|
||||
// Store the report (the database will handle duplicate prevention via unique index)
|
||||
match db
|
||||
.add_report(&file_sha256, reporter_id, &data.as_json())
|
||||
.await
|
||||
{
|
||||
Ok(()) => BlossomResponse::Generic(BlossomGenericResponse {
|
||||
status: Status::Ok,
|
||||
message: Some("Report submitted successfully".to_string()),
|
||||
}),
|
||||
Err(e) => {
|
||||
if e.to_string().contains("Duplicate entry") {
|
||||
BlossomResponse::error("You have already reported this file")
|
||||
} else {
|
||||
BlossomResponse::error(format!("Failed to submit report: {}", e))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -8,12 +8,11 @@ pub use crate::routes::blossom::blossom_routes;
|
||||
#[cfg(feature = "nip96")]
|
||||
pub use crate::routes::nip96::nip96_routes;
|
||||
use crate::settings::Settings;
|
||||
use crate::void_file::VoidFile;
|
||||
use anyhow::{Error, Result};
|
||||
use http_range_header::{
|
||||
parse_range_header, EndPosition, StartPosition, SyntacticallyCorrectRange,
|
||||
};
|
||||
use log::{debug, warn};
|
||||
use log::warn;
|
||||
use nostr::Event;
|
||||
use rocket::fs::NamedFile;
|
||||
use rocket::http::{ContentType, Header, Status};
|
||||
@ -29,12 +28,13 @@ use std::task::{Context, Poll};
|
||||
use tokio::fs::File;
|
||||
use tokio::io::{AsyncRead, AsyncSeek, ReadBuf};
|
||||
|
||||
mod admin;
|
||||
#[cfg(feature = "blossom")]
|
||||
mod blossom;
|
||||
#[cfg(feature = "nip96")]
|
||||
mod nip96;
|
||||
|
||||
mod admin;
|
||||
#[cfg(feature = "payments")]
|
||||
pub mod payment;
|
||||
|
||||
pub struct FilePayload {
|
||||
pub file: File,
|
||||
@ -423,7 +423,8 @@ pub async fn get_blob_thumb(
|
||||
|
||||
if !thumb_file.exists() {
|
||||
let mut p = WebpProcessor::new();
|
||||
if p.thumbnail(&file_path, &thumb_file).is_err() {
|
||||
if let Err(e) = p.thumbnail(&file_path, &thumb_file) {
|
||||
warn!("Failed to generate thumbnail: {}", e);
|
||||
return Err(Status::InternalServerError);
|
||||
}
|
||||
};
|
||||
@ -442,56 +443,6 @@ pub async fn get_blob_thumb(
|
||||
}
|
||||
}
|
||||
|
||||
/// Legacy URL redirect for void.cat uploads
|
||||
#[rocket::get("/d/<id>")]
|
||||
pub async fn void_cat_redirect(id: &str, settings: &State<Settings>) -> Option<NamedFile> {
|
||||
let id = if id.contains(".") {
|
||||
id.split('.').next().unwrap()
|
||||
} else {
|
||||
id
|
||||
};
|
||||
if let Some(base) = &settings.void_cat_files {
|
||||
let uuid = if let Ok(b58) = nostr::bitcoin::base58::decode(id) {
|
||||
uuid::Uuid::from_slice_le(b58.as_slice())
|
||||
} else {
|
||||
uuid::Uuid::parse_str(id)
|
||||
};
|
||||
if uuid.is_err() {
|
||||
return None;
|
||||
}
|
||||
let f = base.join(VoidFile::map_to_path(&uuid.unwrap()));
|
||||
debug!("Legacy file map: {} => {}", id, f.display());
|
||||
if let Ok(f) = NamedFile::open(f).await {
|
||||
Some(f)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
#[rocket::head("/d/<id>")]
|
||||
pub async fn void_cat_redirect_head(id: &str) -> VoidCatFile {
|
||||
let id = if id.contains(".") {
|
||||
id.split('.').next().unwrap()
|
||||
} else {
|
||||
id
|
||||
};
|
||||
let uuid =
|
||||
uuid::Uuid::from_slice_le(nostr::bitcoin::base58::decode(id).unwrap().as_slice()).unwrap();
|
||||
VoidCatFile {
|
||||
status: Status::Ok,
|
||||
uuid: Header::new("X-UUID", uuid.to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Responder)]
|
||||
pub struct VoidCatFile {
|
||||
pub status: Status,
|
||||
pub uuid: Header<'static>,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
@ -174,12 +174,8 @@ async fn upload(
|
||||
settings: &State<Settings>,
|
||||
form: Form<Nip96Form<'_>>,
|
||||
) -> Nip96Response {
|
||||
if let Some(size) = auth.content_length {
|
||||
if size > settings.max_upload_bytes {
|
||||
return Nip96Response::error("File too large");
|
||||
}
|
||||
}
|
||||
if form.size > settings.max_upload_bytes {
|
||||
let upload_size = auth.content_length.or(Some(form.size)).unwrap_or(0);
|
||||
if upload_size > 0 && upload_size > settings.max_upload_bytes {
|
||||
return Nip96Response::error("File too large");
|
||||
}
|
||||
let file = match form.file.open().await {
|
||||
@ -193,7 +189,8 @@ async fn upload(
|
||||
}
|
||||
|
||||
// account for upload speeds as slow as 1MB/s (8 Mbps)
|
||||
let mbs = form.size / 1.megabytes().as_u64();
|
||||
let size_for_timing = if upload_size > 0 { upload_size } else { form.size };
|
||||
let mbs = size_for_timing / 1.megabytes().as_u64();
|
||||
let max_time = 60.max(mbs);
|
||||
if auth.event.created_at < Timestamp::now().sub(Duration::from_secs(max_time)) {
|
||||
return Nip96Response::error("Auth event timestamp out of range");
|
||||
@ -208,17 +205,18 @@ async fn upload(
|
||||
|
||||
let pubkey_vec = auth.event.pubkey.to_bytes().to_vec();
|
||||
|
||||
// check quota
|
||||
// check quota (only if payments are configured)
|
||||
#[cfg(feature = "payments")]
|
||||
{
|
||||
let free_quota = settings.payments.as_ref()
|
||||
.and_then(|p| p.free_quota_bytes)
|
||||
if let Some(payment_config) = &settings.payments {
|
||||
let free_quota = payment_config.free_quota_bytes
|
||||
.unwrap_or(104857600); // Default to 100MB
|
||||
|
||||
match db.check_user_quota(&pubkey_vec, form.size, free_quota).await {
|
||||
Ok(false) => return Nip96Response::error("Upload would exceed quota"),
|
||||
Err(_) => return Nip96Response::error("Failed to check quota"),
|
||||
Ok(true) => {} // Quota check passed
|
||||
if upload_size > 0 {
|
||||
match db.check_user_quota(&pubkey_vec, upload_size, free_quota).await {
|
||||
Ok(false) => return Nip96Response::error("Upload would exceed quota"),
|
||||
Err(_) => return Nip96Response::error("Failed to check quota"),
|
||||
Ok(true) => {} // Quota check passed
|
||||
}
|
||||
}
|
||||
}
|
||||
let upload = match fs
|
||||
@ -227,6 +225,16 @@ async fn upload(
|
||||
{
|
||||
Ok(FileSystemResult::NewFile(blob)) => {
|
||||
let mut upload: FileUpload = (&blob).into();
|
||||
|
||||
// Validate file size after upload if no pre-upload size was available
|
||||
if upload_size == 0 && upload.size > settings.max_upload_bytes {
|
||||
// Clean up the uploaded file
|
||||
if let Err(e) = tokio::fs::remove_file(fs.get(&upload.id)).await {
|
||||
log::warn!("Failed to cleanup oversized file: {}", e);
|
||||
}
|
||||
return Nip96Response::error("File too large");
|
||||
}
|
||||
|
||||
upload.name = form.caption.map(|cap| cap.to_string());
|
||||
upload.alt = form.alt.as_ref().map(|s| s.to_string());
|
||||
upload
|
||||
@ -236,7 +244,7 @@ async fn upload(
|
||||
_ => return Nip96Response::error("File not found"),
|
||||
},
|
||||
Err(e) => {
|
||||
error!("{}", e.to_string());
|
||||
error!("{}", e);
|
||||
return Nip96Response::error(&format!("Could not save file: {}", e));
|
||||
}
|
||||
};
|
||||
@ -246,8 +254,35 @@ async fn upload(
|
||||
Err(e) => return Nip96Response::error(&format!("Could not save user: {}", e)),
|
||||
};
|
||||
|
||||
// Post-upload quota check if we didn't have size information before upload (only if payments are configured)
|
||||
#[cfg(feature = "payments")]
|
||||
if upload_size == 0 {
|
||||
if let Some(payment_config) = &settings.payments {
|
||||
let free_quota = payment_config.free_quota_bytes
|
||||
.unwrap_or(104857600); // Default to 100MB
|
||||
|
||||
match db.check_user_quota(&pubkey_vec, upload.size, free_quota).await {
|
||||
Ok(false) => {
|
||||
// Clean up the uploaded file if quota exceeded
|
||||
if let Err(e) = tokio::fs::remove_file(fs.get(&upload.id)).await {
|
||||
log::warn!("Failed to cleanup quota-exceeding file: {}", e);
|
||||
}
|
||||
return Nip96Response::error("Upload would exceed quota");
|
||||
}
|
||||
Err(_) => {
|
||||
// Clean up on quota check error
|
||||
if let Err(e) = tokio::fs::remove_file(fs.get(&upload.id)).await {
|
||||
log::warn!("Failed to cleanup file after quota check error: {}", e);
|
||||
}
|
||||
return Nip96Response::error("Failed to check quota");
|
||||
}
|
||||
Ok(true) => {} // Quota check passed
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Err(e) = db.add_file(&upload, user_id).await {
|
||||
error!("{}", e.to_string());
|
||||
error!("{}", e);
|
||||
return Nip96Response::error(&format!("Could not save file (db): {}", e));
|
||||
}
|
||||
Nip96Response::UploadResult(Json(Nip96UploadResult::from_upload(settings, &upload)))
|
||||
|
@ -16,12 +16,14 @@
|
||||
"@snort/system-react": "^1.5.1",
|
||||
"classnames": "^2.5.1",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1"
|
||||
"react-dom": "^18.3.1",
|
||||
"react-router-dom": "^7.6.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.9.0",
|
||||
"@types/react": "^18.3.3",
|
||||
"@types/react-dom": "^18.3.0",
|
||||
"@types/react-router-dom": "^5.3.3",
|
||||
"@vitejs/plugin-react": "^4.3.1",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"eslint": "^9.9.0",
|
||||
|
@ -1,12 +1,23 @@
|
||||
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
|
||||
import Header from "./views/header";
|
||||
import Upload from "./views/upload";
|
||||
import Admin from "./views/admin";
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<div className="flex flex-col gap-4 mx-auto mt-4 max-w-[1920px] px-10">
|
||||
<Header />
|
||||
<Upload />
|
||||
</div>
|
||||
<Router>
|
||||
<div className="min-h-screen bg-gray-900">
|
||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<Header />
|
||||
<main className="py-8">
|
||||
<Routes>
|
||||
<Route path="/" element={<Upload />} />
|
||||
<Route path="/admin" element={<Admin />} />
|
||||
</Routes>
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
</Router>
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -22,12 +22,12 @@ export default function Button({
|
||||
}
|
||||
return (
|
||||
<button
|
||||
className={`py-2 px-4 rounded-md border-0 text-sm font-semibold bg-neutral-700 hover:bg-neutral-600 ${className} ${props.disabled || loading ? "opacity-50" : ""}`}
|
||||
className={`${className} ${props.disabled || loading ? "opacity-50 cursor-not-allowed" : ""}`}
|
||||
onClick={doClick}
|
||||
{...props}
|
||||
disabled={loading || (props.disabled ?? false)}
|
||||
>
|
||||
{children}
|
||||
{loading ? "..." : children}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
170
ui_src/src/components/payment.tsx
Normal file
170
ui_src/src/components/payment.tsx
Normal file
@ -0,0 +1,170 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import Button from "./button";
|
||||
import {
|
||||
PaymentInfo,
|
||||
PaymentRequest,
|
||||
Route96,
|
||||
AdminSelf,
|
||||
} from "../upload/admin";
|
||||
|
||||
interface PaymentFlowProps {
|
||||
route96: Route96;
|
||||
onPaymentRequested?: (paymentRequest: string) => void;
|
||||
userInfo?: AdminSelf;
|
||||
}
|
||||
|
||||
export default function PaymentFlow({
|
||||
route96,
|
||||
onPaymentRequested,
|
||||
userInfo,
|
||||
}: PaymentFlowProps) {
|
||||
const [paymentInfo, setPaymentInfo] = useState<PaymentInfo | null>(null);
|
||||
const [gigabytes, setGigabytes] = useState<number>(1);
|
||||
const [months, setMonths] = useState<number>(1);
|
||||
const [paymentRequest, setPaymentRequest] = useState<string>("");
|
||||
const [error, setError] = useState<string>("");
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (paymentInfo === null) {
|
||||
loadPaymentInfo();
|
||||
}
|
||||
}, [paymentInfo]);
|
||||
|
||||
// Set default gigabytes to user's current quota
|
||||
useEffect(() => {
|
||||
if (userInfo?.quota && userInfo.quota > 0) {
|
||||
// Convert from bytes to GB using 1024^3 (MiB)
|
||||
const currentQuotaGB = Math.round(userInfo.quota / (1024 * 1024 * 1024));
|
||||
if (currentQuotaGB > 0) {
|
||||
setGigabytes(currentQuotaGB);
|
||||
}
|
||||
}
|
||||
}, [userInfo]);
|
||||
|
||||
async function loadPaymentInfo() {
|
||||
try {
|
||||
const info = await route96.getPaymentInfo();
|
||||
setPaymentInfo(info);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message);
|
||||
} else {
|
||||
setError("Failed to load payment info");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function requestPayment() {
|
||||
if (!paymentInfo) return;
|
||||
|
||||
setLoading(true);
|
||||
setError("");
|
||||
|
||||
try {
|
||||
const request: PaymentRequest = { units: gigabytes, quantity: months };
|
||||
const response = await route96.requestPayment(request);
|
||||
setPaymentRequest(response.pr);
|
||||
onPaymentRequested?.(response.pr);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message);
|
||||
} else {
|
||||
setError("Failed to request payment");
|
||||
}
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (error && !paymentInfo) {
|
||||
return <div className="text-red-400">Payment not available: {error}</div>;
|
||||
}
|
||||
|
||||
if (!paymentInfo) {
|
||||
return <div className="text-gray-400">Loading payment info...</div>;
|
||||
}
|
||||
|
||||
const totalCostBTC = paymentInfo.cost.amount * gigabytes * months;
|
||||
const totalCostSats = Math.round(totalCostBTC * 100000000); // Convert BTC to sats
|
||||
|
||||
function formatStorageUnit(unit: string): string {
|
||||
if (
|
||||
unit.toLowerCase().includes("gbspace") ||
|
||||
unit.toLowerCase().includes("gb")
|
||||
) {
|
||||
return "GB";
|
||||
}
|
||||
return unit;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="card">
|
||||
<h3 className="text-lg font-bold mb-4">Top Up Account</h3>
|
||||
|
||||
<div className="space-y-4 mb-6">
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-gray-100 mb-2">
|
||||
{gigabytes} {formatStorageUnit(paymentInfo.unit)} for {months} month
|
||||
{months > 1 ? "s" : ""}
|
||||
</div>
|
||||
<div className="text-lg text-blue-400 font-semibold">
|
||||
{totalCostSats.toLocaleString()} sats
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-2 text-gray-300">
|
||||
Storage ({formatStorageUnit(paymentInfo.unit)})
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
min="1"
|
||||
step="1"
|
||||
value={gigabytes}
|
||||
onChange={(e) => setGigabytes(parseInt(e.target.value) || 1)}
|
||||
className="input w-full text-center text-lg"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-2 text-gray-300">
|
||||
Duration (months)
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
min="1"
|
||||
step="1"
|
||||
value={months}
|
||||
onChange={(e) => setMonths(parseInt(e.target.value) || 1)}
|
||||
className="input w-full text-center text-lg"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Button
|
||||
onClick={requestPayment}
|
||||
disabled={loading || gigabytes <= 0 || months <= 0}
|
||||
className="btn-primary w-full mb-4"
|
||||
>
|
||||
{loading ? "Processing..." : "Generate Payment Request"}
|
||||
</Button>
|
||||
|
||||
{error && <div className="text-red-400 text-sm mb-4">{error}</div>}
|
||||
|
||||
{paymentRequest && (
|
||||
<div className="bg-gray-800 p-4 rounded-lg border border-gray-700">
|
||||
<div className="text-sm font-medium mb-2">Lightning Invoice:</div>
|
||||
<div className="font-mono text-xs break-all bg-gray-900 p-2 rounded">
|
||||
{paymentRequest}
|
||||
</div>
|
||||
<div className="text-xs text-gray-400 mt-2">
|
||||
Copy this invoice to your Lightning wallet to complete payment
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
@ -1,6 +1,7 @@
|
||||
import { hexToBech32 } from "@snort/shared";
|
||||
import { NostrLink } from "@snort/system";
|
||||
import { useUserProfile } from "@snort/system-react";
|
||||
import { useMemo } from "react";
|
||||
|
||||
export default function Profile({
|
||||
link,
|
||||
@ -11,15 +12,28 @@ export default function Profile({
|
||||
size?: number;
|
||||
showName?: boolean;
|
||||
}) {
|
||||
const profile = useUserProfile(link.id);
|
||||
const linkId = useMemo(() => link.id, [link.id]);
|
||||
const profile = useUserProfile(linkId);
|
||||
const s = size ?? 40;
|
||||
return (
|
||||
<a className="flex gap-2 items-center" href={`https://snort.social/${link.encode()}`} target="_blank">
|
||||
<a
|
||||
className="flex gap-2 items-center"
|
||||
href={`https://snort.social/${link.encode()}`}
|
||||
target="_blank"
|
||||
>
|
||||
<img
|
||||
src={profile?.picture}
|
||||
src={
|
||||
profile?.picture ||
|
||||
`https://nostr.api.v0l.io/api/v1/avatar/cyberpunks/${link.id}`
|
||||
}
|
||||
alt={profile?.display_name || profile?.name || "User avatar"}
|
||||
width={s}
|
||||
height={s}
|
||||
className="rounded-full object-fit object-center"
|
||||
className="rounded-full object-fit owbject-center"
|
||||
onError={(e) => {
|
||||
const target = e.target as HTMLImageElement;
|
||||
target.src = `https://nostr.api.v0l.io/api/v1/avatar/cyberpunks/${link.id}`;
|
||||
}}
|
||||
/>
|
||||
{(showName ?? true) && (
|
||||
<div>
|
||||
|
@ -1,10 +1,16 @@
|
||||
import { EventPublisher, Nip7Signer } from "@snort/system";
|
||||
import { useMemo } from "react";
|
||||
import useLogin from "./login";
|
||||
|
||||
export default function usePublisher() {
|
||||
const login = useLogin();
|
||||
switch (login?.type) {
|
||||
case "nip7":
|
||||
return new EventPublisher(new Nip7Signer(), login.pubkey);
|
||||
}
|
||||
|
||||
return useMemo(() => {
|
||||
switch (login?.type) {
|
||||
case "nip7":
|
||||
return new EventPublisher(new Nip7Signer(), login.pubkey);
|
||||
default:
|
||||
return undefined;
|
||||
}
|
||||
}, [login?.type, login?.pubkey]);
|
||||
}
|
||||
|
@ -4,9 +4,49 @@
|
||||
|
||||
html,
|
||||
body {
|
||||
@apply bg-black text-white;
|
||||
@apply bg-gray-900 text-gray-100 font-sans;
|
||||
}
|
||||
|
||||
[data-theme="light"] {
|
||||
@apply bg-gray-50 text-gray-900;
|
||||
}
|
||||
|
||||
hr {
|
||||
@apply border-neutral-500;
|
||||
@apply border-gray-700;
|
||||
}
|
||||
|
||||
[data-theme="light"] hr {
|
||||
@apply border-gray-200;
|
||||
}
|
||||
|
||||
.card {
|
||||
@apply bg-gray-800 rounded-lg shadow-sm border border-gray-700 p-6;
|
||||
}
|
||||
|
||||
[data-theme="light"] .card {
|
||||
@apply bg-white border-gray-200;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
@apply bg-blue-600 hover:bg-blue-700 text-white px-4 py-2 rounded-lg font-medium transition-colors duration-200;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
@apply bg-gray-700 hover:bg-gray-600 text-gray-200 px-4 py-2 rounded-lg font-medium transition-colors duration-200;
|
||||
}
|
||||
|
||||
[data-theme="light"] .btn-secondary {
|
||||
@apply bg-gray-100 hover:bg-gray-200 text-gray-700;
|
||||
}
|
||||
|
||||
.btn-danger {
|
||||
@apply bg-red-600 hover:bg-red-700 text-white px-3 py-1.5 rounded-md text-sm font-medium transition-colors duration-200;
|
||||
}
|
||||
|
||||
.input {
|
||||
@apply border border-gray-600 bg-gray-700 text-gray-100 rounded-lg px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent;
|
||||
}
|
||||
|
||||
[data-theme="light"] .input {
|
||||
@apply border-gray-300 bg-white text-gray-900;
|
||||
}
|
||||
|
@ -13,6 +13,11 @@ class LoginStore extends ExternalStore<LoginSession | undefined> {
|
||||
this.notifyChange();
|
||||
}
|
||||
|
||||
logout() {
|
||||
this.#session = undefined;
|
||||
this.notifyChange();
|
||||
}
|
||||
|
||||
takeSnapshot(): LoginSession | undefined {
|
||||
return this.#session ? { ...this.#session } : undefined;
|
||||
}
|
||||
|
@ -12,6 +12,35 @@ export interface AdminSelf {
|
||||
total_available_quota?: number;
|
||||
}
|
||||
|
||||
export interface Report {
|
||||
id: number;
|
||||
file_id: string;
|
||||
reporter_id: number;
|
||||
event_json: string;
|
||||
created: string;
|
||||
reviewed: boolean;
|
||||
}
|
||||
|
||||
export interface PaymentInfo {
|
||||
unit: string;
|
||||
interval: {
|
||||
[key: string]: number;
|
||||
};
|
||||
cost: {
|
||||
currency: string;
|
||||
amount: number;
|
||||
};
|
||||
}
|
||||
|
||||
export interface PaymentRequest {
|
||||
units: number;
|
||||
quantity: number;
|
||||
}
|
||||
|
||||
export interface PaymentResponse {
|
||||
pr: string;
|
||||
}
|
||||
|
||||
export class Route96 {
|
||||
constructor(
|
||||
readonly url: string,
|
||||
@ -39,6 +68,55 @@ export class Route96 {
|
||||
};
|
||||
}
|
||||
|
||||
async listReports(page = 0, count = 10) {
|
||||
const rsp = await this.#req(
|
||||
`admin/reports?page=${page}&count=${count}`,
|
||||
"GET",
|
||||
);
|
||||
const data = await this.#handleResponse<AdminResponseReportList>(rsp);
|
||||
return {
|
||||
...data,
|
||||
...data.data,
|
||||
files: data.data.files,
|
||||
};
|
||||
}
|
||||
|
||||
async acknowledgeReport(reportId: number) {
|
||||
const rsp = await this.#req(`admin/reports/${reportId}`, "DELETE");
|
||||
const data = await this.#handleResponse<AdminResponse<void>>(rsp);
|
||||
return data;
|
||||
}
|
||||
|
||||
async getPaymentInfo() {
|
||||
const rsp = await this.#req("payment", "GET");
|
||||
if (rsp.ok) {
|
||||
return (await rsp.json()) as PaymentInfo;
|
||||
} else {
|
||||
const text = await rsp.text();
|
||||
try {
|
||||
const obj = JSON.parse(text) as AdminResponseBase;
|
||||
throw new Error(obj.message);
|
||||
} catch {
|
||||
throw new Error(`Payment info failed: ${text}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async requestPayment(request: PaymentRequest) {
|
||||
const rsp = await this.#req("payment", "POST", JSON.stringify(request));
|
||||
if (rsp.ok) {
|
||||
return (await rsp.json()) as PaymentResponse;
|
||||
} else {
|
||||
const text = await rsp.text();
|
||||
try {
|
||||
const obj = JSON.parse(text) as AdminResponseBase;
|
||||
throw new Error(obj.message);
|
||||
} catch {
|
||||
throw new Error(`Payment request failed: ${text}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async #handleResponse<T extends AdminResponseBase>(rsp: Response) {
|
||||
if (rsp.ok) {
|
||||
return (await rsp.json()) as T;
|
||||
@ -68,13 +146,19 @@ export class Route96 {
|
||||
};
|
||||
|
||||
const u = `${this.url}${path}`;
|
||||
const headers: Record<string, string> = {
|
||||
accept: "application/json",
|
||||
authorization: await auth(u, method),
|
||||
};
|
||||
|
||||
if (body && method !== "GET") {
|
||||
headers["content-type"] = "application/json";
|
||||
}
|
||||
|
||||
return await fetch(u, {
|
||||
method,
|
||||
body,
|
||||
headers: {
|
||||
accept: "application/json",
|
||||
authorization: await auth(u, method),
|
||||
},
|
||||
headers,
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -94,3 +178,10 @@ export type AdminResponseFileList = AdminResponse<{
|
||||
count: number;
|
||||
files: Array<NostrEvent>;
|
||||
}>;
|
||||
|
||||
export type AdminResponseReportList = AdminResponse<{
|
||||
total: number;
|
||||
page: number;
|
||||
count: number;
|
||||
files: Array<Report>;
|
||||
}>;
|
||||
|
@ -18,7 +18,17 @@ export class Blossom {
|
||||
this.url = new URL(this.url).toString();
|
||||
}
|
||||
|
||||
async upload(file: File) {
|
||||
async #handleError(rsp: Response) {
|
||||
const reason = rsp.headers.get("X-Reason") || rsp.headers.get("x-reason");
|
||||
if (reason) {
|
||||
throw new Error(reason);
|
||||
} else {
|
||||
const text = await rsp.text();
|
||||
throw new Error(text);
|
||||
}
|
||||
}
|
||||
|
||||
async upload(file: File): Promise<BlobDescriptor> {
|
||||
const hash = await window.crypto.subtle.digest(
|
||||
"SHA-256",
|
||||
await file.arrayBuffer(),
|
||||
@ -29,12 +39,12 @@ export class Blossom {
|
||||
if (rsp.ok) {
|
||||
return (await rsp.json()) as BlobDescriptor;
|
||||
} else {
|
||||
const text = await rsp.text();
|
||||
throw new Error(text);
|
||||
await this.#handleError(rsp);
|
||||
throw new Error("Should not reach here");
|
||||
}
|
||||
}
|
||||
|
||||
async media(file: File) {
|
||||
async media(file: File): Promise<BlobDescriptor> {
|
||||
const hash = await window.crypto.subtle.digest(
|
||||
"SHA-256",
|
||||
await file.arrayBuffer(),
|
||||
@ -45,12 +55,12 @@ export class Blossom {
|
||||
if (rsp.ok) {
|
||||
return (await rsp.json()) as BlobDescriptor;
|
||||
} else {
|
||||
const text = await rsp.text();
|
||||
throw new Error(text);
|
||||
await this.#handleError(rsp);
|
||||
throw new Error("Should not reach here");
|
||||
}
|
||||
}
|
||||
|
||||
async mirror(url: string) {
|
||||
async mirror(url: string): Promise<BlobDescriptor> {
|
||||
const rsp = await this.#req(
|
||||
"mirror",
|
||||
"PUT",
|
||||
@ -64,28 +74,28 @@ export class Blossom {
|
||||
if (rsp.ok) {
|
||||
return (await rsp.json()) as BlobDescriptor;
|
||||
} else {
|
||||
const text = await rsp.text();
|
||||
throw new Error(text);
|
||||
await this.#handleError(rsp);
|
||||
throw new Error("Should not reach here");
|
||||
}
|
||||
}
|
||||
|
||||
async list(pk: string) {
|
||||
async list(pk: string): Promise<Array<BlobDescriptor>> {
|
||||
const rsp = await this.#req(`list/${pk}`, "GET", "list");
|
||||
if (rsp.ok) {
|
||||
return (await rsp.json()) as Array<BlobDescriptor>;
|
||||
} else {
|
||||
const text = await rsp.text();
|
||||
throw new Error(text);
|
||||
await this.#handleError(rsp);
|
||||
throw new Error("Should not reach here");
|
||||
}
|
||||
}
|
||||
|
||||
async delete(id: string) {
|
||||
async delete(id: string): Promise<void> {
|
||||
const tags = [["x", id]];
|
||||
|
||||
const rsp = await this.#req(id, "DELETE", "delete", undefined, tags);
|
||||
if (!rsp.ok) {
|
||||
const text = await rsp.text();
|
||||
throw new Error(text);
|
||||
await this.#handleError(rsp);
|
||||
throw new Error("Should not reach here");
|
||||
}
|
||||
}
|
||||
|
||||
|
248
ui_src/src/views/admin.tsx
Normal file
248
ui_src/src/views/admin.tsx
Normal file
@ -0,0 +1,248 @@
|
||||
import { useEffect, useState, useCallback } from "react";
|
||||
import { Navigate } from "react-router-dom";
|
||||
import Button from "../components/button";
|
||||
import FileList from "./files";
|
||||
import ReportList from "./reports";
|
||||
import { Blossom } from "../upload/blossom";
|
||||
import useLogin from "../hooks/login";
|
||||
import usePublisher from "../hooks/publisher";
|
||||
import { Nip96FileList } from "../upload/nip96";
|
||||
import { AdminSelf, Route96, Report } from "../upload/admin";
|
||||
|
||||
export default function Admin() {
|
||||
const [self, setSelf] = useState<AdminSelf>();
|
||||
const [error, setError] = useState<string>();
|
||||
const [adminListedFiles, setAdminListedFiles] = useState<Nip96FileList>();
|
||||
const [reports, setReports] = useState<Report[]>();
|
||||
const [reportPages, setReportPages] = useState<number>();
|
||||
const [reportPage, setReportPage] = useState(0);
|
||||
const [adminListedPage, setAdminListedPage] = useState(0);
|
||||
const [mimeFilter, setMimeFilter] = useState<string>();
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
const login = useLogin();
|
||||
const pub = usePublisher();
|
||||
|
||||
const url =
|
||||
import.meta.env.VITE_API_URL || `${location.protocol}//${location.host}`;
|
||||
|
||||
const listAllUploads = useCallback(
|
||||
async (n: number) => {
|
||||
if (!pub) return;
|
||||
try {
|
||||
setError(undefined);
|
||||
const uploader = new Route96(url, pub);
|
||||
const result = await uploader.listFiles(n, 50, mimeFilter);
|
||||
setAdminListedFiles(result);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message.length > 0 ? e.message : "Upload failed");
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("List files failed");
|
||||
}
|
||||
}
|
||||
},
|
||||
[pub, url, mimeFilter],
|
||||
);
|
||||
|
||||
const listReports = useCallback(
|
||||
async (n: number) => {
|
||||
if (!pub) return;
|
||||
try {
|
||||
setError(undefined);
|
||||
const route96 = new Route96(url, pub);
|
||||
const result = await route96.listReports(n, 10);
|
||||
setReports(result.files);
|
||||
setReportPages(Math.ceil(result.total / result.count));
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message.length > 0 ? e.message : "List reports failed");
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("List reports failed");
|
||||
}
|
||||
}
|
||||
},
|
||||
[pub, url],
|
||||
);
|
||||
|
||||
async function acknowledgeReport(reportId: number) {
|
||||
if (!pub) return;
|
||||
try {
|
||||
setError(undefined);
|
||||
const route96 = new Route96(url, pub);
|
||||
await route96.acknowledgeReport(reportId);
|
||||
await listReports(reportPage);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(
|
||||
e.message.length > 0 ? e.message : "Acknowledge report failed",
|
||||
);
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("Acknowledge report failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function deleteFile(id: string) {
|
||||
if (!pub) return;
|
||||
try {
|
||||
setError(undefined);
|
||||
const uploader = new Blossom(url, pub);
|
||||
await uploader.delete(id);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message.length > 0 ? e.message : "Upload failed");
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("List files failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (pub && !self) {
|
||||
const r96 = new Route96(url, pub);
|
||||
r96
|
||||
.getSelf()
|
||||
.then((v) => {
|
||||
setSelf(v.data);
|
||||
setLoading(false);
|
||||
})
|
||||
.catch(() => {
|
||||
setLoading(false);
|
||||
});
|
||||
}
|
||||
}, [pub, self, url]);
|
||||
|
||||
useEffect(() => {
|
||||
if (pub && self?.is_admin && !adminListedFiles) {
|
||||
listAllUploads(adminListedPage);
|
||||
}
|
||||
}, [adminListedPage, pub, self?.is_admin, listAllUploads, adminListedFiles]);
|
||||
|
||||
useEffect(() => {
|
||||
if (pub && self?.is_admin && !reports) {
|
||||
listReports(reportPage);
|
||||
}
|
||||
}, [reportPage, pub, self?.is_admin, listReports, reports]);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div className="flex justify-center items-center h-64">
|
||||
<div className="text-lg text-gray-400">Loading...</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!login) {
|
||||
return (
|
||||
<div className="card max-w-md mx-auto text-center">
|
||||
<h2 className="text-xl font-semibold mb-4">Authentication Required</h2>
|
||||
<p className="text-gray-400">
|
||||
Please log in to access the admin panel.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!self?.is_admin) {
|
||||
return <Navigate to="/" replace />;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-8">
|
||||
<div className="flex items-center justify-between">
|
||||
<h1 className="text-3xl font-bold text-gray-100">Admin Panel</h1>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="bg-red-900/20 border border-red-800 text-red-400 px-4 py-3 rounded-lg">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="grid gap-8 lg:grid-cols-2">
|
||||
<div className="card">
|
||||
<h2 className="text-xl font-semibold mb-6">File Management</h2>
|
||||
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Filter by MIME type
|
||||
</label>
|
||||
<select
|
||||
className="input w-full"
|
||||
value={mimeFilter || ""}
|
||||
onChange={(e) => setMimeFilter(e.target.value || undefined)}
|
||||
>
|
||||
<option value="">All Files</option>
|
||||
<option value="image/webp">WebP Images</option>
|
||||
<option value="image/jpeg">JPEG Images</option>
|
||||
<option value="image/jpg">JPG Images</option>
|
||||
<option value="image/png">PNG Images</option>
|
||||
<option value="image/gif">GIF Images</option>
|
||||
<option value="video/mp4">MP4 Videos</option>
|
||||
<option value="video/mov">MOV Videos</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<Button
|
||||
onClick={() => listAllUploads(0)}
|
||||
className="btn-primary w-full"
|
||||
>
|
||||
Load All Files
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="card">
|
||||
<h2 className="text-xl font-semibold mb-6">Reports Management</h2>
|
||||
|
||||
<Button onClick={() => listReports(0)} className="btn-primary w-full">
|
||||
Load Reports
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{adminListedFiles && (
|
||||
<div className="card">
|
||||
<h2 className="text-xl font-semibold mb-6">All Files</h2>
|
||||
<FileList
|
||||
files={adminListedFiles.files}
|
||||
pages={Math.ceil(adminListedFiles.total / adminListedFiles.count)}
|
||||
page={adminListedFiles.page}
|
||||
onPage={(x) => setAdminListedPage(x)}
|
||||
onDelete={async (x) => {
|
||||
await deleteFile(x);
|
||||
await listAllUploads(adminListedPage);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{reports && (
|
||||
<div className="card">
|
||||
<h2 className="text-xl font-semibold mb-6">Reports</h2>
|
||||
<ReportList
|
||||
reports={reports}
|
||||
pages={reportPages}
|
||||
page={reportPage}
|
||||
onPage={(x) => setReportPage(x)}
|
||||
onAcknowledge={acknowledgeReport}
|
||||
onDeleteFile={async (fileId) => {
|
||||
await deleteFile(fileId);
|
||||
await listReports(reportPage);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
@ -28,7 +28,7 @@ export default function FileList({
|
||||
}) {
|
||||
const [viewType, setViewType] = useState<"grid" | "list">("grid");
|
||||
if (files.length === 0) {
|
||||
return <b>No Files</b>;
|
||||
return <b className="text-gray-400">No Files</b>;
|
||||
}
|
||||
|
||||
function renderInner(f: FileInfo) {
|
||||
@ -77,19 +77,22 @@ export default function FileList({
|
||||
|
||||
for (let x = start; x < n; x++) {
|
||||
ret.push(
|
||||
<div
|
||||
<button
|
||||
key={x}
|
||||
onClick={() => onPage?.(x)}
|
||||
className={classNames(
|
||||
"bg-neutral-700 hover:bg-neutral-600 min-w-8 text-center cursor-pointer font-bold",
|
||||
"px-3 py-2 text-sm font-medium border transition-colors",
|
||||
{
|
||||
"rounded-l-md": x === start,
|
||||
"rounded-r-md": x + 1 === n,
|
||||
"bg-neutral-400": page === x,
|
||||
"bg-blue-600 text-white border-blue-600": page === x,
|
||||
"bg-white text-gray-700 border-gray-300 hover:bg-gray-50":
|
||||
page !== x,
|
||||
},
|
||||
)}
|
||||
>
|
||||
{x + 1}
|
||||
</div>,
|
||||
</button>,
|
||||
);
|
||||
}
|
||||
|
||||
@ -98,49 +101,56 @@ export default function FileList({
|
||||
|
||||
function showGrid() {
|
||||
return (
|
||||
<div className="grid gap-2 grid-cols-4 lg:grid-cols-6 xl:grid-cols-8 2xl:grid-cols-10">
|
||||
<div className="grid gap-4 grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 xl:grid-cols-8">
|
||||
{files.map((a) => {
|
||||
const info = getInfo(a);
|
||||
|
||||
return (
|
||||
<div
|
||||
key={info.id}
|
||||
className="relative rounded-md aspect-square overflow-hidden bg-neutral-900"
|
||||
className="group relative rounded-lg aspect-square overflow-hidden bg-gray-100 border border-gray-200 hover:shadow-md transition-shadow"
|
||||
>
|
||||
<div className="absolute flex flex-col items-center justify-center w-full h-full text-wrap text-sm break-all text-center opacity-0 hover:opacity-100 hover:bg-black/80">
|
||||
<div>
|
||||
<div className="absolute inset-0 flex flex-col items-center justify-center p-2 text-xs text-center opacity-0 group-hover:opacity-100 bg-black/75 text-white transition-opacity">
|
||||
<div className="font-medium mb-1">
|
||||
{(info.name?.length ?? 0) === 0
|
||||
? "Untitled"
|
||||
: info.name!.length > 20
|
||||
? `${info.name?.substring(0, 10)}...${info.name?.substring(info.name.length - 10)}`
|
||||
: info.name}
|
||||
</div>
|
||||
<div>
|
||||
<div className="text-gray-300 mb-1">
|
||||
{info.size && !isNaN(info.size)
|
||||
? FormatBytes(info.size, 2)
|
||||
: ""}
|
||||
</div>
|
||||
<div>{info.type}</div>
|
||||
<div className="text-gray-300 mb-2">{info.type}</div>
|
||||
<div className="flex gap-2">
|
||||
<a href={info.url} className="underline" target="_blank">
|
||||
Link
|
||||
<a
|
||||
href={info.url}
|
||||
className="bg-blue-600 hover:bg-blue-700 px-2 py-1 rounded text-xs"
|
||||
target="_blank"
|
||||
>
|
||||
View
|
||||
</a>
|
||||
{onDelete && (
|
||||
<a
|
||||
href="#"
|
||||
<button
|
||||
onClick={(e) => {
|
||||
e.preventDefault();
|
||||
onDelete?.(info.id);
|
||||
}}
|
||||
className="underline"
|
||||
className="bg-red-600 hover:bg-red-700 px-2 py-1 rounded text-xs"
|
||||
>
|
||||
Delete
|
||||
</a>
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
{info.uploader &&
|
||||
info.uploader.map((a) => (
|
||||
<Profile link={NostrLink.publicKey(a)} size={20} />
|
||||
info.uploader.map((a, idx) => (
|
||||
<Profile
|
||||
key={idx}
|
||||
link={NostrLink.publicKey(a)}
|
||||
size={20}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
{renderInner(info)}
|
||||
@ -153,106 +163,131 @@ export default function FileList({
|
||||
|
||||
function showList() {
|
||||
return (
|
||||
<table className="table-auto text-sm">
|
||||
<thead>
|
||||
<tr>
|
||||
<th className="border border-neutral-400 bg-neutral-500 py-1 px-2">
|
||||
Preview
|
||||
</th>
|
||||
<th className="border border-neutral-400 bg-neutral-500 py-1 px-2">
|
||||
Name
|
||||
</th>
|
||||
<th className="border border-neutral-400 bg-neutral-500 py-1 px-2">
|
||||
Type
|
||||
</th>
|
||||
<th className="border border-neutral-400 bg-neutral-500 py-1 px-2">
|
||||
Size
|
||||
</th>
|
||||
{files.some((i) => "uploader" in i) && (
|
||||
<th className="border border-neutral-400 bg-neutral-500 py-1 px-2">
|
||||
Uploader
|
||||
<div className="overflow-x-auto">
|
||||
<table className="min-w-full bg-white border border-gray-200 rounded-lg">
|
||||
<thead className="bg-gray-50">
|
||||
<tr>
|
||||
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider border-b border-gray-200">
|
||||
Preview
|
||||
</th>
|
||||
)}
|
||||
<th className="border border-neutral-400 bg-neutral-500 py-1 px-2">
|
||||
Actions
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{files.map((a) => {
|
||||
const info = getInfo(a);
|
||||
return (
|
||||
<tr key={info.id}>
|
||||
<td className="border border-neutral-500 py-1 px-2 w-8 h-8">
|
||||
{renderInner(info)}
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-1 px-2 break-all">
|
||||
{(info.name?.length ?? 0) === 0 ? "<Untitled>" : info.name}
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-1 px-2 break-all">
|
||||
{info.type}
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-1 px-2">
|
||||
{info.size && !isNaN(info.size)
|
||||
? FormatBytes(info.size, 2)
|
||||
: ""}
|
||||
</td>
|
||||
{info.uploader && (
|
||||
<td className="border border-neutral-500 py-1 px-2">
|
||||
{info.uploader.map((a) => (
|
||||
<Profile link={NostrLink.publicKey(a)} size={20} />
|
||||
))}
|
||||
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider border-b border-gray-200">
|
||||
Name
|
||||
</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider border-b border-gray-200">
|
||||
Type
|
||||
</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider border-b border-gray-200">
|
||||
Size
|
||||
</th>
|
||||
{files.some((i) => "uploader" in i) && (
|
||||
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider border-b border-gray-200">
|
||||
Uploader
|
||||
</th>
|
||||
)}
|
||||
<th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider border-b border-gray-200">
|
||||
Actions
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-gray-200">
|
||||
{files.map((a) => {
|
||||
const info = getInfo(a);
|
||||
return (
|
||||
<tr key={info.id} className="hover:bg-gray-50">
|
||||
<td className="px-4 py-3 w-16">
|
||||
<div className="w-12 h-12 bg-gray-100 rounded overflow-hidden">
|
||||
{renderInner(info)}
|
||||
</div>
|
||||
</td>
|
||||
)}
|
||||
<td className="border border-neutral-500 py-1 px-2">
|
||||
<div className="flex gap-2">
|
||||
<a href={info.url} className="underline" target="_blank">
|
||||
Link
|
||||
</a>
|
||||
{onDelete && (
|
||||
<td className="px-4 py-3 text-sm text-gray-900 break-all max-w-xs">
|
||||
{(info.name?.length ?? 0) === 0 ? "<Untitled>" : info.name}
|
||||
</td>
|
||||
<td className="px-4 py-3 text-sm text-gray-500">
|
||||
{info.type}
|
||||
</td>
|
||||
<td className="px-4 py-3 text-sm text-gray-500">
|
||||
{info.size && !isNaN(info.size)
|
||||
? FormatBytes(info.size, 2)
|
||||
: ""}
|
||||
</td>
|
||||
{info.uploader && (
|
||||
<td className="px-4 py-3">
|
||||
{info.uploader.map((a, idx) => (
|
||||
<Profile
|
||||
key={idx}
|
||||
link={NostrLink.publicKey(a)}
|
||||
size={20}
|
||||
/>
|
||||
))}
|
||||
</td>
|
||||
)}
|
||||
<td className="px-4 py-3">
|
||||
<div className="flex gap-2">
|
||||
<a
|
||||
href="#"
|
||||
onClick={(e) => {
|
||||
e.preventDefault();
|
||||
onDelete?.(info.id);
|
||||
}}
|
||||
className="underline"
|
||||
href={info.url}
|
||||
className="bg-blue-600 hover:bg-blue-700 text-white px-3 py-1 rounded text-xs"
|
||||
target="_blank"
|
||||
>
|
||||
Delete
|
||||
View
|
||||
</a>
|
||||
)}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
{onDelete && (
|
||||
<button
|
||||
onClick={(e) => {
|
||||
e.preventDefault();
|
||||
onDelete?.(info.id);
|
||||
}}
|
||||
className="bg-red-600 hover:bg-red-700 text-white px-3 py-1 rounded text-xs"
|
||||
>
|
||||
Delete
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="flex">
|
||||
<div
|
||||
onClick={() => setViewType("grid")}
|
||||
className={`bg-neutral-700 hover:bg-neutral-600 min-w-20 text-center cursor-pointer font-bold rounded-l-md ${viewType === "grid" ? "bg-neutral-500" : ""}`}
|
||||
>
|
||||
Grid
|
||||
</div>
|
||||
<div
|
||||
onClick={() => setViewType("list")}
|
||||
className={`bg-neutral-700 hover:bg-neutral-600 min-w-20 text-center cursor-pointer font-bold rounded-r-md ${viewType === "list" ? "bg-neutral-500" : ""}`}
|
||||
>
|
||||
List
|
||||
<div className="space-y-4">
|
||||
<div className="flex justify-between items-center">
|
||||
<div className="flex rounded-lg border border-gray-300 overflow-hidden">
|
||||
<button
|
||||
onClick={() => setViewType("grid")}
|
||||
className={`px-4 py-2 text-sm font-medium transition-colors ${
|
||||
viewType === "grid"
|
||||
? "bg-blue-600 text-white"
|
||||
: "bg-white text-gray-700 hover:bg-gray-50"
|
||||
}`}
|
||||
>
|
||||
Grid
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setViewType("list")}
|
||||
className={`px-4 py-2 text-sm font-medium transition-colors border-l border-gray-300 ${
|
||||
viewType === "list"
|
||||
? "bg-blue-600 text-white"
|
||||
: "bg-white text-gray-700 hover:bg-gray-50"
|
||||
}`}
|
||||
>
|
||||
List
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{viewType === "grid" ? showGrid() : showList()}
|
||||
{pages !== undefined && (
|
||||
<>
|
||||
<div className="flex flex-wrap">{pageButtons(page ?? 0, pages)}</div>
|
||||
</>
|
||||
|
||||
{pages !== undefined && pages > 1 && (
|
||||
<div className="flex justify-center">
|
||||
<div className="flex rounded-lg border border-gray-300 overflow-hidden">
|
||||
{pageButtons(page ?? 0, pages)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
@ -1,11 +1,22 @@
|
||||
import { Nip7Signer, NostrLink } from "@snort/system";
|
||||
import { Link, useLocation } from "react-router-dom";
|
||||
import { useEffect, useState } from "react";
|
||||
import Button from "../components/button";
|
||||
import Profile from "../components/profile";
|
||||
import useLogin from "../hooks/login";
|
||||
import usePublisher from "../hooks/publisher";
|
||||
import { Login } from "../login";
|
||||
import { AdminSelf, Route96 } from "../upload/admin";
|
||||
|
||||
export default function Header() {
|
||||
const login = useLogin();
|
||||
const pub = usePublisher();
|
||||
const location = useLocation();
|
||||
const [self, setSelf] = useState<AdminSelf>();
|
||||
|
||||
const url =
|
||||
import.meta.env.VITE_API_URL ||
|
||||
`${window.location.protocol}//${window.location.host}`;
|
||||
|
||||
async function tryLogin() {
|
||||
try {
|
||||
@ -19,14 +30,72 @@ export default function Header() {
|
||||
//ignore
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (pub && !self) {
|
||||
const r96 = new Route96(url, pub);
|
||||
r96
|
||||
.getSelf()
|
||||
.then((v) => setSelf(v.data))
|
||||
.catch(() => {});
|
||||
}
|
||||
}, [pub, self, url]);
|
||||
|
||||
return (
|
||||
<div className="flex justify-between items-center">
|
||||
<div className="text-xl font-bold">route96</div>
|
||||
{login ? (
|
||||
<Profile link={NostrLink.publicKey(login.pubkey)} />
|
||||
) : (
|
||||
<Button onClick={tryLogin}>Login</Button>
|
||||
)}
|
||||
</div>
|
||||
<header className="border-b border-gray-700 bg-gray-800 w-full">
|
||||
<div className="px-4 sm:px-6 lg:px-8 flex justify-between items-center py-4">
|
||||
<div className="flex items-center space-x-8">
|
||||
<Link to="/">
|
||||
<div className="text-2xl font-bold text-gray-100 hover:text-blue-400 transition-colors">
|
||||
route96
|
||||
</div>
|
||||
</Link>
|
||||
|
||||
<nav className="flex space-x-6">
|
||||
<Link
|
||||
to="/"
|
||||
className={`text-sm font-medium transition-colors ${
|
||||
location.pathname === "/"
|
||||
? "text-blue-400 border-b-2 border-blue-400 pb-1"
|
||||
: "text-gray-300 hover:text-gray-100"
|
||||
}`}
|
||||
>
|
||||
Upload
|
||||
</Link>
|
||||
|
||||
{self?.is_admin && (
|
||||
<Link
|
||||
to="/admin"
|
||||
className={`text-sm font-medium transition-colors ${
|
||||
location.pathname === "/admin"
|
||||
? "text-blue-400 border-b-2 border-blue-400 pb-1"
|
||||
: "text-gray-300 hover:text-gray-100"
|
||||
}`}
|
||||
>
|
||||
Admin
|
||||
</Link>
|
||||
)}
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center space-x-4">
|
||||
{login ? (
|
||||
<div className="flex items-center space-x-3">
|
||||
<Profile link={NostrLink.publicKey(login.pubkey)} />
|
||||
<Button
|
||||
onClick={() => Login.logout()}
|
||||
className="btn-secondary text-sm"
|
||||
>
|
||||
Logout
|
||||
</Button>
|
||||
</div>
|
||||
) : (
|
||||
<Button onClick={tryLogin} className="btn-primary">
|
||||
Login
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
);
|
||||
}
|
||||
|
158
ui_src/src/views/reports.tsx
Normal file
158
ui_src/src/views/reports.tsx
Normal file
@ -0,0 +1,158 @@
|
||||
import { NostrLink } from "@snort/system";
|
||||
import classNames from "classnames";
|
||||
import Profile from "../components/profile";
|
||||
import { Report } from "../upload/admin";
|
||||
|
||||
export default function ReportList({
|
||||
reports,
|
||||
pages,
|
||||
page,
|
||||
onPage,
|
||||
onAcknowledge,
|
||||
onDeleteFile,
|
||||
}: {
|
||||
reports: Array<Report>;
|
||||
pages?: number;
|
||||
page?: number;
|
||||
onPage?: (n: number) => void;
|
||||
onAcknowledge?: (reportId: number) => void;
|
||||
onDeleteFile?: (fileId: string) => void;
|
||||
}) {
|
||||
if (reports.length === 0) {
|
||||
return <b>No Reports</b>;
|
||||
}
|
||||
|
||||
function pageButtons(page: number, n: number) {
|
||||
const ret = [];
|
||||
const start = 0;
|
||||
|
||||
for (let x = start; x < n; x++) {
|
||||
ret.push(
|
||||
<div
|
||||
key={x}
|
||||
onClick={() => onPage?.(x)}
|
||||
className={classNames(
|
||||
"bg-neutral-700 hover:bg-neutral-600 min-w-8 text-center cursor-pointer font-bold",
|
||||
{
|
||||
"rounded-l-md": x === start,
|
||||
"rounded-r-md": x + 1 === n,
|
||||
"bg-neutral-400": page === x,
|
||||
},
|
||||
)}
|
||||
>
|
||||
{x + 1}
|
||||
</div>,
|
||||
);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
function getReporterPubkey(eventJson: string): string | null {
|
||||
try {
|
||||
const event = JSON.parse(eventJson);
|
||||
return event.pubkey;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function getReportReason(eventJson: string): string {
|
||||
try {
|
||||
const event = JSON.parse(eventJson);
|
||||
return event.content || "No reason provided";
|
||||
} catch {
|
||||
return "Invalid event data";
|
||||
}
|
||||
}
|
||||
|
||||
function formatDate(dateString: string): string {
|
||||
return new Date(dateString).toLocaleString();
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<table className="w-full border-collapse border border-neutral-500">
|
||||
<thead>
|
||||
<tr className="bg-neutral-700">
|
||||
<th className="border border-neutral-500 py-2 px-4 text-left">
|
||||
Report ID
|
||||
</th>
|
||||
<th className="border border-neutral-500 py-2 px-4 text-left">
|
||||
File ID
|
||||
</th>
|
||||
<th className="border border-neutral-500 py-2 px-4 text-left">
|
||||
Reporter
|
||||
</th>
|
||||
<th className="border border-neutral-500 py-2 px-4 text-left">
|
||||
Reason
|
||||
</th>
|
||||
<th className="border border-neutral-500 py-2 px-4 text-left">
|
||||
Created
|
||||
</th>
|
||||
<th className="border border-neutral-500 py-2 px-4 text-left">
|
||||
Actions
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{reports.map((report) => {
|
||||
const reporterPubkey = getReporterPubkey(report.event_json);
|
||||
const reason = getReportReason(report.event_json);
|
||||
|
||||
return (
|
||||
<tr key={report.id} className="hover:bg-neutral-700">
|
||||
<td className="border border-neutral-500 py-2 px-4">
|
||||
{report.id}
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-2 px-4 font-mono text-sm">
|
||||
{report.file_id.substring(0, 12)}...
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-2 px-4">
|
||||
{reporterPubkey ? (
|
||||
<Profile
|
||||
link={NostrLink.publicKey(reporterPubkey)}
|
||||
size={20}
|
||||
/>
|
||||
) : (
|
||||
"Unknown"
|
||||
)}
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-2 px-4 max-w-xs truncate">
|
||||
{reason}
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-2 px-4">
|
||||
{formatDate(report.created)}
|
||||
</td>
|
||||
<td className="border border-neutral-500 py-2 px-4">
|
||||
<div className="flex gap-2">
|
||||
<button
|
||||
onClick={() => onAcknowledge?.(report.id)}
|
||||
className="bg-blue-600 hover:bg-blue-700 px-2 py-1 rounded text-sm"
|
||||
>
|
||||
Acknowledge
|
||||
</button>
|
||||
<button
|
||||
onClick={() => onDeleteFile?.(report.file_id)}
|
||||
className="bg-red-600 hover:bg-red-700 px-2 py-1 rounded text-sm"
|
||||
>
|
||||
Delete File
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{pages !== undefined && (
|
||||
<>
|
||||
<div className="flex justify-center mt-4">
|
||||
<div className="flex gap-1">{pageButtons(page ?? 0, pages)}</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
@ -1,6 +1,7 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useEffect, useState, useCallback } from "react";
|
||||
import Button from "../components/button";
|
||||
import FileList from "./files";
|
||||
import PaymentFlow from "../components/payment";
|
||||
import { openFile } from "../upload";
|
||||
import { Blossom } from "../upload/blossom";
|
||||
import useLogin from "../hooks/login";
|
||||
@ -8,29 +9,21 @@ import usePublisher from "../hooks/publisher";
|
||||
import { Nip96, Nip96FileList } from "../upload/nip96";
|
||||
import { AdminSelf, Route96 } from "../upload/admin";
|
||||
import { FormatBytes } from "../const";
|
||||
import Report from "../report.json";
|
||||
|
||||
export default function Upload() {
|
||||
const [type, setType] = useState<"blossom" | "nip96">("blossom");
|
||||
const [noCompress, setNoCompress] = useState(false);
|
||||
const [showLegacy, setShowLegacy] = useState(false);
|
||||
const [toUpload, setToUpload] = useState<File>();
|
||||
const [self, setSelf] = useState<AdminSelf>();
|
||||
const [error, setError] = useState<string>();
|
||||
const [bulkPrgress, setBulkProgress] = useState<number>();
|
||||
const [results, setResults] = useState<Array<object>>([]);
|
||||
const [listedFiles, setListedFiles] = useState<Nip96FileList>();
|
||||
const [adminListedFiles, setAdminListedFiles] = useState<Nip96FileList>();
|
||||
const [listedPage, setListedPage] = useState(0);
|
||||
const [adminListedPage, setAdminListedPage] = useState(0);
|
||||
const [mimeFilter, setMimeFilter] = useState<string>();
|
||||
const [showPaymentFlow, setShowPaymentFlow] = useState(false);
|
||||
|
||||
const login = useLogin();
|
||||
const pub = usePublisher();
|
||||
|
||||
const legacyFiles = Report as Record<string, Array<string>>;
|
||||
const myLegacyFiles = login ? (legacyFiles[login.pubkey] ?? []) : [];
|
||||
|
||||
const url =
|
||||
import.meta.env.VITE_API_URL || `${location.protocol}//${location.host}`;
|
||||
async function doUpload() {
|
||||
@ -53,7 +46,7 @@ export default function Upload() {
|
||||
}
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message.length > 0 ? e.message : "Upload failed");
|
||||
setError(e.message || "Upload failed - no error details provided");
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
@ -62,42 +55,29 @@ export default function Upload() {
|
||||
}
|
||||
}
|
||||
|
||||
async function listUploads(n: number) {
|
||||
if (!pub) return;
|
||||
try {
|
||||
setError(undefined);
|
||||
const uploader = new Nip96(url, pub);
|
||||
await uploader.loadInfo();
|
||||
const result = await uploader.listFiles(n, 50);
|
||||
setListedFiles(result);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message.length > 0 ? e.message : "Upload failed");
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("List files failed");
|
||||
const listUploads = useCallback(
|
||||
async (n: number) => {
|
||||
if (!pub) return;
|
||||
try {
|
||||
setError(undefined);
|
||||
const uploader = new Nip96(url, pub);
|
||||
await uploader.loadInfo();
|
||||
const result = await uploader.listFiles(n, 50);
|
||||
setListedFiles(result);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(
|
||||
e.message || "List files failed - no error details provided",
|
||||
);
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("List files failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function listAllUploads(n: number) {
|
||||
if (!pub) return;
|
||||
try {
|
||||
setError(undefined);
|
||||
const uploader = new Route96(url, pub);
|
||||
const result = await uploader.listFiles(n, 50, mimeFilter);
|
||||
setAdminListedFiles(result);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message.length > 0 ? e.message : "Upload failed");
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("List files failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
[pub, url],
|
||||
);
|
||||
|
||||
async function deleteFile(id: string) {
|
||||
if (!pub) return;
|
||||
@ -107,179 +87,412 @@ export default function Upload() {
|
||||
await uploader.delete(id);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
setError(e.message.length > 0 ? e.message : "Upload failed");
|
||||
setError(e.message || "Delete failed - no error details provided");
|
||||
} else if (typeof e === "string") {
|
||||
setError(e);
|
||||
} else {
|
||||
setError("List files failed");
|
||||
setError("Delete failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function migrateLegacy() {
|
||||
if (!pub) return;
|
||||
const uploader = new Blossom(url, pub);
|
||||
let ctr = 0;
|
||||
for (const f of myLegacyFiles) {
|
||||
try {
|
||||
await uploader.mirror(`https://void.cat/d/${f}`);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
setBulkProgress(ctr++ / myLegacyFiles.length);
|
||||
useEffect(() => {
|
||||
if (pub && !listedFiles) {
|
||||
listUploads(listedPage);
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
listUploads(listedPage);
|
||||
}, [listedPage]);
|
||||
|
||||
useEffect(() => {
|
||||
listAllUploads(adminListedPage);
|
||||
}, [adminListedPage, mimeFilter]);
|
||||
}, [listedPage, pub, listUploads, listedFiles]);
|
||||
|
||||
useEffect(() => {
|
||||
if (pub && !self) {
|
||||
const r96 = new Route96(url, pub);
|
||||
r96.getSelf().then((v) => setSelf(v.data));
|
||||
}
|
||||
}, [pub, self]);
|
||||
}, [pub, self, url]);
|
||||
|
||||
if (!login) {
|
||||
return (
|
||||
<div className="card max-w-2xl mx-auto text-center">
|
||||
<h2 className="text-2xl font-semibold mb-4 text-gray-100">
|
||||
Welcome to {window.location.hostname}
|
||||
</h2>
|
||||
<p className="text-gray-400 mb-6">
|
||||
Please log in to start uploading files to your storage.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-2 bg-neutral-800 p-8 rounded-xl w-full">
|
||||
<h1 className="text-lg font-bold">
|
||||
Welcome to {window.location.hostname}
|
||||
</h1>
|
||||
<div className="text-neutral-400 uppercase text-xs font-medium">
|
||||
Upload Method
|
||||
</div>
|
||||
<div className="flex gap-4 items-center">
|
||||
<div
|
||||
className="flex gap-2 cursor-pointer"
|
||||
onClick={() => setType("blossom")}
|
||||
>
|
||||
Blossom
|
||||
<input type="radio" checked={type === "blossom"} />
|
||||
</div>
|
||||
<div
|
||||
className="flex gap-2 cursor-pointer"
|
||||
onClick={() => setType("nip96")}
|
||||
>
|
||||
NIP-96
|
||||
<input type="radio" checked={type === "nip96"} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
className="flex gap-2 cursor-pointer"
|
||||
onClick={() => setNoCompress((s) => !s)}
|
||||
>
|
||||
Disable Compression
|
||||
<input type="checkbox" checked={noCompress} />
|
||||
</div>
|
||||
|
||||
{toUpload && <FileList files={toUpload ? [toUpload] : []} />}
|
||||
<div className="flex gap-4">
|
||||
<Button
|
||||
className="flex-1"
|
||||
onClick={async () => {
|
||||
const f = await openFile();
|
||||
setToUpload(f);
|
||||
}}
|
||||
>
|
||||
Choose Files
|
||||
</Button>
|
||||
<Button
|
||||
className="flex-1"
|
||||
onClick={doUpload}
|
||||
disabled={login === undefined}
|
||||
>
|
||||
Upload
|
||||
</Button>
|
||||
</div>
|
||||
<hr />
|
||||
{!listedFiles && (
|
||||
<Button disabled={login === undefined} onClick={() => listUploads(0)}>
|
||||
List Uploads
|
||||
</Button>
|
||||
)}
|
||||
|
||||
{self && (
|
||||
<div className="flex justify-between font-medium">
|
||||
<div>Uploads: {self.file_count.toLocaleString()}</div>
|
||||
<div>Total Size: {FormatBytes(self.total_size)}</div>
|
||||
<div className="max-w-4xl mx-auto space-y-8">
|
||||
{error && (
|
||||
<div className="bg-red-900/20 border border-red-800 text-red-400 px-4 py-3 rounded-lg">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{login && myLegacyFiles.length > 0 && (
|
||||
<div className="flex flex-col gap-4 font-bold">
|
||||
You have {myLegacyFiles.length.toLocaleString()} files which can be
|
||||
migrated from void.cat
|
||||
<div className="flex gap-2">
|
||||
<Button onClick={() => migrateLegacy()}>Migrate Files</Button>
|
||||
<Button onClick={() => setShowLegacy((s) => !s)}>
|
||||
{!showLegacy ? "Show Files" : "Hide Files"}
|
||||
<div className="card">
|
||||
<h2 className="text-xl font-semibold mb-6">Upload Settings</h2>
|
||||
|
||||
<div className="space-y-6">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-3">
|
||||
Upload Method
|
||||
</label>
|
||||
<div className="flex gap-6">
|
||||
<label className="flex items-center cursor-pointer">
|
||||
<input
|
||||
type="radio"
|
||||
checked={type === "blossom"}
|
||||
onChange={() => setType("blossom")}
|
||||
className="mr-2"
|
||||
/>
|
||||
<span className="text-sm font-medium text-gray-300">
|
||||
Blossom
|
||||
</span>
|
||||
</label>
|
||||
<label className="flex items-center cursor-pointer">
|
||||
<input
|
||||
type="radio"
|
||||
checked={type === "nip96"}
|
||||
onChange={() => setType("nip96")}
|
||||
className="mr-2"
|
||||
/>
|
||||
<span className="text-sm font-medium text-gray-300">
|
||||
NIP-96
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="flex items-center cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={noCompress}
|
||||
onChange={(e) => setNoCompress(e.target.checked)}
|
||||
className="mr-2"
|
||||
/>
|
||||
<span className="text-sm font-medium text-gray-300">
|
||||
Disable Compression
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
{toUpload && (
|
||||
<div className="border-2 border-dashed border-gray-600 rounded-lg p-4">
|
||||
<FileList files={[toUpload]} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex gap-4">
|
||||
<Button
|
||||
onClick={async () => {
|
||||
const f = await openFile();
|
||||
setToUpload(f);
|
||||
}}
|
||||
className="btn-secondary flex-1"
|
||||
>
|
||||
Choose File
|
||||
</Button>
|
||||
<Button
|
||||
onClick={doUpload}
|
||||
disabled={!toUpload}
|
||||
className="btn-primary flex-1"
|
||||
>
|
||||
Upload
|
||||
</Button>
|
||||
</div>
|
||||
{bulkPrgress !== undefined && <progress value={bulkPrgress} />}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{self && (
|
||||
<div className="card max-w-2xl mx-auto">
|
||||
<h3 className="text-lg font-semibold mb-4">Storage Quota</h3>
|
||||
<div className="space-y-4">
|
||||
{self.total_available_quota && self.total_available_quota > 0 && (
|
||||
<>
|
||||
{/* File Count */}
|
||||
<div className="flex justify-between text-sm">
|
||||
<span>Files:</span>
|
||||
<span className="font-medium">
|
||||
{self.file_count.toLocaleString()}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* Progress Bar */}
|
||||
<div className="space-y-2">
|
||||
<div className="flex justify-between text-sm">
|
||||
<span>Used:</span>
|
||||
<span className="font-medium">
|
||||
{FormatBytes(self.total_size)} of{" "}
|
||||
{FormatBytes(self.total_available_quota)}
|
||||
</span>
|
||||
</div>
|
||||
<div className="w-full bg-gray-700 rounded-full h-2.5">
|
||||
<div
|
||||
className={`h-2.5 rounded-full transition-all duration-300 ${
|
||||
self.total_size / self.total_available_quota > 0.8
|
||||
? "bg-red-500"
|
||||
: self.total_size / self.total_available_quota > 0.6
|
||||
? "bg-yellow-500"
|
||||
: "bg-green-500"
|
||||
}`}
|
||||
style={{
|
||||
width: `${Math.min(100, (self.total_size / self.total_available_quota) * 100)}%`,
|
||||
}}
|
||||
></div>
|
||||
</div>
|
||||
<div className="flex justify-between text-xs text-gray-400">
|
||||
<span>
|
||||
{(
|
||||
(self.total_size / self.total_available_quota) *
|
||||
100
|
||||
).toFixed(1)}
|
||||
% used
|
||||
</span>
|
||||
<span
|
||||
className={`${
|
||||
self.total_size / self.total_available_quota > 0.8
|
||||
? "text-red-400"
|
||||
: self.total_size / self.total_available_quota > 0.6
|
||||
? "text-yellow-400"
|
||||
: "text-green-400"
|
||||
}`}
|
||||
>
|
||||
{FormatBytes(
|
||||
Math.max(
|
||||
0,
|
||||
self.total_available_quota - self.total_size,
|
||||
),
|
||||
)}{" "}
|
||||
remaining
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Quota Breakdown */}
|
||||
<div className="space-y-2 pt-2 border-t border-gray-700">
|
||||
{self.free_quota && self.free_quota > 0 && (
|
||||
<div className="flex justify-between text-sm">
|
||||
<span>Free Quota:</span>
|
||||
<span className="font-medium">
|
||||
{FormatBytes(self.free_quota)}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
{(self.quota ?? 0) > 0 && (
|
||||
<div className="flex justify-between text-sm">
|
||||
<span>Paid Quota:</span>
|
||||
<span className="font-medium">
|
||||
{FormatBytes(self.quota!)}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
{(self.paid_until ?? 0) > 0 && (
|
||||
<div className="flex justify-between text-sm">
|
||||
<span>Expires:</span>
|
||||
<div className="text-right">
|
||||
<div className="font-medium">
|
||||
{new Date(
|
||||
self.paid_until! * 1000,
|
||||
).toLocaleDateString()}
|
||||
</div>
|
||||
<div className="text-xs text-gray-400">
|
||||
{(() => {
|
||||
const now = Date.now() / 1000;
|
||||
const daysLeft = Math.max(
|
||||
0,
|
||||
Math.ceil(
|
||||
(self.paid_until! - now) / (24 * 60 * 60),
|
||||
),
|
||||
);
|
||||
return daysLeft > 0
|
||||
? `${daysLeft} days left`
|
||||
: "Expired";
|
||||
})()}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{(!self.total_available_quota ||
|
||||
self.total_available_quota === 0) && (
|
||||
<div className="text-center py-4 text-gray-400">
|
||||
<p>No quota information available</p>
|
||||
<p className="text-sm">
|
||||
Contact administrator for storage access
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<Button
|
||||
onClick={() => setShowPaymentFlow(!showPaymentFlow)}
|
||||
className="btn-primary w-full mt-4"
|
||||
>
|
||||
{showPaymentFlow ? "Hide" : "Show"} Payment Options
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
{showLegacy && (
|
||||
<FileList
|
||||
files={myLegacyFiles.map((f) => ({
|
||||
id: f,
|
||||
url: `https://void.cat/d/${f}`,
|
||||
}))}
|
||||
/>
|
||||
)}
|
||||
{listedFiles && (
|
||||
<FileList
|
||||
files={listedFiles.files}
|
||||
pages={Math.ceil(listedFiles.total / listedFiles.count)}
|
||||
page={listedFiles.page}
|
||||
onPage={(x) => setListedPage(x)}
|
||||
onDelete={async (x) => {
|
||||
await deleteFile(x);
|
||||
await listUploads(listedPage);
|
||||
}}
|
||||
/>
|
||||
|
||||
{showPaymentFlow && pub && (
|
||||
<div className="card">
|
||||
<PaymentFlow
|
||||
route96={new Route96(url, pub)}
|
||||
onPaymentRequested={(pr) => {
|
||||
console.log("Payment requested:", pr);
|
||||
}}
|
||||
userInfo={self}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{self?.is_admin && (
|
||||
<>
|
||||
<hr />
|
||||
<h3>Admin File List:</h3>
|
||||
<Button onClick={() => listAllUploads(0)}>List All Uploads</Button>
|
||||
<div>
|
||||
<select value={mimeFilter} onChange={e => setMimeFilter(e.target.value)}>
|
||||
<option value={""}>All</option>
|
||||
<option>image/webp</option>
|
||||
<option>image/jpeg</option>
|
||||
<option>image/jpg</option>
|
||||
<option>image/png</option>
|
||||
<option>image/gif</option>
|
||||
<option>video/mp4</option>
|
||||
<option>video/mov</option>
|
||||
</select>
|
||||
</div>
|
||||
{adminListedFiles && (
|
||||
<FileList
|
||||
files={adminListedFiles.files}
|
||||
pages={Math.ceil(adminListedFiles.total / adminListedFiles.count)}
|
||||
page={adminListedFiles.page}
|
||||
onPage={(x) => setAdminListedPage(x)}
|
||||
onDelete={async (x) => {
|
||||
await deleteFile(x);
|
||||
await listAllUploads(adminListedPage);
|
||||
}}
|
||||
/>
|
||||
<div className="card">
|
||||
<div className="flex justify-between items-center mb-6">
|
||||
<h2 className="text-xl font-semibold">Your Files</h2>
|
||||
{!listedFiles && (
|
||||
<Button onClick={() => listUploads(0)} className="btn-primary">
|
||||
Load Files
|
||||
</Button>
|
||||
)}
|
||||
</>
|
||||
</div>
|
||||
|
||||
{listedFiles && (
|
||||
<FileList
|
||||
files={listedFiles.files}
|
||||
pages={Math.ceil(listedFiles.total / listedFiles.count)}
|
||||
page={listedFiles.page}
|
||||
onPage={(x) => setListedPage(x)}
|
||||
onDelete={async (x) => {
|
||||
await deleteFile(x);
|
||||
await listUploads(listedPage);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{results.length > 0 && (
|
||||
<div className="card">
|
||||
<h3 className="text-lg font-semibold mb-4">Upload Results</h3>
|
||||
<div className="space-y-4">
|
||||
{results.map((result: any, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className="bg-gray-800 border border-gray-700 rounded-lg p-4"
|
||||
>
|
||||
<div className="flex items-start justify-between mb-3">
|
||||
<div className="flex-1">
|
||||
<h4 className="font-medium text-green-400 mb-1">
|
||||
✅ Upload Successful
|
||||
</h4>
|
||||
<p className="text-sm text-gray-400">
|
||||
{new Date(
|
||||
(result.uploaded || Date.now() / 1000) * 1000,
|
||||
).toLocaleString()}
|
||||
</p>
|
||||
</div>
|
||||
<div className="text-right">
|
||||
<span className="text-xs bg-blue-900/50 text-blue-300 px-2 py-1 rounded">
|
||||
{result.type || "Unknown type"}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
|
||||
<div>
|
||||
<p className="text-sm text-gray-400">File Size</p>
|
||||
<p className="font-medium">
|
||||
{FormatBytes(result.size || 0)}
|
||||
</p>
|
||||
</div>
|
||||
{result.nip94?.find((tag: any[]) => tag[0] === "dim") && (
|
||||
<div>
|
||||
<p className="text-sm text-gray-400">Dimensions</p>
|
||||
<p className="font-medium">
|
||||
{
|
||||
result.nip94.find(
|
||||
(tag: any[]) => tag[0] === "dim",
|
||||
)?.[1]
|
||||
}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<div>
|
||||
<p className="text-sm text-gray-400 mb-1">File URL</p>
|
||||
<div className="flex items-center gap-2">
|
||||
<code className="text-xs bg-gray-900 text-green-400 px-2 py-1 rounded flex-1 overflow-hidden">
|
||||
{result.url}
|
||||
</code>
|
||||
<button
|
||||
onClick={() =>
|
||||
navigator.clipboard.writeText(result.url)
|
||||
}
|
||||
className="text-xs bg-blue-600 hover:bg-blue-700 text-white px-2 py-1 rounded transition-colors"
|
||||
title="Copy URL"
|
||||
>
|
||||
Copy
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{result.nip94?.find((tag: any[]) => tag[0] === "thumb") && (
|
||||
<div>
|
||||
<p className="text-sm text-gray-400 mb-1">
|
||||
Thumbnail URL
|
||||
</p>
|
||||
<div className="flex items-center gap-2">
|
||||
<code className="text-xs bg-gray-900 text-blue-400 px-2 py-1 rounded flex-1 overflow-hidden">
|
||||
{
|
||||
result.nip94.find(
|
||||
(tag: any[]) => tag[0] === "thumb",
|
||||
)?.[1]
|
||||
}
|
||||
</code>
|
||||
<button
|
||||
onClick={() =>
|
||||
navigator.clipboard.writeText(
|
||||
result.nip94.find(
|
||||
(tag: any[]) => tag[0] === "thumb",
|
||||
)?.[1],
|
||||
)
|
||||
}
|
||||
className="text-xs bg-blue-600 hover:bg-blue-700 text-white px-2 py-1 rounded transition-colors"
|
||||
title="Copy Thumbnail URL"
|
||||
>
|
||||
Copy
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div>
|
||||
<p className="text-sm text-gray-400 mb-1">
|
||||
File Hash (SHA256)
|
||||
</p>
|
||||
<code className="text-xs bg-gray-900 text-gray-400 px-2 py-1 rounded block overflow-hidden">
|
||||
{result.sha256}
|
||||
</code>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<details className="mt-4">
|
||||
<summary className="text-sm text-gray-400 cursor-pointer hover:text-gray-300">
|
||||
Show raw JSON data
|
||||
</summary>
|
||||
<pre className="text-xs bg-gray-900 text-gray-300 p-3 rounded mt-2 overflow-auto">
|
||||
{JSON.stringify(result, undefined, 2)}
|
||||
</pre>
|
||||
</details>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{error && <b className="text-red-500">{error}</b>}
|
||||
<pre className="text-xs font-monospace overflow-wrap">
|
||||
{JSON.stringify(results, undefined, 2)}
|
||||
</pre>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
{"root":["./src/App.tsx","./src/const.ts","./src/login.ts","./src/main.tsx","./src/vite-env.d.ts","./src/components/button.tsx","./src/components/profile.tsx","./src/hooks/login.ts","./src/hooks/publisher.ts","./src/upload/admin.ts","./src/upload/blossom.ts","./src/upload/index.ts","./src/upload/nip96.ts","./src/views/files.tsx","./src/views/header.tsx","./src/views/upload.tsx"],"version":"5.6.2"}
|
||||
{"root":["./src/App.tsx","./src/const.ts","./src/login.ts","./src/main.tsx","./src/vite-env.d.ts","./src/components/button.tsx","./src/components/payment.tsx","./src/components/profile.tsx","./src/hooks/login.ts","./src/hooks/publisher.ts","./src/upload/admin.ts","./src/upload/blossom.ts","./src/upload/index.ts","./src/upload/nip96.ts","./src/views/admin.tsx","./src/views/files.tsx","./src/views/header.tsx","./src/views/reports.tsx","./src/views/upload.tsx"],"version":"5.6.2"}
|
@ -993,6 +993,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/history@npm:^4.7.11":
|
||||
version: 4.7.11
|
||||
resolution: "@types/history@npm:4.7.11"
|
||||
checksum: 10c0/3facf37c2493d1f92b2e93a22cac7ea70b06351c2ab9aaceaa3c56aa6099fb63516f6c4ec1616deb5c56b4093c026a043ea2d3373e6c0644d55710364d02c934
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/json-schema@npm:^7.0.15":
|
||||
version: 7.0.15
|
||||
resolution: "@types/json-schema@npm:7.0.15"
|
||||
@ -1016,6 +1023,27 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/react-router-dom@npm:^5.3.3":
|
||||
version: 5.3.3
|
||||
resolution: "@types/react-router-dom@npm:5.3.3"
|
||||
dependencies:
|
||||
"@types/history": "npm:^4.7.11"
|
||||
"@types/react": "npm:*"
|
||||
"@types/react-router": "npm:*"
|
||||
checksum: 10c0/a9231a16afb9ed5142678147eafec9d48582809295754fb60946e29fcd3757a4c7a3180fa94b45763e4c7f6e3f02379e2fcb8dd986db479dcab40eff5fc62a91
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/react-router@npm:*":
|
||||
version: 5.1.20
|
||||
resolution: "@types/react-router@npm:5.1.20"
|
||||
dependencies:
|
||||
"@types/history": "npm:^4.7.11"
|
||||
"@types/react": "npm:*"
|
||||
checksum: 10c0/1f7eee61981d2f807fa01a34a0ef98ebc0774023832b6611a69c7f28fdff01de5a38cabf399f32e376bf8099dcb7afaf724775bea9d38870224492bea4cb5737
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/react@npm:*, @types/react@npm:^18.3.3":
|
||||
version: 18.3.8
|
||||
resolution: "@types/react@npm:18.3.8"
|
||||
@ -1522,6 +1550,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"cookie@npm:^1.0.1":
|
||||
version: 1.0.2
|
||||
resolution: "cookie@npm:1.0.2"
|
||||
checksum: 10c0/fd25fe79e8fbcfcaf6aa61cd081c55d144eeeba755206c058682257cb38c4bd6795c6620de3f064c740695bb65b7949ebb1db7a95e4636efb8357a335ad3f54b
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2":
|
||||
version: 7.0.3
|
||||
resolution: "cross-spawn@npm:7.0.3"
|
||||
@ -3187,6 +3222,34 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"react-router-dom@npm:^7.6.2":
|
||||
version: 7.6.2
|
||||
resolution: "react-router-dom@npm:7.6.2"
|
||||
dependencies:
|
||||
react-router: "npm:7.6.2"
|
||||
peerDependencies:
|
||||
react: ">=18"
|
||||
react-dom: ">=18"
|
||||
checksum: 10c0/9a8370333b5c1ada5ed76a2c30a90ca5a5a8e6c8565165f147fb42b150f2b258b9e73935fe4945c459d770841abdfaf99c28f7e13da93b1f49b28e6a8e87aadb
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"react-router@npm:7.6.2":
|
||||
version: 7.6.2
|
||||
resolution: "react-router@npm:7.6.2"
|
||||
dependencies:
|
||||
cookie: "npm:^1.0.1"
|
||||
set-cookie-parser: "npm:^2.6.0"
|
||||
peerDependencies:
|
||||
react: ">=18"
|
||||
react-dom: ">=18"
|
||||
peerDependenciesMeta:
|
||||
react-dom:
|
||||
optional: true
|
||||
checksum: 10c0/c8ef65f2a378f38e3cba900d67fa2b80a41c1c3925102875ee07c12faa01ea40991cb3fbefaf3ff6914e724c755732e3d7dec2b1bdef09e0fddd00fccc85a06a
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"react@npm:^18.2.0, react@npm:^18.3.1":
|
||||
version: 18.3.1
|
||||
resolution: "react@npm:18.3.1"
|
||||
@ -3367,6 +3430,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"set-cookie-parser@npm:^2.6.0":
|
||||
version: 2.7.1
|
||||
resolution: "set-cookie-parser@npm:2.7.1"
|
||||
checksum: 10c0/060c198c4c92547ac15988256f445eae523f57f2ceefeccf52d30d75dedf6bff22b9c26f756bd44e8e560d44ff4ab2130b178bd2e52ef5571bf7be3bd7632d9a
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"shebang-command@npm:^2.0.0":
|
||||
version: 2.0.0
|
||||
resolution: "shebang-command@npm:2.0.0"
|
||||
@ -3726,6 +3796,7 @@ __metadata:
|
||||
"@snort/system-react": "npm:^1.5.1"
|
||||
"@types/react": "npm:^18.3.3"
|
||||
"@types/react-dom": "npm:^18.3.0"
|
||||
"@types/react-router-dom": "npm:^5.3.3"
|
||||
"@vitejs/plugin-react": "npm:^4.3.1"
|
||||
autoprefixer: "npm:^10.4.20"
|
||||
classnames: "npm:^2.5.1"
|
||||
@ -3737,6 +3808,7 @@ __metadata:
|
||||
prettier: "npm:^3.3.3"
|
||||
react: "npm:^18.3.1"
|
||||
react-dom: "npm:^18.3.1"
|
||||
react-router-dom: "npm:^7.6.2"
|
||||
tailwindcss: "npm:^3.4.13"
|
||||
typescript: "npm:^5.5.3"
|
||||
typescript-eslint: "npm:^8.0.1"
|
||||
|
Reference in New Issue
Block a user