Merge pull request #24 from mogproject/dev

Dev
mogproject · Apr 30, 2022 · c67a2a0 · c67a2a0
2 parents 1af8415 + d9ba142
commit c67a2a0
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-    - 'node'
+    - 17
 
 script:
     - npm run coverage

diff --git a/assets/css/yay-filter.css b/assets/css/yay-filter.css
@@ -4,10 +4,10 @@
     height: 23px;
     color: var(--yt-spec-text-secondary);
     font-family: Roboto, Arial, sans-serif;
-    font-size: var(--ytd-tab-system_-_font-size);
-    font-weight: var(--ytd-tab-system_-_font-weight);
-    letter-spacing: var(--ytd-tab-system_-_letter-spacing);
-    text-transform: var(--ytd-tab-system_-_text-transform);
+    font-size: var(--ytd-tab-system-font-size);
+    font-weight: var(--ytd-tab-system-font-weight);
+    letter-spacing: var(--ytd-tab-system-letter-spacing);
+    text-transform: var(--ytd-tab-system-text-transform);
 
     user-select: none;
     -webkit-user-select: none;
@@ -22,6 +22,15 @@
     margin-top: 46px !important;
     opacity: 0;
     transition: opacity 0.3s;
+    font-size: var(--ytd-thumbnail-attribution_-_font-size);
+    font-weight: var(--ytd-thumbnail-attribution_-_font-weight);
+    line-height: var(--ytd-thumbnail-attribution_-_line-height);
+    letter-spacing: var(--ytd-thumbnail-attribution_-_letter-spacing);
+    text-transform: var(--ytd-thumbnail-attribution_-_text-transform);
+    background-color: var(--paper-tooltip-background, #616161);
+    color: var(--paper-tooltip-text-color, white);
+    padding: 8px;
+    border-radius: 2px;
 }
 
 #yay-filter-container:hover .yay-tooltip {

diff --git a/assets/manifest_chrome.json b/assets/manifest_chrome.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Yet Another YouTube Comment Filter",
-    "version": "0.1.5",
+    "version": "0.2.0",
     "description": "Filters comments on YouTube.",
     "author": "Yosuke Mizutani",
 

diff --git a/assets/manifest_firefox.json b/assets/manifest_firefox.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Yet Another YouTube Comment Filter",
-    "version": "0.1.5",
+    "version": "0.2.0",
     "description": "Filters comments on YouTube.",
     "author": "Yosuke Mizutani",
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "yay-filter",
-    "version": "0.1.5",
+    "version": "0.2.0",
     "description": "Yet another YouTube comment filter",
     "devDependencies": {
         "@types/chrome": "0.0.127",

diff --git a/src/App.ts b/src/App.ts
@@ -113,6 +113,8 @@ export default class App {
      * @param url URL to check
      */
     private verifyUrl(url: string): void {
+        // this.log(`verifyUrl(${url})`);
+
         if (url != Config.url.targetUrl) throw new UnexpectedUrlError(url);
     }
 
@@ -169,10 +171,13 @@ export default class App {
 
         // check if it already exists (this can happen by a browser's "go back" button, etc.)
         const e = DomManager.findCommentHeader();
+        // this.log(String(e));
         if (e != null) return Promise.resolve(e);
 
         const p = new Promise<HTMLElement>((resolve, reject) => {
             const observer = new MutationObserver((m, o) => {
+                // this.log('observer call');
+
                 // check if the comment header exists
                 const elem = DomManager.findCommentHeader();
                 if (elem == null) return;
@@ -181,10 +186,12 @@ export default class App {
                 o.disconnect();
 
                 // return element
+                // this.log('observer finds element');
                 resolve(elem);
             });
             observer.observe(commentContainer, { subtree: false, childList: true });
         });
+        // this.log('watching: ' + String(commentContainer.outerHTML));
         return p;
     }
 
@@ -248,6 +255,8 @@ export default class App {
      * Clears the filter button.
      */
     private clearYayFilterContainer(): void {
+        // this.log(`clearYayFilterContainer()`);
+
         const elem = DomManager.findYayFilterContainer();
         if (elem != null) {
             elem.remove();

diff --git a/src/Config.ts b/src/Config.ts
@@ -6,7 +6,7 @@
 declare const __DEBUG__: string;
 
 export const Config = {
-    version: '0.1.5',
+    version: '0.2.0',
     url: {
         targetUrl: 'www.youtube.com/watch',
         projectUrl: 'https://github.com/mogproject/yay-filter',
@@ -21,7 +21,7 @@ export const Config = {
         },
         selector: {
             // YouTube selector queries
-            ytCommentContainer: 'ytd-comments #header.ytd-item-section-renderer',
+            ytCommentContainer: '#primary ytd-comments #header.ytd-item-section-renderer',
             ytCommentTitle: 'ytd-comments #title.ytd-comments-header-renderer',
             ytCommentContents: 'ytd-comments #contents.ytd-item-section-renderer',
             ytCommentThread: 'ytd-comments ytd-comment-thread-renderer',