Software / code / prosody-modules
Annotate
mod_adhoc_groups/mod_adhoc_groups.lua @ 6301:fa45ae704b79
mod_cloud_notify: Update Readme
diff --git a/mod_cloud_notify/README.md b/mod_cloud_notify/README.md
--- a/mod_cloud_notify/README.md
+++ b/mod_cloud_notify/README.md
@@ -1,109 +1,106 @@
----
-labels:
-- 'Stage-Beta'
-summary: 'XEP-0357: Cloud push notifications'
----
+# Introduction
-Introduction
-============
+This module enables support for sending "push notifications" to clients
+that need it, typically those running on certain mobile devices.
-This module enables support for sending "push notifications" to clients that
-need it, typically those running on certain mobile devices.
+As well as this module, your client must support push notifications (the
+apps that need it generally do, of course) and the app developer's push
+gateway must be reachable from your Prosody server (this happens over a
+normal XMPP server-to-server 's2s' connection).
-As well as this module, your client must support push notifications (the apps
-that need it generally do, of course) and the app developer's push gateway
-must be reachable from your Prosody server (this happens over a normal XMPP
-server-to-server 's2s' connection).
-
-Details
-=======
+# Details
Some platforms, notably Apple's iOS and many versions of Android, impose
-limits that prevent applications from running or accessing the network in the
-background. This makes it difficult or impossible for an XMPP application to
-remain reliably connected to a server to receive messages.
-
-In order for messaging and other apps to receive notifications, the OS vendors
-run proprietary servers that their OS maintains a permanent connection to in
-the background. Then they provide APIs to application developers that allow
-sending notifications to specific devices via those servers.
+limits that prevent applications from running or accessing the network
+in the background. This makes it difficult or impossible for an XMPP
+application to remain reliably connected to a server to receive
+messages.
-When you connect to your server with an app that requires push notifications,
-it will use this module to set up a "push registration". When you receive
-a message but your device is not connected to the server, this module will
-generate a notification and send it to the push gateway operated by your
-application's developers). Their gateway will then connect to your device's
-OS vendor and ask them to forward the notification to your device. When your
-device receives the notification, it will display it or wake up the app so it
-can connect to XMPP and receive any pending messages.
+In order for messaging and other apps to receive notifications, the OS
+vendors run proprietary servers that their OS maintains a permanent
+connection to in the background. Then they provide APIs to application
+developers that allow sending notifications to specific devices via
+those servers.
-This protocol is described for developers in [XEP-0357: Push Notifications].
+When you connect to your server with an app that requires push
+notifications, it will use this module to set up a "push registration".
+When you receive a message but your device is not connected to the
+server, this module will generate a notification and send it to the push
+gateway operated by your application's developers). Their gateway will
+then connect to your device's OS vendor and ask them to forward the
+notification to your device. When your device receives the notification,
+it will display it or wake up the app so it can connect to XMPP and
+receive any pending messages.
-For this module to work reliably, you must have [mod_smacks], [mod_mam] and
-[mod_carbons] also enabled on your server.
+This protocol is described for developers in \[XEP-0357: Push
+Notifications\].
+
+For this module to work reliably, you must have \[mod_smacks\],
+\[mod_mam\] and \[mod_carbons\] also enabled on your server.
-Some clients, notably Siskin and Snikket iOS need some additional extensions
-that are not currently defined in a standard XEP. To support these clients,
-see [mod_cloud_notify_extensions].
+Some clients, notably Siskin and Snikket iOS need some additional
+extensions that are not currently defined in a standard XEP. To support
+these clients, see \[mod_cloud_notify_extensions\].
-Configuration
-=============
+# Configuration
- Option Default Description
- ------------------------------------ ----------------- -------------------------------------------------------------------------------------------------------------------
- `push_notification_important_body` `New Message!` The body text to use when the stanza is important (see above), no message body is sent if this is empty
- `push_max_errors` `16` How much persistent push errors are tolerated before notifications for the identifier in question are disabled
- `push_max_devices` `5` The number of allowed devices per user (the oldest devices are automatically removed if this threshold is reached)
- `push_max_hibernation_timeout` `259200` (72h) Number of seconds to extend the smacks timeout if no push was triggered yet (default: 72 hours)
- `push_notification_with_body` (\*) `false` Whether or not to send the real message body to remote pubsub node. Without end-to-end encryption, enabling this may expose your message contents to your client developers and OS vendor. Not recommended.
- `push_notification_with_sender` (\*) `false` Whether or not to send the real message sender to remote pubsub node. Enabling this may expose your contacts to your client developers and OS vendor. Not recommended.
+ Option Default Description
+ -------------------------------------- ---------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ `push_notification_important_body` `New Message!` The body text to use when the stanza is important (see above), no message body is sent if this is empty
+ `push_max_errors` `16` How much persistent push errors are tolerated before notifications for the identifier in question are disabled
+ `push_max_devices` `5` The number of allowed devices per user (the oldest devices are automatically removed if this threshold is reached)
+ `push_max_hibernation_timeout` `259200` (72h) Number of seconds to extend the smacks timeout if no push was triggered yet (default: 72 hours)
+ `push_notification_with_body` (\*) `false` Whether or not to send the real message body to remote pubsub node. Without end-to-end encryption, enabling this may expose your message contents to your client developers and OS vendor. Not recommended.
+ `push_notification_with_sender` (\*) `false` Whether or not to send the real message sender to remote pubsub node. Enabling this may expose your contacts to your client developers and OS vendor. Not recommended.
-(\*) There are privacy implications for enabling these options.
+(\*) There are privacy implications for enabling these options.[^1]
-Internal design notes
-=====================
+# Internal design notes
-App servers are notified about offline messages, messages stored by [mod_mam]
-or messages waiting in the smacks queue.
-The business rules outlined [here](//mail.jabber.org/pipermail/standards/2016-February/030925.html) are all honored[^2].
+App servers are notified about offline messages, messages stored by
+\[mod_mam\] or messages waiting in the smacks queue. The business rules
+outlined
+[here](//mail.jabber.org/pipermail/standards/2016-February/030925.html)
+are all honored[^2].
-To cooperate with [mod_smacks] this module consumes some events:
-`smacks-ack-delayed`, `smacks-hibernation-start` and `smacks-hibernation-end`.
-These events allow this module to send out notifications for messages received
-while the session is hibernated by [mod_smacks] or even when smacks
-acknowledgements for messages are delayed by a certain amount of seconds
-configurable with the [mod_smacks] setting `smacks_max_ack_delay`.
+To cooperate with \[mod_smacks\] this module consumes some events:
+`smacks-ack-delayed`, `smacks-hibernation-start` and
+`smacks-hibernation-end`. These events allow this module to send out
+notifications for messages received while the session is hibernated by
+\[mod_smacks\] or even when smacks acknowledgements for messages are
+delayed by a certain amount of seconds configurable with the
+\[mod_smacks\] setting `smacks_max_ack_delay`.
-The `smacks_max_ack_delay` setting allows to send out notifications to clients
-which aren't already in smacks hibernation state (because the read timeout or
-connection close didn't already happen) but also aren't responding to acknowledgement
-request in a timely manner. This setting thus allows conversations to be smoother
-under such circumstances.
+The `smacks_max_ack_delay` setting allows to send out notifications to
+clients which aren't already in smacks hibernation state (because the
+read timeout or connection close didn't already happen) but also aren't
+responding to acknowledgement request in a timely manner. This setting
+thus allows conversations to be smoother under such circumstances.
-The new event `cloud-notify-ping` can be used by any module to send out a cloud
-notification to either all registered endpoints for the given user or only the endpoints
-given in the event data.
+The new event `cloud-notify-ping` can be used by any module to send out
+a cloud notification to either all registered endpoints for the given
+user or only the endpoints given in the event data.
-The config setting `push_notification_important_body` can be used to specify an alternative
-body text to send to the remote pubsub node if the stanza is encrypted or has a body.
-This way the real contents of the message aren't revealed to the push appserver but it
-can still see that the push is important.
-This is used by Chatsecure on iOS to send out high priority pushes in those cases for example.
+The config setting `push_notification_important_body` can be used to
+specify an alternative body text to send to the remote pubsub node if
+the stanza is encrypted or has a body. This way the real contents of the
+message aren't revealed to the push appserver but it can still see that
+the push is important. This is used by Chatsecure on iOS to send out
+high priority pushes in those cases for example.
-Compatibility
-=============
-
-**Note:** This module should be used with Lua 5.2 and higher. Using it with
-Lua 5.1 may cause push notifications to not be sent to some clients.
+# Compatibility
------- -----------------------------------------------------------------------------
- trunk Works
- 0.12 Works
- 0.11 Works
- 0.10 Works
- 0.9 Support dropped, use last supported version [675726ab06d3](//hg.prosody.im/prosody-modules/raw-file/675726ab06d3/mod_cloud_notify/mod_cloud_notify.lua)
------- -----------------------------------------------------------------------------
+**Note:** This module should be used with Lua 5.2 and higher. Using it
+with Lua 5.1 may cause push notifications to not be sent to some
+clients.
+ ------- -----------------------------------------------------------------
+ trunk Works as of 25-06-13
+ 13 Works
+ 0.12 Works
+ ------- -----------------------------------------------------------------
-[^1]: The service which is expected to forward notifications to something like Google Cloud Messaging or Apple Notification Service
-[^2]: [business_rules.markdown](//hg.prosody.im/prosody-modules/file/tip/mod_cloud_notify/business_rules.markdown)
+[^1]: The service which is expected to forward notifications to
+ something like Google Cloud Messaging or Apple Notification Service
+
+[^2]: [business_rules.md](//hg.prosody.im/prosody-modules/file/tip/mod_cloud_notify/business_rules.md)
| author | Menel <menel@snikket.de> |
|---|---|
| date | Fri, 13 Jun 2025 10:36:52 +0200 |
| parent | 4031:b2a6e163a6b4 |
| rev | line source |
|---|---|
|
1545
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 local rostermanager = require"core.rostermanager"; |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
2 local jid_join = require"util.jid".join; |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
3 local jid_split = require"util.jid".split; |
|
1545
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
4 local host = module.host; |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
5 local st = require "util.stanza"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
6 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
7 local groups = module:open_store("groups"); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
8 local memberships = module:open_store("groups", "map"); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
9 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
10 module:depends("adhoc"); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
11 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
12 local adhoclib = module:require "adhoc"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
13 local dataform = require"util.dataforms"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
14 local adhoc_inital_data = require "util.adhoc".new_initial_data_form; |
|
1545
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
15 |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
16 -- Make a *one-way* subscription. User will see when contact is online, |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
17 -- contact will not see when user is online. |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
18 local function subscribe(user, contact) |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
19 local user_jid, contact_jid = jid_join(user, host), jid_join(contact, host); |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
20 |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
21 -- Update user's roster to say subscription request is pending... |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
22 rostermanager.set_contact_pending_out(user, host, contact_jid); |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
23 -- Update contact's roster to say subscription request is pending... |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
24 rostermanager.set_contact_pending_in(contact, host, user_jid); |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
25 -- Update contact's roster to say subscription request approved... |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 rostermanager.subscribed(contact, host, user_jid); |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
27 -- Update user's roster to say subscription request approved... |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 rostermanager.process_inbound_subscription_approval(user, host, contact_jid); |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
29 |
|
1798
3ae8c81a348b
mod_roster_allinall: Cleanup, remove unused variables [luacheck]
Kim Alvefur <zash@zash.se>
parents:
1545
diff
changeset
|
30 -- Push updates to both rosters |
|
1545
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 rostermanager.roster_push(user, host, contact_jid); |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
32 rostermanager.roster_push(contact, host, user_jid); |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
33 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
34 module:send(st.presence({ type = "probe", from = user_jid, to = contact_jid })); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
35 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
36 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
37 local create_form = dataform.new { |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
38 title = "Create a new group"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
39 { |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
40 type = "hidden"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
41 name = "FORM_TYPE"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
42 value = "xmpp:zash.se/adhoc_groups#new"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
43 }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
44 { |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
45 type = "text-single"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
46 name = "group"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
47 label = "Name of group"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
48 required = true; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
49 }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
50 }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
51 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
52 local join_form = dataform.new { |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
53 title = "Pick the group to join"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
54 { |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
55 type = "hidden"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
56 name = "FORM_TYPE"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
57 value = "xmpp:zash.se/adhoc_groups#join"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
58 }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
59 { |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
60 type = "list-single"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
61 name = "group"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
62 label = "Available groups"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
63 required = true; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
64 }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
65 }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
66 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
67 local function _(f) |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
68 return function (fields, form_err, data) |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
69 local ok, message = f(fields, form_err, data); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
70 if ok then |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
71 return { status = "completed", info = message }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
72 else |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
73 return { status = "completed", error = { message = message} }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
74 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
75 end |
|
1545
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
76 end |
|
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
77 |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
78 module:add_item("adhoc", |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
79 adhoclib.new("Create group", |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
80 "xmpp:zash.se/adhoc_groups#new", |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
81 adhoc_inital_data(create_form, |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
82 function () |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
83 return {}; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
84 end, |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
85 _(function (fields, form_err, data) |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
86 local user = jid_split(data.from); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
87 if form_err then |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
88 return false, "Problem in submitted form"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
89 end |
|
1545
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
90 |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
91 local group, err = groups:get(fields.group); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
92 if group then |
|
4031
b2a6e163a6b4
mod_adhoc_groups: Fix check for error on group creation
Kim Alvefur <zash@zash.se>
parents:
4030
diff
changeset
|
93 return false, "That group already exists"; |
|
b2a6e163a6b4
mod_adhoc_groups: Fix check for error on group creation
Kim Alvefur <zash@zash.se>
parents:
4030
diff
changeset
|
94 elseif err then |
|
b2a6e163a6b4
mod_adhoc_groups: Fix check for error on group creation
Kim Alvefur <zash@zash.se>
parents:
4030
diff
changeset
|
95 return false, "An error occurred on the server. Please try again later."; |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
96 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
97 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
98 if not groups:set(fields.group, { [user] = true }) then |
|
2870
d8325dfb6a13
mod_adhoc_groups: Fix typos [codespell]
Kim Alvefur <zash@zash.se>
parents:
2848
diff
changeset
|
99 return false, "An error occurred while creating the group"; |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
100 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
101 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
102 return true, ("The %s group has been created"):format(fields.group); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
103 end)), "local_user")); -- Maybe admins only? |
|
1545
a104a159697d
mod_roster_allinall: Adds all online users to the roster of newly signed in users, for a lazy everyone-in-everyones roster setup
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
104 |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
105 module:add_item("adhoc", |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
106 adhoclib.new("Join group", |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
107 "xmpp:zash.se/adhoc_groups#join", |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
108 adhoc_inital_data(join_form, |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
109 function () |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
110 local group_list = {}; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
111 for group in groups:users() do |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
112 table.insert(group_list, group); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
113 module:log("debug", "Group: %q", group); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
114 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
115 table.sort(group_list); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
116 return { group = group_list }; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
117 end, |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
118 _(function (fields, form_err, data) |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
119 local user = jid_split(data.from); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
120 if form_err then |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
121 return false, "Problem in submitted form"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
122 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
123 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
124 local group, err = groups:get(fields.group); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
125 if not group then |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
126 if err then |
|
2870
d8325dfb6a13
mod_adhoc_groups: Fix typos [codespell]
Kim Alvefur <zash@zash.se>
parents:
2848
diff
changeset
|
127 return false, "An error occurred on the server. Please try again later."; |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
128 else |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
129 return false, "No such group"; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
130 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
131 end |
|
4030
0d7293c37e1a
mod_adhoc_groups: Fix responding with "You are already in this group." (was never sent before)
Karol Topolski <ktopolski.it@gmail.com>
parents:
2870
diff
changeset
|
132 if group[user] then |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
133 return false, "You are already in this group."; |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
134 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
135 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
136 if not memberships:set(fields.group, user, true) then |
|
2870
d8325dfb6a13
mod_adhoc_groups: Fix typos [codespell]
Kim Alvefur <zash@zash.se>
parents:
2848
diff
changeset
|
137 return false, "An error occurred while adding you to the group"; |
|
2848
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
138 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
139 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
140 for member in pairs(group) do |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
141 if member ~= user then |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
142 subscribe(user, member); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
143 subscribe(member, user); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
144 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
145 end |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
146 |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
147 return true, ("Welcome to the %s group"):format(fields.group); |
|
232da6b1d2c1
mod_adhoc_groups: Allow users to create and join roster groups
Kim Alvefur <zash@zash.se>
parents:
2847
diff
changeset
|
148 end)), "local_user")); |