monetization fixes

Author: merlinfuchs

kite-service/cmd/server.go

@@ -95,7 +95,7 @@ func serverStartCMD(c *cli.Context) error {
 		billingPlans[i] = model.Plan(plan)
 	}
 
-	planManager := plan.NewPlanManager(pg, pg, billingPlans, plan.PlanManagerConfig{
+	planManager := plan.NewPlanManager(pg, pg, pg, billingPlans, plan.PlanManagerConfig{
 		DiscordBotToken: cfg.Discord.BotToken,
 		DiscordGuildID:  cfg.Discord.GuildID,
 	})

kite-service/internal/api/handler/billing/feature.go

@@ -11,10 +11,3 @@ func (h *BillingHandler) HandleFeaturesGet(c *handler.Context) (*wire.FeaturesGe
 	res := wire.Features(features)
 	return &res, nil
 }
-
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}

kite-service/internal/core/plan/manager.go

@@ -17,6 +17,7 @@ type PlanManagerConfig struct {
 type PlanManager struct {
 	entitlementStore  store.EntitlementStore
 	subscriptionStore store.SubscriptionStore
+	userStore         store.UserStore
 	plans             []model.Plan
 
 	config PlanManagerConfig
@@ -25,12 +26,14 @@ type PlanManager struct {
 func NewPlanManager(
 	entitlementStore store.EntitlementStore,
 	subscriptionStore store.SubscriptionStore,
+	userStore store.UserStore,
 	plans []model.Plan,
 	config PlanManagerConfig,
 ) *PlanManager {
 	return &PlanManager{
 		entitlementStore:  entitlementStore,
 		subscriptionStore: subscriptionStore,
+		userStore:         userStore,
 		plans:             plans,
 		config:            config,
 	}

kite-service/internal/core/plan/role.go

@@ -34,7 +34,7 @@ func (m *PlanManager) handOutRoles(ctx context.Context) error {
 		return nil
 	}
 
-	client := api.NewClient(m.config.DiscordBotToken)
+	client := api.NewClient("Bot " + m.config.DiscordBotToken)
 
 	subscriptions, err := m.subscriptionStore.AllSubscriptions(ctx)
 	if err != nil {
@@ -66,7 +66,17 @@ func (m *PlanManager) handOutRoles(ctx context.Context) error {
 			continue
 		}
 
-		discordUserID, err := strconv.ParseUint(sub.UserID, 10, 64)
+		user, err := m.userStore.User(ctx, sub.UserID)
+		if err != nil {
+			slog.Error(
+				"Failed to get user by ID",
+				slog.String("error", err.Error()),
+				slog.String("subscription_id", sub.ID),
+			)
+			continue
+		}
+
+		discordUserID, err := strconv.ParseUint(user.DiscordID, 10, 64)
 		if err != nil {
 			slog.Error(
 				"Failed to parse discord user ID from subscription",

kite-service/internal/db/postgres/pgmodel/entitlements.sql.go

@@ -2,7 +2,7 @@
 SELECT * FROM entitlements WHERE app_id = $1 ORDER BY created_at DESC;
 
 -- name: GetActiveEntitlements :many
-SELECT * FROM entitlements WHERE app_id = $1 AND ends_at IS NULL OR ends_at > $2 ORDER BY created_at DESC;
+SELECT * FROM entitlements WHERE app_id = $1 AND (ends_at IS NULL OR ends_at > $2) ORDER BY created_at DESC;
 
 -- name: UpsertSubscriptionEntitlement :one
 INSERT INTO entitlements (

kite-service/internal/db/postgres/queries/entitlements.sql

@@ -89,6 +89,7 @@ export default function AppPricingList() {
                 <CheckIcon className="text-green-500" />{" "}
                 <h3 className="ml-2">
                   {pricing.feature_max_collaborators} Collaborator
+                  {pricing.feature_max_collaborators === 1 ? "" : "s"}
                 </h3>
               </span>
               <span className="flex">

kite-web/src/components/app/AppPricingList.tsx

@@ -20,6 +20,7 @@ import { MinusIcon } from "lucide-react";
 import ConfirmDialog from "../common/ConfirmDialog";
 import { Button } from "../ui/button";
 import AppCollaboratorAddDialog from "./AppCollaboratorAddDialog";
+import { toast } from "sonner";
 
 export default function AppSettingsCollaborators() {
   const appId = useAppId();
@@ -67,7 +68,15 @@ export default function AppSettingsCollaborators() {
                       title="Remove Collaborator"
                       description="Are you sure you want to remove this collaborator?"
                       onConfirm={() => {
-                        deleteMutation.mutate(collaborator!.user.id);
+                        deleteMutation.mutate(collaborator!.user.id, {
+                          onSuccess: (res) => {
+                            if (!res.success) {
+                              toast.error(
+                                `Failed to remove collaborator: ${res.error.message} (${res.error.code})`
+                              );
+                            }
+                          },
+                        });
                       }}
                     >
                       <Button variant="ghost" size="icon">

kite-web/src/components/app/AppSettingsCollaborators.tsx

@@ -48,18 +48,16 @@ export default function AppSubscriptionListEntry({
           </div>
         </div>
       </CardHeader>
-      <CardFooter className="gap-3">
-        {subscription.manageable && (
-          <>
-            <Button variant="outline" onClick={() => updatePaymentMethod()}>
-              Update Billing
-            </Button>
-            <Button variant="outline" onClick={() => openCustomerPortal()}>
-              Manage
-            </Button>
-          </>
-        )}
-      </CardFooter>
+      {subscription.manageable && (
+        <CardFooter className="gap-3">
+          <Button variant="outline" onClick={() => updatePaymentMethod()}>
+            Update Billing
+          </Button>
+          <Button variant="outline" onClick={() => openCustomerPortal()}>
+            Manage
+          </Button>
+        </CardFooter>
+      )}
     </Card>
   );
 }