--- a/sat/plugins/plugin_xep_0060.py	Tue Sep 20 16:22:18 2022 +0200
+++ b/sat/plugins/plugin_xep_0060.py	Sat Oct 15 20:36:53 2022 +0200
@@ -19,7 +19,7 @@
 
 from collections import namedtuple
 from functools import reduce
-from typing import Any, Dict, Iterable, List, Optional, Tuple, Union, Callable
+from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union
 import urllib.error
 import urllib.parse
 import urllib.request
@@ -658,25 +658,33 @@
         nodeIdentifier: str,
         items: Optional[List[domish.Element]] = None,
         options: Optional[dict] = None,
-        sender: Optional[jid.JID] = None
+        sender: Optional[jid.JID] = None,
+        extra: Optional[Dict[str, Any]] = None
     ) -> domish.Element:
         """Publish pubsub items
 
         @param sender: sender of the request,
             client.jid will be used if nto set
+        @param extra: extra data
+            not used directly by ``publish``, but may be used in triggers
         @return: IQ result stanza
+        @trigger XEP-0060_publish: called just before publication.
+            if it returns False, extra must have a "iq_result_elt" key set with
+            domish.Element to return.
         """
         if sender is None:
             sender = client.jid
+        if extra is None:
+            extra = {}
+        if not await self.host.trigger.asyncPoint(
+            "XEP-0060_publish", client, service, nodeIdentifier, items, options, sender,
+            extra
+        ):
+            return extra["iq_result_elt"]
         iq_result_elt = await client.pubsub_client.publish(
             service, nodeIdentifier, items, sender,
             options=options
         )
-
-        await self.host.trigger.asyncPoint(
-            "XEP-0060_publish", client, service, nodeIdentifier, items, options,
-            iq_result_elt
-        )
         return iq_result_elt
 
     def _unwrapMAMMessage(self, message_elt):
@@ -768,7 +776,7 @@
         try:
             mam_query = extra["mam"]
         except KeyError:
-            d = client.pubsub_client.items(
+            d = defer.ensureDeferred(client.pubsub_client.items(
                 service = service,
                 nodeIdentifier = node,
                 maxItems = max_items,
@@ -776,8 +784,9 @@
                 sender = None,
                 itemIdentifiers = item_ids,
                 orderBy = extra.get(C.KEY_ORDER_BY),
-                rsm_request = rsm_request
-            )
+                rsm_request = rsm_request,
+                extra = extra
+            ))
             # we have no MAM data here, so we add None
             d.addErrback(sat_defer.stanza2NotFound)
             d.addTimeout(TIMEOUT, reactor)
@@ -1652,6 +1661,32 @@
     def connectionInitialized(self):
         rsm.PubSubClient.connectionInitialized(self)
 
+    async def items(
+        self,
+        service: Optional[jid.JID],
+        nodeIdentifier: str,
+        maxItems: Optional[int] = None,
+        subscriptionIdentifier: Optional[str] = None,
+        sender: Optional[jid.JID] = None,
+        itemIdentifiers: Optional[Set[str]] = None,
+        orderBy: Optional[List[str]] = None,
+        rsm_request: Optional[rsm.RSMRequest] = None,
+        extra: Optional[Dict[str, Any]] = None,
+    ):
+        if extra is None:
+            extra = {}
+        items, rsm_response = await super().items(
+            service, nodeIdentifier, maxItems, subscriptionIdentifier, sender,
+            itemIdentifiers, orderBy, rsm_request
+        )
+        # items must be returned, thus this async point can't stop the workflow (but it
+        # can modify returned items)
+        await self.host.trigger.asyncPoint(
+            "XEP-0060_items", self.parent, service, nodeIdentifier, items, rsm_response,
+            extra
+        )
+        return items, rsm_response
+
     def _getNodeCallbacks(self, node, event):
         """Generate callbacks from given node and event