diff options
| -rw-r--r-- | web/panettone/default.nix | 1 | ||||
| -rw-r--r-- | web/panettone/src/irc.lisp | 24 | ||||
| -rw-r--r-- | web/panettone/src/packages.lisp | 5 | ||||
| -rw-r--r-- | web/panettone/src/panettone.lisp | 12 |
4 files changed, 4 insertions, 38 deletions
diff --git a/web/panettone/default.nix b/web/panettone/default.nix index 8d112901ec07..3ff8ca55ecb8 100644 --- a/web/panettone/default.nix +++ b/web/panettone/default.nix @@ -26,7 +26,6 @@ depot.nix.buildLisp.program { ./src/css.lisp ./src/authentication.lisp ./src/model.lisp - ./src/irc.lisp ./src/panettone.lisp ]; diff --git a/web/panettone/src/irc.lisp b/web/panettone/src/irc.lisp deleted file mode 100644 index a54112811f66..000000000000 --- a/web/panettone/src/irc.lisp +++ /dev/null @@ -1,24 +0,0 @@ -;;;; Using irccat to send IRC notifications - -(in-package :panettone.irc) - -(defun get-irccat-config () - "Reads the IRCCATHOST and IRCCATPORT environment variables, and returns them as two values if they both exist (otherwise, returns NIL)." - (destructuring-bind (host port) - (mapcar #'uiop:getenvp '("IRCCATHOST" "IRCCATPORT")) - (when (and host port) - (values host (parse-integer port))))) - -(defun send-irc-notification (body &key channel) - "Sends BODY to the IRC channel CHANNEL (starting with #), if an IRCCat server is configured (using the IRCCATHOST and IRCCATPORT environment variables) -If CHANNEL is NIL, sends the BODY to the first channel configured in the IRCCat configuration. -May signal a condition if sending fails." - (multiple-value-bind (irchost ircport) - (get-irccat-config) - (when irchost - (let ((socket (socket-connect irchost ircport))) - (unwind-protect - (progn - (format (socket-stream socket) "~@[~A ~]~A~%" channel body) - (finish-output (socket-stream socket))) - (ignore-errors (socket-close socket))))))) diff --git a/web/panettone/src/packages.lisp b/web/panettone/src/packages.lisp index 87285fa34d16..1a8453055f8b 100644 --- a/web/panettone/src/packages.lisp +++ b/web/panettone/src/packages.lisp @@ -7,10 +7,6 @@ (:use :cl :lass) (:export :styles)) -(defpackage panettone.irc - (:use :cl :usocket) - (:export :send-irc-notification)) - (defpackage :panettone.authentication (:nicknames :authn) (:use :cl :panettone.util :klatre) @@ -51,6 +47,5 @@ :id :subject :body :author-dn :issue-id :status :created-at :field :previous-value :new-value :acting-user-dn :issue-comments :num-comments :issue-events) - (:import-from :panettone.irc :send-irc-notification) (:shadow :next) (:export :start-pannetone :config :main)) diff --git a/web/panettone/src/panettone.lisp b/web/panettone/src/panettone.lisp index 9135bcf8dd53..cef35722140c 100644 --- a/web/panettone/src/panettone.lisp +++ b/web/panettone/src/panettone.lisp @@ -450,14 +450,10 @@ (render/issue-form (make-instance 'model:issue :subject subject :body body) "Subject is required") - (let ((issue - (model:create-issue :subject subject - :body body - :author-dn (dn *user*)))) - (send-irc-notification (format nil "b/~A: \"~A\" opened by ~A - https://b.tvl.fyi/issues/~A" - (issue-id issue) subject (dn *user*) - (issue-id issue)) - :channel (uiop:getenvp "ISSUECHANNEL")) + (progn + (model:create-issue :subject subject + :body body + :author-dn (dn *user*)) (hunchentoot:redirect "/")))) (defroute show-issue |