diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b84600d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +data* +session* diff --git a/.env.example b/.env.example old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 345320f..8145cfe --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ .idea node_modules sessionData -data \ No newline at end of file +data +bun.lockb +data diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index b871023..bfa56e6 --- a/README.md +++ b/README.md @@ -1,3 +1,37 @@ # user-tracker Tracks and reports on a users actions + +## Docker +Docker image available on Dockerhub: +https://hub.docker.com/r/bradganley/buab + +``` +services: + bskybot_1: + image: bradganley/buab:0.0.1 + restart: unless-stopped + volumes: + - ./sessionData:/sessionData + environment: + - NAME=Brad + - USER_DID=did:plc:pi3zhvcqttk2hrdpmkynqrfi + - TRACKER_BSKY_HANDLE= + - TRACKER_BSKY_PASSWORD= + - DEBUG_LOG_ACTIVE=true + - DEBUG_LOG_LEVEL=info + - JETSTREAM_URL=ws://:6008/subscribe + - SESSION_DATA_PATH=/sessionData + + + jetstream: + image: "ghcr.io/bluesky-social/jetstream:sha-ea96859b93d1790ff20bb168e5fc442d462cea1e" + container_name: jetstream1 + restart: unless-stopped + environment: + - CURSOR_FILE=/data/cursor.json + ports: + - "6008:6008" + volumes: + - ./data:/data +``` diff --git a/bun.lockb b/bun.lockb deleted file mode 100755 index 281a6b0..0000000 Binary files a/bun.lockb and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 index dd1cb4e..69f3b42 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,12 +9,21 @@ services: - ./sessionData:/sessionData env_file: - .env + environment: + - NAME=Aaron + - USER_DID=did:plc:ksjfbda7262bbqmuoly54lww + #- TRACKER_BSKY_HANDLE= + #- TRACKER_BSKY_PASSWORD= + #- DEBUG_LOG_ACTIVE=true + #- DEBUG_LOG_LEVEL=info + #- JETSTREAM_URL='ws://jetstream:6008/subscribe' + #- SESSION_DATA_PATH='/sessionData' networks: - bun jetstream: - image: "ghcr.io/juni-b-queer/jetstream-new:personal-branch" + image: "ghcr.io/bluesky-social/jetstream:sha-ea96859b93d1790ff20bb168e5fc442d462cea1e" container_name: jetstream restart: unless-stopped environment: @@ -29,3 +38,6 @@ services: networks: bun: driver: bridge + ipam: + config: + - subnet: 10.10.0.0/16 diff --git a/makefile b/makefile old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/src/index.ts b/src/index.ts old mode 100644 new mode 100755 index d18ef3f..6f45c0b --- a/src/index.ts +++ b/src/index.ts @@ -33,7 +33,7 @@ let handlers = { CreateSkeetAction.make( (handler: HandlerAgent, commit: JetstreamEventCommit): string => { // @ts-ignore - let text = "\"" + commit.commit.record?.text + "\""; + let text = Bun.env.NAME + " posted \"" + commit.commit.record?.text + "\""; if(text.length > 300){ text = text.substring(1, 301) } @@ -59,7 +59,7 @@ let handlers = { // @ts-ignore [ActionTakenByUserValidator.make(Bun.env.USER_DID)], [ - CreateSkeetAction.make("Aaron liked:", undefined, (handler: HandlerAgent, commit: JetstreamEventCommit): JetstreamSubject => { + CreateSkeetAction.make(Bun.env.NAME +" liked:", undefined, (handler: HandlerAgent, commit: JetstreamEventCommit): JetstreamSubject => { return commit.commit.record.subject as JetstreamSubject; }), LogInputTextAction.make("Like") @@ -74,7 +74,7 @@ let handlers = { // @ts-ignore [ActionTakenByUserValidator.make(Bun.env.USER_DID)], [ - CreateSkeetAction.make("Aaron reposted:", undefined, (handler: HandlerAgent, commit: JetstreamEventCommit): JetstreamSubject => { + CreateSkeetAction.make(Bun.env.NAME + " reposted:", undefined, (handler: HandlerAgent, commit: JetstreamEventCommit): JetstreamSubject => { return commit.commit.record.subject as JetstreamSubject; }), LogInputTextAction.make("Repost") @@ -93,7 +93,7 @@ let handlers = { [ CreateSkeetAction.make((handler: HandlerAgent, event: JetstreamEventCommit): string => { const blockedDid = event.commit.record.subject - return "Aaron blocked a user: " + blockedDid; + return Bun.env.NAME + " blocked a user: " + blockedDid; }, undefined, undefined), LogInputTextAction.make("Block"), ], @@ -115,7 +115,7 @@ async function initialize() { initialize().then(() => { jetstreamSubscription.createSubscription() - DebugLog.info("INIT", 'Initialized!') + DebugLog.info("INIT", 'Initialized and watching ' + Bun.env.NAME + ' (' + Bun.env.USER_DID + ')') });