Skip auto ad

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Canary
+*   Skip button for auto-post ads
+
+
 ## 1.8.0
 *   Added colorblind mode (settings -> rising -> colorblind mode)
 

chat/ConversationView.vue

@@ -108,8 +108,9 @@
             <div class="update">{{adAutoPostUpdate}}</div>
 
             <div v-show="adAutoPostNextAd" class="next">
-                <h5>{{l('admgr.comingNext')}}</h5>
-                <div>{{(adAutoPostNextAd ? adAutoPostNextAd.substr(0, 64) : '')}}...</div>
+                <h5>{{l('admgr.comingNext')}} <a @click="skipAd()"><i class='adAction fas fa-arrow-right' /></a></h5>
+                <div>{{(adAutoPostNextAd ? adAutoPostNextAd.substr(0, 100) : '')}}...</div>
+
             </div>
 
             <a class="btn btn-sm btn-outline-primary renew-autoposts" @click="renewAutoPosting()" v-if="!adsRequireSetup">{{l('admgr.renew')}}</a>
@@ -503,6 +504,12 @@
         }
 
 
+        skipAd(): void {
+          this.conversation.adManager.skipAd();
+          this.updateAutoPostingState();
+        }
+
+
         stopAutoPostAds(): void {
             this.conversation.adManager.stop();
         }
@@ -525,17 +532,7 @@
         }
 
 
-        refreshAutoPostingTimer(): void {
-            if (this.autoPostingUpdater)
-                window.clearInterval(this.autoPostingUpdater);
-
-            if (!this.isAutopostingAds()) {
-                this.adAutoPostUpdate = null;
-                this.adAutoPostNextAd = null;
-                return;
-            }
-
-            const updateAutoPostingState = () => {
+        updateAutoPostingState() {
             const adManager = this.conversation.adManager;
 
             this.adAutoPostNextAd = adManager.getNextAd() || null;
@@ -564,9 +561,18 @@
             }
         };
 
-            this.autoPostingUpdater = window.setInterval(updateAutoPostingState, 1000);
+        refreshAutoPostingTimer(): void {
+            if (this.autoPostingUpdater)
+                window.clearInterval(this.autoPostingUpdater);
 
-            updateAutoPostingState();
+            if (!this.isAutopostingAds()) {
+                this.adAutoPostUpdate = null;
+                this.adAutoPostNextAd = null;
+                return;
+            }
+
+            this.autoPostingUpdater = window.setInterval(() => this.updateAutoPostingState(), 1000);
+            this.updateAutoPostingState();
         }
 
 
@@ -673,6 +679,16 @@
             position: relative;
             margin-top: 5px;
 
+            .adAction {
+              &:hover {
+                color: rgba(255, 255, 255, 0.8);
+              }
+
+              &:active {
+                color: rgba(255, 255, 255, 0.6);
+              }
+            }
+
             .renew-autoposts {
                 display: block;
                 float: right;

chat/ads/ad-manager.ts

@@ -47,6 +47,10 @@ export class AdManager {
         return this.active;
     }
 
+    skipAd(): void {
+        this.adIndex += 1;
+    }
+
     // tslint:disable-next-line
     private async delay(ms: number): Promise<void> {
         return new Promise((resolve) => setTimeout(resolve, ms));