Mercurial > prosody-hg
annotate plugins/mod_vcard4.lua @ 11148:1dc49accb58e
core.moduleapi: Return resource path from module:get_directory() (API BC)
:get_directory has so far returned the base directory of the current
module source code. This has worked well so far to load resources which
tend to be included in the same directory, but with the plugin installer
using LuaRocks, extra resources (e.g. templates and other assets) these
are saved in a completely different directory.
In be73df6765b9 core.modulemanager gained some code for finding that
directory and saving it in module.resource_path but now the question is
how this should be reflected in the API.
A survey of community modules suggest the vast majority use the
:get_directory method for locating templates and other assets, rather
than the code (which would use module:require instead).
Therefore this commit changes :get_directory to return the resource_path
when available. This should work for most modules.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 Oct 2020 16:37:15 +0200 |
| parents | c4b49939b471 |
| children | 74b9e05af71e |
| rev | line source |
|---|---|
|
9261
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 local st = require "util.stanza" |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
2 local jid_split = require "util.jid".split; |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
3 |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
4 local mod_pep = module:depends("pep"); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
5 |
|
9283
e977b64ebd81
mod_vcard4: Advertise feature on account instead of host
Kim Alvefur <zash@zash.se>
parents:
9261
diff
changeset
|
6 module:hook("account-disco-info", function (event) |
|
e977b64ebd81
mod_vcard4: Advertise feature on account instead of host
Kim Alvefur <zash@zash.se>
parents:
9261
diff
changeset
|
7 event.reply:tag("feature", { var = "urn:ietf:params:xml:ns:vcard-4.0" }):up(); |
|
e977b64ebd81
mod_vcard4: Advertise feature on account instead of host
Kim Alvefur <zash@zash.se>
parents:
9261
diff
changeset
|
8 end); |
|
9261
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
10 module:hook("iq-get/bare/urn:ietf:params:xml:ns:vcard-4.0:vcard", function (event) |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
11 local origin, stanza = event.origin, event.stanza; |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
12 |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
13 local pep_service = mod_pep.get_pep_service(jid_split(stanza.attr.to) or origin.username); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
14 local ok, id, item = pep_service:get_last_item("urn:xmpp:vcard4", stanza.attr.from); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
15 if ok and item then |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
16 origin.send(st.reply(stanza):add_child(item.tags[1])); |
|
10707
c4b49939b471
mod_vcard4: Report correct error condition (fixes #1521)
Kim Alvefur <zash@zash.se>
parents:
9283
diff
changeset
|
17 elseif id == "item-not-found" or not id then |
|
9261
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
18 origin.send(st.error_reply(stanza, "cancel", "item-not-found")); |
|
10707
c4b49939b471
mod_vcard4: Report correct error condition (fixes #1521)
Kim Alvefur <zash@zash.se>
parents:
9283
diff
changeset
|
19 elseif id == "forbidden" then |
|
9261
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
20 origin.send(st.error_reply(stanza, "auth", "forbidden")); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
21 else |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
22 origin.send(st.error_reply(stanza, "modify", "undefined-condition")); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
23 end |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
24 return true; |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
25 end); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
27 module:hook("iq-set/self/urn:ietf:params:xml:ns:vcard-4.0:vcard", function (event) |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 local origin, stanza = event.origin, event.stanza; |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
29 |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
30 local vcard4 = st.stanza("item", { xmlns = "http://jabber.org/protocol/pubsub", id = "current" }) |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 :add_child(stanza.tags[1]); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
32 |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
33 local pep_service = mod_pep.get_pep_service(origin.username); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
34 |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
35 local ok, err = pep_service:publish("urn:xmpp:vcard4", origin.full_jid, "current", vcard4); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
36 if ok then |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
37 origin.send(st.reply(stanza)); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
38 elseif err == "forbidden" then |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
39 origin.send(st.error_reply(stanza, "auth", "forbidden")); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
40 else |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
41 origin.send(st.error_reply(stanza, "modify", "undefined-condition", err)); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
42 end |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
43 return true; |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
44 end); |
|
9db9e37610b7
mod_vcard4: Allow access to the vcard4 PEP node via iq syntax
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
45 |
