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

Tweak presence subscription behaviour & new chat behaviour

Browse source 
- The "New or updated group chat" message is very spammy, and not even that
  useful for being notified about a new chat you might have missed out on. We
  no longer send that, but we do send something when you get a message for an
  unknown groupchat.
- Presence subscription requests are now only sent if you have a chat open with
  someone, because I got tired of receiving randomers' presence subscription
  requests...
- Presence is now only ever sent in response to a presence probe, or when a user
  updates their status or profile picture. You won't get presence from all
  whatsapp contacts when the bridge connects any more.
This commit is contained in:
eta 2020-09-16 13:34:30 +01:00
parent 0da958a2d5
commit 2409b8b705
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
stuff.lisp
View file

@ -301,6 +301,7 @@ WhatsXMPP represents users as u440123456789 and groups as g1234-5678."
(warn "None of ~A's resources were joined to group ~A to receive message ~A!" jid group-localpart msg-id))) (warn "None of ~A's resources were joined to group ~A to receive message ~A!" jid group-localpart msg-id)))
(progn (progn
(warn "No chat in database for group ~A for ~A -- creating" group-localpart jid) (warn "No chat in database for group ~A for ~A -- creating" group-localpart jid)
(admin-msg comp jid (format nil "Received message in unknown new WhatsApp group chat ~A; you should receive an invitation soon..." (whatscl::key-jid key)))
(add-wa-chat comp conn jid (whatscl::key-jid key)) (add-wa-chat comp conn jid (whatscl::key-jid key))
(return-from wa-message-key-to-stanza-headers))))) (return-from wa-message-key-to-stanza-headers)))))
(t nil))))) (t nil)))))
@ -523,8 +524,6 @@ Returns three values: avatar data (as two values), and a generalized boolean spe
(progn (progn
(bind-parameters insert-stmt uid wx-localpart ct-name ct-notify) (bind-parameters insert-stmt uid wx-localpart ct-name ct-notify)
(sqlite:step-statement insert-stmt))) (sqlite:step-statement insert-stmt)))
(handle-wa-contact-presence-subscriptions comp jid wx-localpart)
(handle-wa-contact-presence comp conn jid wx-localpart)
wx-localpart)))) wx-localpart))))
(defun wa-handle-contacts (comp conn jid contacts) (defun wa-handle-contacts (comp conn jid contacts)
@ -576,10 +575,15 @@ Returns three values: avatar data (as two values), and a generalized boolean spe
(request-wa-chat-metadata comp conn jid localpart))))))) (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." "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."
(let ((uid (get-user-id jid)) (let ((uid (get-user-id jid))
(wx-localpart (wa-jid-to-whatsxmpp-localpart ct-jid))) (wx-localpart (wa-jid-to-whatsxmpp-localpart ct-jid)))
(when (uiop:string-prefix-p "u" wx-localpart)
;; The user has an open chat with this other user, so they probably want a presence subscription.
(handle-wa-contact-presence-subscriptions comp jid wx-localpart)
(return-from add-wa-chat))
(unless (uiop:string-prefix-p "g" wx-localpart) (unless (uiop:string-prefix-p "g" wx-localpart)
(warn "Interesting localpart pased to ADD-WA-CHAT: ~A" wx-localpart)
(return-from add-wa-chat)) (return-from add-wa-chat))
(assert uid () "No user ID for ~A!" jid) (assert uid () "No user ID for ~A!" jid)
(unless (get-user-chat-id uid wx-localpart) (unless (get-user-chat-id uid wx-localpart)
@ -769,7 +773,6 @@ Returns three values: avatar data (as two values), and a generalized boolean spe
"member")))) "member"))))
(sqlite:step-statement insert-member-stmt) (sqlite:step-statement insert-member-stmt)
(sqlite:reset-statement insert-member-stmt))) (sqlite:reset-statement insert-member-stmt)))
(admin-msg comp jid (format nil "New or updated WhatsApp group chat: \"~A\" (xmpp:~A@~A?join)" subject localpart (component-name comp)))
(handle-wa-chat-invitation comp conn jid uid localpart :noretry t)))))) (handle-wa-chat-invitation comp conn jid uid localpart :noretry t))))))
(defun wa-handle-presence (comp conn jid &key for-jid type participant &allow-other-keys) (defun wa-handle-presence (comp conn jid &key for-jid type participant &allow-other-keys)