Mercurial > prosody-hg
annotate plugins/mod_muc_unique.lua @ 12557:ee5b061588ea 0.12
net.unbound: Merge luaunbound and prosody defaults in absence of user config (fixes #1763) (thanks rgd)
add_defaults() is supposed to merge 3 tables, the defaults in
luaunbound, the defaults from prosody and any config from the prosody
config file. In the case where no `unbound={}` has been in the config,
it skips over the merge and returns only the prosody built-in defaults.
This results in libunbound skipping reading resolv.conf and uses its
default behavior of full recursive resolution.
Prior to #1737 there were only two tables, the luaunbound defaults and
the prosody config, where bypassing the merge and returning the former
did the right thing.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 19 Jun 2022 19:49:32 +0200 |
| parents | 7c3e16fdaf1d |
| children | 74b9e05af71e |
| rev | line source |
|---|---|
|
6091
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
1 -- XEP-0307: Unique Room Names for Multi-User Chat |
|
6409
5fd6c739e9bf
plugins/mod_muc_unique: Fix undefined global access (thanks Lance)
Waqas Hussain <waqas20@gmail.com>
parents:
6091
diff
changeset
|
2 local st = require "util.stanza"; |
|
8878
7c3e16fdaf1d
mod_muc_unique: Use util.id for more compact identifiers
Kim Alvefur <zash@zash.se>
parents:
6409
diff
changeset
|
3 local unique_name = require "util.id".medium; |
|
6091
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
4 module:add_feature "http://jabber.org/protocol/muc#unique" |
|
6409
5fd6c739e9bf
plugins/mod_muc_unique: Fix undefined global access (thanks Lance)
Waqas Hussain <waqas20@gmail.com>
parents:
6091
diff
changeset
|
5 module:hook("iq-get/host/http://jabber.org/protocol/muc#unique:unique", function(event) |
|
6091
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
6 local origin, stanza = event.origin, event.stanza; |
|
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
7 origin.send(st.reply(stanza) |
|
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
8 :tag("unique", {xmlns = "http://jabber.org/protocol/muc#unique"}) |
|
8878
7c3e16fdaf1d
mod_muc_unique: Use util.id for more compact identifiers
Kim Alvefur <zash@zash.se>
parents:
6409
diff
changeset
|
9 :text(unique_name():lower()) |
|
6091
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
10 ); |
|
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
11 return true; |
|
3a1c39b31497
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator <quae@daurnimator.com>
parents:
diff
changeset
|
12 end,-1); |
