plugin XEP-0277, doc: conflict is now checked and avoided if user_friendly_id_suffix is False, doc updated
This commit is contained in:
parent
3c6cd70c80
commit
d80c4e89dc
1 changed files with 29 additions and 5 deletions
|
|
@ -1068,8 +1068,26 @@ class XEP_0277(object):
|
|||
if item_id is None:
|
||||
if data.get("user_friendly_id", True):
|
||||
item_id = self.friendly_id(data)
|
||||
else:
|
||||
item_id = str(shortuuid.uuid())
|
||||
if not data.get("user_friendly_id_suffix", True):
|
||||
# we have no random suffix, which can lead to conflict, so we check if
|
||||
# the item doesn't already exist, and change ID if it's the case.
|
||||
try:
|
||||
items, __ = await self._p.get_items(
|
||||
client,
|
||||
service,
|
||||
node,
|
||||
item_ids = [item_id]
|
||||
)
|
||||
except exceptions.NotFound:
|
||||
pass
|
||||
else:
|
||||
# the item already exists
|
||||
log.info(
|
||||
f"there is already an item with ID {item_id}, we have to "
|
||||
' set the "user_friendly_id_suffix" flag.'
|
||||
)
|
||||
data["user_friendly_id_suffix"] = True
|
||||
item_id = self.friendly_id(data)
|
||||
|
||||
try:
|
||||
await self._manage_comments(client, data, service, node, item_id, access=None)
|
||||
|
|
|
|||
Loading…
Reference in a new issue