justfile

update for ntwl.xyz
offers sliders
2025-04-25 12:34:08 +10:00 · 2025-04-25 12:14:13 +10:00 · 2024-10-07 00:12:58 +11:00 · 2024-10-06 00:25:53 +10:00 · 2024-10-05 21:55:09 +10:00 · 2024-09-11 00:05:04 +10:00
57 changed files with 5662 additions and 1012 deletions
@@ -1,3 +1,7 @@
 node_modules/
 data/
-db/
+db/
+
+.env
+
+*sql.gz
@@ -1,18 +1,30 @@
 # TODO
-contact options on landing page

-move want add to rpc
+- accept new offers that are under highest accepted price
+
+env
+    discogs api key
+    discord api key
+
+discord bot
+    notify on sign up
+    want added
+    offer accepted
+
+email ppl who signed up
+    say we have updates
+
+main list filters
+    order by
+    offers only
+
+sample offer with tooltips
+
+go over and reorganise event logic
+    should be connection.service ?
+
+contact options on landing page

 skip unofficial release

 status stepper
-
-queue up wantlist adds to gracefully handle rate limiting
-
-push offers
-
-listen / notify
-    on offers
-        notify admins
-
-
@@ -0,0 +1 @@
+node_modules/
@@ -1,7 +0,0 @@
-# Environment variables declared in this file are automatically made available to Prisma.
-# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
-
-# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
-# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
-
-DATABASE_URL="postgresql://mcrates:digdeep@0.0.0.0:45432/mcrates?schema=public"
@@ -0,0 +1,14 @@
+FROM node:20
+WORKDIR /opt/crates/api
+
+# puppeteer deps
+RUN apt-get update
+# don't think about it
+RUN apt-get install -y ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils
+
+COPY . ./
+RUN npm i
+# not sure why doesn't do it itself
+RUN node node_modules/puppeteer/install.mjs
+
+CMD ["npm", "start"]
@@ -0,0 +1 @@
+crates-api-7b8d754768-r4f5q 19:40:38.635Z ERROR mcrates: sync error                                                        ││ crates-api-7b8d754768-r4f5q     TypeError: Cannot read properties of undefined (reading 'status')                          ││ crates-api-7b8d754768-r4f5q         at populateListings (/opt/crates/api/src/events.ts:42:28)                              ││ crates-api-7b8d754768-r4f5q         at updateWantListings (/opt/crates/api/src/events.ts:57:30)                            ││ crates-api-7b8d754768-r4f5q         at EventEmitter.sync (/opt/crates/api/src/events.ts:83:13)                             ││ crates-api-7b8d754768-r4f5q 19:40:40.707Z  INFO mcrates:  (event=Sync, wants=192)                                          ││ crates-api-7b8d754768-r4f5q 19:42:14.756Z ERROR mcrates: Navigation timeout of 30000 ms exceeded                           ││ crates-api-7b8d754768-r4f5q     TimeoutError: Navigation timeout of 30000 ms exceeded                                      ││ crates-api-7b8d754768-r4f5q         at new Deferred (/opt/crates/api/node_modules/puppeteer-core/src/util/Deferred.ts:73:2 ││ crates-api-7b8d754768-r4f5q         at Function.create (/opt/crates/api/node_modules/puppeteer-core/src/util/Deferred.ts:2 ││ crates-api-7b8d754768-r4f5q         at new LifecycleWatcher (/opt/crates/api/node_modules/puppeteer-core/src/cdp/Lifecycle ││ crates-api-7b8d754768-r4f5q         at CdpFrame.goto (/opt/crates/api/node_modules/puppeteer-core/src/cdp/Frame.ts:159:21) ││ crates-api-7b8d754768-r4f5q         at CdpFrame.<anonymous> (/opt/crates/api/node_modules/puppeteer-core/src/util/decorato ││ crates-api-7b8d754768-r4f5q         at CdpPage.goto (/opt/crates/api/node_modules/puppeteer-core/src/api/Page.ts:1649:35)  ││ crates-api-7b8d754768-r4f5q         at Object.listings (/opt/crates/api/src/discogs.ts:80:32)                              ││ crates-api-7b8d754768-r4f5q         at populateListings (/opt/crates/api/src/events.ts:37:30)                              ││ crates-api-7b8d754768-r4f5q         at updateWantListings (/opt/crates/api/src/events.ts:57:30)                            ││ crates-api-7b8d754768-r4f5q         at EventEmitter.sync (/opt/crates/api/src/events.ts:83:13)                             ││ crates-api-7b8d754768-r4f5q 19:42:14.989Z ERROR mcrates: sync error                                                        ││ crates-api-7b8d754768-r4f5q     TypeError: Cannot read properties of undefined (reading 'status')                          ││ crates-api-7b8d754768-r4f5q         at populateListings (/opt/crates/api/src/events.ts:42:28)                              ││ crates-api-7b8d754768-r4f5q         at updateWantListings (/opt/crates/api/src/events.ts:57:30)                            ││ crates-api-7b8d754768-r4f5q         at EventEmitter.sync (/opt/crates/api/src/events.ts:83:13)                             ││ crates-api-7b8d754768-r4f5q 19:42:25.047Z  INFO mcrates:  (event=Sync, wants=202)                                          ││ crates-api-7b8d754768-r4f5q 19:44:01.988Z ERROR mcrates: Timed out after waiting 30000ms                                   ││ crates-api-7b8d754768-r4f5q     TimeoutError: Timed out after waiting 30000ms                                              ││ crates-api-7b8d754768-r4f5q         at /opt/crates/api/node_modules/puppeteer-core/src/common/util.ts:302:17               ││ crates-api-7b8d754768-r4f5q         at /opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_party/rxjs/rxjs.js:3986:3 ││ crates-api-7b8d754768-r4f5q         at OperatorSubscriber2._this._next (/opt/crates/api/node_modules/puppeteer-core/lib/cj ││ crates-api-7b8d754768-r4f5q         at OperatorSubscriber2.Subscriber2.next (/opt/crates/api/node_modules/puppeteer-core/l ││ crates-api-7b8d754768-r4f5q         at AsyncAction2.<anonymous> (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third ││ crates-api-7b8d754768-r4f5q         at AsyncAction2._execute (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_pa ││ crates-api-7b8d754768-r4f5q         at AsyncAction2.execute (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_par ││ crates-api-7b8d754768-r4f5q         at AsyncScheduler2.flush (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_pa ││ crates-api-7b8d754768-r4f5q         at listOnTimeout (node:internal/timers:581:17)                                         ││ crates-api-7b8d754768-r4f5q         at processTimers (node:internal/timers:519:7)                                          ││ crates-api-7b8d754768-r4f5q 19:44:04.209Z ERROR mcrates: sync error                                                        ││ crates-api-7b8d754768-r4f5q     TypeError: Cannot read properties of undefined (reading 'status')                          ││ crates-api-7b8d754768-r4f5q         at populateListings (/oLine truncated
@@ -24,12 +24,16 @@ async function start() {
        prisma,
        pg,
        discogs,
+        discord,
        api,
        events,
-    } = createServices(log);
+        notify,
+    } = await createServices(log);
+
+    await notify.listen();
+    await discord.connect();

    // events.emit(Events.Sync);
-    // events.emit(Events.ListingsUpdated);

    api.listen();
 }
@@ -1,12 +1,12 @@
 {
-  "name": "mates-crates",
+  "name": "crates",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
  "scripts": {
    "test": "mocha",
    "test:watch": "mocha --watch",
-    "migrate": "knex migrate:latest",
+    "migrate": "prisma migrate status",
    "migrate:make": "prisma migrate dev --name",
    "start": "ts-node-dev --respawn --transpile-only index.ts | bunyan -o short"
  },
@@ -21,7 +21,6 @@
    "@types/mocha": "^9.1.1",
    "axios": "^0.27.2",
    "mocha": "^10.0.0",
-    "node-dev": "^7.4.3",
    "prisma": "^4.5.0",
    "ts-node-dev": "^2.0.0",
    "typescript": "^4.7.4"
@@ -34,6 +33,8 @@
    "bluebird": "^3.7.2",
    "bunyan": "^1.8.15",
    "cheerio": "^1.0.0-rc.12",
+    "discord.js": "^14.7.1",
+    "esrun": "^3.2.26",
    "koa": "^2.13.4",
    "koa-body": "^5.0.0",
    "koa-passport": "^5.0.0",
@@ -41,7 +42,11 @@
    "koa-websocket": "^7.0.0",
    "koa-ws": "^1.0.1",
    "lodash": "^4.17.21",
-    "passport-local": "^1.0.0"
+    "passport-local": "^1.0.0",
+    "pg-listen": "^1.7.0",
+    "puppeteer": "^23.3.0",
+    "puppeteer-extra": "^3.3.6",
+    "puppeteer-extra-plugin-stealth": "^2.11.2"
  },
  "overrides": {
    "koa-passport": {
@@ -0,0 +1,81 @@
+-- CreateTable
+CREATE TABLE "listings" (
+    "id" BIGINT NOT NULL,
+    "seller" BIGINT NOT NULL,
+    "data" JSONB NOT NULL,
+    "wantId" UUID NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "listings_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "users" (
+    "id" UUID NOT NULL DEFAULT gen_random_uuid(),
+    "email" TEXT NOT NULL,
+    "password" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "users_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "wants" (
+    "id" UUID NOT NULL DEFAULT gen_random_uuid(),
+    "release" BIGINT NOT NULL,
+    "data" JSONB NOT NULL,
+    "userId" UUID NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "wants_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "offers" (
+    "id" UUID NOT NULL DEFAULT gen_random_uuid(),
+    "status" TEXT NOT NULL,
+    "condition" TEXT NOT NULL DEFAULT '',
+    "item" MONEY NOT NULL,
+    "shipping" MONEY NOT NULL,
+    "total" MONEY NOT NULL,
+    "listingId" BIGINT NOT NULL,
+    "userId" UUID NOT NULL,
+    "wantId" UUID NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "offers_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "listings_seller_idx" ON "listings"("seller");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "users_email_key" ON "users"("email");
+
+-- CreateIndex
+CREATE INDEX "wants_release_idx" ON "wants"("release");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "wants_userId_release_key" ON "wants"("userId", "release");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "offers_listingId_key" ON "offers"("listingId");
+
+-- AddForeignKey
+ALTER TABLE "listings" ADD CONSTRAINT "listings_wantId_fkey" FOREIGN KEY ("wantId") REFERENCES "wants"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "wants" ADD CONSTRAINT "wants_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "offers" ADD CONSTRAINT "offers_listingId_fkey" FOREIGN KEY ("listingId") REFERENCES "listings"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "offers" ADD CONSTRAINT "offers_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "offers" ADD CONSTRAINT "offers_wantId_fkey" FOREIGN KEY ("wantId") REFERENCES "wants"("id") ON DELETE CASCADE ON UPDATE CASCADE;
@@ -0,0 +1,111 @@
+CREATE OR REPLACE FUNCTION notify_users() RETURNS TRIGGER AS $$
+    DECLARE
+        record RECORD;
+        id UUID;
+        payload JSON;
+    BEGIN
+    IF (TG_OP = 'DELETE') THEN
+        id = OLD.id;
+    ELSE
+        id = NEW.id;
+    END IF;
+
+    payload = json_build_object(
+        'table', TG_TABLE_NAME,
+        'action', TG_OP,
+        'id', id
+    );
+
+    PERFORM pg_notify('users.events', payload::text);
+
+    RETURN NULL;
+    END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION notify_listings() RETURNS TRIGGER AS $$
+    DECLARE
+        record RECORD;
+        id int8;
+        payload JSON;
+    BEGIN
+    IF (TG_OP = 'DELETE') THEN
+        id = OLD.id;
+    ELSE
+        id = NEW.id;
+    END IF;
+
+    payload = json_build_object(
+        'table', TG_TABLE_NAME,
+        'action', TG_OP,
+        'id', id
+    );
+
+    PERFORM pg_notify('listings.events', payload::text);
+
+    RETURN NULL;
+    END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION notify_offers() RETURNS TRIGGER AS $$
+    DECLARE
+        record RECORD;
+        id UUID;
+        payload JSON;
+    BEGIN
+    IF (TG_OP = 'DELETE') THEN
+        id = OLD.id;
+    ELSE
+        id = NEW.id;
+    END IF;
+
+    payload = json_build_object(
+        'table', TG_TABLE_NAME,
+        'action', TG_OP,
+        'id', id
+    );
+
+    PERFORM pg_notify('offers.events', payload::text);
+
+    RETURN NULL;
+    END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION notify_wants() RETURNS TRIGGER AS $$
+    DECLARE
+        record RECORD;
+        id UUID;
+        payload JSON;
+    BEGIN
+    IF (TG_OP = 'DELETE') THEN
+        id = OLD.id;
+    ELSE
+        id = NEW.id;
+    END IF;
+
+    payload = json_build_object(
+        'table', TG_TABLE_NAME,
+        'action', TG_OP,
+        'id', id
+    );
+
+    PERFORM pg_notify('wants.events', payload::text);
+
+    RETURN NULL;
+    END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE TRIGGER notify_wants_event
+AFTER INSERT OR UPDATE OR DELETE ON wants
+    FOR EACH ROW EXECUTE PROCEDURE notify_wants();
+
+CREATE OR REPLACE TRIGGER notify_listings_event
+AFTER INSERT OR UPDATE OR DELETE ON listings
+    FOR EACH ROW EXECUTE PROCEDURE notify_listings();
+
+CREATE OR REPLACE TRIGGER notify_offers_event
+AFTER INSERT OR UPDATE OR DELETE ON offers
+    FOR EACH ROW EXECUTE PROCEDURE notify_offers();
+
+CREATE OR REPLACE TRIGGER notify_users_event
+AFTER INSERT OR UPDATE OR DELETE ON users
+    FOR EACH ROW EXECUTE PROCEDURE notify_users();
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "postgresql"
@@ -11,6 +11,11 @@ datasource db {
 }

 model Listing {
+
+    // example listingId 2148851036
+    // works fine as a JS number
+    // but JS numbers are cast to int4 for pg by prisma
+    // becomes -2146116260
    id         BigInt      @id
    seller     BigInt
    data       Json
@@ -21,7 +26,7 @@ model Listing {
    offers     Offer[]

    createdAt  DateTime @default(now())
-    updatedAt  DateTime @updatedAt
+    updatedAt  DateTime @default(now())

    @@index([seller])
    @@map("listings")
@@ -33,7 +38,7 @@ model User {
    password   String

    createdAt  DateTime   @default(now())
-    updatedAt  DateTime   @updatedAt
+    updatedAt  DateTime   @default(now())

    wants      Want[]
    offers     Offer[]
@@ -50,7 +55,7 @@ model Want {
    user       User       @relation(fields: [userId], references: [id], onDelete: Cascade, onUpdate: Cascade)

    createdAt  DateTime   @default(now())
-    updatedAt  DateTime   @updatedAt
+    updatedAt  DateTime   @default(now())

    listings   Listing[]
    offers     Offer[]
@@ -48,12 +48,4 @@ describe('api', function apiTests() {
            assert(res.headers['set-cookie']);
        })
    });
-
-    describe('offers', function offerTests() {
-        it('create offers', async function createOffersTest() {
-            const { data: bundles } = await api.get('/bundles');
-            const listingIds = bundles[0].items.map(i => i.id);
-            const { data } = await api.post('/offers', { listingIds, shipping: 50.0, baseShipping: 15.0 });
-        });
-    });
 });
@@ -29,6 +29,11 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of

    const app = koaWebsocket(new koa());

+    // @ts-ignore - ts don't know wtf it talking about
+    BigInt.prototype.toJSON = function bigIntStringify() {
+        return this.toString();
+    };
+
    app.use(async (ctx, next) => {
        try {
            await next();
@@ -46,6 +51,7 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
    function listen() {
        const server = app.listen(PORT);
        log.info({ PORT }, 'listening');
+        return server;
    }

    app.use(cors({ credentials: true }));
@@ -54,7 +60,7 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
    app.keys = [SECRET];
    app.use(session(app));

-    const { authRouter, passport } = routerAuth(log, pg);
+    const { authRouter, passport } = routerAuth(log, pg, events);
    app.use(passport.initialize());
    app.use(passport.session())
    app.use(authRouter.routes());
@@ -63,22 +69,13 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
        ctx.status = 200;
    });

-    router.post('/want', async function wantPost(ctx, next) {
-        ctx.assert(ctx.isAuthenticated(), 401, 'log in required');
-        const { releaseId } = ctx.request.body;
-        const user = await pg.userFindId(ctx.state.user.id);
-        const release = await discogs.release(releaseId);
-        const want = await pg.wantCreate(release, user);
-        events.emit(Events.WantsAdded, [want]);
-        ctx.response.body = [want];
-    });
-
    router.post('/want/discogs', async function wantListPost(ctx, next) {
        ctx.assert(ctx.isAuthenticated(), 401, 'log in required');
        const { username } = ctx.request.body;
+        ctx.assert(username, 'no username supplied');
        const user = await pg.userFindId(ctx.state.user.id);
        const wants = await discogs.wantListSync(username, user);
-        events.emit(Events.WantsAdded, [wants]);
+        events.emit(Events.WantsAdded, wants);
        ctx.response.body = wants;
    });

@@ -109,7 +106,6 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
            const ws = ctx.websocket;
            const rpc = createRpc(log, pg, ws, discogs, offers, events, ctx.state.user as User | null);

-            if (ctx.state.user) events.emit(Events.Connection, { ws, id: ctx.state.user.id });
            ws.on('message', async function incoming(message) {
                try {
                    const parsed = JSON.parse(message.toString());
@@ -127,7 +123,9 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
                log.info('ws disconnected', { user: ctx.state.user });
            });

+            if (ctx.state.user) events.emit(Events.Connection, { rpc, id: ctx.state.user.id });
            await rpc.onConnection();
+
        } catch (e) {
            log.error(e);
        }
@@ -1,23 +1,21 @@
-import fs from 'fs/promises';
-
 import axios from 'axios';
-import cheerio from 'cheerio';
-import Bluebird from 'bluebird';
+import pptr from 'puppeteer-extra'
+import StealthPlugin from 'puppeteer-extra-plugin-stealth'

 import type Log from 'bunyan';
-import type { PrismaClient, Want, User, Listing } from '@prisma/client';
+import type { Want, User } from '@prisma/client';

-import { logAxiosError, wantDetails } from './utils';
+import { wantDetails } from './utils';
 import { Pg } from './pg';

-// margh
-// vanderbabe
-// jmcdermid1
-
-export default function createDiscogs(log: Log, pg: Pg) {
-    const TOKEN = 'Discogs token=wRTXuYZGOPsIQgKRGKCAkUkidGtvpSfQgPWkYIpD';
+export default async function createDiscogs(log: Log, pg: Pg) {
+    const TOKEN = process.env.DISCOGS_TOKEN;
    const apiBase = 'https://api.discogs.com'
-    const discogsBase = 'https://www.discogs.com'
+
+    pptr.use(StealthPlugin())
+    const browser = await pptr.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] })
+
+    log.info('browser created')

    const api = axios.create({
        headers: {
@@ -27,34 +25,37 @@ export default function createDiscogs(log: Log, pg: Pg) {
        },
    });

-    async function handleApiError(e) {
-        logAxiosError(e);
-        if (e.response.status === 429) {
-            throw new Error('rate limited');
-        }
-        return null;
+    function onSuccess(response) {
+        return response.data;
    }

-    async function wantListSync(username: string, user: User): Promise<Want[]> {
-        const { data: { wants, pagination }} = await api.get(`${apiBase}/users/${username}/wants`);
-        const releases = await Promise.all(wants.map(want => release(want.id)));
+    function onError(error) {
+        throw error;
+    }
+    api.interceptors.response.use(onSuccess, onError);

+    async function wantListSync(username: string, user: User): Promise<Want[]> {
+        const res = await api.get(`${apiBase}/users/${username}/wants`);
+        const { wants, pagination } = res;
+
+        const releases = await Promise.all(wants.map(want => release(want.id)));
        log.info({ wants: wants.length, user: username, userId: user.id }, 'fetched discogs wantlist');

        // TODO filter releases to be vinyl format only

        // convert want object to actual release and ignore duplicate errors
        const results = await Promise.allSettled(releases.map(release => pg.wantCreate(release, user)));
+        log.info(results);
        // @ts-ignore
        const additions = results.filter(r => r.status === 'fulfilled').map(r => r.value);

-        log.info('want list additions', additions);
+        log.info('want list additions', { additions: additions.length });

        return additions;
    }

    async function release(id: DiscogsRelease): Promise<any> {
-        const { data } = await api.get(`${apiBase}/releases/${id}`);
+        const data = await api.get(`${apiBase}/releases/${id}`);
        return data;
    }

@@ -63,44 +64,59 @@ export default function createDiscogs(log: Log, pg: Pg) {
        url.searchParams.append('query', query);
        url.searchParams.append('type', 'release');
        url.searchParams.append('format', 'vinyl');
-        const { data: { results } } = await api.get(url.href);
+        const res = await api.get(url.href);
+        const { results } = res;
        return results;
    }

    async function inventory(user: string) {
        const res = await api.get(`${apiBase}/users/${user}/inventory`);
-        return res.data.listings;
+        return res.listings;
    }

    async function listings(want: Want) {
-        const res = await api.get(`https://www.discogs.com/sell/release/${want.release}?limit=250`);
-        const $ = cheerio.load(res.data);
-        const ids = $('.item_description_title[href]')
-            .map(function getListingId() {
-                const id = Number.parseInt(this.attribs.href.replace('/sell/item/', ''), 10);
-                return id;
-            })
-            .get();
+        const page = await browser.newPage()
+        const url = `https://www.discogs.com/sell/release/${want.release}?limit=250`
+        const res = await page.goto(url)
+        log.debug({ status: res.status() }, 'status')
+        if (!res.ok()) throw new Error(res.statusText())
+        const els = await page.$$('.item_description_title[href]')
+        const hrefs = await Promise.all(els.map(e => e.evaluate(e => e.href)))
+        const ids = hrefs
+            .map(h => new URL(h))
+            .map(p => p.pathname.replace('/sell/item/', ''))
+            .map(p => Number.parseInt(p, 10))
+
+        await page.close()
+
+        if (ids.length === 0) log.warn({ res, url, ...wantDetails(want) }, "Want had zero listings")

        const unlisted = await pg.listingRmUnlisted(want, ids);
        if (unlisted) log.info({ unlisted: unlisted, ...wantDetails(want) }, 'missing listings removed');

        // preferentially take listings from sellers if we hit req limits
-        return Bluebird.mapSeries(ids, async id => listing(id, want));
+
+        // sometimes we get dodgy listings from discogs that throw perm errors
+        // we just want to ignore them
+        // const results = await Promise.allSettled(ids.map(id => listing(id, want)));
+
+        const results = []
+        for await (const id of ids) {
+            const r = await listing(id, want)
+            results.push(r)
+        }
+        return results;
+
    }

    async function listing(id, want) {
        const listing = await pg.listingFind(id);
        if (listing) return listing;

-        try {
-            log.debug('fetching listing', id);
-            const res = await api.get(`${apiBase}/marketplace/listings/${id}`);
-            log.debug(res.data);
-            return pg.listingUpsert(res.data, want);
-        } catch (e) {
-            return handleApiError(e);
-        }
+        log.debug('fetching listing', id);
+        const discogsListing = await api.get(`${apiBase}/marketplace/listings/${id}`);
+        log.debug(discogsListing);
+        return pg.listingUpsert(discogsListing, want);
    }

    return {
@@ -0,0 +1,36 @@
+import type Log from 'bunyan';
+
+import { Client, GatewayIntentBits } from 'discord.js';
+
+export default function createDiscord(log: Log) {
+
+    const client = new Client({ intents: [GatewayIntentBits.Guilds] });
+
+    const TOKEN = process.env.DISCORD_TOKEN;
+
+    async function connect() {
+        return new Promise((resolve, reject) => {
+            client.once('ready', () => {
+                log.info({ bot: client.user.tag }, 'discord client logged in');
+                resolve(client);
+            });
+            client.login(TOKEN);
+        });
+    }
+
+    function message(msg) {
+        if (!process.env.DISCORD_ENABLED) return false;
+        log.info({ msg }, 'sending discord message');
+        const channel = client.channels.cache.get('1072490127324090418');
+        // @ts-ignore - wrong
+        const str = JSON.stringify(msg, null, 4);
+        channel.send(`\`\`\`${str}\`\`\``);
+    }
+
+    return {
+        connect,
+        message,
+    };
+}
+
+export type Discord = ReturnType<typeof createDiscord>;
@@ -2,73 +2,127 @@ import { EventEmitter } from 'node:events';
 import { setTimeout } from 'timers/promises';

 import type Log from 'bunyan';
-import type { Want } from '@prisma/client';
+import type { Want, Offer } from '@prisma/client';

 import { Pg } from './pg';
+import { Rpc } from './rpc';
 import { wantDetails } from './utils';
 import routerAuth from './routers/router.auth';

 export enum Events {
    WantsAdded = 'WantsAdded',
    Sync = 'Sync',
-    ListingsUpdated = 'ListingsUpdated',
    Connection = 'Connection',
+
+    ListingsUpdated = 'ListingsUpdated',
+    OffersUpdated = 'OffersUpdated',
+    WantsUpdated = 'WantsUpdated',
+
+    DiscordMessage = 'DiscordMessage',
 }

-export default function createEvents(log: Log, pg: Pg, discogs, offers) {
+export default function createEvents(log: Log, pg: Pg, discogs, offers, discord) {
    const events = new EventEmitter({ captureRejections: true });
-    const connections = new Map();
-
-    async function populateListings(want: Want) {
-        try {
-            const listings = await discogs.listings(want);
-            return listings;
-        } catch (e) {
-            if (e.message === 'rate limited') {
-                log.warn('rate limited, trying again in 60s');
-                await setTimeout(60 * 1000);
-                return populateListings(want);
-            }
-            throw e;
-        }
-    }
+    const connections = new Map<UUID, Rpc>();

    events.on('error', function eventError(e) {
        log.error('event error', e);
    });

+    const MAX_ATTEMPTS = 3;
+    const SYNC_EVERY_MS = 60 * 1000
+    const RATE_LIMIT_WAIT_MS = (attempts) => attempts * 70 * 1000
+    async function populateListings(want: Want, attempts = 1) {
+        try {
+            const listings = await discogs.listings(want);
+            await pg.wantSynced(want);
+            return listings;
+        } catch (e) {
+            log.error(e)
+            if (e.response.status === 429) {
+                log.warn({ RATE_LIMIT_WAIT_MS: RATE_LIMIT_WAIT_MS(attempts), ...e.response.headers }, 'rate limited, trying again');
+
+                await setTimeout(RATE_LIMIT_WAIT_MS(attempts));
+                if (attempts > MAX_ATTEMPTS) {
+                    log.error(wantDetails(want), 'failed to populate listings')
+                }
+                return populateListings(want, attempts++);
+            }
+            throw e;
+        }
+    }
+
    async function updateWantListings(wants: Want[]) {
        for (const want of wants) {
            const listings = await populateListings(want);
-            log.info({ listings: listings.length, ...wantDetails(want) }, 'listings added');
-            events.emit(Events.ListingsUpdated);
+            log.info({ listings: listings.length, ...wantDetails(want) }, 'listings found');
+            await offers.generate();
+            await notifyUser(want.userId);
        }

        log.info({ wants: wants.length }, 'finished syncing');
    }

+    async function notifyUser(id: UUID) {
+        const rpc = connections.get(id);
+        if (!rpc) return null;
+        rpc.pushUserWants();
+        rpc.pushUserOffers();
+    };
+
    events.on(Events.WantsAdded, async function wantsAdded(wants: Want[]) {
        log.info({ event: Events.WantsAdded, wants: wants.map(w => wantDetails(w)) }, 'starting listings population');
        await updateWantListings(wants);
        log.info({ event: Events.WantsAdded, wants: wants.map(w => wantDetails(w)) }, 'finished populating listings');
-        events.emit(Events.ListingsUpdated);
    });

    events.on(Events.Sync, async function sync() {
-        const wants = await pg.wantsToSync();
-        log.info({ event: Events.Sync, wants: wants.length });
-        await updateWantListings(wants);
-        events.emit(Events.ListingsUpdated);
+        try {
+            const wants = await pg.wantsToSync();
+            log.info({ event: Events.Sync, wants: wants.length });
+            await updateWantListings(wants);
+
+            if (wants.length === 0) {
+                log.info('all listings up to date');
+                await setTimeout(10000)
+                // forever
+                events.emit(Events.Sync);
+            }
+        } catch (e) {
+            log.error(e, 'sync error')
+        }
+
    });

-    events.on(Events.ListingsUpdated, async function listingsUpdated() {
-        const updatedOffers = await offers.generate()
-        log.debug({ offers: updatedOffers.length }, 'offers up to date');
-    });
+    // events.on(Events.ListingsUpdated, async function listingsUpdated() {
+    //     const updatedOffers = await offers.generate()
+    //     log.debug({ offers: updatedOffers.length }, 'offers up to date');
+    // });

-    events.on(Events.Connection, async function onConnection({ ws, id }) {
-        connections.set(id, ws);
+    events.on(Events.Connection, async function onConnection({ rpc, id }) {
+        log.debug('new rpc connection', { id, rpc });
+        connections.set(id, rpc);
    })

+    events.on(Events.DiscordMessage, async function onDiscordMessage(msg) {
+        discord.message(msg);
+    })
+
+    // emitted by listen/notify
+    // disabled for now
+    // events.on(Events.OffersUpdated, async function onOffersUpdated(offer: Offer) {
+    //     const rpc = connections.get(offer.userId);
+    //     if (!rpc) return null;
+    //     log.debug({ event: Events.OffersUpdated, rpc, offer });
+    //     return rpc.pushUserOffers();
+    // });
+
+    // events.on(Events.WantsUpdated, async function onWantsUpdated(want: Want) {
+    //     const rpc = connections.get(want.userId);
+    //     if (!rpc) return null;
+    //     log.debug({ event: Events.WantsUpdated, rpc, want });
+    //     return rpc.pushUserWants();
+    // });
+
    return events;
 }
@@ -0,0 +1,60 @@
+import createSubscriber from 'pg-listen'
+import type Log from 'bunyan';
+
+import { Events } from './events';
+import { Pg } from './pg';
+
+export default function createNotify(log: Log, pg: Pg, events) {
+    const OFFERS_CHANNEL = 'offers.events';
+    const USERS_CHANNEL = 'users.events';
+    const LISTINGS_CHANNEL = 'listings.events';
+    const WANTS_CHANNEL = 'wants.events';
+
+    const subscriber = createSubscriber({ connectionString: process.env.DATABASE_URL });
+
+    // pg has a hard limit of 8000B for the notification payload
+    // so we only receive the ids of the updated record
+    // and go fetch the whole thing to figure out who to notify
+
+    async function handleOffers(payload) {
+        const { action, id } = payload;
+        log.debug({ channel: OFFERS_CHANNEL, action, id });
+        if (action === 'DELETE') return null;
+
+        // const offer = await pg.offerFindId(id);
+        // events.emit(Events.OffersUpdated, offer);
+    }
+
+    async function handleUsers(payload) {
+        const { action, id } = payload;
+        log.debug({ channel: USERS_CHANNEL, action, id });
+    }
+
+    async function handleListings(payload) {
+        const { action, id } = payload;
+        log.debug({ channel: LISTINGS_CHANNEL, action, id });
+    }
+
+    async function handleWants(payload) {
+        const { action, id } = payload;
+        // const want = await pg.offerFindId(id);
+        log.debug({ channel: WANTS_CHANNEL, action, id });
+    }
+
+    subscriber.notifications.on(OFFERS_CHANNEL, handleOffers);
+    subscriber.notifications.on(USERS_CHANNEL, handleUsers);
+    subscriber.notifications.on(LISTINGS_CHANNEL, handleListings);
+    subscriber.notifications.on(WANTS_CHANNEL, handleWants);
+
+    async function listen() {
+        await subscriber.connect();
+        await Promise.all([
+            subscriber.listenTo(OFFERS_CHANNEL),
+            subscriber.listenTo(USERS_CHANNEL),
+            subscriber.listenTo(LISTINGS_CHANNEL),
+            subscriber.listenTo(WANTS_CHANNEL),
+        ]);
+    }
+
+    return { listen };
+}
@@ -63,19 +63,20 @@ export default function createOffers(log: Log, pg: Pg) {

        // check the user actually has this offer
        const offer = await pg.userOfferFind(ctx.state.user, id);
-        return pg.offerStatusSet(offer.id, Status.Accepted);
+        return pg.offerStatusSet([offer.id], Status.Accepted);
    }

-    async function statusSet(user: User, id: UUID, status: Status) {
-        log.info({ status, id }, 'setting offer status');
+    async function statusSet(user: User, ids: UUID[], status: Status) {
+        log.info({ status, ids }, 'setting offer status');

-        const offer = await pg.offerFindId(id);
-        const update = await pg.offerStatusSet(offer.id, status);
+        // const offer = await pg.offerFindId(ids);
+        const update = await pg.offerStatusSet(ids, status);

-        if (status === Status.Complete) {
-            log.info({ id, status }, 'completed offer, removing want...');
-            await pg.wantRm(offer.wantId);
-        }
+        // forget about this for now
+        // if (status === Status.Complete) {
+        //     log.info({ id, status }, 'completed offer, removing want...');
+        //     await pg.wantRm(offer.wantId);
+        // }

        return update;
    }
@@ -5,6 +5,7 @@ import * as Bluebird from 'bluebird';
 import _ from 'lodash';

 import { Status } from './offers';
+import { wantDetails } from './utils';

 export interface UserCreateParams {
    email: string,
@@ -21,10 +22,12 @@ export default function createPg(log: Log, prisma: PrismaClient) {
    }

    async function userWants(user: User) {
-        return prisma.want.findMany({
+        const wants = await prisma.want.findMany({
            where: { userId: user.id },
            include: { _count: { select: { offers: true }} },
-        });
+        })
+
+        return _.sortBy(wants, w => `${w.data.artists_sort} - ${w.data.title}`);
    }

    async function userOffers(user: User) {
@@ -97,6 +100,12 @@ export default function createPg(log: Log, prisma: PrismaClient) {
        });
    }

+    async function wantFindId(id: UUID) {
+        return prisma.want.findFirstOrThrow({
+            where: { id },
+        });
+    }
+
    async function wantList(user: User) {
        return prisma.want.findMany({
            where: { userId: user.id },
@@ -104,7 +113,12 @@ export default function createPg(log: Log, prisma: PrismaClient) {
    }

    async function wantsToSync() {
-        return prisma.want.findMany({});
+        return prisma.want.findMany({
+            orderBy: { updatedAt: 'asc' },
+            where: {
+                updatedAt: { lte: new Date(Date.now() - 1000 * 60 * 15) }
+            }
+        });
    }

    async function wantRm(id: UUID) {
@@ -125,14 +139,21 @@ export default function createPg(log: Log, prisma: PrismaClient) {
        });
    }

+    async function wantSynced(want: Want) {
+        return prisma.want.update({
+            where: { id: want.id },
+            data: { updatedAt: new Date() },
+        });
+    }
+
    async function listingRmUnlisted(want: Want, currentListingIds: DiscogsListing[]) {
        return prisma.$transaction(async (prisma) => {
            log.debug({ currentListingIds });

            const protectedOfferStatuses = [Status.Confirmed, Status.Complete];

-            // can't delete a listing with an open offer
-            // so delete those offers first
+            // delete all the offers where we don't want to keep them
+            // for historical reasons
            const { count: offersRemoved } = await prisma.offer.deleteMany({
                where: {
                    wantId: want.id,
@@ -145,7 +166,7 @@ export default function createPg(log: Log, prisma: PrismaClient) {
                }
            });

-            if (offersRemoved > 0) log.info({ offersRemoved }, 'open offers removed');
+            if (offersRemoved > 0) log.info({ offersRemoved, ...wantDetails(want) }, 'pending offers removed');

            // now we have to filter listingIds with confirmed offers
            // and get their listingIds to filter out
@@ -154,26 +175,25 @@ export default function createPg(log: Log, prisma: PrismaClient) {
                    wantId: want.id,
                    status: {
                        in: protectedOfferStatuses,
-                    }
+                    },
                },
                select: {
                    listingId: true,
-                }
+                },
            })).map(r => r.listingId);
-            const removalIds = _.without(currentListingIds, ...confirmedListingIds);
+            const removalIds = currentListingIds.filter(id => confirmedListingIds.includes(id));
+
+            if (removalIds.length) log.info({ removalIds });

            // finally we delete listings that aren't related
            // to a historical offer
            const { count } = await prisma.listing.deleteMany({
                where: {
-                    wantId: want.id,
-                    id: {
-                        notIn: currentListingIds,
-                    }
-                }
+                    id: { in: removalIds },
+                },
            });

-            log.info({ count }, 'second stage open offers removed');
+            if (count) log.info({ count }, 'second stage open offers removed');

            return count;
        });
@@ -269,9 +289,9 @@ export default function createPg(log: Log, prisma: PrismaClient) {
        );
    }

-    async function offerStatusSet(id: UUID, status: Status) {
-        return prisma.offer.update({
-            where: { id: id },
+    async function offerStatusSet(ids: UUID[], status: Status) {
+        return prisma.offer.updateMany({
+            where: { id: { in: ids } },
            data: { status },
        });
    }
@@ -298,6 +318,7 @@ export default function createPg(log: Log, prisma: PrismaClient) {
        wantCreate,
        wantList,
        wantsToSync,
+        wantSynced,
        wantRm,

        listingUpsert,
@@ -4,8 +4,9 @@ import { Strategy as LocalStrategy } from 'passport-local';
 import Router from '@koa/router'

 import type { Pg } from './../pg';
+import { Events } from './../events';

-export default function authRouter(log, pg: Pg) {
+export default function authRouter(log, pg: Pg, events) {
    const passport = new KoaPassport();

    async function verifyPassword(user, password) {
@@ -69,6 +70,7 @@ export default function authRouter(log, pg: Pg) {
            id: user.id,
            email: user.email,
        };
+        events.emit(Events.DiscordMessage, { msg: 'user register', email: user.email });
    });

    return { authRouter, passport };
@@ -12,6 +12,81 @@ import { Status } from './offers';
 import { isAdmin } from './utils';
 import { Events } from './events';

+export type Rpc = ReturnType<typeof createRpc>;
+
+export enum RpcMessageType {
+    Ping = 'Ping',
+    Pong = 'Pong',
+
+    // points out user is anon
+    WhoDis = 'WhoDis',
+
+    Bundles = 'Bundles',
+    Offers = 'Offers',
+    List = 'List',
+    Wants = 'Wants',
+    User = 'User',
+
+    Error = 'Error',
+
+    OfferSamples = 'OfferSamples',
+    OfferStatusSet = 'OfferStatusSet',
+
+    AcpOfferStatusSet = 'AcpOfferStatusSet',
+    AcpOffers = 'AcpOffers',
+    AcpListingsSync = 'AcpListingsSync',
+
+    WantRm = 'WantRm',
+    WantAdd = 'WantAdd',
+}
+
+type ErrorMessage = [RpcMessageType.Error, string];
+type PongMessage = [RpcMessageType.Pong, []];
+type PingMessage = [RpcMessageType.Ping, []];
+type WhoDisMessage = [RpcMessageType.WhoDis, []];
+type UserMessage = [RpcMessageType.User, User];
+type WantsMessage = [RpcMessageType.Wants, Want[]];
+type OffersMessage = [RpcMessageType.Offers, Offer[]];
+type OfferStatusSetMessage = [RpcMessageType.OfferStatusSet, Offer[]];
+type OfferSamplesMessage = [RpcMessageType.OfferSamples, Offer[]];
+
+type AcpOfferStatusSetMessage = [RpcMessageType.AcpOfferStatusSet, Offer[]];
+type AcpOffersMessage = [RpcMessageType.AcpOffers, Offer[]];
+type AcpListingsSyncMessage = [RpcMessageType.AcpListingsSync, []];
+
+export type RpcMessage =
+    PingMessage |
+    PongMessage |
+    WhoDisMessage |
+
+    UserMessage |
+
+    WantsMessage |
+
+    OffersMessage |
+    OfferSamplesMessage |
+    OfferStatusSetMessage |
+
+    AcpOfferStatusSetMessage |
+    AcpOffersMessage |
+    AcpListingsSyncMessage |
+
+    ErrorMessage;
+
+
+type OfferStatusSetParams = {
+    ids: UUID[],
+    status: Status,
+};
+
+type WantRmParams = {
+    id: UUID,
+};
+
+type WantAddParams = {
+    releaseId: number,
+};
+
 function checkMsgType(msgType: RpcMessageType): msgType is RpcMessageType {
    if (RpcMessageType[msgType]) {
        return true;
@@ -34,13 +109,15 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
    }

    async function offerStatusSet(params: OfferStatusSetParams): Promise<OffersMessage> {
-        const { id, status } = params;
-        assert(id, 'no id supplied');
+        const { ids, status } = params;
+        assert(ids, 'no ids supplied');
        assert(Status[status], 'unknown status');

-        const offer = await offers.statusSet(user, id, status);
+        const offer = await offers.statusSet(user, ids, status);
        const userOffers = await offers.userOffers(user);

+        events.emit(Events.DiscordMessage, { msg: 'user offer event', user: user.email, offer })
+
        return [RpcMessageType.Offers, userOffers]
    }

@@ -54,6 +131,18 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
        return [RpcMessageType.Wants, wants];
    }

+    async function wantAdd(params: WantAddParams): Promise<WantsMessage> {
+        const { releaseId } = params;
+        assert(releaseId, 'no id supplied');
+
+        const release = await discogs.release(releaseId);
+        const want = await pg.wantCreate(release, user);
+        events.emit(Events.WantsAdded, [want]);
+
+        const wants = await pg.userWants(user);
+        return [RpcMessageType.Wants, wants];
+    }
+
    async function acpOfferStatusSet(params: OfferStatusSetParams): Promise<AcpOffersMessage> {
        const { id, status } = params;
        assert(isAdmin(user), 'not authorised');
@@ -101,6 +190,8 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers

            case RpcMessageType.WantRm:
                return wantRm(params);
+            case RpcMessageType.WantAdd:
+                return wantAdd(params);

            case RpcMessageType.AcpOfferStatusSet:
                return acpOfferStatusSet(params);
@@ -134,13 +225,8 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
        const userMsg: UserMessage = [RpcMessageType.User, user];
        send(userMsg);

-        const userOffers = await offers.userOffers(user);
-        const offersMsg: OffersMessage = [RpcMessageType.Offers, userOffers];
-        send(offersMsg);
-
-        const wants = await pg.userWants(user);
-        const wantsMsg: WantsMessage = [RpcMessageType.Wants, wants];
-        send(wantsMsg);
+        await pushUserOffers();
+        await pushUserWants();

        if (isAdmin(user)) return adminConnection();
    }
@@ -153,79 +239,20 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
        ))
    }

+    async function pushUserOffers() {
+        send(await userOffers());
+    }
+
+    async function pushUserWants() {
+        send(await userWants());
+    }
+
    return {
        receive,
        send,
        onConnection,
+
+        pushUserOffers,
+        pushUserWants,
    }
 }
-
-export type Rpc = ReturnType<typeof createRpc>;
-
-export enum RpcMessageType {
-    Ping = 'Ping',
-    Pong = 'Pong',
-
-    // points out user is anon
-    WhoDis = 'WhoDis',
-
-    Bundles = 'Bundles',
-    Offers = 'Offers',
-    List = 'List',
-    Wants = 'Wants',
-    User = 'User',
-
-    Error = 'Error',
-
-    OfferSamples = 'OfferSamples',
-    OfferStatusSet = 'OfferStatusSet',
-
-    AcpOfferStatusSet = 'AcpOfferStatusSet',
-    AcpOffers = 'AcpOffers',
-    AcpListingsSync = 'AcpListingsSync',
-
-    WantRm = 'WantRm',
-}
-
-type ErrorMessage = [RpcMessageType.Error, string];
-type PongMessage = [RpcMessageType.Pong, []];
-type PingMessage = [RpcMessageType.Ping, []];
-type WhoDisMessage = [RpcMessageType.WhoDis, []];
-type UserMessage = [RpcMessageType.User, User];
-type WantsMessage = [RpcMessageType.Wants, Want[]];
-type OffersMessage = [RpcMessageType.Offers, Offer[]];
-type OfferStatusSetMessage = [RpcMessageType.OfferStatusSet, Offer[]];
-type OfferSamplesMessage = [RpcMessageType.OfferSamples, Offer[]];
-
-type AcpOfferStatusSetMessage = [RpcMessageType.AcpOfferStatusSet, Offer[]];
-type AcpOffersMessage = [RpcMessageType.AcpOffers, Offer[]];
-type AcpListingsSyncMessage = [RpcMessageType.AcpListingsSync, []];
-
-export type RpcMessage =
-    PingMessage |
-    PongMessage |
-    WhoDisMessage |
-
-    UserMessage |
-
-    WantsMessage |
-
-    OffersMessage |
-    OfferSamplesMessage |
-    OfferStatusSetMessage |
-
-    AcpOfferStatusSetMessage |
-    AcpOffersMessage |
-    AcpListingsSyncMessage |
-
-    ErrorMessage;
-
-
-type OfferStatusSetParams = {
-    id: UUID,
-    status: Status,
-};
-
-type WantRmParams = {
-    id: UUID,
-};
@@ -1,24 +1,30 @@
 import { PrismaClient } from '@prisma/client'

-import createDiscogs from './discogs';
-import createOffers from './offers';
-import createLog from './log';
 import createApi from './api';
+import createDiscogs from './discogs';
 import createEvents from './events';
+import createLog from './log';
+import createNotify from './notify';
+import createOffers from './offers';
 import createPg from './pg';
+import createDiscord from './discord';

-export default function creates(log) {
+export default async function createServices(log) {
    const prisma = new PrismaClient();
+    const discord = createDiscord(log);
    const pg = createPg(log, prisma);
-    const discogs = createDiscogs(log, pg);
+    const discogs = await createDiscogs(log, pg);
    const offers = createOffers(log, pg);
-    const events = createEvents(log, pg, discogs, offers);
+    const events = createEvents(log, pg, discogs, offers, discord);
+    const notify = createNotify(log, pg, events);
    const api = createApi(log, pg, discogs, offers, events);

    return {
        api,
        discogs,
+        discord,
        events,
+        notify,
        pg,
        prisma,
    };
@@ -17,6 +17,8 @@ export function logAxiosError(e) {
 export function wantDetails(want: Want) {
    const data = want.data as any;

+    if (!data) console.warn(want);
+
    return {
        title: data.title,
        release: data.id,
@@ -8,23 +8,27 @@ module.exports = {
        "build/"
    ],
    rules: {
+        'arrow-body-style': [0],
+
+        'max-len': ['error', 120],
+
+        'no-console': [0],
+        'no-multi-spaces': [0],
        // prevents stupid complaints a la
        // (req) {
        //   req.something = x;
        // }
        'no-param-reassign': [2, { props: false }],
-        'no-multi-spaces': [0],
-        'max-len': ['error', 120],
-        'import/no-extraneous-dependencies': [0],
-        'prefer-arrow-callback': [0],
-        'arrow-body-style': [0],
        'no-return-assign': 0,
-        'no-console': [0],
+
+        'prefer-arrow-callback': [0],
+
        // i like loops
        'no-plusplus': [0],
-
        'no-await-in-loop': [0],
+
        indent: ['error', 4],
+
        'keyword-spacing': ['error'],
        'key-spacing': ['error'],
    },
@@ -0,0 +1,12 @@
+# build step
+FROM node:16 AS build-env
+WORKDIR /opt/crates/client
+
+COPY . ./
+RUN npm run build
+
+# static server
+FROM nginx
+WORKDIR /srv/app
+COPY --from=build-env /opt/crates/client/build /srv/app
+COPY ./client.nginx.conf /etc/nginx/nginx.conf
@@ -0,0 +1,8 @@
+# build step
+FROM node:16 AS build-env
+WORKDIR /opt/crates/client
+
+COPY . ./
+RUN npm i
+
+CMD ["npm", "start"]
@@ -0,0 +1,49 @@
+events {
+    worker_connections 1024;
+}
+
+http {
+    include mime.types;
+    sendfile on;
+
+    server {
+        listen 8080;
+        listen [::]:8080;
+
+        autoindex off;
+
+        root /srv/app;
+
+        gzip on;
+        gzip_disable "msie6";
+
+        gzip_vary on;
+        gzip_proxied any;
+        gzip_comp_level 6;
+        gzip_buffers 16 8k;
+        gzip_http_version 1.1;
+        gzip_min_length 256;
+        gzip_types
+            application/atom+xml
+            application/geo+json
+            application/javascript
+            application/x-javascript
+            application/json
+            application/ld+json
+            application/manifest+json
+            application/rdf+xml
+            application/rss+xml
+            application/xhtml+xml
+            application/xml
+            font/eot
+            font/otf
+            font/ttf
+            image/svg+xml
+            text/css
+            text/javascript
+            text/plain
+            text/xml;
+
+        error_page 404 /;
+    }
+}
@@ -22,6 +22,7 @@
            },
            "devDependencies": {
                "@babel/plugin-transform-react-jsx-source": "^7.18.6",
+                "@types/lodash": "^4.17.10",
                "@typescript-eslint/eslint-plugin": "^5.30.6",
                "@typescript-eslint/parser": "^5.30.6",
                "eslint": "^8.20.0",
@@ -3009,6 +3010,13 @@
            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
            "dev": true
        },
+        "node_modules/@types/lodash": {
+            "version": "4.17.10",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
+            "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
+            "dev": true,
+            "license": "MIT"
+        },
        "node_modules/@types/mime": {
            "version": "3.0.0",
            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.0.tgz",
@@ -23437,6 +23445,12 @@
            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
            "dev": true
        },
+        "@types/lodash": {
+            "version": "4.17.10",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
+            "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
+            "dev": true
+        },
        "@types/mime": {
            "version": "3.0.0",
            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.0.tgz",
@@ -6,7 +6,7 @@
    "scripts": {
        "build": "preact build --no-prerender",
        "start": "preact --no-clear watch",
-        "lint": "eslint src"
+        "lint": "eslint --fix src"
    },
    "dependencies": {
        "@reduxjs/toolkit": "^1.8.5",
@@ -22,6 +22,7 @@
    },
    "devDependencies": {
        "@babel/plugin-transform-react-jsx-source": "^7.18.6",
+        "@types/lodash": "^4.17.10",
        "@typescript-eslint/eslint-plugin": "^5.30.6",
        "@typescript-eslint/parser": "^5.30.6",
        "eslint": "^8.20.0",
@@ -9,16 +9,24 @@ import store, {  wsState } from './store'

 import Nav from './components/nav';

-import Offers from './routes/offers';
+import Main from './routes/main';
 import Acp from './routes/acp';
 import Login from './routes/login';
 import Search from './routes/search';
 import List from './routes/list';
 import Info from './routes/info';

-if (window.location.host === 'matescrates.au') LogRocket.init('yh0dy3/mcrates');
+if (window.location.host === 'crates.ntwl.xyz') LogRocket.init('yh0dy3/mcrates');

-const Main = () => {
+
+// ██     ██ ███████      █████  ██████  ███████     ███████  ██████      ██████   █████   ██████ ██   ██
+// ██     ██ ██          ██   ██ ██   ██ ██          ██      ██    ██     ██   ██ ██   ██ ██      ██  ██
+// ██  █  ██ █████       ███████ ██████  █████       ███████ ██    ██     ██████  ███████ ██      █████
+// ██ ███ ██ ██          ██   ██ ██   ██ ██               ██ ██    ██     ██   ██ ██   ██ ██      ██  ██
+//  ███ ███  ███████     ██   ██ ██   ██ ███████     ███████  ██████      ██████  ██   ██  ██████ ██   ██
+
+
+const Mcrates = () => {
    const dispatch = useDispatch();

    // i have no idea why this is needed,
@@ -33,30 +41,32 @@ const Main = () => {
        const { ws } = store.getState();
        if (!ws) return null;
        if (e.url === '/acp') return ws.sendAcpOffers();
+        if (e.url === '/') return ws.sendOffers();
+        if (e.url === '/list') return ws.sendWants();
    }

    return (
-        <main id="app">
+        <div id="mcrates">
            <Nav />
            <Router onChange={routeChange}>
-                <Route path="/" component={Offers} />
+                <Route path="/" component={Main} />
                <Route path="/login" component={Login} mode="login" />
                <Route path="/register" component={Login} mode="register" />
                <Route path="/search" component={Search} />
                <Route path="/list" component={List} />
-                <Route path="/info" component={Info} />
+                {/*<Route path="/info" component={Info} />*/}

                {/* ACP */}
                <Route path="/acp" component={Acp} />
            </Router>
-        </main>
+        </div>
    );
 };

 const App = () => {
    return (
        <Provider store={store}>
-            <Main />
+            <Mcrates />
        </Provider>
    );
 }
@@ -25,7 +25,7 @@ const Nav = () => {
        }
        route(DEFAULT_ROUTE)

-        if (window.location.host === 'matescrates.au') {
+        if (window.location.host === 'crates.ntwl.xyz') {
            LogRocket.identify(user.id, {
                name: user.email,
                email: user.email,
@@ -72,7 +72,7 @@ const Nav = () => {
    return (
        <header>
            {user ? nav() : anonNav()}
-            {showAdmin(user) ? adminNav() : <div></div>}
+            {showAdmin(user) ? adminNav() : <div />}
            {user ? userNav() : null}
        </header>
    );
@@ -1,6 +1,7 @@
 import { h } from 'preact';
 import { ExternalLink, Check } from 'react-feather';
-import { useState } from 'preact/hooks';
+import { useState, useCallback } from 'preact/hooks';
+import _ from 'lodash'

 import { useSelector, useDispatch } from 'react-redux'
 import { State } from './../store';
@@ -49,8 +50,64 @@ function OfferPriceBtn(offer) {
        ? offer.status
        : 'Accept';

+    const title = accepted
+        ? 'Click to cancel'
+        : 'Click to accept this offer';
+
    return (
-        <button disabled={confirmed} onClick={() => setStatus()} class={classes}>${offer.total} {offer.condition}</button>
+        <button disabled={confirmed} title={title} onClick={() => setStatus()} class={classes}>${offer.total} {offer.condition}</button>
+    )
+}
+
+function OfferConditionSlider([condition, offers], i, groupId, rangeMin, rangeMax) {
+    const step = 'any'
+    const id = `${groupId}-${i}`
+    const markersId = `${id}-markers`
+    const steps = offers.map(o => o.total)
+    const initialValue = _.last(offers.filter(o => o.status === 'Accepted'))?.total || 0
+
+    const ws = useSelector((state: State) => state.ws);
+    const [acceptedPrice, setAcceptedPrice] = useState(initialValue)
+
+    const sendOffers = useCallback(_.debounce(function send(v) {
+        const accepted = offers.filter(o => Number(o.total) <= v).map(o => o.id)
+        const pending = offers.filter(o => Number(o.total) > v).map(o => o.id)
+        ws.sendOfferStatusSet(accepted, 'Accepted')
+        ws.sendOfferStatusSet(pending, 'Pending')
+    }, 1000), [])
+
+    function onChange(target) {
+        const highest = () => {
+            return _.findLast(steps, s => target.value >= Number(s)) || 0
+        }
+
+        const v = highest()
+        target.value = v
+        setAcceptedPrice(v)
+        sendOffers(v)
+    }
+
+    const acceptedPriceLabel = acceptedPrice ? `$${acceptedPrice}` : '-'
+
+    return (
+        <div key={id}>
+            <label for={id}>{condition}</label><br />
+            <label for={id}>{acceptedPriceLabel}</label><br />
+            <input
+                type="range"
+                id={id}
+                name={id}
+                list={markersId}
+                step={step}
+                min={rangeMin}
+                max={rangeMax}
+                value={acceptedPrice}
+                onChange={e => onChange((e.target as HTMLInputElement)) } />
+
+            <datalist id={markersId}>
+                {offers.map(o => <option value={o.total}></option>)}
+            </datalist>
+        </div>
    )
 }

@@ -58,19 +115,36 @@ function OfferPriceBtn(offer) {
 export default function OfferGroup(group, i) {
    const ws = useSelector((state: State) => state.ws);

+    const format = group.details.formats[0].text ? `${group.details.formats[0].text} - ` : '';
+    const descriptions = group.details.formats.map(f => f.descriptions.join(' ')).join(' ')
+    const detailText = `${format} ${descriptions}`;
+
+    const conditions = Object.entries(_.groupBy(group.offers, 'condition'))
+    const rangeMin = 0
+    const rangeMax = _.max(group.offers.map(o => Number(o.total)))
+
+    const SHOW_BUTTONS = false
+    const buttons = SHOW_BUTTONS ? (
+        <div class="lines">
+            {group.offers.map(o => OfferPriceBtn(o))}
+        </div>
+    ) : null
+
+
    return (
-        <div class="offer" key={i}>
+        <div class="offer" key={i} id={group.details.id}>
            <section>
-                <h3>{group.details.artists_sort} - {group.details.title} <a href={group.details.uri} target="_blank"><ExternalLink /></a></h3>
+                <h3>{group.details.artists_sort} - {group.details.title} <a href={group.details.uri} target="_blank" rel="noreferrer"><ExternalLink /></a></h3>
                <div class='alt-text details'>
-                    {group.details.year} - {group.details.formats.map(f => f.descriptions.join(' ')).join(' ')}
+                    {group.details.year} - {detailText}
                </div>
                <div class='alt-text details'>Status: {group.status}</div>
            </section>
            <img src={group.details.thumb} />
-            <div class="lines">
-                {group.offers.map(o => OfferPriceBtn(o))}
+            <div>
+                {conditions.map((c, i) => OfferConditionSlider(c, i, group.details.id, rangeMin, rangeMax))}
            </div>
+            { buttons }
        </div>
    )
 }
@@ -29,7 +29,7 @@ export default function Offer(offer) {
    return (
        <div class="offer">
            <section>
-                <h3>{details.artists_sort} - {details.title} <a href={details.uri} target="_blank"><ExternalLink /></a></h3>
+                <h3>{details.artists_sort} - {details.title} <a href={details.uri} target="_blank" rel="noreferrer"><ExternalLink /></a></h3>
                <div class='alt-text' >{details.year}</div>
                <div class='alt-text'>{details.formats[0].descriptions.join(' ')}</div>
                <div class='number'>mcrates price: ${offer.total}</div>
@@ -1,12 +1,10 @@
 import { h } from 'preact';
-import { useState, useCallback } from 'preact/hooks';
+import { useState } from 'preact/hooks';
 import { ExternalLink } from 'react-feather';

 import { useSelector } from 'react-redux'
 import { State } from './../store'

-import http from './../http';
-
 function Want(want) {
    const r = want.data;

@@ -14,10 +12,13 @@ function Want(want) {
    const [confirm, setConfirm] = useState(false);

    function onClick() {
-        if (confirm) return ws.sendWantRm(want.id);
+        if (confirm) {
+            setConfirm(false);
+            return ws.sendWantRm(want.id);
+        }
        setTimeout(() => setConfirm(false), 2500);
        return setConfirm(true);
-    };
+    }

    const text = confirm
        ? 'confirm'
@@ -26,7 +27,7 @@ function Want(want) {
    return (
        <article key={r.id}>
            <div>
-                <h3>{r.artists_sort} - {r.title} <a href={r.uri} target="_blank"><ExternalLink /></a></h3>
+                <h3>{r.artists_sort} - {r.title} <a href={r.uri} target="_blank" rel="noreferrer"><ExternalLink /></a></h3>
            </div>
            <img src={r.thumb} />
            <div class='details'>
@@ -15,8 +15,8 @@ declare module 'axios' {
 }

 const api = axios.create({
-  baseURL: '/api',
-  withCredentials: true
+    baseURL: '/api',
+    withCredentials: true
 });

 function onSuccess(response) {
@@ -33,15 +33,10 @@ api.interceptors.response.use(onSuccess, onError);

 const actions = {
    // TODO move to rpc
-
    postWantSearch: async function postWantSearch(query) {
        return api.post('/want/search', { query });
    },

-    postWant: async function postWant(releaseId) {
-        return api.post('/want', { releaseId });
-    },
-
    postDiscogs: async function postDiscogs(username) {
        return api.post('/want/discogs', { username });
    },
@@ -71,14 +66,6 @@ const actions = {
            password,
        });
    },
-
-    postOffers: async function postOffers(listingIds, shipping, baseShipping) {
-        return api.post('/offers', {
-            listingIds,
-            shipping,
-            baseShipping,
-        });
-    },
 };

 export default actions;
@@ -34,11 +34,11 @@ function Item({ item }) {

    return (
        <div key={item.id} class={bold}>
-            <a href={item.listing.data.uri} target="_blank" >
+            <a href={item.listing.data.uri} target="_blank" rel="noreferrer" >
                <h4>{item.listing.data.release.description}</h4>
            </a>
            <h5>{item.user.email}</h5>
-            <h5 class='alt-text'>{item.total}</h5>
+            <h5 class='alt-text'>{item.total} - {item.condition}</h5>
            <h5>{item.status}</h5>
            <label>Set Status:</label>
            <select onChange={onChange}>
@@ -53,7 +53,7 @@ function SellerGroup(group) {

    return (
        <div class="bundle">
-           <section>
+            <section>
                <h2>{group.username} - {group.seller}</h2>
                <h3>{ready} / {group.offers.length} offers</h3>
                <h4>Ships: {group.mentionsAustralia && 'AU'} {group.mentionsWorldwide && 'WORLD'}</h4>
@@ -75,7 +75,7 @@ function Home() {
    }

    return (
-        <div>
+        <div class='acp'>
            <button onClick={sync}> sync listings </button>
            <button onClick={sync}> generate offers </button>
            <hr />
@@ -18,6 +18,7 @@ const Info = () => {
                    <h2>How It Works</h2>
                    <p> First, add some records to your <span class='alt'>List</span> on the <a href='/search'>Search Page</a>. </p>
                    <p> Mates Crates will then make <span class='alt'>Offers</span> to you for releases you add to your <a href='/list'>List</a>. </p>
+                    <p> (this can take a few minutes time!) </p>
                    <p> Select all <span class='alt'>Offers</span> you are interested in, the more you accept the more likely the item will be <span class='alt-text'>Confirmed</span>.</p>
                    <p> Check back regularly for updated <span class='alt'>Offers</span>, the global record marketplace is a living thing. </p>
                </section>
@@ -10,7 +10,6 @@ import Want from './../components/want';

 const List = () => {
    const wants = useSelector((state: State) => state.wants);
-    const user = useSelector((state: State) => state.user);

    if (!wants) {
        return <div> loading... </div>;
@@ -93,7 +93,7 @@ const Login = ({ mode }) => {
                    <input type="password" name="password" id="password" />
                </div>
                <div class="item">
-                    <input type="submit" value="login"/>
+                    <input type="submit" value="login" />
                </div>
            </form>
            <button onClick={gotoRegister}> create account </button>
@@ -107,9 +107,9 @@ function LoginPage({ mode }) {
            <Login mode={mode} />
            <Swirl />
            <div class='words'>
-                <p>Mates Crates is a record importing service.</p>
-                <p>We bundle orders together from thousands of online stores to reduce the cost of shipping vinyl.</p>
-                <p>Records can then be picked up from Preston.</p>
+                <p>record importing service</p>
+                <p>we bundle orders together from thousands of online stores to reduce the cost of shipping vinyl</p>
+                <p>then we get together and play them</p>
            </div>
        </div>
    )
@@ -0,0 +1,49 @@
+import { h } from 'preact';
+import { route } from 'preact-router';
+import { useSelector } from 'react-redux'
+
+import { State } from './../store';
+import * as toast from './../toast';
+
+import OfferGroup from './../components/offer.group';
+
+const GroupNav = (want) => {
+    if (!want._count.offers) return null
+    const href = `#${want.release}`;
+
+    return (
+        <div class=''>
+            <a href={href}>{want.data.artists_sort} - {want.data.title}</a>
+            <span>{want._count.offers}</span>
+        </div>
+    );
+};
+
+function Home() {
+    const offers = useSelector((state: State) => state.offers);
+    const wants = useSelector((state: State) => state.wants);
+
+    if (offers && offers.length === 0) {
+        toast.info('no offers', 'You have no offers yet, search for some more items.');
+        route('/search');
+    }
+
+    if (!offers || !wants) return <div>loading...</div>;
+
+    return (
+        <main >
+            <nav>
+                <div class='header'>
+                    <span>Record</span>
+                    <span>Offers</span>
+                </div>
+                {wants.map(GroupNav)}
+            </nav>
+            <div class={'offers'}>
+                {offers.map(OfferGroup)}
+            </div>
+        </main>
+    );
+}
+
+export default Home;
@@ -1,27 +0,0 @@
-import { h } from 'preact';
-import { route } from 'preact-router';
-import { useSelector } from 'react-redux'
-
-import { State } from './../store';
-import * as toast from './../toast';
-
-import OfferGroup from './../components/offer.group';
-
-function Home() {
-    const offers = useSelector((state: State) => state.offers);
-
-    if (offers && offers.length === 0) {
-        toast.info('no offers', 'You have no offers yet, search for some more items.');
-        route('/search');
-    }
-
-    if (!offers) return <div>loading...</div>;
-
-    return (
-        <div class={'offers'}>
-            {offers.map(OfferGroup)}
-        </div>
-    );
-}
-
-export default Home;
@@ -4,30 +4,28 @@ import { ExternalLink, Check } from 'react-feather';
 import { useSelector } from 'react-redux'

 import { State } from './../store';
+import { info, error as toastError } from './../toast';

 import http from '../http';

-function Result(r, wants) {
-    const [added, setAdded] = useState(false)
-
+function Result(r, wants, ws) {
    async function onClick() {
-        const [error, want] = await http.postWant(r.id);
-        if (error) return false;
-        setAdded(true);
+        ws.sendWantAdd(r.id);
    }

-    const wanted = wants.some(w => w.release === r.id);
+    // releaseIds are bigints on server
+    const wanted = wants.some(w => BigInt(w.release) === BigInt(r.id));

-    const classes = `${added || wanted ? 'added' : ''}`;
-    const btnText = added
+    const classes = `${wanted ? 'added' : ''}`;
+    const btnText = wanted
        ? <Check />
        : '+';

    return (
        <article key={r.id}>
-            <button onClick={onClick} disabled={added} class={classes} >{btnText}</button>
+            <button onClick={onClick} disabled={wanted} class={classes} >{btnText}</button>
            <div>
-                <h3>{r.title} <a href={`https://discogs.com${r.uri}`} target="_blank"><ExternalLink /></a></h3>
+                <h3>{r.title} <a href={`https://discogs.com${r.uri}`} target="_blank" rel="noreferrer"><ExternalLink /></a></h3>
                <h5 class='alt-text' >{r.year}</h5>
                <h5 class='alt-text'>{r.country}</h5>
                <h5 class='alt-text'>{r.format.join(' ')}</h5>
@@ -39,36 +37,46 @@ function Result(r, wants) {

 const User = () => {
    const [query, setQuery] = useState('')
-    const [title, setTitle] = useState('');
    const [username, setUsername] = useState('');
    const [results, setResults] = useState([]);
-    const [infoText, setInfoText] = useState('');

    const wants = useSelector((state: State) => state.wants);
+    const ws = useSelector((state: State) => state.ws);

    async function fetchResults() {
        const [error, results] = await http.postWantSearch(query);

-        if (results.length === 0) {
+        if (error) {
            setResults([]);
-            return setInfoText('No results');
+            toastError('Error', error);
+        }
+
+        if (results.length === 0) {
+            setResults([]);
+            return info('No Results', 'No results returned from search');
        }

-        setInfoText('');
        setResults(results);
    }

    async function submitWantlist() {
        const [error, wants] = await http.postDiscogs(username);
-        if (wants.length === 0) {
+
+        if (error) {
            setResults([]);
-            return setInfoText('No new additions');
+            toastError('Error', error);
        }

-        setInfoText(`Added ${wants.length} items to your list.`);
+        if (wants.length === 0) {
+            setResults([]);
+            return info('Success', 'No new additions');
+        }
+
+        info('Success', `Added ${wants.length} items to your list.`);
    }

-    const searchRef = useRef<HTMLInputElement>()
+    const searchRef = useRef<HTMLInputElement>();
+    const resultsRef = useRef<HTMLDivElement>();

    useEffect(() => {
        searchRef.current.focus()
@@ -85,11 +93,7 @@ const User = () => {
    }

    const topEl = results.length
-        ? <button onClick={() => window.scrollTo(0, 0)}> top </button>
-        : null;
-
-    const infoEl = infoText
-        ? <article><div></div><div>{infoText}</div></article>
+        ? <button onClick={() => resultsRef.current.scrollTo(0, 0)}> top </button>
        : null;

    return (
@@ -111,9 +115,8 @@ const User = () => {
                <hr />
                <p>Data provided by Discogs.</p>
            </div>
-            <div class='results'>
-                {infoEl}
-                {results.map(r => Result(r, wants))}
+            <div class='results' ref={resultsRef}>
+                {results.map(r => Result(r, wants, ws))}
                {topEl}
            </div>
        </div>
@@ -2,58 +2,58 @@ import { createStore, combineReducers } from 'redux'
 import { configureStore, createSlice } from '@reduxjs/toolkit'

 export const userState = createSlice({
-  name: 'user',
-  initialState: null,
-  reducers: {
-    set: (state, action) => action.payload
-  },
+    name: 'user',
+    initialState: null,
+    reducers: {
+        set: (state, action) => action.payload
+    },
 });

 export const offersState = createSlice({
-  name: 'offers',
-  initialState: null,
-  reducers: {
-    set: (state, action) => action.payload
-  },
+    name: 'offers',
+    initialState: null,
+    reducers: {
+        set: (state, action) => action.payload
+    },
 });

 export const acpOffersState = createSlice({
-  name: 'acpOffers',
-  initialState: [],
-  reducers: {
-    set: (state, action) => action.payload
-  },
+    name: 'acpOffers',
+    initialState: [],
+    reducers: {
+        set: (state, action) => action.payload
+    },
 });

 export const wantsState = createSlice({
-  name: 'wants',
-  initialState: null,
-  reducers: {
-    set: (state, action) => action.payload
-  },
+    name: 'wants',
+    initialState: null,
+    reducers: {
+        set: (state, action) => action.payload
+    },
 });

 export const wsState = createSlice({
-  name: 'ws',
-  initialState: null,
-  reducers: {
-    set: (state, action) => action.payload
-  },
+    name: 'ws',
+    initialState: null,
+    reducers: {
+        set: (state, action) => action.payload
+    },
 });

 const reducer = combineReducers({
-  offers: offersState.reducer,
-  wants: wantsState.reducer,
-  ws: wsState.reducer,
-  user: userState.reducer,
+    offers: offersState.reducer,
+    wants: wantsState.reducer,
+    ws: wsState.reducer,
+    user: userState.reducer,

-  acpOffers: acpOffersState.reducer,
+    acpOffers: acpOffersState.reducer,
 });

 const store = createStore(
-  reducer,
-  // @ts-ignore -- devtools window exists on dev
-  window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
+    reducer,
+    // @ts-ignore -- devtools window exists on dev
+    window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
 );

 export default store;
@@ -0,0 +1,87 @@
+/* vietnamese */
+@font-face {
+  font-family: 'Barlow';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/barlow/v12/7cHpv4kjgoGqM7E_A8s52Hs.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Barlow';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/barlow/v12/7cHpv4kjgoGqM7E_Ass52Hs.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Barlow';
+  font-style: normal;
+  font-weight: 400;
+  src: url(https://fonts.gstatic.com/s/barlow/v12/7cHpv4kjgoGqM7E_DMs5.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Noto Sans Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  src: url(https://fonts.gstatic.com/s/notosansmono/v21/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ09DdVXQQ.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Noto Sans Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  src: url(https://fonts.gstatic.com/s/notosansmono/v21/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ09ndVXQQ.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Noto Sans Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  src: url(https://fonts.gstatic.com/s/notosansmono/v21/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ09HdVXQQ.woff2) format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Noto Sans Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  src: url(https://fonts.gstatic.com/s/notosansmono/v21/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ097dVXQQ.woff2) format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noto Sans Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  src: url(https://fonts.gstatic.com/s/notosansmono/v21/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ09LdVXQQ.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  src: url(https://fonts.gstatic.com/s/notosansmono/v21/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ09PdVXQQ.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noto Sans Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  src: url(https://fonts.gstatic.com/s/notosansmono/v21/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ093dVQ.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
@@ -23,32 +23,6 @@ img {
  height: auto;
 }

-/* latin */
-@font-face {
-  font-family: 'Raleway';
-  font-style: normal;
-  font-weight: 400;
-  src: url(https://fonts.gstatic.com/s/raleway/v28/1Ptxg8zYS_SKggPN4iEgvnHyvveLxVvaorCIPrE.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-  font-family: 'Source Code Pro';
-  font-style: normal;
-  font-weight: 400;
-  src: url(https://fonts.gstatic.com/s/sourcecodepro/v21/HI_diYsKILxRpg3hIP6sJ7fM7PqPMcMnZFqUwX28DMyQtMlrTA.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-  font-family: 'Noto Sans Mono';
-  font-style: normal;
-  font-weight: 400;
-  font-stretch: normal;
-  src: url(https://fonts.gstatic.com/s/notosansmono/v20/BngrUXNETWXI6LwhGYvaxZikqZqK6fBq6kPvUce2oAZcdthSBUsYck4-_FNJ093dVQ.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
 // stuff from UX laws
 html {
    color:var(--base-font-color);
@@ -71,7 +45,7 @@ html {
    --medium-font-size: 1.777em;
    --large-font-size: 2.369em;
    --xlarge-font-size: 3.157em;
-    --base-font-family: 'Raleway', Arial, Sans-Serif;
+    --base-font-family: 'Barlow', Arial, Sans-Serif;
    --secondary-font-family: 'Noto Sans Mono', monospace;
    --base-font-color: var(--color-off-white);
    --secondary-font-color: var(--color-mid-grey);
@@ -101,6 +75,7 @@ html {

    --color-blue: #475977;
    --color-green: #476d4a;
+    --color-red: #ae4442;

    --color-accepted: var(--color-blue);
    --color-confirmed: var(--color-green);
@@ -131,6 +106,11 @@ button, input, optgroup, select, textarea {
    line-height:var(--base-line-height);
 }

+button, [type=submit] {
+    padding: var(--spacing-half);
+    background: var(--background-1);
+}
+
 input:hover, textarea:hover {
    color:var(--base-font-color);
    border:var(--hover-border)
@@ -156,7 +136,7 @@ button, [type=button], [type=reset], [type=submit] {

    font-family: var(--secondary-font-family);
    font-size: var(--small-font-size);
-    font-weight: bold;
+    // font-weight: bold;
    text-transform: uppercase;

    &:hover {
@@ -194,180 +174,6 @@ p {
    margin:0 0 var(--spacing)
 }

-// ok actual styles
-
-body {
-    padding-top: calc(var(--spacing)/2);
-}
-
-main {
-    padding: 0 var(--spacing-double) 0 var(--spacing-double);
-}
-
-button, [type=submit] {
-    padding: var(--spacing-half);
-    background: var(--background-1);
-
-}
-
-.landing {
-    display: grid;
-
-    grid-template-columns: 1fr 2fr;
-    grid-gap: calc(var(--spacing-double) * 2);
-    grid-template-areas:
-        "login swirl"
-        "login words";
-
-    .login {
-        grid-area: login;
-        button {
-            width: 100%;
-        }
-    }
-
-    .swirl {
-        grid-area: swirl;
-        height: 15rem;
-    }
-
-    .words {
-        grid-area: words;
-        text-align: center;
-    }
-}
-
-.info {
-    display: grid;
-
-    grid-template-areas:
-        "words swirl"
-        "words contact";
-
-    grid-template-columns: 1fr 1fr;
-    grid-template-rows: min-content 1fr;
-
-    section {
-        margin-bottom: var(--spacing);
-    }
-
-    .contact {
-        grid-area: contact;
-        text-align: center;
-    }
-
-    .words {
-        grid-area: words;
-    }
-
-    .swirl {
-        grid-area: swirl;
-        height: 15rem;
-    }
-}
-
-.alt-text, .alt {
-    font-family: var(--secondary-font-family);
-    // font-size: var(--small-font-size);
-    text-transform: uppercase;
-}
-
-article {
-    background-color: var(--background-1);
-
-    button {
-        border-color: var(--background-2);
-    }
-}
-
-.search {
-    display: grid;
-    grid-template-columns: 1fr 2fr;
-
-    .results {
-        display: grid;
-        padding-left: var(--spacing);
-        grid-gap: var(--spacing);
-
-        article {
-            display: grid;
-            padding: var(--spacing);
-            grid-template-columns: 1fr 4fr min-content;
-        }
-    }
-
-    button {
-        margin-right: var(--spacing);
-        background: var(--background-2);
-        border-color: var(--background-1);
-
-        &.added {
-            background: var(--color-green);
-            cursor: auto;
-        }
-    }
-}
-
-.list {
-    display: grid;
-    grid-template-columns:
-        1fr 1fr 1fr;
-
-    grid-gap: var(--spacing);
-
-    article {
-        display: grid;
-
-        // grid-template-rows:
-        //     1fr min-content min-content;
-
-        grid-template-areas:
-            "title img"
-            "details details"
-            "remove remove";
-
-        button {
-            margin-top: var(--spacing-half);
-            grid-area: remove
-        }
-
-        .details {
-            grid-area: details;
-        }
-
-        padding: var(--spacing);
-
-        img {
-            justify-self: end;
-        }
-    }
-}
-
-form {
-    margin-bottom: var(--spacing);
-
-    label, input {
-        display: block;
-    }
-
-    input, button {
-        width: 100%;
-    }
-
-    input {
-        padding: var(--spacing-half);
-        margin-bottom: var(--spacing);
-    }
-
-    label {
-        font-family: var(--secondary-font-family);
-        font-size: var(--small-font-size);
-        text-transform: uppercase;
-        margin-bottom: var(--spacing-half);
-    }
-
-}
-
 a {
    color: var(--secondary-font-color);
    font-family: var(--secondary-font-family);
@@ -378,184 +184,11 @@ a {
    }
 }

-nav {
-    a {
-        font-size: var(--small-font-size);
-        margin-right: var(--spacing);
-    }
-}
-
-
-header {
-    display: grid;
-    grid-template-columns: 1fr 1fr min-content;
-    padding-bottom: var(--spacing);
-
-    a {
-        white-space: nowrap;
-    }
-}
-
-.bundles {
-    flex-flow: row;
-
-    .bundle {
-        margin-bottom: var(--spacing-double);
-
-        section {
-            margin-bottom: var(--spacing);
-        }
-
-        .items {
-            display: grid;
-            grid-template-columns: repeat(5, 1fr);
-
-            div {
-                margin-right: var(--spacing);
-                margin-bottom: var(--spacing);
-
-                display: grid;
-
-                &.bold {
-                    font-weight: bold;
-                    background: var(--background-2);
-                }
-            }
-        }
-    }
-}
-
-.offers {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    grid-gap: var(--spacing);
-
-    .offer {
-        display: grid;
-        grid-template-columns: 1fr min-content;
-        grid-template-rows: min-content min-content;
-        grid-template-areas:
-            "details img"
-            "lines lines";
-
-        padding: var(--spacing);
-        background: var(--background-1);
-
-        .details {
-            font-size: var(--small-font-size);
-        }
-
-        .status {
-            margin-top: var(--spacing-half);
-        }
-
-        section {
-            grid-area: details;
-        }
-
-        img {
-            grid-area: img;
-            justify-self: end;
-            margin-left: var(--spacing-half);
-        }
-
-        .lines {
-            grid-area: lines;
-            display: flex;
-            flex-wrap: wrap;
-            column-gap: var(--spacing-half);
-
-            button {
-                margin-top: var(--spacing-half);
-                border-color: var(--background-2);
-
-                &.accepted {
-                    background: var(--color-accepted);
-                }
-
-                &.confirmed {
-                    cursor: auto;
-                    background: var(--color-confirmed);
-                }
-
-                &.neg {
-                    margin-left: var(--spacing-half);
-                }
-            }
-        }
-    }
-}
-
-.number {
+.alt-text, .alt {
    font-family: var(--secondary-font-family);
+    // font-size: var(--small-font-size);
    text-transform: uppercase;
 }

-.swirl {
-    background-image: url("./../assets/swirl.fix.svg");
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center;
-
-    margin-bottom: var(--spacing);
-}
-
-@media (max-width:900px)  {
-    .landing {
-        grid-template-columns: 1fr;
-        grid-template-areas:
-            "swirl"
-            "login"
-            "words";
-    }
-
-    .list {
-        grid-template-columns: 1fr;
-    }
-
-    .search {
-        grid-template-columns: 1fr;
-    }
-
-    .offers {
-        grid-template-columns: 1fr;
-    }
-
-    .info {
-        grid-template-columns: 1fr;
-        // is necessary for some reason
-        grid-template-areas:
-            "swirl"
-            "contact"
-            "words";
-    }
-
-    main {
-        padding: 0 var(--spacing) 0 var(--spacing);
-    }
-}
-
-@media (max-width:1200px) {
-    img {
-        width: 5rem;
-    }
-}
-
-
-// ------------
-// toasts
-
-.iziToast {
-    border-radius: 0;
-    border-color: var(--base-border-color);
-
-    .iziToast-body {
-        font-family: var(--base-font-family);
-        font-size: var(--base-font-size);
-    }
-
-    .iziToast-title {
-        font-family: var(--secondary-font-family);
-        text-transform: uppercase;
-    }
-}
+@import 'fonts.less';
+@import 'styles.less';
@@ -0,0 +1,422 @@
+body {
+    padding-top: calc(var(--spacing)/2);
+    overflow: hidden;
+}
+
+#mcrates {
+    padding: 0 var(--spacing-double) var(--spacing) var(--spacing-double);
+    display: grid;
+
+    grid-template-areas:
+        "header header"
+        "main   main"
+        "footer footer";
+
+    height: 100vh;
+    width: 100vw;
+    display: grid;
+    grid-template-columns: 1fr;
+    grid-template-rows: min-content 1fr min-content;
+}
+
+.landing {
+    display: grid;
+
+    overflow: scroll;
+
+    grid-template-columns: 1fr 2fr;
+    grid-gap: calc(var(--spacing-double) * 2);
+    grid-template-areas:
+        "login swirl"
+        "login words";
+
+    .login {
+        grid-area: login;
+        button {
+            width: 100%;
+        }
+    }
+
+    .swirl {
+        grid-area: swirl;
+        height: 15rem;
+    }
+
+    .words {
+        grid-area: words;
+        text-align: center;
+    }
+}
+
+.info {
+    display: grid;
+
+    overflow: hidden;
+
+    grid-template-areas:
+        "words swirl"
+        "words contact";
+
+    grid-template-columns: 1fr 1fr;
+    grid-template-rows: min-content 1fr;
+
+    section {
+        margin-bottom: var(--spacing);
+    }
+
+    .contact {
+        grid-area: contact;
+        text-align: center;
+        overflow: scroll;
+    }
+
+    .words {
+        grid-area: words;
+        overflow: scroll;
+    }
+
+    .swirl {
+        grid-area: swirl;
+        height: 15rem;
+    }
+}
+
+article {
+    background-color: var(--background-1);
+
+    button {
+        border-color: var(--background-2);
+    }
+}
+
+.search {
+    display: grid;
+    grid-template-columns: 1fr 2fr;
+
+    overflow: hidden;
+
+    .results {
+        display: grid;
+        padding-left: var(--spacing);
+        grid-gap: var(--spacing);
+
+        article {
+            display: grid;
+            padding: var(--spacing);
+            grid-template-columns: 1fr 4fr min-content;
+        }
+
+        overflow: scroll;
+    }
+
+    button {
+        margin-right: var(--spacing);
+        background: var(--background-2);
+        border-color: var(--background-1);
+
+        &.added {
+            background: var(--color-green);
+            cursor: auto;
+        }
+    }
+}
+
+.list {
+    display: grid;
+    grid-template-columns:
+        1fr 1fr 1fr;
+
+    grid-gap: var(--spacing);
+    overflow: scroll;
+
+    article {
+        display: grid;
+
+        grid-template-areas:
+            "title img"
+            "details details"
+            "remove remove";
+
+        button {
+            margin-top: var(--spacing-half);
+            grid-area: remove
+        }
+
+        .details {
+            grid-area: details;
+        }
+
+        padding: var(--spacing);
+
+        img {
+            justify-self: end;
+        }
+    }
+}
+
+form {
+    margin-bottom: var(--spacing);
+
+    label, input {
+        display: block;
+    }
+
+    input, button {
+        width: 100%;
+    }
+
+    input {
+        padding: var(--spacing-half);
+        margin-bottom: var(--spacing);
+    }
+
+    label {
+        font-family: var(--secondary-font-family);
+        font-size: var(--small-font-size);
+        text-transform: uppercase;
+        margin-bottom: var(--spacing-half);
+    }
+
+}
+
+header {
+    grid-area: header;
+
+    display: grid;
+    grid-template-columns: 1fr 1fr min-content;
+
+    border-bottom: var(--base-border);
+    padding-bottom: var(--spacing-half);
+    margin-bottom: var(--spacing-half);
+
+    a {
+        font-size: var(--small-font-size);
+        margin-right: var(--spacing);
+    }
+
+    a {
+        white-space: nowrap;
+    }
+}
+
+main {
+    grid-area: main;
+
+    display: grid;
+    grid-template-areas:
+        "nav content";
+
+    grid-template-columns:
+        1fr 1fr;
+
+    column-gap: var(--spacing);
+
+    overflow: hidden;
+
+    nav {
+        // duck scrollbars
+        padding-right: var(--spacing-half);
+
+        grid-area: nav;
+
+        div {
+            display: grid;
+            grid-template-columns:
+                1fr min-content min-content;
+
+            column-gap: var(--spacing-half);
+
+            a {
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
+
+        overflow: scroll;
+    }
+
+    .offers {
+        grid-area: content;
+        overflow: scroll;
+    }
+}
+
+.acp {
+    overflow: scroll;
+
+    .bundles {
+        flex-flow: row;
+
+        .bundle {
+            margin-bottom: var(--spacing-double);
+
+            section {
+                margin-bottom: var(--spacing);
+            }
+
+            .items {
+                display: grid;
+                grid-template-columns: repeat(5, 1fr);
+
+                div {
+                    margin-right: var(--spacing);
+                    margin-bottom: var(--spacing);
+
+                    display: grid;
+
+                    &.bold {
+                        font-weight: bold;
+                        background: var(--background-2);
+                    }
+                }
+            }
+        }
+    }
+}
+
+.offers {
+    display: grid;
+    // grid-template-columns: 1fr 1fr;
+    grid-gap: var(--spacing);
+
+    .offer {
+        display: grid;
+        grid-template-columns: 1fr min-content;
+        grid-template-rows: min-content min-content;
+        grid-template-areas:
+            "details img"
+            "lines lines";
+
+        padding: var(--spacing);
+        background: var(--background-1);
+
+        .details {
+            font-size: var(--small-font-size);
+        }
+
+        .status {
+            margin-top: var(--spacing-half);
+        }
+
+        section {
+            grid-area: details;
+        }
+
+        img {
+            grid-area: img;
+            justify-self: end;
+            margin-left: var(--spacing-half);
+        }
+
+        .lines {
+            grid-area: lines;
+            display: flex;
+            flex-wrap: wrap;
+            column-gap: var(--spacing-half);
+
+            button {
+                margin-top: var(--spacing-half);
+                border-color: var(--background-2);
+
+                &.accepted {
+                    background: var(--color-accepted);
+                }
+
+                &.confirmed {
+                    cursor: auto;
+                    background: var(--color-confirmed);
+                }
+
+                &.neg {
+                    margin-left: var(--spacing-half);
+                }
+            }
+        }
+    }
+}
+
+.number {
+    font-family: var(--secondary-font-family);
+    text-transform: uppercase;
+}
+
+.swirl {
+    background-image: url("./../assets/swirl.fix.svg");
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
+
+    margin-bottom: var(--spacing);
+}
+
+input[type='range']{ accent-color: var(--color-accepted); }
+
+@media (max-width:900px)  {
+    .landing {
+        grid-template-columns: 1fr;
+        grid-template-areas:
+            "swirl"
+            "login"
+            "words";
+    }
+
+    .list {
+        grid-template-columns: 1fr;
+    }
+
+    .search {
+        grid-template-columns: 1fr;
+    }
+
+    .offers {
+        grid-template-columns: 1fr;
+    }
+
+    .info {
+        grid-template-columns: 1fr;
+        // is necessary for some reason
+        grid-template-areas:
+            "swirl"
+            "contact"
+            "words";
+    }
+
+    #mcrates {
+        padding: 0 var(--spacing) 0 var(--spacing);
+    }
+
+    main {
+        grid-template-columns: 1fr;
+        grid-template-rows: 1fr 3fr;
+        grid-gap: var(--spacing-half);
+        grid-template-areas:
+            "nav"
+            "content";
+    }
+}
+
+@media (max-width:1200px) {
+    img {
+        width: 5rem;
+    }
+}
+
+
+// ------------
+// toasts
+
+.iziToast {
+    border-radius: 0;
+    border-color: var(--base-border-color);
+
+    .iziToast-body {
+        font-family: var(--base-font-family);
+        font-size: var(--base-font-size);
+    }
+
+    .iziToast-title {
+        font-family: var(--secondary-font-family);
+        text-transform: uppercase;
+    }
+}
@@ -2,10 +2,11 @@
 <html lang="en">
  <head>
    <meta charset="utf-8">
-    <title>matescrates.au - record import service</title>
+    <title>crates - record import service</title>
    <meta name="viewport" content="width=device-width,initial-scale=1">
    <meta name="mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-capable" content="yes">
+
    <% preact.headEnd %>
  </head>
  <body>
@@ -3,7 +3,7 @@ import toast from 'izitoast';
 export function info(title, message) {
    toast.info({
        title,
-        message,
+        message: message || '',
        position: 'bottomCenter',
        color: '#1f2128',
        titleColor: '#F4F1D0',
@@ -13,3 +13,18 @@ export function info(title, message) {
        theme: 'dark',
    });
 }
+
+export function error(title, message) {
+    toast.error({
+        title,
+        message: message || '',
+        position: 'bottomCenter',
+        color: '#ae4442',
+        titleColor: '#F4F1D0',
+        messageColor: '#F4F1D0',
+        iconColor: '#F4F1D0',
+        icon: '',
+        theme: 'dark',
+    });
+}
+
@@ -1,4 +1,7 @@
-import { wantsState, wsState, userState, offersState, acpOffersState } from './store'
+import throttle from 'lodash/throttle';
+
+import { wantsState, userState, offersState, acpOffersState } from './store'
+import * as toast from './toast';

 const SOCKET_URL = `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`;

@@ -26,14 +29,18 @@ export default function createSocket(dispatch) {
        // setTimeout(sendPing, 50);
    }

-    function sendOfferStatusSet(id, status) {
-        send(['OfferStatusSet', { id, status }]);
+    function sendOfferStatusSet(ids, status) {
+        send(['OfferStatusSet', { ids, status }]);
    }

    function sendWantRm(id) {
        send(['WantRm', { id }]);
    }

+    function sendWantAdd(releaseId) {
+        send(['WantAdd', { releaseId }]);
+    }
+
    function sendOffers() {
        send(['Offers', {}]);
    }
@@ -70,7 +77,13 @@ export default function createSocket(dispatch) {
        dispatch(wantsState.actions.set(wants));
    }

+    const offersNotification = throttle((offers) => {
+        if (!offers.length) return false;
+        toast.info('Offers Updated', 'New offers available.')
+    }, 60 * 1000);
+
    function onOffers(offers) {
+        offersNotification(offers);
        dispatch(offersState.actions.set(offers));
    }

@@ -114,6 +127,7 @@ export default function createSocket(dispatch) {
    // Connection opened
    function onOpen() {
        console.log('websocket connected', SOCKET_URL)
+        toast.info('connected', 'connected to server');
        sendPing();
    }

@@ -153,8 +167,10 @@ export default function createSocket(dispatch) {

        sendOfferStatusSet,
        sendWantRm,
+        sendWantAdd,

        sendOffers,
+        sendWants,

        sendAcpOffers,
        sendAcpOfferStatusSet,
@@ -0,0 +1,14 @@
+version: "3.3"
+
+services:
+  client:
+    image: registry.ntwl.xyz/crates-client
+    build:
+      context: ./client
+      dockerfile: ./client.Dockerfile
+
+  api:
+    image: registry.ntwl.xyz/crates-api
+    build:
+      context: ./api
+      dockerfile: ./api.Dockerfile
@@ -1,35 +0,0 @@
-version: "3.3"
-
-services:
-  pg:
-    image: postgres:latest
-    environment:
-      POSTGRES_USER: 'mcrates'
-      POSTGRES_DB: 'mcrates'
-      POSTGRES_PASSWORD: 'digdeep'
-
-    # allow prisma client to push changes from outside docker etc
-    # ufw blocks this from being publicly accessible
-    ports:
-      - '45432:5432'
-    volumes:
-      - "./db:/var/lib/postgresql/data"
-
-  api:
-    image: node:16
-    working_dir: /opt/mcrates/api
-    entrypoint: npm start
-    environment:
-      DATABASE_URL: 'postgresql://mcrates:digdeep@pg:5432/mcrates?schema=public'
-    volumes:
-      - "./api:/opt/mcrates/api"
-
-  nginx:
-    image: nginx:latest
-    volumes:
-      - './nginx/matescrates.au.nginx.conf:/etc/nginx/conf.d/default.conf'
-      - './client/build:/srv/matescrates'
-      - '/etc/letsencrypt:/etc/letsencrypt'
-    ports:
-      - '80:80'
-      - '443:443'
@@ -4,18 +4,18 @@ services:
  pg:
    image: postgres:latest
    environment:
-      POSTGRES_USER: 'mcrates'
+      POSTGRES_USER: 'crates'
      POSTGRES_DB: 'test'
      POSTGRES_PASSWORD: 'digdeep'

  api:
    image: node:16
-    working_dir: /opt/mcrates/api
+    working_dir: /opt/crates/api
    entrypoint: npm run test:watch
    depends_on:
      - pg
    environment:
-      DATABASE_URL: "postgresql://mcrates:digdeep@pg:5432/test?schema=public"
+      DATABASE_URL: "postgresql://crates:digdeep@pg:5432/test?schema=public"
    volumes:
-      - "./api:/opt/mcrates/api"
+      - "./api:/opt/crates/api"

@@ -4,34 +4,54 @@ services:
  pg:
    image: postgres:latest
    environment:
-      POSTGRES_USER: 'mcrates'
-      POSTGRES_DB: 'mcrates'
-      POSTGRES_PASSWORD: 'digdeep'
+      POSTGRES_USER: '${POSTGRES_USER}'
+      POSTGRES_DB: '${POSTGRES_DB}'
+      POSTGRES_PASSWORD: '${POSTGRES_PASSWORD}'
+    volumes:
+      # so ez
+      # insane
+      - "./pg:/docker-entrypoint-initdb.d"
    ports:
      - '45432:5432'
-    volumes:
-      - "./db:/var/lib/postgresql/data"

  api:
-    image: node:16
-    working_dir: /opt/mcrates/api
+    image: crates/api
+    build:
+      context: ./api
+      dockerfile: ./api.Dockerfile
+    working_dir: /opt/crates/api
    depends_on:
      - 'pg'
-    entrypoint: npm start
+    command: npm start
    environment:
-      DATABASE_URL: 'postgresql://mcrates:digdeep@pg:5432/mcrates?schema=public'
+      DATABASE_URL: 'postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}?schema=public'
+      DISCORD_TOKEN: '${DISCORD_TOKEN}'
+      DISCOGS_TOKEN: '${DISCOGS_TOKEN}'
+      CHOKIDAR_USEPOLLING: 1
    volumes:
-      - "./api:/opt/mcrates/api"
+      - "./api:/opt/crates/api"
+      - "/opt/crates/api/node_modules"
+
+  migrate:
+    restart: on-failure:3
+    extends: api
+    command: npm run migrate status

  client:
    image: node:16
-    working_dir: /opt/mcrates/client
+    working_dir: /opt/crates/client
+    build:
+      context: ./client
+      dockerfile: ./client.dev.Dockerfile
    entrypoint: npm start
    ports:
      - '8080:8080' # fwd the hmr websocket
+    environment:
+      CHOKIDAR_USEPOLLING: 1
    volumes:
-      - "./client:/opt/mcrates/client"
-      - "./api:/opt/mcrates/api"
+      - "./client:/opt/crates/client"
+      - "./api:/opt/crates/api"
+      - "/opt/crates/client/node_modules"

  nginx:
    image: nginx:latest
@@ -0,0 +1,2 @@
+dev:
+    docker compose up
@@ -1,8 +1,8 @@
-upstream mcrates_api {
+upstream crates_api {
    server api:41337;
 }

-upstream mcrates_client {
+upstream crates_client {
    server client:8080;
 }

@@ -13,12 +13,12 @@ map $http_upgrade $connection_upgrade {

 server {
    location / {
-        proxy_pass http://mcrates_client;
+        proxy_pass http://crates_client;
        proxy_read_timeout 600s;
    }

    location /api/ws {
-        proxy_pass http://mcrates_api;
+        proxy_pass http://crates_api;
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection $connection_upgrade;
@@ -28,7 +28,7 @@ server {

    location /api/ {
        # trailing slash means api will receive url WITHOUT /api
-        proxy_pass http://mcrates_api/;
+        proxy_pass http://crates_api/;
        proxy_read_timeout 600s;
    }
 }
Author	SHA1	Message	Date
Nathan Rashleigh	1f799ce538	justfile	2025-04-25 12:34:08 +10:00
Nathan Rashleigh	f2d805b7e5	update for ntwl.xyz	2025-04-25 12:14:13 +10:00
Nathan Rashleigh	54b1900c88	offers sliders	2024-10-07 00:12:58 +11:00
Nathan Rashleigh	5e86a52d43	Sliders for accepting	2024-10-06 00:25:53 +10:00
Nathan Rashleigh	445821aa10	we're back on windows bigtime	2024-10-05 21:55:09 +10:00
Nathan Rashleigh	29610b49b2	fixes for cloudflare	2024-09-11 00:05:04 +10:00
Nathan Rashleigh	ae83ad54c4	catch status properly	2024-09-10 22:24:59 +10:00
Nathan Rashleigh	b340fc7b61	we're so back	2024-09-08 23:16:47 +10:00
ntr	986b61962a	Merge branch 'master' of ssh://mnml-studios:/home/ntr/mcrates	2024-01-05 21:33:10 +11:00
ntr	3a0525fffe	k8s and dockerfiles	2023-12-18 22:44:12 +11:00
ntr	278e1c4a95	typo	2023-12-06 11:50:45 +11:00
ntr	c379ef925d	Merge branch 'master' of ssh://mnml-studios:/home/ntr/mcrates	2023-02-14 18:19:59 +11:00
ntr	e4b7356b6e	todo	2023-02-14 18:19:34 +11:00
ntr	19e0376edf	handle weird rejected private listings	2023-02-10 17:32:50 +11:00
ntr	2dbbf75369	fix prd env	2023-02-09 00:21:00 +11:00
ntr	fa703b678f	discord bot	2023-02-09 00:16:47 +11:00
ntr	ac0a31511d	fix errors for discogs and use env settings in mcrates compose	2023-02-08 23:05:23 +11:00
ntr	2ffb5f9bc3	use [err, res] pattern for server axios	2023-02-08 22:51:09 +11:00
ntr	306dc30499	todo updates'	2023-02-07 23:50:39 +11:00
ntr	36fc3665dd	sync constantly	2023-02-07 23:04:06 +11:00
ntr	c6bf50f963	nicer toasts and fix some discogs sync problems	2023-02-07 22:11:38 +11:00
ntr	1ca9a7225c	env files, fixes for discogs sync	2023-02-07 18:23:54 +11:00
ntr	1ee8dbc749	sort by title and scroll landing	2023-02-06 00:02:46 +11:00
ntr	c4cc12850d	fix acp scrolling	2023-02-02 21:29:40 +11:00
ntr	f3813c0f61	Merge branch 'master' of ssh://git.mnml.gg:40022/home/ntr/mcrates	2023-01-26 15:24:15 +11:00
ntr	f76ceb011e	lint	2023-01-26 15:24:05 +11:00
ntr	84a19fbde3	simplify events	2023-01-23 18:42:41 +11:00
ntr	5b0c7c05ca	navbar and notifications	2023-01-17 23:44:16 +11:00
ntr	a97560c1c7	fix search and list to work with overflow scrolling	2023-01-15 12:24:15 +11:00
ntr	00cb224fb3	font change	2023-01-15 12:07:47 +11:00
ntr	6c3cac7381	navbar wip	2023-01-11 23:22:15 +11:00
ntr	b91f877045	notify	2022-12-27 15:37:46 +11:00
ntr	b86a4216cf	comments	2022-12-27 13:07:07 +11:00
ntr	57fefdc9e2	more notify	2022-12-27 13:01:42 +11:00
ntr	358958c127	notify wip	2022-12-27 01:05:56 +11:00
ntr	c205ae81e2	format notes	2022-12-26 19:34:04 +11:00
ntr	0cec6414ae	open offers fix	2022-12-26 19:02:26 +11:00
ntr	43173a833d	ask for updates on route changes	2022-12-21 23:43:49 +11:00
				`@@ -0,0 +1 @@`
				crates-api-7b8d754768-r4f5q 19:40:38.635Z ERROR mcrates: sync error ││ crates-api-7b8d754768-r4f5q TypeError: Cannot read properties of undefined (reading 'status') ││ crates-api-7b8d754768-r4f5q at populateListings (/opt/crates/api/src/events.ts:42:28) ││ crates-api-7b8d754768-r4f5q at updateWantListings (/opt/crates/api/src/events.ts:57:30) ││ crates-api-7b8d754768-r4f5q at EventEmitter.sync (/opt/crates/api/src/events.ts:83:13) ││ crates-api-7b8d754768-r4f5q 19:40:40.707Z INFO mcrates: (event=Sync, wants=192) ││ crates-api-7b8d754768-r4f5q 19:42:14.756Z ERROR mcrates: Navigation timeout of 30000 ms exceeded ││ crates-api-7b8d754768-r4f5q TimeoutError: Navigation timeout of 30000 ms exceeded ││ crates-api-7b8d754768-r4f5q at new Deferred (/opt/crates/api/node_modules/puppeteer-core/src/util/Deferred.ts:73:2 ││ crates-api-7b8d754768-r4f5q at Function.create (/opt/crates/api/node_modules/puppeteer-core/src/util/Deferred.ts:2 ││ crates-api-7b8d754768-r4f5q at new LifecycleWatcher (/opt/crates/api/node_modules/puppeteer-core/src/cdp/Lifecycle ││ crates-api-7b8d754768-r4f5q at CdpFrame.goto (/opt/crates/api/node_modules/puppeteer-core/src/cdp/Frame.ts:159:21) ││ crates-api-7b8d754768-r4f5q at CdpFrame.<anonymous> (/opt/crates/api/node_modules/puppeteer-core/src/util/decorato ││ crates-api-7b8d754768-r4f5q at CdpPage.goto (/opt/crates/api/node_modules/puppeteer-core/src/api/Page.ts:1649:35) ││ crates-api-7b8d754768-r4f5q at Object.listings (/opt/crates/api/src/discogs.ts:80:32) ││ crates-api-7b8d754768-r4f5q at populateListings (/opt/crates/api/src/events.ts:37:30) ││ crates-api-7b8d754768-r4f5q at updateWantListings (/opt/crates/api/src/events.ts:57:30) ││ crates-api-7b8d754768-r4f5q at EventEmitter.sync (/opt/crates/api/src/events.ts:83:13) ││ crates-api-7b8d754768-r4f5q 19:42:14.989Z ERROR mcrates: sync error ││ crates-api-7b8d754768-r4f5q TypeError: Cannot read properties of undefined (reading 'status') ││ crates-api-7b8d754768-r4f5q at populateListings (/opt/crates/api/src/events.ts:42:28) ││ crates-api-7b8d754768-r4f5q at updateWantListings (/opt/crates/api/src/events.ts:57:30) ││ crates-api-7b8d754768-r4f5q at EventEmitter.sync (/opt/crates/api/src/events.ts:83:13) ││ crates-api-7b8d754768-r4f5q 19:42:25.047Z INFO mcrates: (event=Sync, wants=202) ││ crates-api-7b8d754768-r4f5q 19:44:01.988Z ERROR mcrates: Timed out after waiting 30000ms ││ crates-api-7b8d754768-r4f5q TimeoutError: Timed out after waiting 30000ms ││ crates-api-7b8d754768-r4f5q at /opt/crates/api/node_modules/puppeteer-core/src/common/util.ts:302:17 ││ crates-api-7b8d754768-r4f5q at /opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_party/rxjs/rxjs.js:3986:3 ││ crates-api-7b8d754768-r4f5q at OperatorSubscriber2._this._next (/opt/crates/api/node_modules/puppeteer-core/lib/cj ││ crates-api-7b8d754768-r4f5q at OperatorSubscriber2.Subscriber2.next (/opt/crates/api/node_modules/puppeteer-core/l ││ crates-api-7b8d754768-r4f5q at AsyncAction2.<anonymous> (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third ││ crates-api-7b8d754768-r4f5q at AsyncAction2._execute (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_pa ││ crates-api-7b8d754768-r4f5q at AsyncAction2.execute (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_par ││ crates-api-7b8d754768-r4f5q at AsyncScheduler2.flush (/opt/crates/api/node_modules/puppeteer-core/lib/cjs/third_pa ││ crates-api-7b8d754768-r4f5q at listOnTimeout (node:internal/timers:581:17) ││ crates-api-7b8d754768-r4f5q at processTimers (node:internal/timers:519:7) ││ crates-api-7b8d754768-r4f5q 19:44:04.209Z ERROR mcrates: sync error ││ crates-api-7b8d754768-r4f5q TypeError: Cannot read properties of undefined (reading 'status') ││ crates-api-7b8d754768-r4f5q at populateListings (/oLine truncated