citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

* A few minor changes including accidentally unappended code 

* Fix sending as a chan address
This commit is contained in:
Luke Montalvo 2014-04-30 19:29:04 -05:00
parent 276b8d3125
commit cc5301327c
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/bitmessagecurses/__init__.py
View File

@ -1,7 +1,7 @@
# Copyright (c) 2014 Luke Montalvo <lukemontalvo@gmail.com> # Copyright (c) 2014 Luke Montalvo <lukemontalvo@gmail.com>
# This file adds a alternative commandline interface, feel free to critique and fork # This file adds a alternative commandline interface, feel free to critique and fork
# #
# This has only been tested on Arch Linux # This has only been tested on Arch Linux and Linux Mint
# Dependencies: # Dependencies:
# * from python2-pip # * from python2-pip
# * python2-pythondialog # * python2-pythondialog
@ -349,7 +349,10 @@ def handlech(c, stdscr):
d.scrollbox(unicode("Message moved to trash. There is no interface to view your trash, \nbut the message is still on disk if you are desperate to recover it."), d.scrollbox(unicode("Message moved to trash. There is no interface to view your trash, \nbut the message is still on disk if you are desperate to recover it."),
exit_label="Continue") exit_label="Continue")
elif menutab == 2: elif menutab == 2:
sendMessage(addresses[addrcur][2]) a = ""
if addresses[addrcur][3] != 0: # if current address is a chan
a = addresses[addrcur][2]
sendMessage(addresses[addrcur][2], a)
elif menutab == 3: elif menutab == 3:
d.set_background_title("Sent Messages Dialog Box") d.set_background_title("Sent Messages Dialog Box")
r, t = d.menu("Do what with \""+sentbox[sentcur][4]+"\" to \""+sentbox[sentcur][0]+"\"?", r, t = d.menu("Do what with \""+sentbox[sentcur][4]+"\" to \""+sentbox[sentcur][0]+"\"?",
@ -455,7 +458,10 @@ def handlech(c, stdscr):
else: else:
d.scrollbox(unicode("Passphrases do not match"), exit_label="Continue") d.scrollbox(unicode("Passphrases do not match"), exit_label="Continue")
elif t == "2": # Send a message elif t == "2": # Send a message
sendMessage(addresses[addrcur][2]) a = ""
if addresses[addrcur][3] != 0: # if current address is a chan
a = addresses[addrcur][2]
sendMessage(addresses[addrcur][2], a)
elif t == "3": # Rename address label elif t == "3": # Rename address label
a = addresses[addrcur][2] a = addresses[addrcur][2]
label = addresses[addrcur][0] label = addresses[addrcur][0]
@ -545,7 +551,11 @@ def handlech(c, stdscr):
r, t = d.inputbox("New subscription label") r, t = d.inputbox("New subscription label")
if r == d.DIALOG_OK: if r == d.DIALOG_OK:
label = t label = t
subscriptions.reverse().append(label, addr, True).reverse() # Prepend entry
subscriptions.reverse()
subscriptions.append([label, addr, True])
subscriptions.reverse()
sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, address, True) sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, address, True)
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
elif t == "2": elif t == "2":
@ -576,7 +586,11 @@ def handlech(c, stdscr):
r, t = d.inputbox("New subscription label") r, t = d.inputbox("New subscription label")
if r == d.DIALOG_OK: if r == d.DIALOG_OK:
label = t label = t
subscriptions.reverse().append(label, addr, True).reverse() # Prepend entry
subscriptions.reverse()
subscriptions.append([label, addr, True])
subscriptions.reverse()
sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, address, True) sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, address, True)
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
elif t == "3": elif t == "3":
@ -587,7 +601,10 @@ def handlech(c, stdscr):
r, t = d.inputbox("Label for address \""+addr+"\"") r, t = d.inputbox("Label for address \""+addr+"\"")
if r == d.DIALOG_OK: if r == d.DIALOG_OK:
sqlExecute("INSERT INTO addressbook VALUES (?,?)", t, addr) sqlExecute("INSERT INTO addressbook VALUES (?,?)", t, addr)
addrbook.reverse().append([t, addr]).reverse() # Prepend new entry # Prepend entry
addrbook.reverse()
addrbook.append([t, addr])
addrbook.reverse()
else: else:
d.scrollbox(unicode("The selected address is already in the Address Book."), exit_label="Continue") d.scrollbox(unicode("The selected address is already in the Address Book."), exit_label="Continue")
elif t == "4": elif t == "4":
@ -680,7 +697,7 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F
menutab = 6 menutab = 6
return return
recv = t recv = t
if broadcast == None: if broadcast == None and sender != recv:
r, t = d.radiolist("How to send the message?", r, t = d.radiolist("How to send the message?",
choices=[("1", "Send to one or more specific people", True), choices=[("1", "Send to one or more specific people", True),
("2", "Broadcast to everyone who is subscribed to your address", False)]) ("2", "Broadcast to everyone who is subscribed to your address", False)])
@ -761,18 +778,18 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F
2) 2)
shared.workerQueue.put(("sendmessage", addr)) shared.workerQueue.put(("sendmessage", addr))
else: # Broadcast else: # Broadcast
if addr == "": if recv == "":
d.set_background_title("Empty sender error") d.set_background_title("Empty sender error")
d.scrollbox(unicode("You must specify an address to send the message from."), d.scrollbox(unicode("You must specify an address to send the message from."),
exit_label="Continue") exit_label="Continue")
else: else:
ackdata = OpenSSL.rand(32) ackdata = OpenSSL.rand(32)
addr = BROADCAST_STR recv = BROADCAST_STR
ripe = "" ripe = ""
sqlExecute( sqlExecute(
"INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", "INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)",
"", "",
addr, recv,
ripe, ripe,
sender, sender,
subject, subject,