Merge pull request #89 from useplunk/dev-driaug-revert

Catch up canary to main

README.md

@@ -8,8 +8,10 @@
 
 <p align="center">
     <img src="https://img.shields.io/github/contributors/useplunk/plunk"/>
-    <img src="https://img.shields.io/github/actions/workflow/status/driaug/plunk-whitelabel/docker-build.yml"/>
+    <img src="https://img.shields.io/github/actions/workflow/status/driaug/plunk-whitelabel/docker-build-prod.yml"/>
     <img src="https://img.shields.io/docker/pulls/driaug/plunk"/>
+    <img src="https://img.shields.io/github/license/useplunk/plunk"/>
+    <img src="https://img.shields.io/github/stars/useplunk/plunk"/>
 </p>
 
 ## Introduction

package.json

@@ -1,12 +1,10 @@
 {
 	"name": "plunk",
-  "version": "1.0.3",
+	"version": "1.0.5",
 	"private": true,
 	"license": "agpl-3.0",
 	"workspaces": {
-    "packages": [
-      "packages/*"
-    ]
+		"packages": ["packages/*"]
 	},
 	"engines": {
 		"npm": ">=6.14.x",

packages/api/src/controllers/v1/Contacts.ts

@@ -103,13 +103,13 @@ export class Contacts {
 
 		const { id, email } = ContactSchemas.manage.parse(req.body);
 
-		const contact = id ? await ContactService.id(id) : await ContactService.email(project.id, email as string);
+		let contact = id ? await ContactService.id(id) : await ContactService.email(project.id, email as string);
 
 		if (!contact || contact.projectId !== project.id) {
 			throw new NotFound("contact");
 		}
 
-		await prisma.contact.update({
+		contact = await prisma.contact.update({
 			where: { id: contact.id },
 			data: { subscribed: false },
 		});
@@ -154,13 +154,13 @@ export class Contacts {
 
 		const { id, email } = ContactSchemas.manage.parse(req.body);
 
-		const contact = id ? await ContactService.id(id) : await ContactService.email(project.id, email as string);
+		let contact = id ? await ContactService.id(id) : await ContactService.email(project.id, email as string);
 
 		if (!contact || contact.projectId !== project.id) {
 			throw new NotFound("contact");
 		}
 
-		await prisma.contact.update({
+		contact = await prisma.contact.update({
 			where: { id: contact.id },
 			data: { subscribed: true },
 		});

packages/api/src/controllers/v1/Events.ts

@@ -33,6 +33,7 @@ export class Events {
 		await prisma.event.delete({ where: { id } });
 
 		await redis.del(Keys.Event.id(id));
+		await redis.del(Keys.Event.event(project.id, event.name));
 
 		return res.status(200).json(event);
 	}

packages/dashboard/src/components/Input/MarkdownEditor/Editor.tsx

@@ -108,6 +108,22 @@ export default function Editor({ value, onChange, mode, modeSwitcher }: Markdown
 				keydown: (_view, event) => {
 					return event.key === "Enter" && !event.shiftKey;
 				},
+				paste: (view, event) => {
+					const text = event.clipboardData?.getData("text");
+					const urlPattern = /^(https?:\/\/)?([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*({{[\w-]+}})?)*$/;
+
+					if (editor && text && urlPattern.test(text)) {
+						event.preventDefault();
+						editor
+							.chain()
+							.focus()
+							.extendMarkRange("link")
+							.setLink({ href: text.startsWith("http") ? text : `https://${text}`, target: "_blank" })
+							.run();
+						editor.commands.insertContent(text);
+					}
+					return true;
+				},
 			},
 		},
 		onUpdate: ({ editor }) => {