From f7d0dc3754afd29307ea2c2d35430c39e5ea4ba2 Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxemail.ext>
Date: Sun, 23 Jun 2019 20:02:40 -0500
Subject: [PATCH] More fixes
---
chat/ImagePreview.vue | 8 +++++++-
chat/image-preview-mutator.ts | 23 +++++++++++++++++------
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/chat/ImagePreview.vue b/chat/ImagePreview.vue
index a0366f0..5c12b52 100644
--- a/chat/ImagePreview.vue
+++ b/chat/ImagePreview.vue
@@ -43,6 +43,8 @@
private shouldDismiss = false;
private visibleSince = 0;
+ private debug = false;
+
@Hook('mounted')
onMounted(): void {
@@ -67,7 +69,8 @@
webview.addEventListener(
'dom-ready',
() => {
- // webview.openDevTools();
+ if (this.debug)
+ webview.openDevTools();
const url = webview.getURL();
@@ -127,6 +130,9 @@
if (this.url !== url)
return; // simply ignore
+ if (this.debug)
+ return;
+
// console.log('DISMISS');
const due = this.visible ? this.MinTimePreviewVisible - Math.min(this.MinTimePreviewVisible, (Date.now() - this.visibleSince)) : 0;
diff --git a/chat/image-preview-mutator.ts b/chat/image-preview-mutator.ts
index 17fcdd8..fd42d96 100644
--- a/chat/image-preview-mutator.ts
+++ b/chat/image-preview-mutator.ts
@@ -19,13 +19,12 @@ export class ImagePreviewMutator {
if (!urlDomain)
return;
- console.log('Domain is', urlDomain);
+ // console.log('Domain is', urlDomain);
- const mutatorJs = this.mutators[urlDomain];
+ let mutatorJs = this.mutators[urlDomain];
- if (!mutatorJs) {
- return this.mutators['default'];
- }
+ if (!mutatorJs)
+ mutatorJs = this.mutators['default'];
return `(() => { try { ${mutatorJs} } catch (err) { console.error(err); } })()`;
}
@@ -44,9 +43,14 @@ export class ImagePreviewMutator {
this.add('gfycat.com', this.getBaseJsMutatorScript('video'));
this.add('gfycatporn.com', this.getBaseJsMutatorScript('video'));
this.add('www.youtube.com', this.getBaseJsMutatorScript('video'));
+ this.add('youtube.com', this.getBaseJsMutatorScript('video'));
this.add('instantfap.com', this.getBaseJsMutatorScript('#post img, #post video'));
this.add('www.webmshare.com', this.getBaseJsMutatorScript('video'));
+ this.add('webmshare.com', this.getBaseJsMutatorScript('video'));
this.add('pornhub.com', this.getBaseJsMutatorScript('.mainPlayerDiv video, .photoImageSection img'));
+ this.add('www.sex.com', this.getBaseJsMutatorScript('.image_frame img, .image_frame video'));
+ this.add('sex.com', this.getBaseJsMutatorScript('.image_frame img, .image_frame video'));
+ this.add('redirect.media.tumblr.com', this.getBaseJsMutatorScript('picture img, picture video'));
// this fixes videos only -- images are fine as is
this.add('i.imgur.com', this.getBaseJsMutatorScript('video'));
@@ -75,7 +79,10 @@ export class ImagePreviewMutator {
getBaseJsMutatorScript(imageSelector: string, skipElementRemove = false): string {
return `const body = document.querySelector('body');
- const img = document.querySelector('${imageSelector}');
+ const img = Array.from(document.querySelectorAll('${imageSelector}')).filter((i) => ((i.width !== 1) && (i.height !== 1))).shift()
+
+ if (!img) { return; }
+
const el = document.createElement('div');
el.id = 'flistWrapper';
@@ -90,6 +97,10 @@ export class ImagePreviewMutator {
body.append(el);
body.class = '';
+ console.log(el);
+ console.log(img);
+ console.log('${imageSelector}');
+
body.style = 'border: 0 !important; padding: 0 !important; margin: 0 !important; overflow: hidden !important;'
+ 'width: 100% !important; height: 100% !important; opacity: 1 !important;'
+ 'top: 0 !important; left: 0 !important;';