Merge pull request #109 from vedansh-5/replyBug

fixed:scrum being injected in reply

Author: hpdang

src/manifest.json

@@ -24,7 +24,7 @@
         "*://outlook.office.com/*",      
         "*://mail.yahoo.com/*"          
       ],
-      "js": ["scripts/jquery-3.2.1.min.js", "scripts/scrumHelper.js",  "scripts/emailClientAdapter.js"] 
+      "js": ["scripts/jquery-3.2.1.min.js", "scripts/emailClientAdapter.js", "scripts/scrumHelper.js"] 
     }
   ],
 

src/scripts/emailClientAdapter.js

@@ -1,4 +1,38 @@
+
 class EmailClientAdapter {
+	isNewConversation() {
+	const clientType = this.detectClient();
+	if (!clientType) return false;
+	const elements = this.getEditorElements();
+	if (!elements || !elements.subject) return false;
+	const currentSubject = elements.subject.value || '';
+	const isReplySubject = currentSubject.startsWith('Re:') || currentSubject.startsWith('Fwd:');	
+	let isReplyContext = false;
+
+	switch (clientType) {
+		case 'gmail': {
+            const editor = document.querySelector('.Am.Al.editable.LW-avf');
+            const isNewWindow = editor ? !!editor.closest('div[role="dialog"]') : false;
+            isReplyContext = !isNewWindow;
+            break;
+        }
+
+		case 'outlook': {
+            isReplyContext = !!document.querySelector('[aria-label="Reply"]');
+            break;
+        }
+
+		case 'yahoo': {
+            const header = document.querySelector('[data-test-id="compose-header-title"]');
+            if (header) {
+                const title = header.innerText.trim().toLowerCase();
+                isReplyContext = title.includes('reply') || title.includes('forward');
+            }
+            break;
+        }
+    }
+	return !(isReplySubject || isReplyContext);
+}
 	constructor() {
 		this.clientConfigs = {
 			'google-groups': {
@@ -11,7 +45,7 @@ class EmailClientAdapter {
 					subjectChange: 'input',
 				},
 			},
-			gmail: {
+			'gmail': {
 				selectors: {
 					body: 'div.editable.LW-avf[contenteditable="true"][role="textbox"]',
 					subject: 'input[name="subjectbox"][tabindex="1"]',
@@ -21,7 +55,7 @@ class EmailClientAdapter {
 					subjectChange: 'input',
 				},
 			},
-			outlook: {
+			'outlook': {
 				selectors: {
 					body: 'div[role="textbox"][contenteditable="true"][aria-multiline="true"]',
 					subject: [
@@ -35,7 +69,7 @@ class EmailClientAdapter {
 				},
 				injectMethod: 'focusAndPaste', // Custom injection method
 			},
-			yahoo: {
+			'yahoo': {
 				selectors: {
 					body: [
 						// Desktop selectors
@@ -179,3 +213,4 @@ class EmailClientAdapter {
 
 // Create global instance
 window.emailClientAdapter = new EmailClientAdapter();
+console.log('Email client adapter initialized');

src/scripts/scrumHelper.js

@@ -1,3 +1,4 @@
+console.log('Script loaded, adapter exists:', !!window.emailClientAdapter);
 var enableToggle = true;
 function allIncluded(outputTarget = 'email') {
 	console.log('allIncluded called with outputTarget:', outputTarget);
@@ -223,6 +224,17 @@ function allIncluded(outputTarget = 'email') {
 	function writeScrumBody() {
 		if (!enableToggle) return;
 
+		if(outputTarget ==='email') {
+			if(!window.emailClientAdapter) {
+				console.error('Email client adapter not found');
+				return;
+			}
+			if(!window.emailClientAdapter.isNewConversation()) {
+				console.log('Not a new conversation, skipping scrum helper');
+				return;
+			}
+		}
+
 		setTimeout(() => {
 			// Generate content first
 			var lastWeekUl = '<ul>';
@@ -291,81 +303,32 @@ ${userReason}`;
 		else if (projectUrl === 'open-event') project = 'Open Event';
 		return project;
 	}
-	const intervalSubject = setInterval(() => {
-		if (!window.emailClientAdapter) {
-			return;
-		}
 
-		const elements = window.emailClientAdapter.getEditorElements();
-		if (!elements || !elements.subject) {
-			return;
-		}
+  function scrumSubjectLoaded() {
+		try{
 
-	
-		if (!githubUserData) {
+		
+		if (!enableToggle) return;
+		if (!scrumSubject){
+			console.error('Subject element not found');
 			return;
 		}
-
-		
-		clearInterval(intervalSubject);
-		scrumSubject = elements.subject;
-
-		// Add a small delay to ensure the subject field is fully initialized
 		setTimeout(() => {
-			scrumSubjectLoaded();
-		}, 100);
-	}, 500);
-
-	function scrumSubjectLoaded() {
-		try {
-			
-
-			if (!enableToggle) {
-				
-				return;
-			}
-
-			if (!scrumSubject) {
-				
-				return;
-			}
-
-			// Get the current subject value
-			const currentSubject = scrumSubject.value || '';
-			
-
-			// Don't modify the subject if it's a reply or already has [Scrum]
-			if (currentSubject.startsWith('Re:')) {
-				
-				return;
-			}
-
-			if (currentSubject.includes('[Scrum]')) {
-				
-				return;
-			}
-
-			// Get user name and project
-			const name = githubUserData.name || githubUsername;
-			const project = getProject();
-
-			// Format date
-			const curDate = new Date();
-			const year = curDate.getFullYear().toString();
-			const month = (curDate.getMonth() + 1).toString().padStart(2, '0');
-			const date = curDate.getDate().toString().padStart(2, '0');
-			const dateCode = year + month + date;
-
-			// Create and set new subject
-			const newSubject = `[Scrum] ${name} - ${project} - ${dateCode} - False`;
-			if (window.DEBUG) {
-				console.log('Setting new subject:', newSubject);
-			}
-
-			scrumSubject.value = newSubject;
+			var name = githubUserData.name || githubUsername;
+			var project = getProject();
+			var curDate = new Date();
+			var year = curDate.getFullYear().toString();
+			var date = curDate.getDate();
+			var month = curDate.getMonth();
+			month++;
+			if (month < 10) month = '0' + month;
+			if (date < 10) date = '0' + date;
+			var dateCode = year.toString() + month.toString() + date.toString();
+			scrumSubject.value = '[Scrum] ' + name + ' - ' + project + ' - ' + dateCode + ' - False';
 			scrumSubject.dispatchEvent(new Event('input', { bubbles: true }));
-			} catch (error) {
-			console.error('Error during subject modification:', error);
+		});
+		} catch (err) {
+			console.err('Error while setting subject: ', err);
 		}
 	}
 
@@ -502,6 +465,25 @@ ${userReason}`;
 		writeScrumBody();
 	}, 500);
 
+	var intervalSubject = setInterval(() => {
+		if (!githubUserData || !window.emailClientAdapter) return;
+
+		const elements = window.emailClientAdapter.getEditorElements();
+		if (!elements || !elements.subject) return;
+
+		if (outputTarget === 'email' && !window.emailClientAdapter.isNewConversation()) {
+			console.log('Not a new conversation, skipping subject interval');
+			clearInterval(intervalSubject);
+			return;
+		}
+
+		clearInterval(intervalSubject);
+		scrumSubject = elements.subject;
+		
+		setTimeout(() => {
+			scrumSubjectLoaded();
+		}, 500);
+	}, 500);
 
 	//check for github safe writing for both issues/prs and pr reviews
 	var intervalWriteGithub = setInterval(() => {
@@ -519,10 +501,4 @@ $('button>span:contains(New conversation)').parent('button').click(() => {
 
 window.generateScrumReport = function() {
     allIncluded('popup');
-};
-
-$('button>span:contains(New conversation)')
-	.parent('button')
-	.click(() => {
-		allIncluded();
-	});
+};