* riece-misc.el (riece-concat-channel-topic): Don't append ":" if

[riece] / lisp / riece-misc.el

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index bc68892..60a02c0 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -24,13 +24,12 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-(eval-when-compile (require 'riece-inlines))
-

 (require 'riece-options)
 (require 'riece-coding)
 (require 'riece-identity)
 (require 'riece-version)
 (require 'riece-channel)
 (require 'riece-options)
 (require 'riece-coding)
 (require 'riece-identity)
 (require 'riece-version)
 (require 'riece-channel)

+(require 'riece-server)

 (require 'riece-user)
 
 (defun riece-get-buffer-create (name)
 (require 'riece-user)
 
 (defun riece-get-buffer-create (name)


@@ -80,16 +79,16 @@
   (with-current-buffer buffer
     (eq riece-freeze 'own)))
 
   (with-current-buffer buffer
     (eq riece-freeze 'own)))
 

-(defun riece-process-send-string (process string)
-  (with-current-buffer (process-buffer process)
-    (process-send-string process (riece-encode-coding-string string))))
+(defun riece-channel-p (string)
+  "Return t if STRING is a channel.
+\(i.e. it matches `riece-channel-regexp')"
+  (string-match (concat "^" riece-channel-regexp) string))

 
 

-(defun riece-send-string (string)
-  (let ((process (riece-find-server-process)))
-    (unless process
-      (error "%s" (substitute-command-keys
-                  "Type \\[riece-command-open-server] to open server.")))
-    (riece-process-send-string process string)))
+(defun riece-current-nickname ()
+  "Return the current nickname."
+  (riece-with-server-buffer (riece-identity-server riece-current-channel)
+    (if riece-real-nickname
+       (riece-make-identity riece-real-nickname riece-server-name))))

 
 (defun riece-split-parameters (string)
   (if (eq ?: (aref string 0))
 
 (defun riece-split-parameters (string)
   (if (eq ?: (aref string 0))


@@ -106,19 +105,20 @@
          (setq parameters (nconc parameters (list string))))
       parameters)))
 
          (setq parameters (nconc parameters (list string))))
       parameters)))
 

-(defun riece-concat-modes (target string)
-  (let ((modes
-        (if (riece-channel-p target)
-            (riece-channel-get-modes target)
-          (riece-user-get-modes target))))
-    (if modes
-       (concat string " [" (apply #'string modes) "]")
-      string)))
-
-(defsubst riece-concat-current-channel-modes (string)
-  (if riece-current-channel
-      (riece-concat-modes riece-current-channel string)
-    string))
+(defun riece-concat-channel-topic (target string)
+  (riece-with-server-buffer (riece-identity-server target)
+    (let ((topic (riece-channel-get-topic (riece-identity-prefix target))))
+      (if (or (null topic)
+             (equal topic ""))
+         string
+       (concat string ": " topic)))))
+
+(defun riece-concat-channel-modes (target string)
+  (riece-with-server-buffer (riece-identity-server target)
+    (let ((modes (riece-channel-get-modes (riece-identity-prefix target))))
+      (if modes
+         (concat string " [" (apply #'string modes) "]")
+       string))))

 
 (defun riece-concat-message (string message)
   (if (or (null message)
 
 (defun riece-concat-message (string message)
   (if (or (null message)


@@ -127,10 +127,9 @@
     (concat string " (" message ")")))
 
 (defun riece-concat-server-name (string)
     (concat string " (" message ")")))
 
 (defun riece-concat-server-name (string)

-  (riece-with-server-buffer
-   (if riece-server-name
-       (concat string " (from " riece-server-name ")")
-     string)))
+  (if (equal riece-server-name "")
+      string
+    (concat string " (from " riece-server-name ")")))

 
 (defun riece-prefix-user-at-host (prefix)
   (if (string-match "!" prefix)
 
 (defun riece-prefix-user-at-host (prefix)
   (if (string-match "!" prefix)


@@ -161,16 +160,16 @@
     user-at-host))
 
 (defun riece-get-users-on-server ()
     user-at-host))
 
 (defun riece-get-users-on-server ()

-  (riece-with-server-buffer
-   (let (users)
-     (mapatoms
-      (lambda (atom)
-       (unless (riece-channel-p (symbol-name atom))
-         (setq users (cons (symbol-name atom) users))))
-      riece-obarray)
-     (if (member riece-real-nickname users)
-        users
-       (cons riece-real-nickname users)))))
+  (riece-with-server-buffer (riece-identity-server riece-current-channel)
+    (let (users)
+      (mapatoms
+       (lambda (atom)
+        (unless (riece-channel-p (symbol-name atom))
+          (setq users (cons (symbol-name atom) users))))
+       riece-obarray)
+      (if (member riece-real-nickname users)
+         users
+       (cons riece-real-nickname users)))))

 
 (provide 'riece-misc)
 
 
 (provide 'riece-misc)