Merge pull request #117 from thefirstspine/next

Release 3.4.0

api/controllers/GoController.js

@@ -0,0 +1,28 @@
+/**
+ * CodesController
+ *
+ * @description :: Server-side actions for handling incoming requests.
+ * @help        :: See https://sailsjs.com/docs/concepts/actions
+ */
+
+const { default: axios } = require("axios");
+
+module.exports = {
+
+  async index(req, res) {
+    const code = req.params?.code;
+    if (!code) {
+      return res.redirect(301, '/');
+    }
+
+    const link = await sails.models.link.findOne({code});
+    if (!link) {
+      return res.redirect(301, '/');
+    }
+
+    await sails.models.linkclick.create({ code, ip: req.ip, userAgant: req.headers?['user-agent'] ?? req.headers['user-agent'] : 'unknown' });
+    return res.redirect(301, link.url);
+  },
+
+};
+

api/helpers/get-events.js

@@ -9,7 +9,7 @@ module.exports = {
     try {
       const baseUrl = process.env.CALENDAR_URL;
       const date = (new Date()).toISOString();
-      const url = `${baseUrl}/events?filter=datetimeTo||gt||${date}&sort=datetimeFrom,ASC`;
+      const url = `${baseUrl}/events/next`;
       const result = await axios.get(url);
       const resultJson = result.data;
       return exits.success(resultJson);

api/models/Link.js

@@ -0,0 +1,33 @@
+/**
+ * Code.js
+ *
+ * @description :: A model definition represents a database table/collection.
+ * @docs        :: https://sailsjs.com/docs/concepts/models-and-orm/models
+ */
+
+module.exports = {
+
+  attributes: {
+
+    //  ╔═╗╦═╗╦╔╦╗╦╔╦╗╦╦  ╦╔═╗╔═╗
+    //  ╠═╝╠╦╝║║║║║ ║ ║╚╗╔╝║╣ ╚═╗
+    //  ╩  ╩╚═╩╩ ╩╩ ╩ ╩ ╚╝ ╚═╝╚═╝
+
+    code: { type: 'string', required: true },
+    url: { type: 'string', required: true },
+    createdAt: { type: 'number', autoCreatedAt: true },
+    updatedAt: { type: 'number', autoUpdatedAt: true },
+
+    //  ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
+    //  ║╣ ║║║╠╩╗║╣  ║║╚═╗
+    //  ╚═╝╩ ╩╚═╝╚═╝═╩╝╚═╝
+
+
+    //  ╔═╗╔═╗╔═╗╔═╗╔═╗╦╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
+    //  ╠═╣╚═╗╚═╗║ ║║  ║╠═╣ ║ ║║ ║║║║╚═╗
+    //  ╩ ╩╚═╝╚═╝╚═╝╚═╝╩╩ ╩ ╩ ╩╚═╝╝╚╝╚═╝
+
+  },
+
+};
+

api/models/LinkClick.js

@@ -0,0 +1,34 @@
+/**
+ * Code.js
+ *
+ * @description :: A model definition represents a database table/collection.
+ * @docs        :: https://sailsjs.com/docs/concepts/models-and-orm/models
+ */
+
+module.exports = {
+
+  attributes: {
+
+    //  ╔═╗╦═╗╦╔╦╗╦╔╦╗╦╦  ╦╔═╗╔═╗
+    //  ╠═╝╠╦╝║║║║║ ║ ║╚╗╔╝║╣ ╚═╗
+    //  ╩  ╩╚═╩╩ ╩╩ ╩ ╩ ╚╝ ╚═╝╚═╝
+
+    code: { type: 'string', required: true },
+    ip: { type: 'string' },
+    userAgent: { type: 'string' },
+    createdAt: { type: 'number', autoCreatedAt: true },
+    updatedAt: { type: 'number', autoUpdatedAt: true },
+
+    //  ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
+    //  ║╣ ║║║╠╩╗║╣  ║║╚═╗
+    //  ╚═╝╩ ╩╚═╝╚═╝═╩╝╚═╝
+
+
+    //  ╔═╗╔═╗╔═╗╔═╗╔═╗╦╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
+    //  ╠═╣╚═╗╚═╗║ ║║  ║╠═╣ ║ ║║ ║║║║╚═╗
+    //  ╩ ╩╚═╝╚═╝╚═╝╚═╝╩╩ ╩ ╩ ╩╚═╝╝╚╝╚═╝
+
+  },
+
+};
+

config/policies.js

@@ -44,5 +44,6 @@ module.exports.policies = {
   'code/*':['load-user', 'is-logged-in', 'is-admin'],
   'mailinglist/*':['load-user', 'is-logged-in', 'is-admin'],
   'steamcode/*':['load-user', 'is-logged-in', 'is-admin'],
+  'link/*':['load-user', 'is-logged-in', 'is-admin'],
 
 };

config/routes.js

@@ -80,4 +80,6 @@ module.exports.routes = {
   'GET /report/:id': 'ReportController.index',
   'POST /report/:id': 'ReportController.report',
 
+  // Go
+  'GET /go/:code': 'GoController.index',
 };