@eso-status/forum-message 2.0.0-dev.6 → 2.0.0-dev.7

package/lib/connector.d.ts

@@ -60,9 +60,9 @@ export default class Connector {
      */
     private fetch;
     /**
-     * Method for retrieving the information contained in an announcement
-     * @param raw Raw data of the announcement
+     * Method to create the return list with all the data contained in the announcements, sorted by importance while avoiding duplicates
+     * @param matches List of all the data contained in the announcements
      * @private
      */
-    private fetchEach;
+    private fetchAll;
 }

package/lib/connector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
+const types_1 = require("@eso-status/types");
 const raw_1 = require("./raw");
 /**
  * Class for retrieving information from announcements
@@ -50,7 +51,7 @@ class Connector {
      * @private
      */
     getMessages() {
-        ['WarningMessage', 'AlertMessage'].forEach((type) => this.getMessagesByType(type));
+        ['AlertMessage', 'WarningMessage'].forEach((type) => this.getMessagesByType(type));
     }
     /**
      * Method for retrieving raw announcements based on the announcement level
@@ -76,10 +77,14 @@ class Connector {
             initialRaw = initialRaw.replace(' 。', '');
             initialRaw = initialRaw.replace(/<br\/>\n/g, '<br>');
             initialRaw = initialRaw.replace('. <br>', '.<br>');
-            if (!initialRaw.includes('. <')) {
-                return initialRaw.replace('. ', '.');
+            initialRaw = initialRaw.replace(' Thank you for your patience.', '');
+            if (initialRaw.includes('. Please check here for status updates: <a href')) {
+                return initialRaw.split(' Please check here for status updates: <a href')[0];
             }
-            return initialRaw;
+            if (initialRaw.includes('. <a href')) {
+                return initialRaw.split(' <a href')[0];
+            }
+            return initialRaw.replace('. ', '.');
         });
     }
     /**
@@ -110,16 +115,34 @@ class Connector {
      * @private
      */
     fetch() {
-        this.raw.forEach((raw) => this.fetchEach(raw));
+        const matches = [];
+        this.raw.forEach((raw) => {
+            new raw_1.default(this.url, raw).matches.forEach((match) => {
+                matches.push(match);
+            });
+        });
+        this.fetchAll(matches);
     }
     /**
-     * Method for retrieving the information contained in an announcement
-     * @param raw Raw data of the announcement
+     * Method to create the return list with all the data contained in the announcements, sorted by importance while avoiding duplicates
+     * @param matches List of all the data contained in the announcements
      * @private
      */
-    fetchEach(raw) {
-        new raw_1.default(this.url, raw).matches.forEach((match) => {
-            this.rawEsoStatus.push(match);
+    fetchAll(matches) {
+        matches.forEach((match) => {
+            const alreadyInList = this.rawEsoStatus.filter((esoStatusRawData) => esoStatusRawData.slug === match.slug).length !== 0;
+            const alone = matches.filter((esoStatusRawData) => esoStatusRawData.slug === match.slug).length === 1;
+            const slugIsIssues = matches.filter((esoStatusRawData) => esoStatusRawData.status === types_1.IssuesStatus &&
+                esoStatusRawData.slug === match.slug).length !== 0;
+            const slugIsUp = matches.filter((esoStatusRawData) => esoStatusRawData.status === types_1.UpStatus &&
+                esoStatusRawData.slug === match.slug).length !== 0;
+            if (!alreadyInList) {
+                if (alone ||
+                    (match.status === types_1.IssuesStatus && slugIsIssues) ||
+                    (match.status === types_1.UpStatus && slugIsUp)) {
+                    this.rawEsoStatus.push(match);
+                }
+            }
         });
     }
 }

package/lib/identifier/slug.identifier.js

@@ -54,6 +54,7 @@ class SlugIdentifier {
          */
         this.ServerPsEuMatchesList = [
             'PlayStation®: NA and EU megaservers for',
+            'The PlayStation™ Network',
         ];
         /**
          * List of indicators proving that the announcement pertains to the slug server_ps_na
@@ -61,6 +62,7 @@ class SlugIdentifier {
          */
         this.ServerPsNaMatchesList = [
             'PlayStation®: NA and EU megaservers for',
+            'The PlayStation™ Network',
         ];
         /**
          * List of indicators proving that the announcement pertains to the slug server_xbox_eu

package/lib/identifier/status.identifier.d.ts

@@ -33,6 +33,11 @@ export default class StatusIdentifier {
      * @private
      */
     private readonly plannedMatchesList;
+    /**
+     * List of indicators proving that the announcement pertains to the status issues
+     * @private
+     */
+    private readonly issuesMatchesList;
     /**
      * @param raw Raw data of the announcement
      */

package/lib/identifier/status.identifier.js

@@ -14,7 +14,12 @@ class StatusIdentifier {
          * List of statuses to check for presence in the announcement
          * @private
          */
-        this.statusList = [types_1.UpStatus, types_1.DownStatus, types_1.PlannedStatus];
+        this.statusList = [
+            types_1.UpStatus,
+            types_1.DownStatus,
+            types_1.PlannedStatus,
+            types_1.IssuesStatus,
+        ];
         /**
          * List of indicators proving that the announcement pertains to the status up
          * @private
@@ -23,6 +28,7 @@ class StatusIdentifier {
             '[COMPLETE]',
             'now available',
             'complete',
+            'been resolved',
         ];
         /**
          * List of indicators proving that the announcement pertains to the status down
@@ -40,6 +46,13 @@ class StatusIdentifier {
         this.plannedMatchesList = [
             'We will be performing maintenance',
         ];
+        /**
+         * List of indicators proving that the announcement pertains to the status issues
+         * @private
+         */
+        this.issuesMatchesList = [
+            'is currently experiencing a service interruption',
+        ];
         this.statusList.forEach((status) => this.identify(status));
         this.default();
     }

package/lib/type/remoteRawStatus.type.d.ts

@@ -1,7 +1,8 @@
 import { RemoteUpRawStatus } from './remoteUpRawStatus.type';
 import { RemoteDownRawStatus } from './remoteDownRawStatus.type';
 import { RemotePlannedRawStatus } from './remotePlannedRawStatus.type';
+import { RemoteIssuesRawStatus } from './remoteIssuesRawStatus.type';
 /**
  * Different statuses of announcements
  */
-export type RemoteRawStatus = RemoteUpRawStatus | RemoteDownRawStatus | RemotePlannedRawStatus;
+export type RemoteRawStatus = RemoteUpRawStatus | RemoteDownRawStatus | RemotePlannedRawStatus | RemoteIssuesRawStatus;

package/lib/type/remoteServerPsEuRawSlug.type.d.ts

@@ -1,4 +1,4 @@
 /**
  * Different slugs of announcements concerning the European PlayStation® Megaserver
  */
-export type RemoteServerPsEuRawSlug = 'PlayStation®: NA and EU megaservers for';
+export type RemoteServerPsEuRawSlug = 'PlayStation®: NA and EU megaservers for' | 'The PlayStation™ Network';

package/lib/type/remoteServerPsNaRawSlug.type.d.ts

@@ -1,4 +1,4 @@
 /**
  * Different slugs of announcements concerning the North American PlayStation® Megaserver
  */
-export type RemoteServerPsNaRawSlug = 'PlayStation®: NA and EU megaservers for';
+export type RemoteServerPsNaRawSlug = 'PlayStation®: NA and EU megaservers for' | 'The PlayStation™ Network';

package/lib/type/remoteUpRawStatus.type.d.ts

@@ -1,4 +1,4 @@
 /**
  * Different statuses of announcements indicating that the announcement refers to an accessible service/server
  */
-export type RemoteUpRawStatus = '[COMPLETE]' | 'now available' | 'complete';
+export type RemoteUpRawStatus = '[COMPLETE]' | 'now available' | 'complete' | 'been resolved';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eso-status/forum-message",
-  "version": "2.0.0-dev.6",
+  "version": "2.0.0-dev.7",
   "description": "Library for retrieving and formatting data, available at https://forums.elderscrollsonline.com or https://forums.elderscrollsonline.com/en/categories/pts",
   "author": "@dov118 <contact@dov118.dev> (https://dov118.dev)",
   "main": "lib/index.js",
@@ -91,18 +91,18 @@
     "moment": "2.30.1"
   },
   "devDependencies": {
-    "@types/jest": "29.5.12",
-    "eslint": "8.57.0",
+    "@types/jest": "29.5.13",
+    "eslint": "8.57.1",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "18.0.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-jest": "28.8.3",
     "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-sonarjs": "2.0.2",
-    "eslint-plugin-unused-imports": "4.1.3",
-    "husky": "9.1.5",
+    "eslint-plugin-sonarjs": "2.0.3",
+    "eslint-plugin-unused-imports": "4.1.4",
+    "husky": "9.1.6",
     "jest": "29.7.0",
-    "nodemon": "3.1.4",
+    "nodemon": "3.1.7",
     "prettier": "3.3.3",
     "ts-jest": "29.2.5",
     "typescript": "5.5.4"