Random order ads

chat/ads/ConversationAdSettings.vue

@@ -2,8 +2,11 @@
     <modal :action="`Ads for ${conversation.name}`" @submit="submit" ref="dialog" @open="load()" dialogClass="w-100"
         :buttonText="l('conversationSettings.save')">
 
-        <div>
-            [] Randomize the order of the ads every time you start automated posting.
+        <div class="form-group">
+            <label class="control-label" for="randomOrder">
+                <input type="checkbox" v-model="randomOrder" id="randomOrder" />
+                Serve ads in random order
+            </label>
         </div>
 
         <div class="form-group ad-list" v-for="(ad, index) in ads">
@@ -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
                 }
             };
         }

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<void> {
         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<void> {
         const initTime = Date.now();
@@ -86,7 +85,6 @@ export class AdManager {
         );
     }
 
-
     private async sendNextPost(): Promise<void> {
         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(

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 {

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 }

chat/preview/image-url-mutator.ts

@@ -25,10 +25,10 @@ export class ImageUrlMutator {
     }
 
     protected init(): void {
-        this.add(
-          /^https?:\/\/.*twitter.com/,
-          async(): Promise<string> => 'https://i.imgur.com/ScNLbsp.png'
-        );
+        // this.add(
+        //   /^https?:\/\/.*twitter.com/,
+        //   async(): Promise<string> => 'https://i.imgur.com/ScNLbsp.png'
+        // );
 
         this.add(
           /^https?:\/\/(www.)?pornhub.com\/view_video.php\?viewkey=([a-z0-9A-Z]+)/,