catch cloudflare 403 errors

Author: rfresh2

src/main/java/vc/live/LiveFeed.java

@@ -250,10 +250,21 @@ private void handleBroadcastError(final Throwable error, final String guildId, f
                 LOGGER.error("Rate limited while broadcasting message to channel: {}", channel.getId().asString());
                 return;
             } else if (code == 403 || code == 404) {
-                // missing permissions or channel deleted, disable immediately
-                LOGGER.error("Missing permissions while broadcasting message to channel: {}", channel.getId().asString());
-                disableFeed(guildId);
-                return;
+                var cloudflareError = e.getErrorResponse()
+                    .map(r -> r.getFields().get("body"))
+                    .filter(body -> body instanceof String)
+                    .map(body -> (String) body)
+                    .map(body -> body.contains("cloudflare"))
+                    .orElse(false);
+                if (cloudflareError) {
+                    LOGGER.error("Cloudflare error while broadcasting message to channel: {}", channel.getId().asString(), error);
+                    return;
+                } else {
+                    // missing permissions or channel deleted, disable immediately
+                    LOGGER.error("Missing permissions while broadcasting message to channel: {}", channel.getId().asString());
+                    disableFeed(guildId);
+                    return;
+                }
             }
         }
         // for any unknown error, count it and disable if we get too many

src/main/java/vc/live/watch/WatchManager.java

@@ -331,8 +331,16 @@ private <T extends UserWatch> void sendUserWatchNotification(
                             if (code == 429) {
                                 LOGGER.error("Rate limited while sending {} notification to user: {}", targetName, userWatch.ownerUserName());
                             } else if (code == 403 || code == 404) {
-                                LOGGER.error("Missing permissions while sending {} notification to user: {}. Removing watch.", targetName, userWatch.ownerUserName());
-                                removeWatchConsumer.accept(userWatch);
+                                var cloudflareError = e.getErrorResponse()
+                                    .map(r -> r.getFields().get("body"))
+                                    .filter(body -> body instanceof String)
+                                    .map(body -> (String) body)
+                                    .map(body -> body.contains("cloudflare"))
+                                    .orElse(false);
+                                if (!cloudflareError) {
+                                    LOGGER.error("Missing permissions while sending {} notification to user: {}. Removing watch.", targetName, userWatch.ownerUserName());
+                                    removeWatchConsumer.accept(userWatch);
+                                }
                             }
                         }
                     }
@@ -395,8 +403,16 @@ private <T extends GuildWatch> void sendGuildNotification(
                             if (code == 429) {
                                 LOGGER.error("Rate limited while sending {} notification to guild: {}, channelId: {}.", targetName, guildWatch.guildId(), channel.getId());
                             } else if (code == 403 || code == 404) {
-                                LOGGER.error("Missing permissions while sending {} notification to guild: {}, channelId: {}. Removing watch.", targetName, guildWatch.guildId(), channel.getId());
-                                removeGuildWatchFunction.accept(guildWatch);
+                                var cloudflareError = e.getErrorResponse()
+                                    .map(r -> r.getFields().get("body"))
+                                    .filter(body -> body instanceof String)
+                                    .map(body -> (String) body)
+                                    .map(body -> body.contains("cloudflare"))
+                                    .orElse(false);
+                                if (!cloudflareError) {
+                                    LOGGER.error("Missing permissions while sending {} notification to guild: {}, channelId: {}. Removing watch.", targetName, guildWatch.guildId(), channel.getId());
+                                    removeGuildWatchFunction.accept(guildWatch);
+                                }
                             }
                         }
                     }