diff options
| author | Kim Alvefur <zash@zash.se> | 2018-12-23 15:34:19 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-12-23 15:34:19 +0100 |
| commit | 72f5bf7f3acfe0fe6621fcea2f8622369874541e (patch) | |
| tree | a8294834db6faf39e642040aa0b0d5b78390bebb /spec | |
| parent | 9ff2b47bcc4a5c1c026ecdba8fc3b6c818af183e (diff) | |
| parent | 67a3bf56f3d74c27bc49918e5b4ed5a891ed5b92 (diff) | |
| download | prosody-72f5bf7f3acfe0fe6621fcea2f8622369874541e.tar.gz prosody-72f5bf7f3acfe0fe6621fcea2f8622369874541e.zip | |
Merge 0.11->trunk
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/scansion/mam_prefs_prep.scs | 36 | ||||
| -rw-r--r-- | spec/scansion/prosody.cfg.lua | 3 |
2 files changed, 38 insertions, 1 deletions
diff --git a/spec/scansion/mam_prefs_prep.scs b/spec/scansion/mam_prefs_prep.scs new file mode 100644 index 00000000..9589ec65 --- /dev/null +++ b/spec/scansion/mam_prefs_prep.scs @@ -0,0 +1,36 @@ +# mod_mam shold apply JIDprep in prefs + +[Client] Romeo + jid: romeo@localhost + password: password + +----- + +Romeo connects + +Romeo sends: + <iq id="lx2" type="set"> + <prefs xmlns="urn:xmpp:mam:2" default="roster"> + <always> + <jid>JULIET@MONTAGUE.LIT</jid> + </always> + <never> + <jid>MONTAGUE@MONTAGUE.LIT</jid> + </never> + </prefs> + </iq> + +Romeo receives: + <iq id="lx2" type="result"> + <prefs xmlns="urn:xmpp:mam:2" default="roster"> + <always> + <jid>juliet@montague.lit</jid> + </always> + <never> + <jid>montague@montague.lit</jid> + </never> + </prefs> + </iq> + +Romeo disconnects + diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua index 8d6e7c0a..fd742db6 100644 --- a/spec/scansion/prosody.cfg.lua +++ b/spec/scansion/prosody.cfg.lua @@ -26,7 +26,7 @@ modules_enabled = { "time"; -- Let others know the time here on this server "ping"; -- Replies to XMPP pings with pongs "register"; -- Allow users to register on this server using a client and change passwords - --"mam"; -- Store messages in an archive and allow users to access it + "mam"; -- Store messages in an archive and allow users to access it --"csi_simple"; -- Simple Mobile optimizations -- Admin interfaces @@ -65,6 +65,7 @@ insecure_open_authentication = "Yes please, I know what I'm doing!" storage = "memory" +mam_smart_enable = true -- For the "sql" backend, you can uncomment *one* of the below to configure: --sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename. |