From 725d25091096b4e862938c23d64bbb3955c490a7 Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Mon, 28 Dec 2020 17:07:10 -0600 Subject: [PATCH] Random order ads --- chat/ads/ConversationAdSettings.vue | 19 +++++++++++-------- chat/ads/ad-manager.ts | 23 +++++++++++++++++++---- chat/common.ts | 3 ++- chat/interfaces.ts | 1 + chat/preview/image-url-mutator.ts | 8 ++++---- 5 files changed, 37 insertions(+), 17 deletions(-) diff --git a/chat/ads/ConversationAdSettings.vue b/chat/ads/ConversationAdSettings.vue index 462f77e..e62a583 100644 --- a/chat/ads/ConversationAdSettings.vue +++ b/chat/ads/ConversationAdSettings.vue @@ -2,8 +2,11 @@ -
- [] Randomize the order of the ads every time you start automated posting. +
+
@@ -39,12 +42,14 @@ l = l; setting = Conversation.Setting; ads!: string[]; + randomOrder! = false; core = core; load(): void { const settings = this.conversation.settings; this.ads = settings.adSettings.ads.slice(0); + this.randomOrder = !!settings.adSettings.randomOrder; if (this.ads.length === 0) { this.ads.push(''); @@ -53,13 +58,11 @@ submit(): void { this.conversation.settings = { - notify: this.conversation.settings.notify, - highlight: this.conversation.settings.highlight, - highlightWords: this.conversation.settings.highlightWords, - joinMessages: this.conversation.settings.joinMessages, - defaultHighlights: this.conversation.settings.defaultHighlights, + ...this.conversation.settings, + adSettings: { - ads: this.ads.map((ad: string) => ad.trim()).filter((ad: string) => (ad.length > 0)) + ads: this.ads.map((ad: string) => ad.trim()).filter((ad: string) => (ad.length > 0)), + randomOrder: this.randomOrder } }; } diff --git a/chat/ads/ad-manager.ts b/chat/ads/ad-manager.ts index 4651e5b..3563166 100644 --- a/chat/ads/ad-manager.ts +++ b/chat/ads/ad-manager.ts @@ -37,6 +37,7 @@ export class AdManager { private expireDue?: Date; private firstPost?: Date; private interval?: Timer; + private adMap: number[] = []; constructor(conversation: Conversation) { this.conversation = conversation; @@ -46,13 +47,11 @@ export class AdManager { return this.active; } - // tslint:disable-next-line private async delay(ms: number): Promise { return new Promise((resolve) => setTimeout(resolve, ms)); } - // This makes sure there is a 5s delay between channel posts private async sendAdToChannel(msg: string, conv: Conversation.ChannelConversation): Promise { const initTime = Date.now(); @@ -86,7 +85,6 @@ export class AdManager { ); } - private async sendNextPost(): Promise { const msg = this.getNextAd(); @@ -116,6 +114,17 @@ export class AdManager { ) as Timer; } + generateAdMap(): number[] { + const ads = this.getAds(); + const idx = _.range(ads.length); + + return this.shouldUseRandomOrder() ? _.shuffle(idx) : idx; + } + + shouldUseRandomOrder(): boolean { + return !!this.conversation.settings.adSettings.randomOrder; + } + getAds(): string[] { return this.conversation.settings.adSettings.ads; } @@ -126,7 +135,12 @@ export class AdManager { if (ads.length === 0) return; - return ads[this.adIndex % ads.length]; + if (ads.length !== this.adMap.length) { + log.debug('adManager.regenerate.on-the-fly', ads.length, this.adMap.length); + this.adMap = this.generateAdMap(); + } + + return ads[this.adMap[this.adIndex % this.adMap.length] % ads.length]; } getNextPostDue(): Date | undefined { @@ -149,6 +163,7 @@ export class AdManager { this.active = true; this.nextPostDue = new Date(Date.now() + initialWait); this.expireDue = new Date(Date.now() + AdManager.POSTING_PERIOD); + this.adMap = this.generateAdMap(); // tslint:disable-next-line: no-unnecessary-type-assertion this.interval = setTimeout( diff --git a/chat/common.ts b/chat/common.ts index f1b890b..68745fb 100644 --- a/chat/common.ts +++ b/chat/common.ts @@ -58,6 +58,7 @@ export class Settings implements ISettings { export class AdSettings implements Conversation.AdSettings { ads: string[] = []; + randomOrder = false; } @@ -67,7 +68,7 @@ export class ConversationSettings implements Conversation.Settings { highlightWords: string[] = []; joinMessages = Conversation.Setting.Default; defaultHighlights = true; - adSettings: Conversation.AdSettings = { ads: [] }; + adSettings: Conversation.AdSettings = { ads: [], randomOrder: false }; } function pad(num: number): string | number { diff --git a/chat/interfaces.ts b/chat/interfaces.ts index afbfb0c..c83fbac 100644 --- a/chat/interfaces.ts +++ b/chat/interfaces.ts @@ -108,6 +108,7 @@ export namespace Conversation { export interface AdSettings { readonly ads: string[]; + readonly randomOrder: boolean; } export const enum UnreadState { None, Unread, Mention } diff --git a/chat/preview/image-url-mutator.ts b/chat/preview/image-url-mutator.ts index ce612c6..a844a10 100644 --- a/chat/preview/image-url-mutator.ts +++ b/chat/preview/image-url-mutator.ts @@ -25,10 +25,10 @@ export class ImageUrlMutator { } protected init(): void { - this.add( - /^https?:\/\/.*twitter.com/, - async(): Promise => 'https://i.imgur.com/ScNLbsp.png' - ); + // this.add( + // /^https?:\/\/.*twitter.com/, + // async(): Promise => 'https://i.imgur.com/ScNLbsp.png' + // ); this.add( /^https?:\/\/(www.)?pornhub.com\/view_video.php\?viewkey=([a-z0-9A-Z]+)/,