Merge pull request #3537 from Bnyro/master

feat: alert api error messages in feed and subscriptions

src/components/FeedPage.vue

@@ -94,8 +94,13 @@ export default {
         },
     },
     mounted() {
-        this.fetchFeed().then(videos => {
+        this.fetchFeed().then(resp => {
-            this.videosStore = videos;
+            if (resp.error) {
+                alert(resp.error);
+                return;
+            }
+
+            this.videosStore = resp;
             this.loadMoreVideos();
             this.updateWatched(this.videos);
         });
@@ -118,26 +123,6 @@ export default {
         window.removeEventListener("scroll", this.handleScroll);
     },
     methods: {
-        async fetchFeed() {
-            if (this.authenticated) {
-                return await this.fetchJson(this.authApiUrl() + "/feed", {
-                    authToken: this.getAuthToken(),
-                });
-            } else {
-                const channels = this.getUnauthenticatedChannels();
-                const split = channels.split(",");
-                if (split.length > 100) {
-                    return await this.fetchJson(this.authApiUrl() + "/feed/unauthenticated", null, {
-                        method: "POST",
-                        body: JSON.stringify(split),
-                    });
-                } else {
-                    return await this.fetchJson(this.authApiUrl() + "/feed/unauthenticated", {
-                        channels: channels,
-                    });
-                }
-            }
-        },
         async loadChannelGroups() {
             const groups = await this.getChannelGroups();
             this.channelGroups.push(...groups);

src/components/SubscriptionsPage.vue

@@ -143,6 +143,11 @@ export default {
     },
     mounted() {
         this.fetchSubscriptions().then(json => {
+            if (json.error) {
+                alert(json.error);
+                return;
+            }
+
             this.subscriptions = json;
             this.subscriptions.forEach(subscription => (subscription.subscribed = true));
         });

src/main.js

@@ -204,6 +204,26 @@ const mixin = {
                 }
             }
         },
+        async fetchFeed() {
+            if (this.authenticated) {
+                return await this.fetchJson(this.authApiUrl() + "/feed", {
+                    authToken: this.getAuthToken(),
+                });
+            } else {
+                const channels = this.getUnauthenticatedChannels();
+                const split = channels.split(",");
+                if (split.length > 100) {
+                    return await this.fetchJson(this.authApiUrl() + "/feed/unauthenticated", null, {
+                        method: "POST",
+                        body: JSON.stringify(split),
+                    });
+                } else {
+                    return await this.fetchJson(this.authApiUrl() + "/feed/unauthenticated", {
+                        channels: channels,
+                    });
+                }
+            }
+        },
         /* generate a temporary file and ask the user to download it */
         download(text, filename, mimeType) {
             var file = new Blob([text], { type: mimeType });