feat: Implement gift subscription notifications and update Supabase types

Geczy · Geczy · commit 3c27e379635d · 2025-03-13T07:29:55.000-04:00
- Add new gift_subscriptions and notifications tables to Supabase types
- Implement notification handling for gift subscriptions in Twitch chat
- Enhance runner.sh to check for Colima and Docker status before generating types
- Update translation file to include a message for gifted subscriptions
diff --git a/packages/dota/locales/en/translation.json b/packages/dota/locales/en/translation.json
@@ -1,4 +1,5 @@
 {
+  "giftSub": "A gift sub for Dotabod Pro was just gifted by {{- senderName}}!",
   "2mdelay": "(2m delay)",
   "aegis": {
     "denied": "{{- heroName}} denied the aegis {{emote}}",
diff --git a/packages/dota/src/db/supabase-types.ts b/packages/dota/src/db/supabase-types.ts
@@ -239,6 +239,47 @@ export type Database = {
         }
         Relationships: []
       }
+      gift_subscriptions: {
+        Row: {
+          created_at: string
+          giftMessage: string | null
+          giftQuantity: number
+          giftType: string
+          id: string
+          senderName: string
+          subscriptionId: string
+          updated_at: string
+        }
+        Insert: {
+          created_at?: string
+          giftMessage?: string | null
+          giftQuantity?: number
+          giftType?: string
+          id?: string
+          senderName?: string
+          subscriptionId: string
+          updated_at?: string
+        }
+        Update: {
+          created_at?: string
+          giftMessage?: string | null
+          giftQuantity?: number
+          giftType?: string
+          id?: string
+          senderName?: string
+          subscriptionId?: string
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'gift_subscriptions_subscriptionId_fkey'
+            columns: ['subscriptionId']
+            isOneToOne: false
+            referencedRelation: 'subscriptions'
+            referencedColumns: ['id']
+          },
+        ]
+      }
       MessageDelivery: {
         Row: {
           createdAt: string
@@ -326,6 +367,51 @@ export type Database = {
           },
         ]
       }
+      notifications: {
+        Row: {
+          created_at: string
+          giftSubscriptionId: string | null
+          id: string
+          isRead: boolean
+          type: string
+          updated_at: string
+          userId: string
+        }
+        Insert: {
+          created_at?: string
+          giftSubscriptionId?: string | null
+          id?: string
+          isRead?: boolean
+          type?: string
+          updated_at?: string
+          userId: string
+        }
+        Update: {
+          created_at?: string
+          giftSubscriptionId?: string | null
+          id?: string
+          isRead?: boolean
+          type?: string
+          updated_at?: string
+          userId?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'notifications_giftSubscriptionId_fkey'
+            columns: ['giftSubscriptionId']
+            isOneToOne: false
+            referencedRelation: 'gift_subscriptions'
+            referencedColumns: ['id']
+          },
+          {
+            foreignKeyName: 'notifications_userId_fkey'
+            columns: ['userId']
+            isOneToOne: false
+            referencedRelation: 'users'
+            referencedColumns: ['id']
+          },
+        ]
+      }
       ScheduledMessage: {
         Row: {
           createdAt: string
@@ -502,6 +588,7 @@ export type Database = {
           created_at: string
           currentPeriodEnd: string | null
           id: string
+          isGift: boolean
           status: Database['public']['Enums']['SubscriptionStatus'] | null
           stripeCustomerId: string | null
           stripePriceId: string | null
@@ -516,6 +603,7 @@ export type Database = {
           created_at?: string
           currentPeriodEnd?: string | null
           id?: string
+          isGift?: boolean
           status?: Database['public']['Enums']['SubscriptionStatus'] | null
           stripeCustomerId?: string | null
           stripePriceId?: string | null
@@ -530,6 +618,7 @@ export type Database = {
           created_at?: string
           currentPeriodEnd?: string | null
           id?: string
+          isGift?: boolean
           status?: Database['public']['Enums']['SubscriptionStatus'] | null
           stripeCustomerId?: string | null
           stripePriceId?: string | null
diff --git a/packages/dota/src/db/watcher.ts b/packages/dota/src/db/watcher.ts
@@ -12,6 +12,8 @@ import getDBUser from './getDBUser.js'
 import { handleUserOnlineMessages } from './handleScheduledMessages'
 import type { Tables } from './supabase-types.js'
 import supabase from './supabase.js'
+import { chatClient } from '../twitch/chatClient'
+import { t } from 'i18next'
 
 class SetupSupabase {
   channel: any // ReturnType<typeof supabase.channel>
@@ -261,6 +263,40 @@ class SetupSupabase {
           }
         },
       )
+      .on(
+        'postgres_changes',
+        { event: 'INSERT', schema: 'public', table: 'gift_subscriptions' },
+        async (payload: { new: Tables<'gift_subscriptions'> }) => {
+          const newObj = payload.new
+          const userId = await supabase
+            .from('subscriptions')
+            .select('userId')
+            .eq('id', newObj.subscriptionId)
+            .single()
+
+          if (!userId) return
+          const client = findUser(userId.data?.userId)
+
+          if (!client || !client.stream_online) return
+
+          try {
+            // Send notification message to chat
+            chatClient.say(
+              client.name,
+              t('giftSub', {
+                senderName: newObj.senderName,
+                giftMessage: newObj.giftMessage,
+                lng: client.locale,
+              }) + (newObj.giftMessage ? `" ${newObj.giftMessage}"` : ''),
+            )
+          } catch (e) {
+            logger.error('Error sending notification to chat', {
+              error: e,
+              userId: client.token,
+            })
+          }
+        },
+      )
       .on(
         'postgres_changes',
         { event: '*', schema: 'public', table: 'settings' },
diff --git a/packages/twitch-chat/src/db/supabase-types.ts b/packages/twitch-chat/src/db/supabase-types.ts
@@ -239,6 +239,47 @@ export type Database = {
         }
         Relationships: []
       }
+      gift_subscriptions: {
+        Row: {
+          created_at: string
+          giftMessage: string | null
+          giftQuantity: number
+          giftType: string
+          id: string
+          senderName: string
+          subscriptionId: string
+          updated_at: string
+        }
+        Insert: {
+          created_at?: string
+          giftMessage?: string | null
+          giftQuantity?: number
+          giftType?: string
+          id?: string
+          senderName?: string
+          subscriptionId: string
+          updated_at?: string
+        }
+        Update: {
+          created_at?: string
+          giftMessage?: string | null
+          giftQuantity?: number
+          giftType?: string
+          id?: string
+          senderName?: string
+          subscriptionId?: string
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'gift_subscriptions_subscriptionId_fkey'
+            columns: ['subscriptionId']
+            isOneToOne: false
+            referencedRelation: 'subscriptions'
+            referencedColumns: ['id']
+          },
+        ]
+      }
       MessageDelivery: {
         Row: {
           createdAt: string
@@ -326,6 +367,51 @@ export type Database = {
           },
         ]
       }
+      notifications: {
+        Row: {
+          created_at: string
+          giftSubscriptionId: string | null
+          id: string
+          isRead: boolean
+          type: string
+          updated_at: string
+          userId: string
+        }
+        Insert: {
+          created_at?: string
+          giftSubscriptionId?: string | null
+          id?: string
+          isRead?: boolean
+          type?: string
+          updated_at?: string
+          userId: string
+        }
+        Update: {
+          created_at?: string
+          giftSubscriptionId?: string | null
+          id?: string
+          isRead?: boolean
+          type?: string
+          updated_at?: string
+          userId?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'notifications_giftSubscriptionId_fkey'
+            columns: ['giftSubscriptionId']
+            isOneToOne: false
+            referencedRelation: 'gift_subscriptions'
+            referencedColumns: ['id']
+          },
+          {
+            foreignKeyName: 'notifications_userId_fkey'
+            columns: ['userId']
+            isOneToOne: false
+            referencedRelation: 'users'
+            referencedColumns: ['id']
+          },
+        ]
+      }
       ScheduledMessage: {
         Row: {
           createdAt: string
@@ -502,6 +588,7 @@ export type Database = {
           created_at: string
           currentPeriodEnd: string | null
           id: string
+          isGift: boolean
           status: Database['public']['Enums']['SubscriptionStatus'] | null
           stripeCustomerId: string | null
           stripePriceId: string | null
@@ -516,6 +603,7 @@ export type Database = {
           created_at?: string
           currentPeriodEnd?: string | null
           id?: string
+          isGift?: boolean
           status?: Database['public']['Enums']['SubscriptionStatus'] | null
           stripeCustomerId?: string | null
           stripePriceId?: string | null
@@ -530,6 +618,7 @@ export type Database = {
           created_at?: string
           currentPeriodEnd?: string | null
           id?: string
+          isGift?: boolean
           status?: Database['public']['Enums']['SubscriptionStatus'] | null
           stripeCustomerId?: string | null
           stripePriceId?: string | null
diff --git a/packages/twitch-events/src/db/supabase-types.ts b/packages/twitch-events/src/db/supabase-types.ts
diff --git a/runner.sh b/runner.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "giftSub": "A gift sub for Dotabod Pro was just gifted by {{- senderName}}!",`
`2`	`3`	`"2mdelay": "(2m delay)",`
`3`	`4`	`"aegis": {`
`4`	`5`	`"denied": "{{- heroName}} denied the aegis {{emote}}",`