From fd707a6e1b20406ff9725b2be52df455efbdf289 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Mon, 27 Dec 2021 19:28:55 +0000
Subject: [PATCH] feat(version-control): add github-review package

This serves as a alternative to the code-review package. I'm adding it
mostly for testing purposes so I can compare the two and see the
pros/cons with each.
---
 core/siren-core-modules.el                     |  1 +
 modules/version-control/siren-code-review.el   | 10 +---------
 modules/version-control/siren-forge.el         |  6 ++++++
 modules/version-control/siren-github-review.el | 17 +++++++++++++++++
 straight/versions/default.el                   |  4 +++-
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 modules/version-control/siren-github-review.el

diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index fe2329b..9767d42 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -126,6 +126,7 @@
 (require 'siren-gh-notify)
 (require 'siren-git-timemachine)
 (require 'siren-github)
+(require 'siren-github-review)
 (require 'siren-magit)
 
 ;; Window management
diff --git a/modules/version-control/siren-code-review.el b/modules/version-control/siren-code-review.el
index 1dc3829..95c087b 100644
--- a/modules/version-control/siren-code-review.el
+++ b/modules/version-control/siren-code-review.el
@@ -6,8 +6,6 @@
 
 ;;; Code:
 
-(require 'siren-forge)
-
 (use-package code-review
   :defer t
   :custom
@@ -15,13 +13,7 @@
                                  "code-review-db.sqlite" siren-cache-dir))
   (code-review-fill-column 80)
   (code-review-lgtm-message "lgtm :)")
-  (code-review-new-buffer-window-strategy 'switch-to-buffer)
-
-  :init
-  (with-eval-after-load 'forge
-    (transient-insert-suffix 'forge-dispatch '(1)
-      ["""Pull Request"
-       ("p r" "review at point" code-review-forge-pr-at-point)])))
+  (code-review-new-buffer-window-strategy 'switch-to-buffer))
 
 (provide 'siren-code-review)
 ;;; siren-code-review.el ends here
diff --git a/modules/version-control/siren-forge.el b/modules/version-control/siren-forge.el
index ca9e276..861c98e 100644
--- a/modules/version-control/siren-forge.el
+++ b/modules/version-control/siren-forge.el
@@ -6,7 +6,9 @@
 
 ;;; Code:
 
+(require 'siren-code-review)
 (require 'siren-gh-notify)
+(require 'siren-github-review)
 (require 'siren-magit)
 
 (use-package forge
@@ -18,6 +20,10 @@
                         "forge-database.sqlite" siren-cache-dir))
 
   :config
+  (transient-insert-suffix 'forge-dispatch '(1)
+    ["Pull Request"
+     ("p c" "code-review at point" code-review-forge-pr-at-point)
+     ("p g" "github-review at point" github-review-forge-pr-at-point)])
   (transient-insert-suffix 'forge-dispatch '(1)
     ["GitHub"
      ("g n" "notifications" gh-notify)]))
diff --git a/modules/version-control/siren-github-review.el b/modules/version-control/siren-github-review.el
new file mode 100644
index 0000000..8e5a7a6
--- /dev/null
+++ b/modules/version-control/siren-github-review.el
@@ -0,0 +1,17 @@
+;;; siren-github-review.el --- jimeh's Emacs Siren: github-review configuration
+
+;;; Commentary:
+
+;; Basic configuration for github-review.
+
+;;; Code:
+
+(use-package github-review
+  :defer t
+  :custom
+  (github-review-fill-column 80)
+  (github-review-lgtm-message "lgtm :)")
+  (github-review-new-buffer-window-strategy 'switch-to-buffer))
+
+(provide 'siren-github-review)
+;;; siren-github-review.el ends here
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 0dfe5f9..9d29429 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -12,7 +12,7 @@
  ("centaur-tabs" . "8b4249c40581368faf7bb8e06f86b9eee199c3c6")
  ("cfrs" . "c1f639d7bfd3e728cf85dbe224b06a4be76158f4")
  ("closql" . "15f906c393db1a0fb6577afc3cf59466531eafef")
- ("code-review" . "4427bfde0874f4a95b7c6c1df7fdf8cc343e6a9d")
+ ("code-review" . "79ae7fa56cc73c8732ab9bc2bb0013546829c0ed")
  ("coffee-mode" . "35a41c7d8233eac0b267d9593e67fb8b6235e134")
  ("company-mode" . "6abb232acde15e1a7bf402a57f7bb982edf2de7d")
  ("company-nginx" . "82bdb730ad5971c594d9c99c069f3c7bb067897d")
@@ -38,6 +38,7 @@
  ("edit-indirect" . "bdc8f542fe8430ba55f9a24a7910639d4c434422")
  ("editorconfig-emacs" . "2ab86dc9a8ed7a669ca348252d4af46522b5c411")
  ("el-get" . "960f3fb962c35d3196bab20b2a3f6d6228119277")
+ ("eldoc" . "2be22ded9e74a034d2fefc347d00c9419fb1de3d")
  ("elisp-refs" . "c06aec4486c034d0d4efae98cb7054749f9cc0ec")
  ("emacs-async" . "5d365ffc6a2c2041657eaa5d762c395ea748c8d7")
  ("emacs-deferred" . "2239671d94b38d92e9b28d4e12fd79814cfb9c16")
@@ -77,6 +78,7 @@
  ("git-timemachine" . "3381797bcbf906b18dff654a2361032d2d01b4a3")
  ("github-browse-file" . "9742a5183af853788c6ecb83fb7ee0b00d1675ac")
  ("gnu-elpa-mirror" . "fea2b2e75458dc7ed77290d10fc0a7c47dccd24d")
+ ("github-review" . "725fbc7b385228f53a7ddc46a92c1276bab4aea8")
  ("go-dlv.el" . "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b")
  ("go-eldoc" . "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd")
  ("go-gen-test" . "35df36dcd555233ee1a618c0f6a58ce6db4154d9")