diff --git a/onionr/onionrpeers.py b/onionr/onionrpeers.py index 207f5825..041a69b9 100644 --- a/onionr/onionrpeers.py +++ b/onionr/onionrpeers.py @@ -90,7 +90,7 @@ def peerCleanup(coreInst): if PeerProfiles(address, coreInst).score < minScore: coreInst.removeAddress(address) try: - if (coreInst._utils.getEpoch() - coreInst.getPeerInfo(address, 4)) >= 600: + if (coreInst._utils.getEpoch() - coreInst.getPeerInfo(address, 'dateSeen')) >= 600: expireTime = 600 else: expireTime = 86400 diff --git a/onionr/onionrusers.py b/onionr/onionrusers.py index 208419aa..29b9375b 100644 --- a/onionr/onionrusers.py +++ b/onionr/onionrusers.py @@ -71,6 +71,5 @@ class OnionrUser: if newName.isalnum(): logger.info('%s is now using the name %s.' % (self.publicKey, self._core._utils.escapeAnsi(newName))) self._core.setPeerInfo(self.publicKey, 'name', newName) - print("DEBUG PLS") else: raise onionrexceptions.InvalidPubkey \ No newline at end of file diff --git a/onionr/static-data/default-plugins/pms/main.py b/onionr/static-data/default-plugins/pms/main.py index 46a614b7..f569ec9b 100644 --- a/onionr/static-data/default-plugins/pms/main.py +++ b/onionr/static-data/default-plugins/pms/main.py @@ -88,13 +88,12 @@ class OnionrMail: senderKey = senderKey.decode() except AttributeError: pass - print("DEBUG:", senderKey) senderDisplay = onionrusers.OnionrUser(self.myCore, senderKey).getName() if senderDisplay == 'anonymous': senderDisplay = senderKey blockDate = pmBlocks[blockHash].getDate().strftime("%m/%d %H:%M") - print('%s. %s - %s: %s' % (blockCount, blockDate, senderDisplay, blockHash)) + print('%s. %s - %s: %s' % (blockCount, blockDate, senderDisplay[:12], blockHash)) try: choice = logger.readline('Enter a block number, -r to refresh, or -q to stop: ').strip().lower()