{{l('chat.status')}}
diff --git a/chat/ads/ad-manager.ts b/chat/ads/ad-manager.ts
index 423865b..06c9e23 100644
--- a/chat/ads/ad-manager.ts
+++ b/chat/ads/ad-manager.ts
@@ -90,7 +90,7 @@ export class AdManager {
}
private determineNextAdDelayMs(chanConv: Conversation.ChannelConversation): number {
- const match = chanConv.channel.description.toLowerCase().match(/\[\s*ads:\s*([0-9.]+)\s*(m|min|minutes?|h|hr|hours?|s|secs?|seconds?)\s*]/);
+ const match = chanConv.channel.description.toLowerCase().match(/\[\s*ads:\s*([0-9.]+)\s*(m|mins?|minutes?|h|hrs?|hours?|s|secs?|seconds?)\.?\s*]/);
if (!match) {
return AdManager.POST_DELAY;
@@ -105,7 +105,7 @@ export class AdManager {
mul = 60 * 1000; // minutes
}
- return Math.max((n * mul) - (Date.now() - chanConv.nextAd), AdManager.POST_DELAY);
+ return Math.max((n * mul) - Math.max(Date.now() - chanConv.nextAd, 0), AdManager.POST_DELAY);
}
private async sendNextPost(): Promise {
diff --git a/chat/localize.ts b/chat/localize.ts
index ea8fb63..c510503 100644
--- a/chat/localize.ts
+++ b/chat/localize.ts
@@ -189,7 +189,7 @@ Current log location: {1}`,
'settings.beta': 'Opt-in to test unstable prerelease updates',
'settings.hwAcceleration': 'Enable hardware acceleration (requires restart)',
'settings.bbCodeBar': 'Show BBCode formatting bar',
- 'settings.browserOption': 'Set command for opening clicked links',
+ 'settings.browserOption': 'Set default browser',
'settings.browserOptionHeader': 'Browser Settings',
'settings.browserOptionTitle': 'Browser Path',
'settings.browserOptionPath': 'Path to browser executable',
diff --git a/chat/preview/ImagePreview.vue b/chat/preview/ImagePreview.vue
index 642d373..f53f63c 100644
--- a/chat/preview/ImagePreview.vue
+++ b/chat/preview/ImagePreview.vue
@@ -560,6 +560,8 @@
async executeJavaScript(js: string | undefined, context: string = 'unknown', logDetails?: any): Promise {
+ console.log('EXECUTE JS', js);
+
if (!this.runJs) return;
const webview = this.getWebview();
diff --git a/chat/preview/assets/browser.processor.raw.js b/chat/preview/assets/browser.processor.raw.js
index 0ea5aff..d939e32 100644
--- a/chat/preview/assets/browser.processor.raw.js
+++ b/chat/preview/assets/browser.processor.raw.js
@@ -80,7 +80,7 @@ class FListImagePreviewDomMutator {
const img = selected.filter(el => (el !== body)).shift();
- this.debug('detectImage.found', !!img, img);
+ this.debug('detectImage.found', !!img, img, body);
return img;
}
diff --git a/chat/preview/helper/external.ts b/chat/preview/helper/external.ts
index 065ac1c..cada32f 100644
--- a/chat/preview/helper/external.ts
+++ b/chat/preview/helper/external.ts
@@ -110,10 +110,11 @@ export class ExternalImagePreviewHelper extends ImagePreviewHelper {
this.ratio = null;
webview.stop();
+ webview.setAudioMuted(true);
// Broken promise chain on purpose
// tslint:disable-next-line:no-floating-promises
- this.urlMutator.resolve(url)
+ void this.urlMutator.resolve(url)
.then(
async(finalUrl: string) => {
if (this.debug)
@@ -121,7 +122,9 @@ export class ExternalImagePreviewHelper extends ImagePreviewHelper {
webview.stop();
- return webview.loadURL(finalUrl);
+ await webview.loadURL(finalUrl);
+
+ webview.setAudioMuted(true);
}
)
.catch(
diff --git a/chat/preview/image-dom-mutator.ts b/chat/preview/image-dom-mutator.ts
index b3f0a5a..2a3e87b 100644
--- a/chat/preview/image-dom-mutator.ts
+++ b/chat/preview/image-dom-mutator.ts
@@ -181,6 +181,11 @@ export class ImageDomMutator {
this.getBaseJsMutatorScript([/*'#__flistCore', '#player', */ '#photoImageSection img', 'video', 'img', '#player'], false)
);
+ this.add(
+ 'tiktokstalk.com',
+ this.getBaseJsMutatorScript(['video'], false, [], true, true)
+ );
+
this.add(
'gifmixxx.com',
diff --git a/chat/preview/image-url-mutator.ts b/chat/preview/image-url-mutator.ts
index 2ab0ab3..63a6f7e 100644
--- a/chat/preview/image-url-mutator.ts
+++ b/chat/preview/image-url-mutator.ts
@@ -33,6 +33,23 @@ export class ImageUrlMutator {
}
protected init(): void {
+ this.add(
+ /^https?:\/\/(www\.)?tiktok\.com\//,
+ async(url: string, _match: RegExpMatchArray): Promise => {
+ const result = await Axios.get(
+ `https://www.tiktok.com/oembed?url=${encodeURIComponent(url)}`,
+ {
+ responseType: 'json'
+ }
+ );
+
+ const userId = result.data.author_unique_id;
+ const videoId = result.data.embed_product_id;
+
+ return `https://www.tiktokstalk.com/user/${userId}/${videoId}/`;
+ }
+ );
+
this.add(
/^http(?:s?):\/\/(?:www\.)?youtu(?:be\.com\/watch\?v=|\.be\/)([\w\-\_]*)(&(amp;)?[\w\?=]*)?/,
async(_url: string, match: RegExpMatchArray): Promise => {
@@ -40,6 +57,7 @@ export class ImageUrlMutator {
return `https://yewtu.be/embed/${videoId}?autoplay=1`
}
);
+
this.add(
/^https?:\/\/.*twitter.com\/(.*)/,
async(url: string, match: RegExpMatchArray): Promise => {
diff --git a/docs/_config.yml b/docs/_config.yml
index 16b2a51..74834ef 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -51,7 +51,7 @@ changelog: https://github.com/hearmeneigh/fchat-rising/blob/master/CHANGELOG.md
installurl: https://github.com/hearmeneigh/fchat-rising/wiki
download:
- version: 1.24.2
+ version: 1.25.0
url: https://github.com/hearmeneigh/fchat-rising/releases/latest/download/F-Chat-Rising-%PLATFORM_TAIL%
diff --git a/electron/BrowserOption.vue b/electron/BrowserOption.vue
index 5913c2b..1dbadbe 100644
--- a/electron/BrowserOption.vue
+++ b/electron/BrowserOption.vue
@@ -24,9 +24,9 @@
-
+
This is an advanced setting. By changing this setting to an unsupported program (i.e. not a browser), you might not be able to open links from F-Chat anymore.
-
Mac User: As of writing, MacOS has a bug in how it handles opening links.
-When your default browser is something other than Safari and you select Safari in this settings window, links might be opened twice.
-Once in Safari and a second time in your default browser. This tends to happen when Safari is not running when clicking a link.
Mac User: As of writing, MacOS has a bug in how it handles opening links.
+When your default browser is something other than Safari and you select Safari in this settings window, links might be opened twice.
+Once in Safari and a second time in your default browser. This tends to happen when Safari is not running when clicking a link.