Resolve #3

- Bump version to v1.7

chrome-extension/js/content_script.js

@@ -1,26 +1,55 @@
 (async () => {
   try {
     const HOST = 'https://osk2.me:9977';
+    const ipValidation = /((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/;
     const comments = document.querySelectorAll('.push-ipdatetime');
-    const ipList = [].map.call(comments, node => node.textContent.trim().split(' ')[0]);
-    const flagsResponse = await axios.post(`${HOST}/ip`, { ip: ipList });
-    const flags = flagsResponse.data;
+    const f2Nodes = document.querySelectorAll('.f2');
+    const authorComment = [].filter.call(f2Nodes, n => n.innerHTML.match(ipValidation));
+    const authorIpList = authorComment.map(c => c.innerHTML.match(ipValidation)[0]);
+    const commentIpList = [].map.call(comments, n => n.textContent.trim().split(' ')[0]);
+    const authorFlagsResponse = await axios.post(`${HOST}/ip`, { ip: authorIpList });
+    const authorFlags = authorFlagsResponse.data;
+
+    const generateImageHTML = (ip, flag) => {
+      const imagePath = flag.imagePath ? `${HOST}/${flag.imagePath}` : null;
+      const imageTitile = `${flag.locationName || 'N/A'}<br>
+        <a href='https://www.google.com/search?q=${ip}' target='_blank'>${ip}</a>`;
+
+      if (!imagePath) {
+        return;
+      }
+      return `<img data-flag src="${imagePath}" title="${imageTitile}">`;
+    }
+
+    authorComment.forEach((comment, index) => {
+      const ip = comment.innerHTML.match(ipValidation)[0];
+      const imageHTML = generateImageHTML(ip, authorFlags[index]);
+
+      if (!imageHTML) {
+        return;
+      }
+      comment.innerHTML = comment.innerHTML.replace(ipValidation, `${imageHTML} ${ip}`);
+    });
+
+    if (commentIpList.lenth === 0) {
+      return;
+    }
+
+    const commentFlagsResponse = await axios.post(`${HOST}/ip`, { ip: commentIpList });
+    const flags = commentFlagsResponse.data;
 
     [].forEach.call(comments, (comment, index) => {
       const commentInfo = comment.textContent.trim().split(' ');
       const commentIp = commentInfo[0];
-      const commentId = comment.previousSibling.previousSibling.innerHTML;
       const commentDatetime = commentInfo.splice(1, 2).join(' ');
-      const imagePath = flags[index].imagePath ? `${HOST}/${flags[index].imagePath}` : null;
-      const imageTitile = `${flags[index].locationName || 'N/A'}<br>
-        <a href='https://www.google.com/search?q=${commentId}+${commentIp}' target='_blank'>${commentIp}</a>`;
-      const imageHTML = `<img data-flag src="${imagePath}" title="${imageTitile}">`;
+      const imageHTML = generateImageHTML(commentIp, flags[index]);
 
-      if (!imagePath) {
+      if (!imageHTML) {
         return;
       }
       comment.innerHTML = `${imageHTML} ${commentDatetime}`;
     });
+
     tippy('[data-flag]', {
       arrow: true,
       size: 'large',

chrome-extension/manifest.json

@@ -2,7 +2,7 @@
   "name": "八卦插IP",
   "short_name": "八卦插IP",
   "manifest_version": 2,
-  "version": "1.6",
+  "version": "1.7",
   "description": "開門！查IP",
   "author": "osk2",
   "icons":  { "128": "images/icon_128.png" },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ptt-comment-flag",
-  "version": "1.0.0",
+  "version": "1.7",
   "description": "Query country of PTT comment",
   "main": "index.js",
   "scripts": {