From d5b5ca441b81b1cfd854729790f378207fba4d92 Mon Sep 17 00:00:00 2001
From: Vitor Hugo <vhcsilvaa@gmail.com>
Date: Fri, 9 Aug 2024 09:12:34 -0300
Subject: [PATCH 1/3] Fix email templates (#496)

* use handle if exists

* adjust template layout

* add missing prop

* also exclude user who commented, because he dont need to receive notification
---
 server/common/comments/post.ts                | 23 +++++----
 .../email-comment-template-compiler.ts        |  3 +-
 .../templates/emails/comment-subscriber.hbs   | 48 ++++++++++---------
 server/templates/emails/comment.hbs           | 40 ++++++++--------
 server/templates/partials/styles.hbs          |  5 +-
 5 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/server/common/comments/post.ts b/server/common/comments/post.ts
index 95ed47ed39..ebc7bf478e 100644
--- a/server/common/comments/post.ts
+++ b/server/common/comments/post.ts
@@ -3,6 +3,8 @@ import {IncludeOptions, Op, Sequelize, WhereOptions} from "sequelize";
 
 import models from "db/models";
 
+import { truncateAddress } from "helpers/truncate-address";
+
 import {HttpBadRequestError, HttpConflictError, HttpNotFoundError} from "server/errors/http-errors";
 import {Push} from "server/services/push/push";
 import {AnalyticEventName, AnalyticEvents} from "server/services/push/types";
@@ -78,6 +80,8 @@ export default async function post(req: NextApiRequest, res: NextApiResponse) {
   const pushEvents: AnalyticEvents = [];
   await subscribeUserToTask(+issueId, user.id);
 
+  const creatorLabel = user.handle ? `@${user.handle}` : truncateAddress(user.address);
+
   if (replyId) {
     const repliedComment = await models.comments.findOne({
       where: {
@@ -98,7 +102,7 @@ export default async function post(req: NextApiRequest, res: NextApiResponse) {
         type: name,
         data: {
           comment,
-          creator: user.address,
+          creator: creatorLabel,
           taskId: issueId,
           deliverableId: deliverableId,
           proposalId: proposalId,
@@ -186,8 +190,8 @@ export default async function post(req: NextApiRequest, res: NextApiResponse) {
         entryId: deliverableId || proposalId,
         taskId: issueId,
         comment,
-        madeBy: user.handle || user.address,
-        creator: user.address,
+        madeBy: creatorLabel,
+        creator: creatorLabel,
         marketplace,
       };
   
@@ -211,10 +215,13 @@ export default async function post(req: NextApiRequest, res: NextApiResponse) {
         { email: { [Op.not]: "" } },
         { 
           id: { 
-            [Op.notIn]: pushEvents.flatMap(event => event.params.target.map(target => target.id))
+            [Op.notIn]: [
+              bounty.userId,
+              user.id,
+              ...pushEvents.flatMap(event => event.params.target.map(target => target.id))
+            ]
           } 
-        },
-        { id: { [Op.ne]: bounty.userId } }
+        }
       ]
     },
     include: [
@@ -237,8 +244,8 @@ export default async function post(req: NextApiRequest, res: NextApiResponse) {
       entryId: deliverableId || proposalId,
       taskId: issueId,
       comment,
-      madeBy: user.handle || user.address,
-      creator: user.address,
+      madeBy: creatorLabel,
+      creator: creatorLabel,
       marketplace: bounty.network.name,
     };
 
diff --git a/server/templates/compilers/email-comment-template-compiler.ts b/server/templates/compilers/email-comment-template-compiler.ts
index d1d562bd4f..2d44b45e5f 100644
--- a/server/templates/compilers/email-comment-template-compiler.ts
+++ b/server/templates/compilers/email-comment-template-compiler.ts
@@ -35,7 +35,8 @@ export class EmailCommentTemplateCompiler extends Template {
       pageTitle: title,
       comment: payload.data.comment,
       type,
-      actionHref: `${publicRuntimeConfig.urls.home}/${actionUrlPart}/?fromEmail=${payload.uuid}`
+      actionHref: `${publicRuntimeConfig.urls.home}/${actionUrlPart}/?fromEmail=${payload.uuid}`,
+      commentCreator: payload.data.creator,
     };
 
     super.registerPartials();
diff --git a/server/templates/emails/comment-subscriber.hbs b/server/templates/emails/comment-subscriber.hbs
index 327adf5816..6275dfe366 100644
--- a/server/templates/emails/comment-subscriber.hbs
+++ b/server/templates/emails/comment-subscriber.hbs
@@ -5,29 +5,31 @@
     {{> headLinks}}
     {{> styles}}
 </head>
-<body id="body">
-<table id="container" cellspacing="0" cellpadding="0" border="0">
-    <tr>
-        <td>
-            {{> logo}}
-            {{#if isTaskType}}
-                <h1>You have a new comment on a subscribed task</h1>
-            {{else}}
-                <h1>You have a new comment on a {{type}} of a subscribed task</h1>
-            {{/if}}
+<body>
+    <div class="main">
+        <table id="container" cellspacing="0" cellpadding="0" border="0">
+            <tr>
+                <td>
+                    {{> logo}}
+                    {{#if isTaskType}}
+                        <h1>You have a new comment on a subscribed task</h1>
+                    {{else}}
+                        <h1>You have a new comment on a {{type}} of a subscribed task</h1>
+                    {{/if}}
 
-            <table id="action-card" cellspacing="0" cellpadding="0" border="0">
-                <tr>
-                    <td>
-                        <p>{{commentCreator}} commented:</p>
-                        <p>{{comment}}</p>
-                        <a id="action-button" href="{{actionHref}}">View comment</a>
-                    </td>
-                </tr>
-            </table>
-            {{> appLinks}}
-        </td>
-    </tr>
-</table>
+                    <table id="action-card" cellspacing="0" cellpadding="0" border="0">
+                        <tr>
+                            <td>
+                                <p>{{commentCreator}} commented:</p>
+                                <p>{{comment}}</p>
+                                <a id="action-button" href="{{actionHref}}">View comment</a>
+                            </td>
+                        </tr>
+                    </table>
+                    {{> appLinks}}
+                </td>
+            </tr>
+        </table>
+    </div>
 </body>
 </html>
diff --git a/server/templates/emails/comment.hbs b/server/templates/emails/comment.hbs
index f4274e7c38..5bec933daf 100644
--- a/server/templates/emails/comment.hbs
+++ b/server/templates/emails/comment.hbs
@@ -5,24 +5,26 @@
     {{> headLinks}}
     {{> styles}}
 </head>
-<body id="body">
-<table id="container" cellspacing="0" cellpadding="0" border="0">
-    <tr>
-        <td>
-            {{> logo}}
-            <h1>You have a new comment on your {{type}}</h1>
-            <table id="action-card" cellspacing="0" cellpadding="0" border="0">
-                <tr>
-                    <td>
-                        <p>{{commentCreator}} Commented on your {{type}}:</p>
-                        <p>{{comment}}</p>
-                        <a id="action-button" href="{{actionHref}}">View comment</a>
-                    </td>
-                </tr>
-            </table>
-            {{> appLinks}}
-        </td>
-    </tr>
-</table>
+<body>
+    <div class="main">
+        <table id="container" cellspacing="0" cellpadding="0" border="0">
+            <tr>
+                <td>
+                    {{> logo}}
+                    <h1>You have a new comment on your {{type}}</h1>
+                    <table id="action-card" cellspacing="0" cellpadding="0" border="0">
+                        <tr>
+                            <td>
+                                <p>{{commentCreator}} commented on your {{type}}:</p>
+                                <p>{{comment}}</p>
+                                <a id="action-button" href="{{actionHref}}">View comment</a>
+                            </td>
+                        </tr>
+                    </table>
+                    {{> appLinks}}
+                </td>
+            </tr>
+        </table>
+    </div>
 </body>
 </html>
diff --git a/server/templates/partials/styles.hbs b/server/templates/partials/styles.hbs
index ec05aa5853..68196189c0 100644
--- a/server/templates/partials/styles.hbs
+++ b/server/templates/partials/styles.hbs
@@ -1,12 +1,13 @@
 <style>
-    #body {
-        padding: 4.4375em 10.25em;
+    .main {
+        width: 100%;
         background: #09090B;
         font-family: 'Inter', sans-serif;
     }
 
     #container {
         width: 100%;
+        box-sizing: border-box;
         padding: 4.4375em 10.25em;
         font-family: 'Inter', sans-serif;
         background-color: #09090B;

From cbd1be36af344aed01ce8e908ec29bd917b2ab8d Mon Sep 17 00:00:00 2001
From: Vitor Hugo <vhcsilvaa@gmail.com>
Date: Wed, 4 Sep 2024 15:28:16 -0300
Subject: [PATCH 2/3] fix cancelable time nan (#509)

---
 components/bounty/bounty-hero/bounty-settings/controller.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/bounty/bounty-hero/bounty-settings/controller.tsx b/components/bounty/bounty-hero/bounty-settings/controller.tsx
index 4f571683d2..ffb66ebe15 100644
--- a/components/bounty/bounty-hero/bounty-settings/controller.tsx
+++ b/components/bounty/bounty-hero/bounty-settings/controller.tsx
@@ -31,7 +31,7 @@ export default function BountySettings({
 
   const isGovernor = currentUser?.isGovernor;
   const isDraftFunding = currentBounty?.isDraft || !currentBounty?.isFunded
-  const cancelableTime = currentBounty?.network?.cancelableTime;
+  const cancelableTime = +currentBounty?.network?.cancelableTime;
   const isCancelable = +new Date() >= +new Date(+currentBounty.createdAt + cancelableTime);
   const objViewProps = {
     onEditIssue,

From c10fee0b7795e8aaf613995206ade64cf1474182 Mon Sep 17 00:00:00 2001
From: Vitor Hugo <vhcsilvaa@gmail.com>
Date: Wed, 6 Nov 2024 14:29:45 -0300
Subject: [PATCH 3/3] add new tags (#511)

---
 helpers/constants.ts | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/helpers/constants.ts b/helpers/constants.ts
index 3893fd4982..6534273066 100644
--- a/helpers/constants.ts
+++ b/helpers/constants.ts
@@ -78,6 +78,36 @@ export const STATIC_URL_PATHS = [
   "tasks",
 ];
 export const BOUNTY_TAGS = [
+  {
+    type: "AI",
+    tags: [
+      "AI Agents",
+      "LLMs (Large Language Models)",
+      "Machine Learning Models",
+      "NLP (Natural Language Processing)",
+      "Computer Vision",
+      "Predictive Analytics",
+      "Data Labeling",
+      "Model Training",
+      "Model Optimization",
+      "Synthetic Data Generation",
+      "Speech Recognition",
+      "Image Processing",
+      "Reinforcement Learning",
+      "Recommendation Systems",
+      "Chatbots & Conversational AI",
+      "Model Fine-tuning",
+      "Data Preprocessing",
+      "Anomaly Detection",
+      "Edge AI",
+      "AI Infrastructure Setup",
+      "Model Deployment",
+      "Federated Learning",
+      "Explainable AI",
+      "Text-to-Image Generation",
+      "Automation & Workflow Orchestration",
+    ],
+  },
   {
     type: "Technology",
     tags: [