use properties instead of stupid get/set methods

4 files changed, 16 insertions, 29 deletions

diff --git a/vk/tracking/db/backend/log.py b/vk/tracking/db/backend/log.py
index 0cc8a63..0ffee5c 100644
--- a/vk/tracking/db/backend/log.py
+++ b/vk/tracking/db/backend/log.py
@@ -47,7 +47,7 @@ class Writer(meta.Writer):
 
     def on_initial_status(self, user):
         self._reset_last_notification()
-        if user.is_online():
+        if user.is_online:
             self.info(self._format_user_is_online(user))
         else:
             self.info(self._format_user_is_offline(user))
@@ -55,7 +55,7 @@ class Writer(meta.Writer):
 
     def on_status_update(self, user):
         self._reset_last_notification()
-        if user.is_online():
+        if user.is_online:
             self.info(self._format_user_went_online(user))
         else:
             self.info(self._format_user_went_offline(user))
@@ -70,37 +70,24 @@ class Writer(meta.Writer):
         self.exception(e)
 
     @staticmethod
-    def _format_user(user):
-        if user.has_last_name():
-            return f'{user.get_first_name()} {user.get_last_name()}'
-        return f'{user.get_first_name()}'
-
-    @staticmethod
     def _format_user_is_online(user):
-        user = Writer._format_user(user)
-        return f'{user} is ONLINE.'
+        return f'{user.full_name} is ONLINE.'
 
     @staticmethod
     def _format_user_is_offline(user):
-        user = Writer._format_user(user)
-        return f'{user} is OFFLINE.'
+        return f'{user.full_name} is OFFLINE.'
 
     @staticmethod
     def _format_user_last_seen(user):
-        last_seen = user.get_last_seen_time_local()
-        platform = user.get_last_seen_platform().get_descr_text()
-        user = Writer._format_user(user)
-        return f'{user} was last seen at {last_seen} using {platform}.'
+        return f'{user.full_name} was last seen at {user.last_seen.time_local} using {user.last_seen.platform.descr}.'
 
     @staticmethod
     def _format_user_went_online(user):
-        user = Writer._format_user(user)
-        return f'{user} went ONLINE.'
+        return f'{user.full_name} went ONLINE.'
 
     @staticmethod
     def _format_user_went_offline(user):
-        user = Writer._format_user(user)
-        return f'{user} went OFFLINE.'
+        return f'{user.full_name} went OFFLINE.'
 
     @staticmethod
     def _format_another_connection_error(e):
diff --git a/vk/tracking/db/record.py b/vk/tracking/db/record.py
index b641a67..86a417f 100644
--- a/vk/tracking/db/record.py
+++ b/vk/tracking/db/record.py
@@ -73,7 +73,7 @@ class Record(MutableMapping):
             if isinstance(field, UserField):
                 record[field] = user[field]
             elif isinstance(field, LastSeenField):
-                record[field] = user.get_last_seen()[field]
+                record[field] = user.last_seen[field]
             else:
                 assert False
         return record
@@ -98,5 +98,5 @@ class Record(MutableMapping):
             else:
                 assert False
         if last_seen:
-            user.set_last_seen(last_seen)
+            user.last_seen = last_seen
         return user
diff --git a/vk/tracking/sessions.py b/vk/tracking/sessions.py
index 3386c7f..6c4e787 100644
--- a/vk/tracking/sessions.py
+++ b/vk/tracking/sessions.py
@@ -129,18 +129,18 @@ class OnlineSessionEnumerator(MutableMapping):
         return self._close_user_session(record.to_user())
 
     def _known_user(self, user):
-        return user.get_uid() in self._records
+        return user.uid in self._records
 
     def _unknown_user(self, user):
         return not self._known_user(user)
 
     def _close_user_session(self, user):
-        if user not in self or self[user].is_offline():
+        if user not in self or self[user].is_offline:
             self[user] = user
             return None
-        if user.is_online():
+        if user.is_online:
             return None
-        session = user, self[user].get_last_seen_time(), user.get_last_seen_time()
+        session = user, self[user].last_seen.time, user.last_seen.time
         self[user] = user
         return session
 
@@ -291,7 +291,7 @@ class OutputSinkJSON(OutputSinkOnlineSessions):
 class OutputConverterPlot:
     @staticmethod
     def convert_user(user):
-        return f'{user.get_first_name()}\n{user.get_last_name()}'
+        return f'{user.first_name}\n{user.last_name}'
 
     @staticmethod
     def convert_date(date):
diff --git a/vk/tracking/status.py b/vk/tracking/status.py
index 7ef8e7c..7ef0b3c 100644
--- a/vk/tracking/status.py
+++ b/vk/tracking/status.py
@@ -62,7 +62,7 @@ class StatusTracker:
         user_list = self._api.users_get(
             uids, self._USER_FIELDS, deactivated_users=False
         )
-        return {user.get_uid(): user for user in user_list}
+        return {user.uid: user for user in user_list}
 
     def _notify_status(self, user):
         for fn in self._on_initial_status:
@@ -95,7 +95,7 @@ class StatusTracker:
     @staticmethod
     def _filter_status_updates(old_users, new_users):
         for uid, user in new_users.items():
-            if old_users[uid].is_online() != user.is_online():
+            if old_users[uid].is_online != user.is_online:
                 old_users[uid] = user
                 yield user