X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-ctcp.el;h=45eebf826c312df0089b34c4757c0e1a2308ca3a;hp=9406b12d50a9acbe062096ef4dd74b5bc1451196;hb=2dfa61195f9c87cba749c44c86630744f5494d12;hpb=1622a7f5532394d43982e1629393aec8098e45b8 diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el index 9406b12..45eebf8 100644 --- a/lisp/riece-ctcp.el +++ b/lisp/riece-ctcp.el @@ -26,23 +26,37 @@ (require 'riece-version) (require 'riece-misc) +(require 'riece-highlight) (require 'riece-display) +(require 'riece-debug) + +(defface riece-ctcp-action-face + '((((class color) + (background dark)) + (:foreground "PaleGreen" :italic t)) + (((class color) + (background light)) + (:foreground "ForestGreen" :italic t)) + (t + (:bold t))) + "Face used for displaying \"*** Action:\" line" + :group 'riece-highlight-faces) +(defvar riece-ctcp-action-face 'riece-ctcp-action-face) + +(defconst riece-ctcp-action-prefix "*** Action: ") (defvar riece-ctcp-ping-time nil) (defvar riece-ctcp-additional-clientinfo nil) (defvar riece-dialogue-mode-map) -(defun riece-ctcp-insinuate () - (add-hook 'riece-privmsg-hook 'riece-handle-ctcp-request) - (add-hook 'riece-notice-hook 'riece-handle-ctcp-response) - (define-key riece-dialogue-mode-map "\C-cv" 'riece-command-ctcp-version) - (define-key riece-dialogue-mode-map "\C-cp" 'riece-command-ctcp-ping) - (define-key riece-dialogue-mode-map "\C-ca" 'riece-command-ctcp-action) - (define-key riece-dialogue-mode-map "\C-cc" 'riece-command-ctcp-clientinfo)) +(defvar riece-ctcp-enabled nil) + +(defconst riece-ctcp-description + "CTCP (Client To Client Protocol) support") (defun riece-handle-ctcp-request (prefix string) - (when (and prefix string + (when (and riece-ctcp-enabled prefix string (riece-prefix-nickname prefix)) (let* ((parameters (riece-split-parameters string)) (targets (split-string (car parameters) ",")) @@ -59,34 +73,23 @@ (after-hook (intern (concat "riece-ctcp-after-" request "-request-hook")))) - (unless (condition-case error - (run-hook-with-args-until-success - hook prefix (car targets) message) - (error - (if riece-debug - (message "Error occurred in `%S': %S" hook error)) - nil)) + (unless (riece-ignore-errors (symbol-name hook) + (run-hook-with-args-until-success + hook prefix (car targets) message)) (if function - (condition-case error - (funcall function prefix (car targets) message) - (error - (if riece-debug - (message "Error occurred in `%S': %S" - function error)))))) - (condition-case error + (riece-funcall-ignore-errors (symbol-name function) + function prefix (car targets) + message)) + (riece-ignore-errors (symbol-name after-hook) (run-hook-with-args-until-success - after-hook prefix (car targets) message) - (error - (if riece-debug - (message "Error occurred in `%S': %S" - after-hook error))))) + after-hook prefix (car targets) message)))) t))))) (defun riece-handle-ctcp-version-request (prefix target string) - (let ((buffer (if (riece-channel-p target) - (riece-channel-buffer (riece-make-identity - target riece-server-name)))) - (user (riece-prefix-nickname prefix))) + (let* ((target-identity (riece-make-identity target riece-server-name)) + (buffer (if (riece-channel-p target) + (riece-channel-buffer target-identity))) + (user (riece-prefix-nickname prefix))) (riece-send-string (format "NOTICE %s :\1VERSION %s\1\r\n" user (riece-extended-version))) (riece-insert-change buffer (format "CTCP VERSION from %s\n" user)) @@ -100,14 +103,14 @@ (format "CTCP VERSION from %s (%s) to %s" user (riece-strip-user-at-host (riece-prefix-user-at-host prefix)) - target)) + (riece-format-identity target-identity t))) "\n")))) (defun riece-handle-ctcp-ping-request (prefix target string) - (let ((buffer (if (riece-channel-p target) - (riece-channel-buffer (riece-make-identity - target riece-server-name)))) - (user (riece-prefix-nickname prefix))) + (let* ((target-identity (riece-make-identity target riece-server-name)) + (buffer (if (riece-channel-p target) + (riece-channel-buffer target-identity))) + (user (riece-prefix-nickname prefix))) (riece-send-string (if string (format "NOTICE %s :\1PING %s\1\r\n" user string) @@ -123,14 +126,14 @@ (format "CTCP PING from %s (%s) to %s" user (riece-strip-user-at-host (riece-prefix-user-at-host prefix)) - target)) + (riece-format-identity target-identity t))) "\n")))) (defun riece-handle-ctcp-clientinfo-request (prefix target string) - (let ((buffer (if (riece-channel-p target) - (riece-channel-buffer (riece-make-identity - target riece-server-name)))) - (user (riece-prefix-nickname prefix))) + (let* ((target-identity (riece-make-identity target riece-server-name)) + (buffer (if (riece-channel-p target) + (riece-channel-buffer target-identity))) + (user (riece-prefix-nickname prefix))) (riece-send-string (format "NOTICE %s :\1CLIENTINFO %s\1\r\n" user @@ -159,7 +162,7 @@ (format "CTCP CLIENTINFO from %s (%s) to %s" user (riece-strip-user-at-host (riece-prefix-user-at-host prefix)) - target)) + (riece-format-identity target-identity t))) "\n")))) (defun riece-handle-ctcp-action-request (prefix target string) @@ -167,16 +170,52 @@ (riece-channel-buffer (riece-make-identity target riece-server-name)))) (user (riece-prefix-nickname prefix))) - (riece-insert-change buffer (concat user " " string "\n")) + (riece-insert buffer (concat riece-ctcp-action-prefix + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + " " string + "\n")) + (riece-insert + (if (and riece-channel-buffer-mode + (not (eq buffer riece-channel-buffer))) + (list riece-dialogue-buffer riece-others-buffer) + riece-dialogue-buffer) + (concat (riece-concat-server-name + (concat riece-ctcp-action-prefix + (riece-format-identity + (riece-make-identity target riece-server-name) + t) + ": " + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + " " string)) "\n")))) + +(defun riece-handle-ctcp-time-request (prefix target string) + (let* ((target-identity (riece-make-identity target riece-server-name)) + (buffer (if (riece-channel-p target) + (riece-channel-buffer target-identity))) + (user (riece-prefix-nickname prefix)) + (time (format-time-string "%c"))) + (riece-send-string + (format "NOTICE %s :\1TIME %s\1\r\n" user time)) + (riece-insert-change buffer (format "CTCP TIME from %s\n" user)) (riece-insert-change (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) (list riece-dialogue-buffer riece-others-buffer) riece-dialogue-buffer) - (concat (riece-concat-server-name (concat user " " string)) "\n")))) + (concat + (riece-concat-server-name + (format "CTCP TIME from %s (%s) to %s" + user + (riece-strip-user-at-host (riece-prefix-user-at-host prefix)) + (riece-format-identity target-identity t))) + "\n")))) (defun riece-handle-ctcp-response (prefix string) - (when (and prefix string + (when (and riece-ctcp-enabled prefix string (riece-prefix-nickname prefix)) (let* ((parameters (riece-split-parameters string)) (targets (split-string (car parameters) ",")) @@ -192,27 +231,16 @@ (after-hook (intern (concat "riece-ctcp-after-" response "-response-hook")))) - (unless (condition-case error - (run-hook-with-args-until-success - hook prefix (car targets) message) - (error - (if riece-debug - (message "Error occurred in `%S': %S" hook error)) - nil)) + (unless (riece-ignore-errors (symbol-name hook) + (run-hook-with-args-until-success + hook prefix (car targets) message)) (if function - (condition-case error - (funcall function prefix (car targets) message) - (error - (if riece-debug - (message "Error occurred in `%S': %S" - function error)))))) - (condition-case error + (riece-funcall-ignore-errors + (symbol-name function) + function prefix (car targets) message)) + (riece-ignore-errors (symbol-name after-hook) (run-hook-with-args-until-success - after-hook prefix (car targets) message) - (error - (if riece-debug - (message "Error occurred in `%S': %S" - after-hook error))))) + after-hook prefix (car targets) message)))) t))))) (defun riece-handle-ctcp-version-response (prefix target string) @@ -251,57 +279,120 @@ string)) "\n"))) -(defun riece-ctcp-completing-read-identity () - (riece-completing-read-identity - "Channel/User: " - (let ((server-name (riece-current-server-name))) - (append (mapcar - (lambda (user) - (riece-make-identity user server-name)) - (riece-get-users-on-server)) - riece-current-channels)))) - -(defun riece-command-ctcp-version (user) +(defun riece-handle-ctcp-time-response (prefix target string) + (riece-insert-change + (list riece-dialogue-buffer riece-others-buffer) + (concat + (riece-concat-server-name + (format "CTCP TIME for %s (%s) = %s" + (riece-prefix-nickname prefix) + (riece-strip-user-at-host (riece-prefix-user-at-host prefix)) + string)) + "\n"))) + +(defun riece-command-ctcp-version (target) (interactive - (list (riece-ctcp-completing-read-identity))) - (riece-send-string (format "PRIVMSG %s :\1VERSION\1\r\n" user))) + (list (riece-completing-read-identity + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))))) + (riece-send-string (format "PRIVMSG %s :\1VERSION\1\r\n" + (riece-identity-prefix target)))) -(defun riece-command-ctcp-ping (user) +(defun riece-command-ctcp-ping (target) (interactive - (list (riece-ctcp-completing-read-identity))) - (riece-send-string (format "PRIVMSG %s :\1PING\1\r\n" user)) + (list (riece-completing-read-identity + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))))) + (riece-send-string (format "PRIVMSG %s :\1PING\1\r\n" + (riece-identity-prefix target))) (setq riece-ctcp-ping-time (current-time))) -(defun riece-command-ctcp-clientinfo (user) +(defun riece-command-ctcp-clientinfo (target) (interactive - (list (riece-ctcp-completing-read-identity))) - (riece-send-string (format "PRIVMSG %s :\1CLIENTINFO\1\r\n" user))) + (list (riece-completing-read-identity + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))))) + (riece-send-string (format "PRIVMSG %s :\1CLIENTINFO\1\r\n" + (riece-identity-prefix target)))) -(defun riece-command-ctcp-action (channel action) +(defun riece-command-ctcp-action (target action) (interactive (list (if current-prefix-arg - (riece-ctcp-completing-read-identity) + (riece-completing-read-identity + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))) riece-current-channel) - (read-string "Action: "))) + (let (message) + (beginning-of-line) + (setq message (buffer-substring (point) + (progn (end-of-line) (point)))) + (if (equal message "") + (read-string "Action: ") + (prog1 (read-from-minibuffer "Action: " (cons message 0)) + (let ((next-line-add-newlines t)) + (next-line 1))))))) (if (equal action "") (error "No action")) (riece-send-string (format "PRIVMSG %s :\1ACTION %s\1\r\n" - (riece-identity-prefix channel) + (riece-identity-prefix target) action)) - (let ((buffer (riece-channel-buffer channel))) - (riece-insert-change + (let ((buffer (riece-channel-buffer target))) + (riece-insert buffer - (concat (riece-identity-prefix (riece-current-nickname)) " " action "\n")) - (riece-insert-change + (concat riece-ctcp-action-prefix + (riece-identity-prefix (riece-current-nickname)) " " action "\n")) + (riece-insert (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) (list riece-dialogue-buffer riece-others-buffer) riece-dialogue-buffer) (concat - (riece-concat-server-name - (concat (riece-identity-prefix (riece-current-nickname)) " " action)) + (riece-with-server-buffer (riece-identity-server target) + (riece-concat-server-name + (concat riece-ctcp-action-prefix + (riece-format-identity target t) ": " + (riece-identity-prefix (riece-current-nickname)) " " action))) "\n")))) +(defun riece-command-ctcp-time (target) + (interactive + (list (riece-completing-read-identity + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))))) + (riece-send-string (format "PRIVMSG %s :\1TIME\1\r\n" + (riece-identity-prefix target)))) + +(defun riece-ctcp-requires () + (if (memq 'riece-highlight riece-addons) + '(riece-highlight))) + +(defun riece-ctcp-insinuate () + (add-hook 'riece-privmsg-hook 'riece-handle-ctcp-request) + (add-hook 'riece-notice-hook 'riece-handle-ctcp-response) + (if (memq 'riece-highlight riece-addons) + (setq riece-dialogue-font-lock-keywords + (cons (list (concat "^" riece-time-prefix-regexp "\\(" + (regexp-quote riece-ctcp-action-prefix) + ".*\\)$") + 1 riece-ctcp-action-face t t) + riece-dialogue-font-lock-keywords)))) + +(defun riece-ctcp-enable () + (define-key riece-dialogue-mode-map "\C-cv" 'riece-command-ctcp-version) + (define-key riece-dialogue-mode-map "\C-cp" 'riece-command-ctcp-ping) + (define-key riece-dialogue-mode-map "\C-ca" 'riece-command-ctcp-action) + (define-key riece-dialogue-mode-map "\C-cc" 'riece-command-ctcp-clientinfo) + (define-key riece-dialogue-mode-map "\C-ct" 'riece-command-ctcp-time) + (setq riece-ctcp-enabled t)) + +(defun riece-ctcp-disable () + (define-key riece-dialogue-mode-map "\C-cv" nil) + (define-key riece-dialogue-mode-map "\C-cp" nil) + (define-key riece-dialogue-mode-map "\C-ca" nil) + (define-key riece-dialogue-mode-map "\C-cc" nil) + (define-key riece-dialogue-mode-map "\C-ct" nil) + (setq riece-ctcp-enabled nil)) + (provide 'riece-ctcp) ;;; riece-ctcp.el ends here