Philipp Hörist pushed to branch muc-nicks at gajim / gajim
Commits:
a5c00f83 by Philipp Hörist at 2026-06-04T14:47:06+02:00
new: MUC: Use account log adapter for affiliation manager
- - - - -
1 changed file:
- gajim/common/modules/muc.py
Changes:
=====================================
gajim/common/modules/muc.py
=====================================
@@ -175,7 +175,7 @@ def __init__(self, con: types.Client) -> None:
)
self._mucs: dict[JID, MUCData] = {}
self._muc_nicknames = {}
- self._muc_affiliations = AffiliationManager()
+ self._muc_affiliations = AffiliationManager(self._log)
self._muc_affiliations.connect(
"affiliation-request-complete", self._on_affiliations_complete
)
@@ -1355,8 +1355,9 @@ def cleanup(self) -> None:
class AffiliationManager(Observable):
- def __init__(self) -> None:
+ def __init__(self, log: logging.LoggerAdapter[Any]) -> None:
Observable.__init__(self)
+ self._log = log
self._affiliations: dict[JID, dict[str, list[JID]]] = defaultdict(
lambda: defaultdict(list)
)
@@ -1370,11 +1371,11 @@ def process_affiliation_result(
) -> None:
if muc_jid not in self._running_affiliation_requests:
- log.info("Unexpected affiliation request for %s", muc_jid)
+ self._log.info("Unexpected affiliation request for %s", muc_jid)
return
if result is None:
- log.info(
+ self._log.info(
"AffiliationManager: Remove affiliation: %s %s", muc_jid,
affiliation
)
try:
@@ -1384,7 +1385,7 @@ def process_affiliation_result(
else:
user_jids = [jid.new_as_bare() for jid in result.users]
- log.info(
+ self._log.info(
"AffiliationManager: Add result: %s %s %s",
result.jid,
affiliation,
@@ -1395,14 +1396,14 @@ def process_affiliation_result(
open_requests = self._running_affiliation_requests[muc_jid]
open_requests.discard(affiliation)
if not open_requests:
- log.info("AffiliationManager: Request complete for %s", muc_jid)
+ self._log.info("AffiliationManager: Request complete for %s",
muc_jid)
self._running_affiliation_requests.pop(muc_jid)
self.notify("affiliation-request-complete", muc_jid)
def _add_user_affiliation(
self, muc_jid: JID, affiliation: Affiliation, user_real_jid: JID
) -> None:
- log.info(
+ self._log.info(
"AffiliationManager: Add user: %s %s %s",
muc_jid,
affiliation,
@@ -1411,7 +1412,7 @@ def _add_user_affiliation(
self._affiliations[muc_jid][affiliation.value].append(user_real_jid)
def _remove_user_affiliation(self, muc_jid: JID, user_real_jid: JID) ->
None:
- log.info("AffiliationManager: Remove user: %s %s", muc_jid,
user_real_jid)
+ self._log.info("AffiliationManager: Remove user: %s %s", muc_jid,
user_real_jid)
for jids in self._affiliations.get(muc_jid, {}).values():
if user_real_jid in jids:
jids.remove(user_real_jid)
@@ -1420,7 +1421,7 @@ def _remove_user_affiliation(self, muc_jid: JID,
user_real_jid: JID) -> None:
def change_user_affiliation(
self, muc_jid: JID, affiliation: Affiliation, user_real_jid: JID
) -> None:
- log.info(
+ self._log.info(
"AffiliationManager: Change user affiliation: %s %s %s",
muc_jid,
affiliation,
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a5c00f8316dc3f6834d550e0e9905b621942f4c3
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a5c00f8316dc3f6834d550e0e9905b621942f4c3
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
