1 files changed, 64 insertions, 32 deletions

@@ -51,6 +51,16 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to
                        nick
                        'popup))))
 
+(defalias 'jabber-irc-join 'jabber-biboumi-muc-connect)
+
+(defun jabber-connect-all* (&optional arg)
+  "Run `jabber-connect-all'.
+With a prefix ARG, disconnect first."
+  (interactive "p")
+  (when arg
+    (jabber-disconnect))
+  (jabber-connect-all))
+
 (defun jabber-group-yank-join-url ()
   "Yank a url for joining the focused group."
   (interactive)
@@ -62,7 +72,7 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to
 ;;; Packages
 
 (use-package jabber
-  :load-path "~/src/emacs/jabber/"
+  :load-path "~/src/jabber.el/"
   :custom-face
   (jabber-activity-face ((t :inherit jabber-chat-prompt-foreign
                             :foreground unspecified
@@ -85,37 +95,58 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to
   :bind-keymap ("C-c j" . jabber-global-keymap)
   :bind (("C-c C-SPC" . jabber-activity-switch-to))
   :config
-  (setopt jabber-account-list '(("acdw@hmm.st"))
-          jabber-auto-reconnect t
-          jabber-biboumi-server "irc.hmm.st"
-          jabber-biboumi-irc-servers '("irc.libera.chat"
-                                       "irc.tilde.chat"
-                                       "tilde.town"
-                                       "m455.casa"
-                                       "irc.twitch.tv")
-          jabber-biboumi-default-nick "acdw"
-          jabber-last-read-marker (make-string fill-column ?.)
-          jabber-muc-decorate-presence-patterns
-          '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$" . nil)
-            ("Mode #.*" . jabber-muc-presence-dim)
-            ("." . jabber-muc-presence-dim))
-          jabber-activity-make-strings #'jabber-activity-make-strings-shorten
-          jabber-rare-time-format  " - - - - - - %H:%M %F"
-          jabber-muc-header-line-format
-          '(" " (:eval (replace-regexp-in-string "%" "%%"
-                                                 (jabber-jid-displayname
-                                                  jabber-group)))
-            " / " jabber-muc-topic)
-          ;; buffer name formats
-          jabber-chat-buffer-format "*xmpp* %n"
-          jabber-browse-buffer-format "*xmpp-browse* %n"
-          jabber-groupchat-buffer-format "*xmpp-muc* %n"
-          jabber-muc-private-buffer-format "*xmpp-muc-private* %n"
-          ;; "prompt" (speaker) formats
-          jabber-groupchat-prompt-format (format "%%>%dn . " jabber-prefix-width)
-          jabber-chat-local-prompt-format (format "%%>%dn . " jabber-prefix-width)
-          jabber-chat-foreign-prompt-format (format "%%>%dn . " jabber-prefix-width)
-          jabber-muc-private-foreign-prompt-format "\n%g/%n . ")
+  (setq jabber-account-list '(("acdw@hmm.st"))
+        jabber-auto-reconnect t
+        jabber-biboumi-server "irc.hmm.st"
+        jabber-biboumi-irc-servers '("irc.libera.chat"
+                                     "irc.oftc.net"
+                                     "irc.tilde.chat"
+                                     "tilde.town"
+                                     "m455.casa"
+                                     "irc.twitch.tv")
+        jabber-biboumi-default-nick "acdw"
+        jabber-last-read-marker (make-string fill-column ?.)
+        jabber-muc-decorate-presence-patterns
+        '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$" . nil)
+          ("Mode #.*" . jabber-muc-presence-dim)
+          ("." . jabber-muc-presence-dim))
+        jabber-activity-make-strings #'jabber-activity-make-strings-shorten
+        jabber-rare-time-format  " - - - - - - %H:%M %F"
+        jabber-chat-header-line-format
+        '("" (jabber-chat-buffer-show-avatar
+              (:eval
+               (let ((buddy (jabber-jid-symbol jabber-chatting-with)))
+                 (jabber-propertize " "
+                                    'display (get buddy 'avatar)))))
+          (:eval (replace-regexp-in-string "%" "%%"
+                                           (jabber-jid-displayname
+                                            jabber-chatting-with)))
+          "\t" (:eval (let ((buddy (jabber-jid-symbol jabber-chatting-with)))
+                        (propertize
+                         (or
+                          (cdr (assoc (get buddy 'show) jabber-presence-strings))
+                          (get buddy 'show))
+                         'face
+                         (or (cdr (assoc (get buddy 'show) jabber-presence-faces))
+                             'jabber-roster-user-online))))
+          "\t" (:eval (jabber-fix-status (get (jabber-jid-symbol jabber-chatting-with) 'status)))
+          "\t" jabber-events-message
+          "\t" jabber-chatstates-message)
+        jabber-muc-header-line-format
+        '(" " (:eval (replace-regexp-in-string "%" "%%"
+                                               (jabber-jid-displayname
+                                                jabber-group)))
+          " / " jabber-muc-topic)
+        ;; buffer name formats
+        jabber-chat-buffer-format "*xmpp* %n"
+        jabber-browse-buffer-format "*xmpp-browse* %n"
+        jabber-groupchat-buffer-format "*xmpp-muc* %n"
+        jabber-muc-private-buffer-format "*xmpp-muc-private* %n"
+        ;; "prompt" (speaker) formats
+        jabber-groupchat-prompt-format (format "%%>%dn . " jabber-prefix-width)
+        jabber-chat-local-prompt-format (format "%%>%dn . " jabber-prefix-width)
+        jabber-chat-foreign-prompt-format (format "%%>%dn . " jabber-prefix-width)
+        jabber-muc-private-foreign-prompt-format "\n%g/%n . ")
   ;; jabber muc nick coloring
   ;; wgreenhous | I found 1.5 ok for saturation and 2.0 for value (modus)
   ;; (setopt jabber-muc-nick-value 1.0
@@ -131,6 +162,7 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to
   (map-keymap (lambda (key command)
                 (define-key jabber-global-keymap (vector (+ key #x60)) command))
               jabber-global-keymap)
+  (define-key jabber-global-keymap "c" #'jabber-connect-all*)
   (require 'jabber-httpupload nil t)
   (add-hook 'jabber-post-connect-hooks #'jabber-enable-carbons)
   (remove-hook 'jabber-alert-muc-hooks 'jabber-muc-echo)