start news

Author: misterhat

README.md

@@ -241,7 +241,7 @@ rsc-data-server sends these to certain (or all) clients with the each header
 corresponding to the `.handler` property:
 
 ### playerLoggedIn
-sent to rsc-server instances when players login.
+sent to data clients when players login.
 
 ```javascript
 {
@@ -252,7 +252,7 @@ sent to rsc-server instances when players login.
 ```
 
 ### playerLoggedOut
-sent to rsc-server instances when players logout
+sent to data clients when players logout.
 
 ```javascript
 {
@@ -262,7 +262,7 @@ sent to rsc-server instances when players logout
 ```
 
 ### playerWorldChange
-sent to rsc-server instances when players change world appearance.
+sent to data clients when players change world appearance.
 
 ```javascript
 {
@@ -273,7 +273,7 @@ sent to rsc-server instances when players change world appearance.
 ```
 
 ### playerMessage
-sent to the rsc-server instance corresponding to the the world `toUsername`
+sent to the data client corresponding to the the world `toUsername`
 resides in the `playerMessage` handler.
 
 ```javascript

rsc-data-server.sql renamed to create-tables.sql

@@ -129,3 +129,17 @@ CREATE TABLE IF NOT EXISTS `login_attempts` (
 
 CREATE UNIQUE INDEX IF NOT EXISTS `login_attempts_ip_unique` on `login_attempts`
 (`ip`);
+
+CREATE TABLE IF NOT EXISTS `news` (
+    `id` integer not null primary key autoincrement,
+    `date` datetime default (strftime('%s', 'now')),
+    `category` integer default '0',
+    `title` varchar(255),
+    `body` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `uploads` (
+    `id` integer not null primary key autoincrement,
+    `name` varchar(255),
+    `file` blob
+);

src/handlers/index.js

@@ -1,6 +1,7 @@
 const handlers = [
     require('./authenticate'),
     require('./hiscores'),
+    require('./news'),
     require('./player'),
     require('./world')
 ];

src/handlers/news.js

@@ -0,0 +1,33 @@
+async function getNews({
+    token,
+    id = -1,
+    terms = '',
+    page = 0,
+    category = -1,
+    before = -1,
+    after = 1
+}) {
+    const queryHandler = this.server.queryHandler;
+
+    const articles = queryHandler.getNews({
+        id,
+        terms,
+        page,
+        category,
+        before,
+        after
+    });
+
+    this.socket.sendMessage({
+        token,
+        articles
+    });
+}
+
+async function addNews({ token, title, category, body }) {}
+
+async function editNews({ token, id, title, category, body }) {}
+
+async function uploadFile({ token, name, file }) {}
+
+module.exports = { getNews, addNews, editNews, uploadFile };

src/query-handler.js

@@ -5,7 +5,7 @@ const snakeCaseKeys = require('snakecase-keys');
 const { experienceToLevel } = require('./skills');
 
 const CREATE_TABLES = fs
-    .readFileSync(`${__dirname}/../rsc-data-server.sql`)
+    .readFileSync(`${__dirname}/../create-tables.sql`)
     .toString();
 
 const SET_PLAYER_ATTRIBUTES = [
@@ -61,7 +61,10 @@ const PLAYER_JSON_FIELDS = [
 const TOTAL_EXP = `(\`exp_${skills.join('` + `exp_')}\`) AS \`experience\``;
 const RANKS_PER_PAGE = 16;
 
-function getPages(database) {
+const SUMMARY_LENGTH = 140;
+const NEWS_PER_PAGE = 10;
+
+function getHiscorePages(database) {
     return Math.ceil(
         database.prepare('SELECT COUNT(1) FROM `hiscore_ranks`').pluck().get() /
             RANKS_PER_PAGE
@@ -138,8 +141,21 @@ class QueryHandler {
             getPlayerRanks:
                 `SELECT ${skills.map(
                     (skill) => `\`exp_${skill}\`, \`rank_${skill}\``
-                )}, \`total_level\`, ${TOTAL_EXP}, \`rank_total\` `+
-                'FROM `players` WHERE `username` = ?'
+                )}, \`total_level\`, ${TOTAL_EXP}, \`rank_total\` ` +
+                'FROM `players` WHERE `username` = ?',
+            searchNews:
+                'SELECT `id`, `date`, `category`, `title`, ' +
+                `substr(\`body\`, 0, ${SUMMARY_LENGTH}) AS \`summary\` ` +
+                'FROM `news` WHERE ' +
+                'CASE WHEN :category > -1 THEN `category` = :category ELSE ' +
+                'true END AND ' +
+                'CASE WHEN LENGTH(:terms) > 0 THEN `title` LIKE :terms OR ' +
+                '`body` LIKE :terms ELSE true END AND ' +
+                'CASE WHEN :before > -1 AND :after > -1 THEN ' +
+                '`date` < :before AND `date` >= :after ELSE true END ' +
+                'ORDER BY `date` DESC ' +
+                `LIMIT ${NEWS_PER_PAGE} OFFSET (:page * ${NEWS_PER_PAGE})`,
+            getNews: 'SELECT * FROM `news` WHERE `id` = ?'
         };
 
         for (const [name, statement] of Object.entries(this.statements)) {
@@ -162,7 +178,7 @@ class QueryHandler {
                     '`players`.`id`)'
             );
 
-            return getPages(this.database);
+            return getHiscorePages(this.database);
         });
 
         this.statements.getSkillHiscoreRanks = {};
@@ -205,7 +221,7 @@ class QueryHandler {
                             '`players`.`id`);'
                     );
 
-                    return getPages(this.database);
+                    return getHiscorePages(this.database);
                 }
             );
         }
@@ -435,6 +451,17 @@ class QueryHandler {
         return ranks;
     }
 
+    getNews(query) {
+        if (query.id !== -1) {
+            return this.statements.getNews.get(query.id);
+        }
+
+        delete query.id;
+        query.terms = `%${query.terms.replace(/%|_/g, '')}%`;
+
+        return this.statements.searchNews.all(query);
+    }
+
     sync() {
         this.database.pragma('journal_mode = WAL');
         this.createTables();

src/server.js

@@ -115,12 +115,13 @@ class Server {
         if (this.config.sockFile) {
             try {
                 fs.unlinkSync(this.config.sockFile);
+
                 log.debug(
                     'removing existing socket file',
                     this.config.sockFile
                 );
             } catch (e) {
-                // ignore
+                // pass
             }
 
             this.ipcServer.listen(this.config.sockFile);