fix(eventsub): insert subscription in any case in db

twirapp · May 31, 2024 · 7cfae27 · 7cfae27
1 parent 6a9ea82
commit 7cfae27
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/apps/eventsub/internal/manager/manager.go b/apps/eventsub/internal/manager/manager.go
@@ -264,29 +264,27 @@ func (c *Manager) SubscribeToNeededEvents(
 				return
 			}
 
-			if (status != nil && len(status.Data) > 0) || (casterErr != nil && casterErr.Status == 409) {
-				subStatus := "enabled"
-				subId := uuid.New()
-				if status != nil && len(status.Data) > 0 {
-					subStatus = status.Data[0].Status
-					subId = uuid.MustParse(status.Data[0].ID)
-				}
-
-				if err := c.gorm.Create(
-					&model.EventsubSubscription{
-						ID:          subId,
-						TopicID:     topic.ID,
-						UserID:      broadcasterId,
-						Status:      subStatus,
-						Version:     topic.Version,
-						CallbackUrl: c.tunnel.GetAddr(),
-					},
-				).Error; err != nil {
-					c.logger.Error("failed to create subscription", slog.Any("err", err))
-				}
+			subStatus := "unknown"
+			subId := uuid.New()
+			if status != nil && len(status.Data) > 0 {
+				subStatus = status.Data[0].Status
+				subId = uuid.MustParse(status.Data[0].ID)
+			}
 
-				newSubsCount.Inc()
+			if err := c.gorm.Create(
+				&model.EventsubSubscription{
+					ID:          subId,
+					TopicID:     topic.ID,
+					UserID:      broadcasterId,
+					Status:      subStatus,
+					Version:     topic.Version,
+					CallbackUrl: c.tunnel.GetAddr(),
+				},
+			).Error; err != nil {
+				c.logger.Error("failed to create subscription", slog.Any("err", err))
 			}
+
+			newSubsCount.Inc()
 		}()
 	}