@xpadev-net/niconicomments 0.2.58 → 0.2.59

package/dist/bundle.d.ts

@@ -187,7 +187,7 @@ type BaseConfig = {
   commentYOffset: ConfigSizeItem<ConfigResizedItem<number>>;
   commentYPaddingTop: ConfigResizedItem<number>;
   contextFillLiveOpacity: number;
-  contextLineWidth: number;
+  contextLineWidth: ConfigItem<number>;
   contextStrokeColor: string;
   contextStrokeInversionColor: string;
   contextStrokeOpacity: number;

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.58
+  niconicomments.js v0.2.59
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -645,7 +645,7 @@
         });
     };
     const processNicoscript = (comment, commands) => {
-        const nicoscript = RegExp(/^[@\uff20](\u30c7\u30d5\u30a9\u30eb\u30c8|\u7f6e\u63db|\u9006|\u30b3\u30e1\u30f3\u30c8\u7981\u6b62|\u30b7\u30fc\u30af\u7981\u6b62|\u30b8\u30e3\u30f3\u30d7|\u30dc\u30bf\u30f3)(?:\s(.+))?/).exec(comment.content);
+        const nicoscript = RegExp(/^[@\uff20](.*)(?:\s(.+))?/).exec(comment.content);
         if (!nicoscript)
             return;
         if (nicoscript[1] === "\u30dc\u30bf\u30f3" && nicoscript[2]) {
@@ -1333,7 +1333,7 @@
         if (!comment.button || comment.button.limit <= 0)
             return;
         comment.button.limit -= 1;
-        const mail = [...comment.button.commentMail];
+        const mail = [...comment.button.commentMail, "from_button"];
         if (!comment.button.commentVisible) {
             mail.push("invisible");
         }
@@ -1740,7 +1740,7 @@
             this.cacheKey =
                 JSON.stringify(this.comment.content) +
                     `@@${this.pluginName}@@` +
-                    [...this.comment.mail].sort().join(",");
+                    [...this.comment.mail].sort((a, b) => a.localeCompare(b)).join(",");
             delete this.image;
         }
         convertComment(comment) {
@@ -1947,7 +1947,6 @@
                     this.comment.lineHeight *
                     config.commentYOffset[this.comment.size][offsetKey];
             let lastFont = this.comment.font, leftOffset = 0, lineCount = 0, isLastButton = false;
-            console.log(this.comment);
             for (const item of this.comment.content) {
                 const font = item.font ?? this.comment.font;
                 if (lastFont !== font) {
@@ -1955,23 +1954,20 @@
                     context.font = parseFont(font, this.comment.fontSize);
                 }
                 const lines = item.slicedContent;
-                for (let j = 0, n = lines.length; j < n; j++) {
-                    const line = lines[j];
+                for (let lineIndex = 0, lineLength = lines.length; lineIndex < lineLength; lineIndex++) {
+                    const line = lines[lineIndex];
                     if (line === undefined)
                         continue;
                     const posY = (lineOffset + lineCount + 1) * lineHeight + offsetY;
-                    const partWidth = item.width[j] ?? 0;
-                    if (this.comment.button && !this.comment.button.hidden) {
-                        if (!isLastButton && item.isButton) {
-                            leftOffset += atButtonPadding * 2;
-                        }
-                        else if (isLastButton && !item.isButton) {
-                            leftOffset += atButtonPadding * 2;
-                        }
+                    const partWidth = item.width[lineIndex] ?? 0;
+                    if (this.comment.button &&
+                        !this.comment.button.hidden &&
+                        ((!isLastButton && item.isButton) || (isLastButton && !item.isButton))) {
+                        leftOffset += atButtonPadding * 2;
                     }
                     context.strokeText(line, leftOffset, posY);
                     context.fillText(line, leftOffset, posY);
-                    if (j < n - 1) {
+                    if (lineIndex < lineLength - 1) {
                         leftOffset = 0;
                         lineCount += 1;
                         continue;
@@ -1992,7 +1988,12 @@
             const atButtonRadius = getConfig(config.atButtonRadius, true);
             const isHover = this.isHovered(cursor, posX, posY);
             context.save();
-            context.strokeStyle = isHover ? this.comment.color : "white";
+            context.strokeStyle =
+                this.comment.button.limit < 1
+                    ? "#777777"
+                    : isHover
+                        ? this.comment.color
+                        : "white";
             drawLeftBorder(context, parts.left.left, parts.left.top, parts.left.width, parts.left.height, atButtonRadius);
             for (const part of parts.middle) {
                 drawMiddleBorder(context, part.left, part.top, part.width, part.height);
@@ -2007,6 +2008,7 @@
             const { left, middle, right } = this.comment.buttonObjects;
             const scale = this._globalScale *
                 this.comment.scale *
+                this.comment.scaleX *
                 (this.comment.layer === -1 ? options.scale : 1);
             const posX = (_posX ?? this.pos.x) / scale;
             const posY = (_posY ?? this.pos.y) / scale;
@@ -2030,7 +2032,7 @@
                     return true;
                 }
             }
-            return (between(cursor.x, posX + right.right - atButtonPadding, posX + right.right + atButtonPadding * 2) && between(cursor.y, posY + right.top, posY + right.top + right.height));
+            return (between(cursor.x, posX + right.right - atButtonPadding, posX + right.right + getConfig(config.contextLineWidth, true) / 2) && between(cursor.y, posY + right.top, posY + right.top + right.height));
         }
         _setupCanvas(image, context) {
             const atButtonPadding = getConfig(config.atButtonPadding, true);
@@ -2041,7 +2043,7 @@
             context.fillStyle = this.comment.color;
             context.textAlign = "start";
             context.textBaseline = "alphabetic";
-            context.lineWidth = 4;
+            context.lineWidth = getConfig(config.contextLineWidth, true);
             context.font = parseFont(this.comment.font, this.comment.fontSize);
             const scale = this._globalScale *
                 this.comment.scale *
@@ -2282,7 +2284,7 @@
             context.fillStyle = this.comment.color;
             context.textAlign = "start";
             context.textBaseline = "alphabetic";
-            context.lineWidth = config.contextLineWidth;
+            context.lineWidth = getConfig(config.contextLineWidth, false);
             context.font = parseFont(this.comment.font, fontSize);
             const drawScale = getConfig(config.commentScale, false) *
                 scale *
@@ -2490,7 +2492,10 @@
             contextStrokeInversionColor: "#FFFFFF",
             contextStrokeOpacity: 0.4,
             contextFillLiveOpacity: 0.5,
-            contextLineWidth: 2.8,
+            contextLineWidth: {
+                html5: 2.8,
+                flash: 4,
+            },
             commentScale: {
                 html5: 1920 / 683,
                 flash: 1920 / 683,
@@ -3074,7 +3079,7 @@
             this.context = getContext(canvas);
             this.context.textAlign = "start";
             this.context.textBaseline = "alphabetic";
-            this.context.lineWidth = config.contextLineWidth;
+            this.context.lineWidth = getConfig(config.contextLineWidth, false);
             let formatType = options.format;
             if (options.formatted) {
                 console.warn("Deprecated: options.formatted is no longer recommended. Please use options.format. https://xpadev-net.github.io/niconicomments/#p_format");
@@ -3174,13 +3179,12 @@
                 pv.push(createCommentInstance(val, this.context));
                 return pv;
             }, []);
-            console.log(comments);
             for (const plugin of plugins) {
                 try {
                     plugin.instance.addComments?.(comments);
                 }
                 catch (e) {
-                    console.error("Failed to add comments");
+                    console.error("Failed to add comments", e);
                 }
             }
             for (const comment of comments) {
@@ -3269,12 +3273,12 @@
                 this.context.fillStyle = "red";
                 if (leftCollision) {
                     for (const comment of leftCollision) {
-                        this.context.fillRect(config.collisionRange.left, comment.posY, config.contextLineWidth, comment.height);
+                        this.context.fillRect(config.collisionRange.left, comment.posY, getConfig(config.contextLineWidth, comment.flash), comment.height);
                     }
                 }
                 if (rightCollision) {
                     for (const comment of rightCollision) {
-                        this.context.fillRect(config.collisionRange.right, comment.posY, config.contextLineWidth * -1, comment.height);
+                        this.context.fillRect(config.collisionRange.right, comment.posY, getConfig(config.contextLineWidth, comment.flash) * -1, comment.height);
                     }
                 }
                 this.context.restore();
@@ -3321,6 +3325,7 @@
             for (const comment of comments) {
                 if (comment.isHovered(pos)) {
                     const newComment = buildAtButtonComment(comment.comment, vpos);
+                    console.log(newComment);
                     if (!newComment)
                         continue;
                     this.addComments(newComment);

package/package.json

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