wgreenhouse
/
emacs-jabber
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Decouple jabber-history-enabled and jabber-history-mam (get history from mam when both set)

This commit is contained in:
thibault 2018-07-02 21:25:53 -05:00 committed by wgreenhouse
parent 469e095c88
commit 61af9466f3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jabber-history.el
View File

@ -40,7 +40,10 @@ Jabber history files."
:group 'jabber)
(defcustom jabber-history-enabled nil
"Non-nil means message logging is enabled."
"Non-nil means message logging is enabled.
When this variable and `jabber-history-mam' are both non-nil,
messages are logged to files but history requests are handled by
the MAM module (see `jabber-mam')."
:type 'boolean
:group 'jabber-history)
@ -127,7 +130,7 @@ in the message history.")
(not (file-directory-p jabber-history-dir)))
(make-directory jabber-history-dir))
(let ((is-muc (jabber-muc-message-p xml-data)))
(when (and jabber-history-enabled (not jabber-history-mam)
(when (and jabber-history-enabled
(or
(not is-muc) ;chat message or private MUC message
(and jabber-history-muc-enabled is-muc))) ;muc message and muc logging active
@ -150,7 +153,7 @@ in the message history.")
(make-directory jabber-history-dir))
;; This function is called from a chat buffer, so jabber-chatting-with
;; contains the desired value.
(if (and jabber-history-enabled (not jabber-history-mam))
(if jabber-history-enabled
(jabber-history-log-message "out" nil jabber-chatting-with body (current-time))))
(defun jabber-history-filename (contact)

10
jabber-mam.el
View File

@ -21,11 +21,11 @@
;;; Commentary:
;; Provides an interface to server message archives following XEP-0313 (message
;; archive management--MAM). To use, set `jabber-history-enabled' and
;; `jabber-history-mam' to non-nil values. This requires server support for
;; XEP-0313 (http://xmpp.org/extensions/xep-0313.html) and proper configuration.
;; In particular, the archiving behavior can be configured to select which
;; messages are stored. User preferences can be set by server requests
;; archive management--MAM). To use, set `jabber-history-mam' to a non-nil
;; value. This requires server support for XEP-0313
;; (http://xmpp.org/extensions/xep-0313.html) and proper configuration. In
;; particular, the archiving behavior can be configured to select which messages
;; are stored. User preferences can be set by server requests
;; (http://xmpp.org/extensions/xep-0313.html#prefs).