diff options
Diffstat (limited to 'poezio/user.py')
| -rw-r--r-- | poezio/user.py | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/poezio/user.py b/poezio/user.py index 655eb0de..602ee2c8 100644 --- a/poezio/user.py +++ b/poezio/user.py @@ -3,16 +3,15 @@ # This file is part of Poezio. # # Poezio is free software: you can redistribute it and/or modify -# it under the terms of the zlib license. See the COPYING file. +# it under the terms of the GPL-3.0+ license. See the COPYING file. """ Define the user class. -An user is a MUC participant, not a roster contact (see contact.py) +A user is a MUC participant, not a roster contact (see contact.py) """ import logging from datetime import timedelta, datetime from hashlib import md5 -from random import choice from typing import Optional, Tuple from poezio import xhtml, colors @@ -26,7 +25,7 @@ ROLE_DICT = {'': 0, 'none': 0, 'visitor': 1, 'participant': 2, 'moderator': 3} class User: """ - keep trace of an user in a Room + keep track of a user in a Room """ __slots__ = ('last_talked', 'jid', 'chatstate', 'affiliation', 'show', 'status', 'role', 'nick', 'color') @@ -38,28 +37,28 @@ class User: status: str, role: str, jid: JID, - deterministic=True, color='') -> None: # The oldest possible time - self.last_talked = datetime(1, 1, 1) # type: datetime + self.last_talked: datetime = datetime(1, 1, 1) self.update(affiliation, show, status, role) self.change_nick(nick) - self.jid = jid # type: JID - self.chatstate = None # type: Optional[str] - self.color = (1, 1) # type: Tuple[int, int] + self.jid: JID = jid + self.chatstate: Optional[str] = None + self.color: Tuple[int, int] = (1, 1) if color != '': - self.change_color(color, deterministic) + self.change_color(color) else: - if deterministic: - self.set_deterministic_color() - else: - self.color = choice(get_theme().LIST_COLOR_NICKNAMES) + self.set_deterministic_color() - def set_deterministic_color(self): + def set_deterministic_color(self) -> None: theme = get_theme() if theme.ccg_palette: # use XEP-0392 CCG - fg_color = colors.ccg_text_to_color(theme.ccg_palette, self.nick) + if self.jid and self.jid.domain: + input_ = self.jid.bare + else: + input_ = self.nick + fg_color = colors.ccg_text_to_color(theme.ccg_palette, input_) self.color = fg_color, -1 else: mod = len(theme.LIST_COLOR_NICKNAMES) @@ -78,14 +77,10 @@ class User: def change_nick(self, nick: str): self.nick = nick - def change_color(self, color_name: Optional[str], deterministic=False): - color = xhtml.colors.get(color_name) + def change_color(self, color_name: Optional[str]): + color = xhtml.colors.get(color_name or '') if color is None: - log.error('Unknown color "%s"', color_name) - if deterministic: - self.set_deterministic_color() - else: - self.color = choice(get_theme().LIST_COLOR_NICKNAMES) + self.set_deterministic_color() else: self.color = (color, -1) @@ -93,7 +88,8 @@ class User: """ time: datetime object """ - self.last_talked = time + if time > self.last_talked: + self.last_talked = time def has_talked_since(self, t: int) -> bool: """ |