correctly encode sent messages
This commit is contained in:
parent
c03dfacd49
commit
f33bde72e4
1 changed files with 13 additions and 3 deletions
|
|
@ -23,6 +23,7 @@ import re
|
||||||
import datetime
|
import datetime
|
||||||
import random
|
import random
|
||||||
import urllib
|
import urllib
|
||||||
|
from htmlentitydefs import codepoint2name
|
||||||
try:
|
try:
|
||||||
import json
|
import json
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|
@ -227,8 +228,17 @@ class AuMBrowser(BaseBrowser):
|
||||||
|
|
||||||
@check_login
|
@check_login
|
||||||
def post_mail(self, id, content):
|
def post_mail(self, id, content):
|
||||||
|
new_content = u''
|
||||||
|
for c in content:
|
||||||
|
try:
|
||||||
|
new_content += '&%s;' % codepoint2name[ord(c)]
|
||||||
|
except KeyError:
|
||||||
|
new_content += c
|
||||||
|
|
||||||
|
content = new_content.replace('\n', '<br>').encode('Windows-1252', 'replace')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
r = self.api_request('message', 'new', data={'memberId': id, 'message': content.encode('utf-8')})
|
self.api_request('message', 'new', data={'memberId': id, 'message': content})
|
||||||
except AuMException, e:
|
except AuMException, e:
|
||||||
raise CantSendMessage(unicode(e))
|
raise CantSendMessage(unicode(e))
|
||||||
|
|
||||||
|
|
@ -240,7 +250,7 @@ class AuMBrowser(BaseBrowser):
|
||||||
@check_login
|
@check_login
|
||||||
def send_charm(self, id):
|
def send_charm(self, id):
|
||||||
try:
|
try:
|
||||||
r = self.api_request('member', 'addBasket', data={'id': id})
|
self.api_request('member', 'addBasket', data={'id': id})
|
||||||
except AuMException:
|
except AuMException:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
|
|
@ -249,7 +259,7 @@ class AuMBrowser(BaseBrowser):
|
||||||
@check_login
|
@check_login
|
||||||
def add_basket(self, id):
|
def add_basket(self, id):
|
||||||
try:
|
try:
|
||||||
r = self.api_request('member', 'addBasket', data={'id': id})
|
self.api_request('member', 'addBasket', data={'id': id})
|
||||||
except AuMException:
|
except AuMException:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue