Fix server error on issues repored by anynomous users and Fix auto me…

…rge (#1002) * automerge fixed * Fix server error on issues repored by anynomous users
OWASP-BLT · Dec 15, 2022 · c8cea55 · c8cea55
1 parent ca37629
commit c8cea55
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 31 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -1,13 +1,29 @@
-name: auto-merge
+name: automerge
 
 on:
   pull_request:
-
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
 jobs:
-  auto-merge:
+  automerge:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - id: automerge
+        name: automerge
+        uses: "pascalgn/automerge-action@v0.15.5"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/website/api/views.py b/website/api/views.py
@@ -154,30 +154,33 @@ def post(self,request,id,format=None,*args,**kwargs):
             liked_user = issue.user
             liker_user = request.user
             issue_pk = issue.pk
-            msg_plain = render_to_string(
-                "email/issue_liked.txt",
-                {
-                    "liker_user": liker_user.username,
-                    "liked_user": liked_user.username,
-                    "issue_pk": issue_pk,
-                },
-            )
-            msg_html = render_to_string(
-                "email/issue_liked.txt",
-                {
-                    "liker_user": liker_user.username,
-                    "liked_user": liked_user.username,
-                    "issue_pk": issue_pk,
-                },
-            )
-
-            send_mail(
-                "Your issue got an upvote!!",
-                msg_plain,
-                "Bugheist <support@bugheist.com>",
-                [liked_user.email],
-                html_message=msg_html,
-            )
+
+            if liked_user:
+
+                msg_plain = render_to_string(
+                    "email/issue_liked.txt",
+                    {
+                        "liker_user": liker_user.username,
+                        "liked_user": liked_user.username,
+                        "issue_pk": issue_pk,
+                    },
+                )
+                msg_html = render_to_string(
+                    "email/issue_liked.txt",
+                    {
+                        "liker_user": liker_user.username,
+                        "liked_user": liked_user.username,
+                        "issue_pk": issue_pk,
+                    },
+                )
+
+                send_mail(
+                    "Your issue got an upvote!!",
+                    msg_plain,
+                    "Bugheist <support@bugheist.com>",
+                    [liked_user.email],
+                    html_message=msg_html,
+                )
 
             return Response({"issue":"liked"})