1 files changed, 60 insertions, 0 deletions

@@ -7,9 +7,32 @@
 ;;; Code:
 
 (require 'circe)
+(require 'el-patch)
 
 ;;; Functions
 
+(defun irc ()
+  "Connect to all IRC networks in `circe-network-options'."
+  (interactive)
+  (dolist (network (mapcar #'car circe-network-options))
+    (unless (member network circe-network-inhibit-autoconnect)
+      (circe-maybe-connect network))))
+
+(defun circe-network-connected-p (network)
+  "Return whether circe is connected to NETWORK."
+  (catch 'return
+    (dolist (buffer (circe-server-buffers))
+      (with-current-buffer buffer
+        (if (string= network circe-server-network)
+            (throw 'return t))))))
+
+(defun circe-maybe-connect (network)
+  "Connect to NETWORK, asking for confirmation to reconnect."
+  (interactive "sNetwork: ")
+  (if (or (not (circe-network-connected-p network))
+          (y-or-n-p (format "Already connected to %s, reconnect? " network)))
+      (circe network)))
+
 (defun circe-current-topic (&optional message)
   "Return the topic of the current channel.
 When called with MESSAGE set to non-nil (or interactively), also
@@ -93,6 +116,43 @@ message the current topic."
         (message "%s: %s" buf circe-server-killed-confirmation)
         (kill-buffer)))))
 
+;;; Patches
+
+(el-patch-feature circe)
+(with-eval-after-load 'circe
+  (defvar circe-server-buffer-action 'pop-to-buffer-same-window
+    "What to do with `circe-server' buffers when created.")
+  
+  (el-patch-defun circe (network-or-server &rest server-options)
+    "Connect to IRC.
+
+Connect to the given network specified by NETWORK-OR-SERVER.
+
+When this function is called, it collects options from the
+SERVER-OPTIONS argument, the user variable
+`circe-network-options', and the defaults found in
+`circe-network-defaults', in this order.
+
+If NETWORK-OR-SERVER is not found in any of these variables, the
+argument is assumed to be the host name for the server, and all
+relevant settings must be passed via SERVER-OPTIONS.
+
+All SERVER-OPTIONS are treated as variables by getting the string
+\"circe-\" prepended to their name. This variable is then set
+locally in the server buffer.
+
+See `circe-network-options' for a list of common options."
+    (interactive (circe--read-network-and-options))
+    (let* ((options (circe--server-get-network-options network-or-server
+                                                       server-options))
+           (buffer (circe--server-generate-buffer options)))
+      (with-current-buffer buffer
+        (circe-server-mode)
+        (circe--server-set-variables options)
+        (circe-reconnect))
+      (el-patch-swap (pop-to-buffer-same-window buffer)
+                     (funcall circe-server-buffer-action buffer)))))
+
 ;;; Dumb modes
 
 (define-minor-mode circe-cappy-hour-mode