a3x
/
whatsxmpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Invite users to chats they're not in when messages are sent in those chats 

(untested!)
This commit is contained in:
eta 2021-05-28 16:55:24 +01:00
parent 4698d41d65
commit 5ba2ea763b
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
message.lisp
View File

@ -159,6 +159,12 @@ FIXME: the above behaviour is a bit meh."
(from (if one-to-one-p (from (if one-to-one-p
(concatenate 'string (from msg) "@" component-host "/whatsapp") (concatenate 'string (from msg) "@" component-host "/whatsapp")
(concatenate 'string (conversation msg) "@" component-host "/" (from msg))))) (concatenate 'string (conversation msg) "@" component-host "/" (from msg)))))
(when (and (not one-to-one-p)
(eql (length destinations) 0))
(warn "User ~A not in groupchat ~A; inviting due to new message"
jid (conversation msg))
(handle-wa-chat-invitation comp nil jid (uid msg) (conversation msg)
:use-join-count t))
(loop (loop
for to in destinations for to in destinations
do (with-message (comp to do (with-message (comp to

37
stuff.lisp
View File

@ -578,34 +578,41 @@ Returns three values: avatar data (as two values), and a generalized boolean spe
(lambda (conn meta) (lambda (conn meta)
(wa-handle-group-metadata comp conn jid wx-localpart meta)))) (wa-handle-group-metadata comp conn jid wx-localpart meta))))
(defun handle-wa-chat-invitation (comp conn jid uid localpart &key noretry) (defun handle-wa-chat-invitation (comp conn jid uid localpart &key noretry use-join-count)
"Checks to see whether the group chat LOCALPART has any metadata; if not, requests some. If it does, and the user hasn't been invited to that group chat yet, send them an invitation." "Checks to see whether the group chat LOCALPART has any metadata; if not, requests some. If it does, and the user hasn't been invited to that group chat yet, send them an invitation.
If USE-JOIN-COUNT is set, checks whether the user is in the groupchat and invites them if they aren't, instead of checking whether the bridge has invited them previously."
(unless (uiop:string-prefix-p "g" localpart) (unless (uiop:string-prefix-p "g" localpart)
(return-from handle-wa-chat-invitation)) (return-from handle-wa-chat-invitation))
(with-prepared-statements (with-prepared-statements
((get-stmt "SELECT id, invitation_state FROM user_chats WHERE user_id = ? AND wa_jid = ?") ((get-stmt "SELECT id, invitation_state FROM user_chats WHERE user_id = ? AND wa_jid = ?")
(count-stmt "SELECT COUNT(*) FROM user_chat_members WHERE chat_id = ?") (count-stmt "SELECT COUNT(*) FROM user_chat_members WHERE chat_id = ?")
(count-joined-stmt "SELECT COUNT(*) FROM user_chat_joined WHERE chat_id = ?")
(update-stmt "UPDATE user_chats SET invitation_state = ? WHERE id = ?")) (update-stmt "UPDATE user_chats SET invitation_state = ? WHERE id = ?"))
(bind-parameters get-stmt uid localpart) (bind-parameters get-stmt uid localpart)
(assert (sqlite:step-statement get-stmt) () (assert (sqlite:step-statement get-stmt) ()
"Chat ~A doesn't exist in database!" localpart) "Chat ~A doesn't exist in database!" localpart)
(with-bound-columns (chat-id invitation-state) get-stmt (with-bound-columns (chat-id invitation-state) get-stmt
(bind-parameters count-stmt chat-id) (bind-parameters count-stmt chat-id)
(bind-parameters count-joined-stmt chat-id)
(assert (sqlite:step-statement count-stmt)) (assert (sqlite:step-statement count-stmt))
(assert (sqlite:step-statement count-joined-stmt))
(with-bound-columns (n-members) count-stmt (with-bound-columns (n-members) count-stmt
(if (> n-members 0) (with-bound-columns (n-joined) count-joined-stmt
(when (equal invitation-state "none") (if (> n-members 0)
(with-message (comp jid) (when (or
(cxml:with-element "x" (and use-join-count (eql n-joined 0))
(cxml:attribute "xmlns" +muc-invite-ns+) (equal invitation-state "none"))
(cxml:attribute "jid" (concatenate 'string (with-message (comp jid)
localpart (cxml:with-element "x"
"@" (cxml:attribute "xmlns" +muc-invite-ns+)
(component-name comp))))) (cxml:attribute "jid" (concatenate 'string
(bind-parameters update-stmt "invited" chat-id) localpart
(sqlite:step-statement update-stmt)) "@"
(unless noretry (component-name comp)))))
(request-wa-chat-metadata comp conn jid localpart))))))) (bind-parameters update-stmt "invited" chat-id)
(sqlite:step-statement update-stmt))
(unless noretry
(request-wa-chat-metadata comp conn jid localpart))))))))
(defun add-wa-chat (comp conn jid ct-jid) (defun add-wa-chat (comp conn jid ct-jid)
"Adds the JID CT-JID to the list of the user's groupchats, if it is a groupchat. If it's a user JID, sends a presence subscription request if necessary." "Adds the JID CT-JID to the list of the user's groupchats, if it is a groupchat. If it's a user JID, sends a presence subscription request if necessary."