diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/coins.py | 4 | ||||
| -rw-r--r-- | modules/messages.py | 2 | ||||
| -rw-r--r-- | modules/seen.py | 2 | ||||
| -rw-r--r-- | modules/stats.py | 2 | ||||
| -rw-r--r-- | modules/tweets/format.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/modules/coins.py b/modules/coins.py index 4f366500..8e84c96e 100644 --- a/modules/coins.py +++ b/modules/coins.py @@ -194,7 +194,7 @@ class Module(ModuleManager.BaseModule): time_left = self.bot.cache.until_expiration(cache) event["stderr"].write("%s: Please wait %s before redeeming" % ( event["user"].nickname, - utils.datetime.format.to_pretty_time(time_left))) + utils.datetime.format.to_pretty_until(time_left))) else: event["stderr"].write( "%s: You can only redeem coins when you have none" % @@ -492,7 +492,7 @@ class Module(ModuleManager.BaseModule): def next_lottery(self, event): until = self._until_next_6_hour() event["stdout"].write("Next lottery is in: %s" % - utils.datetime.format.to_pretty_time(until)) + utils.datetime.format.to_pretty_until(until)) @utils.hook("received.command.lotterywinner") @utils.kwarg("help", "Show who last won the lottery") diff --git a/modules/messages.py b/modules/messages.py index f6c37530..19d9a1a3 100644 --- a/modules/messages.py +++ b/modules/messages.py @@ -16,7 +16,7 @@ class Module(ModuleManager.BaseModule): for i, message in enumerate(message_list): seconds = utils.datetime.seconds_since(message.line.timestamp) messages.append("(%d/%d) %s ago %s" % (i+1, message_count, - utils.datetime.format.to_pretty_time(seconds), + utils.datetime.format.to_pretty_since(seconds), message.line.format())) event["stdout"].write("%s: found: %s" diff --git a/modules/seen.py b/modules/seen.py index 780ea99e..01c0d0f3 100644 --- a/modules/seen.py +++ b/modules/seen.py @@ -35,7 +35,7 @@ class Module(ModuleManager.BaseModule): seen_info = " (%s%s)" % (seen_info["action"], utils.consts.RESET) - since = utils.datetime.format.to_pretty_time( + since = utils.datetime.format.to_pretty_since( time.time()-seen_seconds, max_units=2) event["stdout"].write("%s was last seen %s ago%s" % ( event["args_split"][0], since, seen_info or "")) diff --git a/modules/stats.py b/modules/stats.py index d61312f7..4d82ac45 100644 --- a/modules/stats.py +++ b/modules/stats.py @@ -7,7 +7,7 @@ HIDDEN_MODES = set(["s", "p"]) class Module(ModuleManager.BaseModule): def _uptime(self): - return utils.datetime.format.to_pretty_time( + return utils.datetime.format.to_pretty_since( int(time.time()-self.bot.start_time)) @utils.hook("received.command.uptime") diff --git a/modules/tweets/format.py b/modules/tweets/format.py index aab1c62d..540e7638 100644 --- a/modules/tweets/format.py +++ b/modules/tweets/format.py @@ -3,7 +3,7 @@ from src import utils def _timestamp(dt): seconds_since = time.time()-dt.timestamp() - timestamp = utils.datetime.format.to_pretty_time( + timestamp = utils.datetime.format.to_pretty_since( seconds_since, max_units=2) return "%s ago" % timestamp |