pyworker fixes and ogimages fixes

pyworker/pyworker/scheduler.py

@@ -126,9 +126,9 @@ class TaskScheduler:
                     self.logger.info(f"Running task '{task_name}'")
                     # Use task instance as a context manager to ensure
                     # a single database connection is used for the entire task
-                    with task_info["instance"] as task_instance:
+                    with task_info["instance"]:
-                        # Execute the task instance's run method directly
+                        # Execute the registered task function with its arguments
-                        task_instance.run()
+                        task_info["func"](*task_info["args"], **task_info["kwargs"])
                     self.logger.info(f"Task '{task_name}' completed")
                 except Exception as e:
                     self.logger.exception(f"Error running task '{task_name}': {e}")

web/prisma/triggers/01_karma_tx.sql

@@ -8,6 +8,7 @@ DROP TRIGGER IF EXISTS comment_suspicious_change_trigger ON "Comment";
 DROP TRIGGER IF EXISTS comment_upvote_change_trigger ON "Comment";
 DROP TRIGGER IF EXISTS comment_vote_change_trigger ON "CommentVote";
 DROP TRIGGER IF EXISTS suggestion_status_change_trigger ON "ServiceSuggestion";
+DROP TRIGGER IF EXISTS manual_karma_adjustment_trigger ON "KarmaTransaction";
 
 -- Drop existing functions
 DROP FUNCTION IF EXISTS handle_comment_upvote_change();
@@ -19,26 +20,30 @@ DROP FUNCTION IF EXISTS handle_comment_vote_change();
 DROP FUNCTION IF EXISTS insert_karma_transaction();
 DROP FUNCTION IF EXISTS update_user_karma();
 DROP FUNCTION IF EXISTS handle_suggestion_status_change();
+DROP FUNCTION IF EXISTS handle_manual_karma_adjustment();
 
 -- Helper function to insert karma transaction
 CREATE OR REPLACE FUNCTION insert_karma_transaction(
     p_user_id INT,
     p_points INT,
-    p_action "KarmaTransactionAction",
+    p_action TEXT,
     p_comment_id INT,
     p_description TEXT,
     p_suggestion_id INT DEFAULT NULL
 ) RETURNS VOID AS $$
 BEGIN
     INSERT INTO "KarmaTransaction" (
-        "userId", "points", "action", "commentId", 
+        "userId", "points", "action", "commentId", "suggestionId", "description", "processed", "createdAt"
-        "suggestionId",
+    )
-        "description", "processed", "createdAt"
-    ) 
     VALUES (
-        p_user_id, p_points, p_action, p_comment_id, 
+        p_user_id,
+        p_points,
+        p_action::"KarmaTransactionAction",
+        p_comment_id,
         p_suggestion_id,
-        p_description, true, NOW()
+        p_description,
+        true,
+        NOW()
     );
 END;
 $$ LANGUAGE plpgsql;

web/src/pages/ogimage.png.ts

@@ -3,21 +3,21 @@ import { urlParamsToObject } from '../lib/urls'
 
 import type { APIRoute } from 'astro'
 
-export const GET: APIRoute = ({ url }) => {
+export const GET: APIRoute = (context) => {
-  const { template, ...props } = urlParamsToObject(url.searchParams)
+  const { template, ...props } = urlParamsToObject(context.url.searchParams)
 
-  if (!template) return ogImageTemplates.default()
+  if (!template) return ogImageTemplates.default({}, context)
 
   if (!(template in ogImageTemplates)) {
     console.error(`Invalid template: "${template}"`)
-    return ogImageTemplates.default()
+    return ogImageTemplates.default({}, context)
   }
 
-  const response = ogImageTemplates[template as keyof typeof ogImageTemplates](props)
+  const response = ogImageTemplates[template as keyof typeof ogImageTemplates](props, context)
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (!response) {
     console.error(`Cannot generate image for template: ${template} and props: ${JSON.stringify(props)}`)
-    return ogImageTemplates.default()
+    return ogImageTemplates.default({}, context)
   }
 
   return response