eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Write on country wall update

Browse Source
This commit is contained in:
Eriks Karls 2019-07-30 18:32:12 +03:00
parent 8690c4d3f2
commit 53257487d8
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erepublik/citizen.py
View File

@ -927,7 +927,7 @@ class Citizen(classes.CitizenAPI):
amount = amount_remaining amount = amount_remaining
best_offer = self.get_market_offers(self.details.citizenship, industry, 1) best_offer = self.get_market_offers(self.details.citizenship, industry, 1)
amount = best_offer['amount'] if amount >= best_offer['amount'] else amount amount = best_offer['amount'] if amount >= best_offer['amount'] else amount
rj = self.buy_from_market(amount=best_offer['amount'], offer=best_offer['offer_id']).json() rj = self.buy_from_market(amount=best_offer['amount'], offer=best_offer['offer_id'])
if not rj.get('error'): if not rj.get('error'):
amount_remaining -= amount amount_remaining -= amount
else: else:
@ -1416,18 +1416,18 @@ class Citizen(classes.CitizenAPI):
self.reporter.report_action("SELL_PRODUCT", ret.json()) self.reporter.report_action("SELL_PRODUCT", ret.json())
return ret return ret
def buy_from_market(self, offer: int, amount: int) -> Response: def buy_from_market(self, offer: int, amount: int) -> dict:
ret = self._post_economy_marketplace_actions(amount, True, offer=offer) ret = self._post_economy_marketplace_actions(amount, True, offer=offer)
json_ret = ret.json() json_ret = ret.json()
if json_ret.get('error'): if json_ret.get('error'):
return ret return json_ret
else: else:
self.details.cc = ret.json()['currency'] self.details.cc = ret.json()['currency']
self.details.gold = ret.json()['gold'] self.details.gold = ret.json()['gold']
r_json = ret.json() r_json = ret.json()
r_json.pop("offerUpdate", None) r_json.pop("offerUpdate", None)
self.reporter.report_action("BUY_PRODUCT", ret.json()) self.reporter.report_action("BUY_PRODUCT", ret.json())
return ret return json_ret
def get_raw_surplus(self) -> (float, float): def get_raw_surplus(self) -> (float, float):
frm = 0.00 frm = 0.00
@ -1691,8 +1691,8 @@ class Citizen(classes.CitizenAPI):
buy = self.buy_from_market(global_cheapest['offer_id'], 1) buy = self.buy_from_market(global_cheapest['offer_id'], 1)
else: else:
buy = self.buy_from_market(cheapest_offer['offer_id'], 1) buy = self.buy_from_market(cheapest_offer['offer_id'], 1)
if buy.json()["error"]: if buy["error"]:
msg = "Unable to buy q{} house! \n{}".format(q, buy.json()['message']) msg = "Unable to buy q{} house! \n{}".format(q, buy['message'])
self.write_log(msg) self.write_log(msg)
else: else:
ok_to_activate = True ok_to_activate = True
@ -1766,12 +1766,10 @@ class Citizen(classes.CitizenAPI):
def write_on_country_wall(self, message: str) -> bool: def write_on_country_wall(self, message: str) -> bool:
self._get_main() self._get_main()
post_to_wall_as = re.findall(r"""id="post_to_country_as".*?<option value="(.*?)">.*?</option>.*</select>""", post_to_wall_as = re.findall(r"""id="post_to_country_as".*?<option value="(\d?)">.*?</option>.*</select>""",
self.r.text, re.S | re.M) self.r.text, re.S | re.M)
if post_to_wall_as: r = self._post_country_post_create(message, max(post_to_wall_as, key=int) if post_to_wall_as else 0)
self._post_country_post_create(message, max(post_to_wall_as)) return r.json()
return True
return False
def report_error(self, msg: str = ""): def report_error(self, msg: str = ""):
utils.process_error(msg, self.name, sys.exc_info(), self, self.commit_id, False) utils.process_error(msg, self.name, sys.exc_info(), self, self.commit_id, False)