@xpadev-net/niconicomments 0.2.5 → 0.2.6

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.5
+  niconicomments.js v0.2.6
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -9,34 +9,6 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.NiconiComments = factory());
 })(this, (function () { 'use strict';
 
-    /*! *****************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */
-    var __assign = function () {
-      __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-          s = arguments[i];
-
-          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-
-        return t;
-      };
-
-      return __assign.apply(this, arguments);
-    };
-
     var NiconiComments = (function () {
         function NiconiComments(canvas, data, options) {
             if (options === void 0) { options = {
@@ -68,7 +40,7 @@
                 },
                 "big": {
                     "default": 111,
-                    "resized": 62
+                    "resized": 61
                 }
             };
             this.doubleResizeMaxWidth = {
@@ -87,7 +59,7 @@
             this.showFPS = options.showFPS;
             this.showCommentCount = options.showCommentCount;
             this.timeline = {};
-            this.nicoScripts = { reverse: [], "default": [], replace: [], ban: [] };
+            this.nicoScripts = { "reverse": [], "default": [] };
             this.collision_right = {};
             this.collision_left = {};
             this.collision_ue = {};
@@ -107,7 +79,7 @@
             for (var i = 0; i < data.length; i++) {
                 for (var key in data[i]) {
                     var value = data[i][key];
-                    if (key === "chat" && value["deleted"] !== 1) {
+                    if (key === "chat" && value["deleted"] !== 1 && !value["content"].startsWith("/")) {
                         var tmpParam = {
                             "id": value["no"],
                             "vpos": value["vpos"],
@@ -121,9 +93,6 @@
                         if (value["mail"]) {
                             tmpParam["mail"] = value["mail"].split(/[\s　]/g);
                         }
-                        if (value["content"].startsWith("/") && !value["user_id"]) {
-                            tmpParam["mail"].push("invisible");
-                        }
                         data_.push(tmpParam);
                     }
                 }
@@ -146,7 +115,9 @@
             return data_;
         };
         NiconiComments.prototype.preRendering = function (rawData, drawAll) {
-            var parsedData = this.getCommentPos(this.getCommentSize(this.getFont(rawData)));
+            rawData = this.getFont(rawData);
+            rawData = this.getCommentSize(rawData);
+            var parsedData = this.getCommentPos(rawData);
             this.data = this.sortComment(parsedData);
             if (drawAll) {
                 for (var i in parsedData) {
@@ -155,15 +126,27 @@
             }
         };
         NiconiComments.prototype.getFont = function (parsedData) {
-            var result = [];
             for (var i in parsedData) {
-                result[i] = this.parseCommandAndNicoscript(parsedData[i]);
+                var comment = parsedData[i];
+                var command = this.parseCommandAndNicoscript(comment);
+                parsedData[i].loc = command.loc;
+                parsedData[i].size = command.size;
+                parsedData[i].fontSize = command.fontSize;
+                parsedData[i].font = command.font;
+                parsedData[i].color = command.color;
+                parsedData[i].full = command.full;
+                parsedData[i].ender = command.ender;
+                parsedData[i]._live = command._live;
+                parsedData[i].long = command.long;
+                parsedData[i].invisible = command.invisible;
+                parsedData[i].content = parsedData[i].content.replaceAll("\t", "\u2003\u2003");
+                if (parsedData[i].content.match(/\s{4,}/))
+                    console.log(parsedData[i], parsedData[i].content.replace(/\t/g, "\u2003\u2003"));
             }
-            return result;
+            return parsedData;
         };
         NiconiComments.prototype.getCommentSize = function (parsedData) {
             var tmpData = groupBy(parsedData, "font", "fontSize");
-            var result = [];
             for (var i in tmpData) {
                 for (var j in tmpData[i]) {
                     this.context.font = parseFont(i, j, this.useLegacy);
@@ -173,19 +156,18 @@
                             continue;
                         }
                         var measure = this.measureText(comment);
-                        result[comment.index] = parsedData[comment.index];
-                        result[comment.index].height = measure.height;
-                        result[comment.index].width = measure.width;
-                        result[comment.index].width_max = measure.width_max;
-                        result[comment.index].width_min = measure.width_min;
+                        parsedData[comment.index].height = measure.height;
+                        parsedData[comment.index].width = measure.width;
+                        parsedData[comment.index].width_max = measure.width_max;
+                        parsedData[comment.index].width_min = measure.width_min;
                         if (measure.resized) {
-                            result[comment.index].fontSize = measure.fontSize;
+                            parsedData[comment.index].fontSize = measure.fontSize;
                             this.context.font = parseFont(i, j, this.useLegacy);
                         }
                     }
                 }
             }
-            return result;
+            return parsedData;
         };
         NiconiComments.prototype.getCommentPos = function (parsedData) {
             var data = parsedData;
@@ -368,19 +350,19 @@
                 if (comment.size === "big" && lines.length > 2) {
                     comment.fontSize = this.fontSize.big.resized;
                     comment.resized = true;
-                    comment.tateresized = true;
+                    comment.tateRisized = true;
                     this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
                 }
                 else if (comment.size === "medium" && lines.length > 4) {
                     comment.fontSize = this.fontSize.medium.resized;
                     comment.resized = true;
-                    comment.tateresized = true;
+                    comment.tateRisized = true;
                     this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
                 }
                 else if (comment.size === "small" && lines.length > 6) {
                     comment.fontSize = this.fontSize.small.resized;
                     comment.resized = true;
-                    comment.tateresized = true;
+                    comment.tateRisized = true;
                     this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
                 }
             }
@@ -392,9 +374,9 @@
             width_max = Math.max.apply(Math, width_arr);
             width_min = Math.min.apply(Math, width_arr);
             height = (comment.fontSize * (1 + this.commentYPaddingTop) * lines.length) + (this.commentYMarginBottom * comment.fontSize);
-            if (comment.loc !== "naka" && !comment.tateresized) {
+            if (comment.loc !== "naka" && !comment.tateRisized) {
                 if (comment.full && width_max > 1920) {
-                    comment.fontSize -= 1;
+                    comment.fontSize -= 2;
                     comment.resized = true;
                     comment.yokoResized = true;
                     this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
@@ -408,14 +390,14 @@
                     return this.measureText(comment);
                 }
             }
-            else if (comment.loc !== "naka" && comment.tateresized && (comment.full && width_max > 1920 || !comment.full && width_max > 1440) && !comment.yokoResized) {
+            else if (comment.loc !== "naka" && comment.tateRisized && (comment.full && width_max > 1920 || !comment.full && width_max > 1440) && !comment.yokoResized) {
                 comment.fontSize = this.fontSize[comment.size]["default"];
                 comment.resized = true;
                 comment.yokoResized = true;
                 this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
                 return this.measureText(comment);
             }
-            else if (comment.loc !== "naka" && comment.tateresized && comment.yokoResized) {
+            else if (comment.loc !== "naka" && comment.tateRisized && comment.yokoResized) {
                 if (comment.full && width_max > this.doubleResizeMaxWidth.full[this.useLegacy ? "legacy" : "default"]) {
                     comment.fontSize -= 1;
                     this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
@@ -447,12 +429,6 @@
                     reverse = true;
                 }
             }
-            for (var i in this.nicoScripts.ban) {
-                var range = this.nicoScripts.ban[i];
-                if (range.start < vpos && vpos < range.end) {
-                    return;
-                }
-            }
             var posX = (1920 - comment.width_max) / 2, posY = comment.posY;
             if (comment.loc === "naka") {
                 if (reverse) {
@@ -655,7 +631,6 @@
             return { loc: loc, size: size, fontSize: fontSize, color: color, font: font, full: full, ender: ender, _live: _live, invisible: invisible, long: long };
         };
         NiconiComments.prototype.parseCommandAndNicoscript = function (comment) {
-            comment.content = comment.content.replace("/\t/g", "  ");
             var data = this.parseCommand(comment), nicoscript = comment.content.match(/^@(デフォルト|置換|逆|コメント禁止|シーク禁止|ジャンプ)/);
             if (nicoscript) {
                 switch (nicoscript[1]) {
@@ -678,61 +653,9 @@
                             data.long = 30;
                         }
                         this.nicoScripts.reverse.push({
-                            start: comment.vpos,
-                            end: comment.vpos + (data.long * 100),
-                            target: reverse[1]
-                        });
-                        break;
-                    case "コメント禁止":
-                        if (data.long === null) {
-                            data.long = 30;
-                        }
-                        this.nicoScripts.reverse.push({
-                            start: comment.vpos,
-                            end: comment.vpos + (data.long * 100)
-                        });
-                        break;
-                    case "置換":
-                        var content = comment.content.split(""), quote = "", last_i = "", string = "", result = [];
-                        for (var _i = 0, _a = content.slice(4); _i < _a.length; _i++) {
-                            var i = _a[_i];
-                            if (i.match(/["'「]/) && quote === "") {
-                                quote = i;
-                            }
-                            else if (i.match(/["']/) && quote === i && last_i !== "\\") {
-                                result.push(replaceAll(string, "\\n", "\n"));
-                                quote = "";
-                                string = "";
-                            }
-                            else if (i.match(/」/) && quote === "「") {
-                                result.push(string);
-                                quote = "";
-                                string = "";
-                            }
-                            else if (quote === "" && i.match(/[\s　]/)) {
-                                if (string) {
-                                    result.push(string);
-                                    string = "";
-                                }
-                            }
-                            else {
-                                string += i;
-                            }
-                            last_i = i;
-                        }
-                        result.push(string);
-                        this.nicoScripts.replace.push({
-                            start: comment.vpos,
-                            long: data.long === null ? null : Math.floor(data.long * 100),
-                            keyword: result[0],
-                            replace: result[1] || "",
-                            range: result[2] || "単",
-                            target: result[3] || "コメ",
-                            condition: result[4] || "部分一致",
-                            color: data.color,
-                            size: data.size,
-                            font: data.font,
-                            loc: data.loc
+                            "start": comment.vpos,
+                            "end": comment.vpos + (data.long * 100),
+                            "target": reverse[1]
                         });
                         break;
                 }
@@ -757,35 +680,6 @@
                     font = this.nicoScripts["default"][i].font;
                 }
             }
-            for (var i in this.nicoScripts.replace) {
-                if (this.nicoScripts.replace[i].long !== null && this.nicoScripts.replace[i].start + this.nicoScripts.replace[i].long < comment.vpos) {
-                    this.nicoScripts["default"] = this.nicoScripts["default"].splice(Number(i), 1);
-                    continue;
-                }
-                var item = this.nicoScripts.replace[i];
-                if ((item.target === "コメ" && comment.owner) || (item.target === "投コメ" && !comment.owner) || (item.target === "含まない" && comment.owner))
-                    continue;
-                if ((item.condition === "完全一致" && comment.content === item.keyword) || (item.condition === "部分一致" && comment.content.indexOf(item.keyword) !== -1)) {
-                    if (item.range === "単") {
-                        comment.content = replaceAll(comment.content, item.keyword, item.replace);
-                    }
-                    else {
-                        comment.content = item.replace;
-                    }
-                    if (item.loc) {
-                        loc = item.loc;
-                    }
-                    if (item.color) {
-                        color = item.color;
-                    }
-                    if (item.size) {
-                        size = item.size;
-                    }
-                    if (item.font) {
-                        font = item.font;
-                    }
-                }
-            }
             if (!data.loc) {
                 data.loc = loc;
             }
@@ -807,7 +701,7 @@
                     data.long = Math.floor(data.long * 100);
                 }
             }
-            return __assign(__assign({}, comment), data);
+            return data;
         };
         NiconiComments.prototype.drawCanvas = function (vpos) {
             if (this.lastVpos === vpos)
@@ -910,14 +804,6 @@
             return parseInt(str, 16);
         });
     };
-    var replaceAll = function (string, target, replace) {
-        var count = 0;
-        while (string.indexOf(target) !== -1 && count < 100) {
-            string = string.replace(target, replace);
-            count++;
-        }
-        return string;
-    };
 
     return NiconiComments;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
   "main": "dist/bundle.js",
   "scripts": {