mod_rest: Do not allow replies to <iq type=result> from webhooks Replying to a result stanza could cause loops, just as replying to an error. No stanza.name check here but it should be fine since no other kinds of stanzas have type=result, and the boolean logic would most definitely be wrong on the first attempt.

mod_clean_roster: Clean out invalid characters from roster entires

mod_sasl2_fast: Add more debug logging

mod_sasl2_fast: Fixes to make channel binding work again tls-endpoint isn't a thing that exists. Also, we needed to copy more channel binding state from the primary sasl_handler. Ideally we'd have a cleaner way to do this, but I think that's part of more substantial changes that the SASL API deserves.

mod_sasl2_fast: Clean up backend return values (fixes constant rotation)

mod_password_reset: Add rockspec.build.copy_directories entry to make it work with the plugin installer.

mod_rest: Fix JSON conversion of 'displayed' chat marker

mod_vjud: Better docs for vjud_mode

mod_sasl2_fast: Implement rotation and invalidation

mod_sasl2_fast: Remove X-TOKEN-PLAIN and related profile handler

mod_sasl2_fast: Improved logging

mod_sasl2_fast: Register HT-* mechanisms with the required channel binding

mod_sasl2_fast: Fix field name for returned secret

mod_sasl2_fast: Copy channel binding data state from original SASL handler

mod_sasl2_fast: Fixes for <authenticate> processing

mod_sasl2_fast: Take username from SASL exchange rather than stream@from

mod_sasl2_fast: Fix make_token() to return appropriate result

mod_sasl2_fast: Improve backend profile name and correctly use it everywhere It didn't match before, and the mechanisms didn't show up.

mod_sasl2_fast: More robust handling of stream@from and user-agent@id

mod_sasl2: Forward stream attributes into sub-event

mod_sasl2_fast: Implement most of FAST + SASL HT-SHA-256

mod_block_registrations: Expand default list of blocked usernames (RFC 2142)

mod_sasl2: Add some brief dev notes about events to the README

mod_sasl2: Clear sasl_handler on final success

mod_sasl2_fast: New module for SASL2 FAST authentication (WIP)

mod_storage_appendmap: Fix keyvalue writes store_raw() takes a filename, unlike most other datamanager functions that take a series of path components, leading to this bug where it would write the hostname into a file named after the first argument (commonly a username) in the working directory.

mod_sasl2_bind2, mod_sasl2_sm: Remove bind2 <features/> wrapper element This was dropped from the spec. It's more consistent with SASL2.

mod_cloud_notify_extensions: Add note about dependency Noting here because people might not click through to see it on the mod_cloud_notify_encrypted page.

mod_cloud_notify: README overhaul

mod_cloud_notify: Improve logging for various error cases

mod_cloud_notify: Add warnings about options including real body/sender

mod_cloud_notify_encrypted: Add debug logging when successfully encrypted

mod_cloud_notify_encrypted: Additional debug logging when enabling/skipping

mod_cloud_notify: Fix default extended timeout from 72 days -> 72 hours

mod_cloud_notify: Only delay hibernation timeout for push-enabled clients

mod_bookmarks2: Update README to reflect 0.12 release

mod_spam_reporting: Remove redundant rockspec dependency on mod_blocklist mod_blocklist is included in the same version that has the plugin installer

mod_sasl2: Further break up success handling, into pre/post stream:features This allows us to enable mod_smacks after sending success, but before sending stream:features. Previously, the features were being calculated before SM was finalized on the session. We can't finalize SM before sending <success> because it may generate stanzas.

mod_sasl2: Store client id if provided

mod_sasl2_bind2: Generate resource from client tag if provided This follows the updated advice in the latest XEP-0386 proposal.

mod_sasl2_bind2: Remove deprecated <jid> element from <bound> This is now communicated via SASL2's <authorization-identity> element.

mod_sasl2_bind2: Update xmlns to match latest XEP proposal (thanks Andrzej)

mod_sasl2, mod_sasl2_bind2: rename event.session -> .origin for consistency

mod_sasl2_bind2: Move <inline> into <bind> feature element This mirrors the equivalent change in SASL2.

mod_sasl2: Move <inline/> into <authentication> This is a small change we've agreed upon in the upcoming version of the XEP.

mod_sasl2: Fix missing namespace on failure condition (thanks tmolitor)

mod_invites_adhoc: Set non-nil defaults for options, fixes traceback (thanks Martin) Fixes an error when attempting to call the :empty() method on the default implicit default nil value.

mod_sasl2, mod_sasl_bind2, mod_sasl2_sm: Bump XEP-0388 namespace This is the namespace for the proposed update to XEP-0388. I.e. not even experimental yet... but this is all a work in progress anyway.

mod_sasl2: Hacky support for channel binding We should work out how to share this code properly between here and mod_saslauth.

mod_sasl2_bind2, mod_sasl2_sm: Move sasl2_sm_success to session ...to allow referencing it across multiple different events.

mod_sasl2_bind2: Indicate to the client when carbons has been enabled

mod_sasl2_sm: Fix event field name

mod_sasl2_sm: Fix typo

mod_sasl2_bind2: Fix event name

mod_sasl2_bind2: Use correct method to get text

mod_sasl2_bind2: Fix namespace (thanks Daniel)

mod_sasl2_sm: Integration with mod_sasl2_bind2

mod_sasl2_bind: Support for Bind 2.0 with SASL2 This is based on an experimental in-progress derivative of the current XEP-0386.

mod_sasl2: Add event for other modules to advertise inline features

mod_sasl2_sm: Use a stanza method that actually exists

mod_sasl2_sm: Experimental mod_isr alternative

mod_sasl2: Fix handling of various failure/error cases

mod_isr: XEP-0397: Instant Stream Resumption

mod_sasl2: Include additional-data in SASL success response

mod_watch_spam_reports: Fix traceback due to misplaced parenthesis (thanks Menel) Just like in 964de9997552

mod_sasl2: Eventually return true from success handler ...while allowing other handlers to run in the priority range -1000 to -2000.

mod_sasl2: Return true to indicate challenge was handled successfully

mod_sasl2: Fix <challenge> generation - We are just adding child text data, so the correct method is :text() - The data should be base64-encoded, but it was being sent raw

mod_sasl2: Return status from event handlers Without this, clients would get "unsupported-stanza-type" even on successfully handled responses.

mod_admin_blocklist: Add config option for which role(s) to consider (0.12+) Fixes that in trunk, a "prosody:operator" (formerly a global admin) is not considered a "prosody:admin", so those were not included in the set.

mod_admin_blocklist: Fix traceback due to misplaced parenthesis get_jids_with_role() throws an exception when 'host' is nil since Prosody trunk rev 7ca5645f46cd

mod_muc_ban_ip: Support for service-wide IP bans from trusted services

mod_register_apps: add monal iOS and macOS versions

mod_auth_imap: Remove unused variable [luacheck]

mod_auth_imap: Fix packaging Since this module consists of multiple files and the additional directory level, we need to tell luarocks which files correspond to what Lua modules names.

mod_muc_bot/README: Update to account for 0.12 going stable

mod_restrict_xmpp: Treat archive query as a read despite using iq-set XEP-0313 uses iq-set to initiate a query, but unlike many other uses of iq-set, this does not mutate anything on the server, so it should not be treated as a write request.

mod_restrict_xmpp: XMPP-layer access control using Prosody's permissions API

Merge role-auth

*/README: Update compatibility info of modules still using legacy is_admin API mod_admin_message mod_admin_probe mod_block_outgoing mod_broadcast mod_data_access mod_muc_config_restrict mod_muc_restrict_rooms

mod_http_oauth2: Update for new new role API

mod_http_admin_api: Update for new new role API

mod_isolate_host: Switch to module:may() (back compatible via compat_roles)

.luacheckrc: Update for module:may() & co.

mod_firewall: Update for role-auth (backwards compatible) Probably worth investigating mod_compat_roles in the future.

mod_rest: Update for mod_tokenauth API changes (backwards-compatible)

mod_invites_adhoc: Update for Prosody's new role API (backwards-compatible)

mod_http_xep227: Updates for new mod_tokenauth (trunk/0.13 only)

mod_http_oauth2: Updates for Prosody's new role API (backwards-compatible)

mod_http_admin_api: Updates for new role auth API in Prosody (trunk/0.13 only)

mod_cloud_notify: Rename field in event for clarity ('node' is ambiguous here) ...because the push protocol is based on XEP-0060, and the 'node' can mean the identifier communicated to the push service.

mod_sentry: Log warning when server returns unexpected response

mod_privilege: process entity IQs (credit to adx) and messages with a constructed entity session

mod_http_muc_log: Use stanza:find to save a few bytes Why don't we have a stanza:get_child_attr(name, namespace, attrname) ?

mod_http_muc_log: Use XEP-0421 ID over nickname for XEP-0308 This prevents someone else from joining with the same nickname as someone who left, and "correcting" their messages.

mod_http_muc_log: Use XEP-0359 ID if available Clients apparently prefer this over message@id for reasons. Only used internally to find items for message edits

mod_http_muc_log: Rename variable for improved clarity

mod_http_muc_log: Remove dead code This might be something left over since a different variant where the loop went like `for n = i-1, i-100, -1 do ... end` i.e. it went trough a fixed number of items instead of all the page until the current message. Then it would have needed something to stop going over the end, but since the checks are simple it shouldn't be much of a problem looping over even a very busy day.

mod_rest: Fill in 'type' field in error registry The 'type' defaults to "modify" in util.error, which doesn't quite fit many of these error conditions. LuaFormatter changed ',' to ';'

mod_http_muc_log: Link to replied-to message using XEP-0461: Message Replies

mod_http_muc_log: Mention relevant XEPs in comments

mod_rest: Add JSON mapping for XEP-0461: Message Replies

mod_compat_roles/README: Fix yaml syntax in metadata block

mod_compat_roles: New module providing compat shim for trunk's new role API The new role API is translated to is_admin() calls on older versions. On newer versions (which have the role API) this module does nothing. It allows modules to drop their use of is_admin() (which is not available in trunk) and switch to the new role API, while remaining compatible with previous Prosody versions.

mod_muc_badge: If room has no title use localpart of room's jid (fixes #1767) Without this patch Prosody shows an HTTP 500 error (Lua 5.1) or a "nil" label in the SVG badge (Lua 5.2) if room has no title set.

mod_s2s_smacks_timeout: Use mod_smacks to close stale s2s connections

replaced 'session' with 'origin' in push_disable session is not defined in this function, trying to access it leads to an error. The correct reference seems to be 'origin'. (This may have come about by copying from the similar code in process_stanza_queue.)

mod_default_bookmarks: Fix support for array of string config in bookmarks 2 part (thanks Menel)

mod_default_bookmarks: Bail on empty 'default_bookmarks' to fix traceback Ipairs fails on nil if the option is unset Thanks more666p0wer for reporting

mod_log_http: Undo mistake in 456b9f608fcf Where'd this "Add" come from?

various: Improve error reporting if missing file server module on 0.12 If there is some error loading net.http.files then it would be swallowed by the pcall and then it would proceed to trying mod_http_files, which might cause unexpected behavior on 0.12 Ref #1765

various: Use 0.12+ API for serving files from the file system over HTTP Using mod_http_files this way is deprecated. Having the base behavior in a separate module makes it easier to have a specialized module with coherent behavior that does not do things when not explicitly enabled.

mod_log_json: Prefer native Lua table.pack over Prosody util.table one Prosody is removing support for Lua 5.1, which was the reason for util.table.pack to exist in the first place, since Lua 5.2+ provides table.pack. In prosody rev 5eaf77114fdb everything was switched over to use table.pack, opening the door for removing util.table.pack at some point. This change here is to prepare for that future eventuality.

mod_http_muc_log: Improve accessibility with descriptive @title attrs Especially relevant here where the link text is just an icon

mod_http_muc_log: Move OOB style from attribute to <style> in header Allows stricter restrictions, i.e. Content-Security-Policy

luacheck: Update with changes from Prosody 0.12

mod_http_muc_log: Drop support for pre-0.11 MUC API The oldest supported Prosody branch is 0.11, therefore we can drop code for the MUC API of Prosody 0.10 and before. The module:shared("rooms") method was never even in a release...

mod_csi_battery_saver: Add support for urn:xmpp:jingle-message:1 (XEP-0353)

mod_cloud_notify: Compat for prosody 0.12

mod_firewall: README: Fix grammar and further improve wording

mod_firewall: README: Clarify when storage access can occur with roster checks

mod_firewall: README: Correct mention of 'JUMP_CHAIN' to 'JUMP CHAIN'

mod_ping_muc/README: Update Compatibility section for 0.12 going stable

mod_http_muc_log: Show XEP-0444 reactions

mod_muc_restrict_media: Don't apply restriction to affiliated users Looks like an oversight. Assuming that all truthy affiliations are valid, and that "outcast" would not reach this point anyway.

mod_pubsub_post/README: Update references to trunk with release numbers

mod_muc_ping: Remove since Prosody mod_muc 0.11+ covers this natively See trunk rev 7c1cdf5f9f83 and trunk rev 224e681c4db2

mod_rest: Add various things to openapi spec These are already in xmpp-schema.json

mod_rest: Add some descriptive details to schema

mod_profile: Obsolete. Remove. Redirect to mod_vcard_legacy

mod_http_admin_api: Update for 0.12 changes to mod_smacks

mod_rest: Provide a log function on temporary session Fixes traceback in places using session.log()

merge upstream

mod_delegation: use clean_xmlns to remove jabber:client namespace from node: for the same reason as in mod_privilege, `jabber:client` namespace is removed with the clean_xmlns method coming from there. Furthermore, the forwarded <iq> stanza use the `jabber:client` xmlns while the stanza may come from a component with e.g. `jabber:component:accept` xmlns, this can lead to inconsistencies between the <iq> stanza and children (like <error> element).

mod_rest: Add an example OAuth client (needs mod_http_oauth2)

mod_muc_occupant_id: Update Compatibility to mention being built-in in 0.12

mod_muc_auto_reserve_nicks: Force refresh of nickname (thanks phryk)

mod_rest: Add mapping of XEP-0380: Explicit Message Encryption Useful since OMEMO etc isn't mapped

mod_rest: Document /archive/ in openapi spec

mod_rest: Treat archive.ids as comma-separated to work in query string Can't easily put an array into a query string. Hope nobody puts commas into their archive ids.

mod_reload_modules: Be aware of component module (thanks Menel) Without this, the component module is seen as a module that is loaded but not configured, and is thus unloaded

mod_onions: Fix for bitop with Lua 5.4

mod_net_proxy: Fix for bitop with Lua 5.4

mod_rest: Fix attempt to index nil in handling of single iq response Fix handling of many responses, break handling of single response :(

mod_rest: Ensure MAM result-iq is included in results from remote hosts Needed for the same reason as the special message handling, the remote route does not pass our origin.send() here

mod_rest: Add special handling to catch MAM results from remote hosts Makes MAM queries to remote hosts works. As the comment says, MAM results from users' local archives or local MUCs are returned via origin.send() which is provided in the event and thus already worked. Results from remote hosts go via normal stanza routing and events, which need this extra handling to catch. This pattern of iq-set, message+, iq-result is generally limited to MAM. Closest similar thing might be MUC join, but to really handle that you would need the webhook callback mechanism.

mod_auth_dovecot: Fix compat with Lua 5.2+ move of unpack() (thanks Tom)

mod_auth_dovecot: Add luarocks metadata to make automatic packaging work This subdirectory is not handled by the luarocks packaging in module browser

upstream merge

mod_privilege: update to v0.4: - now the namespace "urn:xmpp:privilege:2" is exclusively used - IQ permission implementation - README update roster pushes are not implemented yet

mod_rest: Fix 'format' property in schema These are unused anyways so no harm.

mod_rest: Expand mapping of XEP-0045 join stanza The previous 'join' mapping was apparently lost in translation when swithing to datamapper, so might as well map some properties allowing history control. Usually you probably want either zero history or history since the last known time of being joined. Maybe that the former should be the default?

mod_audit: make the extension of the module API less of a hack Thanks, Zash, for making me look at mod_http.

mod_audit*: fix luacheck warnings

mod_audit*: modules for audit logging in prosody These are to be seen as proof-of-concept for now.

mod_s2soutinjection: Rewrite based on mod_onions for 0.12 compat (thanks Zash)

mod_http_muc_log: Fix exception on lack of trailing slash in room path A request to /room leads to the match call returning nil which in turn calls nodeprep(nil). In Prosody 0.11.x this does nothing and simply returns the nil, while in 0.12 it is an error. Now it redirects to the calendar view at /room/ - even for non-existant rooms. Discovered at a deployment with http_paths = { muc_log = "/" } and requests to /robots.txt and similar, which now result in a uses redirect before returning 404.

mod_rest: Fix description of extdisco endpoint (thanks MattJ) Where's the archive docs tho?

mod_rest/apidemo: Don't show traceback to users on config/resource problem

mod_rest: Add some notes about custom disco#info mapping code

mod_auth_cyrus: Adjust module import to work with repo clone - Fix #1744 The module import was made to work with the plugin installer, but was not compatible with the old method of cloning the whole repo

mod_http_admin_api: Indicate whether a given push registration uses encryption

mod_http_admin_api: Fix client -> client_id (the actual field name)

mod_http_oauth2/README: Update Compatibility section to mention 0.12

mod_rest: Add configuration of which stanzas to route to callback Makes it simpler to build APIs that only handle a certain kind of stanzas, letting them be handled by the unhandled stanza handler instead of having to write code to ignore certain kinds of stanzas.

mod_rest: Improve logging of results from callback startup probe Especially interested in logging 500 status codes and their errors, to diagnose problems with the callback API.

mod_rest: Support parameters in callback URL E.g. rest_callback_url = "http://myapi.example:5000/api/{kind}/{type}" which results in e.g. requests to /api/message/chat Allows using path routing in web frameworks for dispatch instead of having to pick apart the payload to further dispatch it.

mod_rest/README: Mention the OPTIONS probe fired at the callback ... in passing. Should be documented better. But not this day! This day, I commit features!

mod_rest: Improve error handling during format mapping Prevents e.g. a nil, error return going directly into e.g. json encoding, resulting in "null" being returned. Further handling improvements down the line is needed.

mod_rest: Catch and coerce errors in echo endpoint This should ensure problems in encode() are reported back

mod_rest: Move most of XEP-0432 handling into JSON mapping schema The pre- and post-processing is still needed to encode/decode the JSON since util.datamapper can't (currently) do this.

mod_rest/jsonmap: Fix indentation

mod_conversejs: Bump Copyright year Mostly to trigger a rebuild of the .rock

mod_conversejs: Remove plugin installer dependency on mod_bookmarks It's available with Prosody 0.12+ already, 0.11 has no installer.

mod_register_web: Include HTML templates in rock (thanks unbunt) Makes the module usable with the new plugin installer in Prosody 0.12

mod_bookmarks2: Ignore failure to delete nothing (thanks Ge0rG) Attempting to delete all bookmarks when the bookmarks node does not even exist logged a fairly harmless error that we now ignore.

mod_vjud: Add permission parameter "any" for compatibility with 0.12 (fixes #1720)

mod_adhoc_account_management: Add compatibility with 0.12 permission string (thanks mirux)

mod_onions: Add comment explaining s2s-check-certificate handler

mod_invites_register: Push invitee contact entry to inviter (Thanks gerald) Invitee would not show up in the roster of the invite creator unless they fetch their roster afterwards. Fixes #1715

mod_http_upload: Update compatibility information At least 0.9.x is broken due to use of util.jid.host, and I didn't check 0.10.x since that branch is also obsolete. Added info about mod_http_file_share.

mod_muc_restrict_media: Fix traceback when checking default (thanks Martin)

mod_muc_restrict_media: Fix logic inversion on default value

mod_cloud_notify_encrypted: Linkify dependencies

mod_ping_muc: Fix typo in README

mod_portcheck: Don't rewrite '*' to '0.0.0.0' since Prosody doesn't They mean the same, but it's LuaSocket that deals with that, not Prosody

mod_muc_moderation: Update Clients section (+ Gajim, clix)

mod_portcheck: Include '*' in allowed characters so '*:port' works

mod_graceful_shutdown: Add a banner saying no longer needed with trunk

mod_portcheck: Shell command to check if ports are open

mod_dnsupdate: Add a --remove option to delete all SRV records

mod_turn_external: Fix type of config option (thanks mirux) There was a separate boolean option to enable TLS before, but it was merged with the port number option and it seems the typed API interface got confused. Backport of trunk rev aa7a8aa64d3f

mod_turn_external: Import from prosody trunk @ ed23bbf3b946

mod_graceful_shutdown: Close multiplex ports Another way clients might reconnect before the restart has been completed

mod_graceful_shutdown: Deactivate direct TLS c2s along with plain c2s Stops clients from reconnecting that way after their sessions are closed

mod_conversejs: Revert back to depending on mod_bookmarks

mod_bookmarks2: Remove conflict check with mod_bookmarks Should no longer be needed and causes trouble when mod_bookmarks (community) redirects to mod_bookmarks2

mod_rest: Add XEP-0363 HTTP Upload to schemas

mod_rest: Ensure mod_http is loaded before API demo Fixes an error as it tried to use module:http_url() which doesn't exist before mod_http is loaded

mod_ping_muc: Remove 'kick' status code The intent is "you fell off", not "you were kicked out", however older clients may not recognise the 333 code, but that will have to be an acceptable loss.

mod_bookmarks: Add a stub that loads mod_bookmarks2 This has a magic meta marker that prevents loading on latest trunk as of rev 7adfd5d29576 or nightly build 1616

mod_bookmarks: Use autolink to mod_bookmarks2

mod_bookmarks: Also link to mod_bookmarks included with Prosody (trunk)

mod_pubsub_feeds: Allow but ignore XML comments and processing instructions This should allow but ignore them, which should be safe.

mod_dnsupdate: Fix typo

mod_invites_page: Fix templates including stray inviter name (thanks Menel) The util.interpolation syntax `{var?placeholder}` appears to have been intended as an if-not, but this syntax will always return either the variable or the placeholder-template.

misc/lnav: Attempt at log format description for lnav The default lnav behavior often misidentifies messages with the word 'error' as errors, even in debug messages. This solves that.

mod_vcard_muc: Add a summary to improve SEO

mod_measure_process: Handle unlimited FD limits While unlikely, better type-safe than sorry

mod_measure_process: Report the enforced limit The soft limit is what the kernel actually enforces, while the hard limit is is how far you can change the soft limit without privileges. Unless the process dynamically adjusts the soft limit, knowing the hard limit is not as useful as knowing the soft limit. Reporting the soft limit and the number of in-use FDs allows placing alerts on expressions like 'process_open_fds / process_max_fds >= 0.95'

mod_http_xep227: Add support for import via APIs rather than direct store manipulation In particular this transitions PEP nodes and data to be imported via mod_pep's APIs, fixing issues with importing at runtime while PEP data may already be live in RAM. Next obvious candidate for this approach is rosters, so clients get immediate roster pushes and other special handling (such as emitting subscribes to reach the desired subscription state).

mod_pubsub_summary: Fix typo in example

mod_pubsub_summary: Add stub documentation

mod_http_xep227: Fix typo in method name

mod_http_xep227: Correctly read selected stores from URL query part

mod_http_xep227: Handle nil/errors opening archive stores This matches how mod_mam opens archive stores. nil can be returned when there is no data in the store yet (it doesn't exist).

mod_http_xep227: Don't require admin privileges to use import/export These APIs always operate on the current user account only. In the future we may want to have a more specific permission check though.

mod_http_xep227: Initialize XEP-0227 XML mod_storage_xep0227 only writes if there is XML already for a user (it uses the presence of an existing <user> element as an indicator that an account exists, although technically this is not something Prosody itself does, so it's a little weird).

mod_http_xep227: Fix validation of resulting export XML

mod_http_xep227: Fix luacheck warnings

mod_bookmarks2: Skip send_last_published_item (unavailable in 0.11) (thanks carlos) Not the most important setting, we can live without it for now.

mod_http_xep227: New module providing HTTP API for account data import/export

mod_default_bookmarks: Silence warning when probing for mod_bookmarks version

mod_groups_muc_bookmarks: restore bookmark injection on empty store

mod_groups_muc_bookmarks: fix typo/leftover from refactor The update_bookmark function no longer takes a "current" argument; passing it causes havoc in service:publish (because it gets the room JID instaed of the item as item).

mod_groups_muc_bookmarks: Switch to XEP-0402 Rationale: Look at the diffstat

mod_default_bookmarks: Improve validation

mod_default_bookmarks: Add support for XEP-0402 via mod_bookmarks(2)

mod_default_bookmarks: Minor refactor to do some checks earlier

mod_default_bookmarks: Use whichever of mod_bookmarks and mod_bookmarks2 is enabled

mod_default_bookmarks: Fix mod_bookmarks capability check Too many variables named too close to 'bookmarks' here...

mod_conversejs: Reduce mod_bookmarks dependency to a warning The luarocks dependency removed because the plugin installer is only available in trunk, which now has mod_bookmarks available

mod_default_bookmarks: Abort on incompatible mod_bookmarks The module formerly known as mod_bookmarks exposed this publish_to_pep function, while the new mod_bookmarks2 (called mod_bookmarks in trunk) does not.

mod_tcpproxy: Reject missing or non-number block-size, as per XEP-0047

mod_bookmarks2: Update Compatibility table

mod_bookmarks2: Add a notice of inclusion in prosody-trunk

mod_bookmarks2: Override the node configuration if it was wrong

mod_conversejs: Try to depend on mod_bookmarks in trunk else mod_bookmarks2

Back out ad7767a9f3ea Turns out it does error on 0.11 because it tries to compare a number with the string "max" Thanks Marcel

mod_bookmarks: So long, and thanks for all the fish!