EnDroid

Merge lp:~jamesh-f/endroid/minorbug into lp:endroid

  1. minorbug
  2. Merge into trunk
Proposed by James
Status: Rejected
Rejected by: Phil Connell
Proposed branch: lp:~jamesh-f/endroid/minorbug
Merge into: lp:endroid
Diff against target: 21 lines (+4/-0)
1 file modified
src/endroid/plugins/sms/__init__.py (+4/-0)
To merge this branch: bzr merge lp:~jamesh-f/endroid/minorbug
Reviewer Review Type Date Requested Status
Phil Connell Approve
Review via email: mp+233546@code.launchpad.net

Commit message

now add someone to period send db

Description of the change

now add someone to period send db

To post a comment you must log in.
Revision history for this message
Phil Connell (pconnell) :
review: Approve
Revision history for this message
ChrisD (gingerchris) :
Revision history for this message
Phil Connell (pconnell) wrote :

I'm actually going to disapprove this, and merge it in separately (I need to tag the 1.4.1 release to get the code out!)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/endroid/plugins/sms/__init__.py' (properties changed: +x to -x)
2--- src/endroid/plugins/sms/__init__.py 2014-09-05 12:37:54 +0000
3+++ src/endroid/plugins/sms/__init__.py 2014-09-05 15:36:21 +0000
4@@ -170,6 +170,9 @@
5 Returns the number of SMS messages sent by a user in a period.
6 """
7 results = self.db.fetch(DB_LIMIT_TABLE, ['texts_sent_this_period'], {'user': user})
8+ if results == []:
9+ raise self.UserNotFoundError
10+ return results
11
12 @command(helphint="{sender}")
13 def block_sender(self, msg, arg):
14@@ -364,6 +367,7 @@
15
16 try:
17 number_sent = self.get_number_sms_sent(sender)
18+ print(number_sent)
19 number_sent += number_messages
20 senders_blocked = self.whos_blocked(jid)
21 except self.UserNotFoundError:

Subscribers

People subscribed via source and target branches