Merge branch 'develop' of github.com:rtCamp/frappe-gmail-thread into fix/surrogate_escape

Author: zeel-codder

.github/workflows/build-test.yml

@@ -3,13 +3,16 @@ name: Bench Build Test
 on:
   pull_request:
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.repository }}-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
   Bench-Build-Test:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     container:
       image: docker.io/frappe/bench:latest
       options: --user root
@@ -55,4 +58,4 @@ jobs:
 
       - name: Cleanup
         if: ${{ always() }}
-        uses: rtCamp/action-cleanup@master
+        uses: rtCamp/action-cleanup@master

.github/workflows/linters.yml

@@ -13,7 +13,7 @@ concurrency:
 jobs:
   pre-commit:
     name: "Frappe Linter"
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     container:
       image: alpine:latest # latest used here for simplicity, not recommended
     defaults:

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 exclude: 'node_modules|.git'
-default_stages: [commit]
+default_stages: [pre-commit]
 fail_fast: false
 
 repos:

frappe_gmail_thread/api/activity.py

@@ -4,6 +4,17 @@
 import frappe.utils
 
 
+def get_attachments_data(email):
+    attachments_data = json.loads(email.attachments_data)
+    # instead of using file_url from attachments_data, we have to use frappe.get_value to get the latest file_url
+    for attachment in attachments_data:
+        file_doc_name = attachment.get("file_doc_name")
+        if file_doc_name:
+            file_url = frappe.db.get_value("File", file_doc_name, "file_url")
+            attachment["file_url"] = file_url
+    return attachments_data
+
+
 @frappe.whitelist()
 def get_linked_gmail_threads(doctype, docname):
     gmail_threads = frappe.get_all(
@@ -49,7 +60,7 @@ def get_linked_gmail_threads(doctype, docname):
                         "read_by_recipient": email.read_by_recipient,
                         "rating": 0,  # TODO: add rating
                         "recipients": email.recipients,
-                        "attachments": json.loads(email.attachments_data),
+                        "attachments": get_attachments_data(email),
                         "_url": thread.get_url(),
                         "_doc_status": (
                             "Sent" if email.sent_or_received == "Sent" else "Received"

frappe_gmail_thread/utils/helpers.py

@@ -208,7 +208,6 @@ def process_attachments(new_email, gmail_thread, email_object):
                 {
                     "file_name": _file.file_name,
                     "file_doc_name": _file.name,
-                    "file_url": _file.file_url,
                     "is_private": _file.is_private,
                 }
             )