Allow specifying offset for orders, remove terraform stuff

src/api/index.js

@@ -32,13 +32,20 @@ router.get('/orders', async (req, res) => {
             width: order.width
         };
 
+        order.offset = {
+            x: order.offset_x,
+            y: order.offset_y
+        };
+
         order.createdAt = order.created_at;
 
         delete order.created_at;
         delete order.created_by;
         delete order.flags; // implementation detail
         delete order.height;
         delete order.width;
+        delete order.offset_x;
+        delete order.offset_y;
     }
 
     res.json(orders);

src/artist/index.js

@@ -132,13 +132,16 @@ router.post('/order', upload.fields([{
         fs.copyFileSync(priority.path, path.join(IMAGES_DIRECTORY, `${id}-priority.png`));
     }
 
+    let xOffset = Number(req.body['x-offset']) || 0;
+    let yOffset = Number(req.body['y-offset']) || 0;
+
     await chief.sql`INSERT INTO users (id, name, avatar)
                     VALUES (${userData.id}, ${userData.username}, ${avatar})
                     ON CONFLICT (id) DO UPDATE SET name   = ${userData.username},
                                                    avatar = ${avatar};`;
-    await chief.sql`INSERT INTO orders (id, message, flags, width, height, created_by)
+    await chief.sql`INSERT INTO orders (id, message, flags, width, height, created_by, offset_x, offset_y)
                     VALUES (${id}, ${req.body.message || null}, ${flags}, ${orderPng.width}, ${orderPng.height},
-                            ${userData.id})`;
+                            ${userData.id}, ${xOffset}, ${yOffset})`;
 
     const payload = {
         id,
@@ -155,6 +158,10 @@ router.post('/order', upload.fields([{
             order: `${BASE_URL}/orders/${id}.png`,
             priority: req.files.priority ? `${BASE_URL}/orders/${id}-priority.png` : null
         },
+        offset: {
+            x: xOffset,
+            y: yOffset
+        },
         createdAt: new Date()
     };
 
@@ -233,6 +240,13 @@ async function validate(req) {
             perfect = false;
             messages.push(`Order has a different size than the current order (${orderPng.width}x${orderPng.height} new, ${previousOrder.width}x${previousOrder.height} old). If the canvas has been resized, you can ignore this warning.`);
         }
+
+        let xOffset = Number(req.body['x-offset']) || 0;
+        let yOffset = Number(req.body['y-offset']) || 0;
+        if (previousOrder.offset_x !== xOffset || previousOrder.offset_y !== yOffset) {
+            perfect = false;
+            messages.push(`Order has a different offset than the current order (${xOffset},${yOffset} new, ${previousOrder.offset_x},${previousOrder.offset_y} old). If the canvas has been resized, you can ignore this warning.`);
+        }
     }
 
     if (!req.body.message) {

src/index.js

@@ -34,6 +34,9 @@ CREATE TABLE IF NOT EXISTS orders (
 
     CONSTRAINT fk_created_by FOREIGN KEY(created_by) REFERENCES users(id)
 );
+
+ALTER TABLE orders ADD COLUMN IF NOT EXISTS offset_x INTEGER NOT NULL DEFAULT -500;
+ALTER TABLE orders ADD COLUMN IF NOT EXISTS offset_y INTEGER NOT NULL DEFAULT -500;
 `);
 
 expressWs(app);

src/ws/handler/orders.js

@@ -22,13 +22,20 @@ export async function handleGetOrder(chief, client) {
         width: order.width
     };
 
+    order.offset = {
+        x: order.offset_x,
+        y: order.offset_y
+    };
+
     order.createdAt = order.created_at;
 
     delete order.created_at;
     delete order.created_by;
     delete order.flags; // implementation detail
     delete order.height;
     delete order.width;
+    delete order.offset_x;
+    delete order.offset_y;
 
     client.ws.sendPayload('order', order);
 }