diff --git a/erepublik/access_points.py b/erepublik/access_points.py index 89ff1f7..d75c055 100644 --- a/erepublik/access_points.py +++ b/erepublik/access_points.py @@ -132,23 +132,23 @@ class CitizenBaseAPI: class ErepublikAnniversaryAPI(CitizenBaseAPI): def _post_main_collect_anniversary_reward(self) -> Response: - return self.post("{}/main/collect-anniversary-reward".format(self.url), data={"_token": self.token}) + return self.post(f"{self.url}/main/collect-anniversary-reward", data={"_token": self.token}) # 12th anniversary endpoints def _get_anniversary_quest_data(self) -> Response: - return self.get("{}/main/anniversaryQuestData".format(self.url)) + return self.get(f"{self.url}/main/anniversaryQuestData") def _post_map_rewards_unlock(self, node_id: int) -> Response: data = {'nodeId': node_id, '_token': self.token} - return self.post("{}/main/map-rewards-unlock".format(self.url), data=data) + return self.post(f"{self.url}/main/map-rewards-unlock", data=data) def _post_map_rewards_speedup(self, node_id: int, currency_amount: int) -> Response: data = {'nodeId': node_id, '_token': self.token, "currencyCost": currency_amount} - return self.post("{}/main/map-rewards-speedup".format(self.url), data=data) + return self.post(f"{self.url}/main/map-rewards-speedup", data=data) def _post_map_rewards_claim(self, node_id: int) -> Response: data = {'nodeId': node_id, '_token': self.token} - return self.post("{}/main/map-rewards-claim".format(self.url), data=data) + return self.post(f"{self.url}/main/map-rewards-claim", data=data) def _post_main_wheel_of_fortune_spin(self, cost) -> Response: return self.post(f"{self.url}/wheeloffortune-spin", data={'_token': self.token, "cost": cost}) @@ -159,52 +159,52 @@ class ErepublikAnniversaryAPI(CitizenBaseAPI): class ErepublikArticleAPI(CitizenBaseAPI): def _get_main_article_json(self, article_id: int) -> Response: - return self.get("{}/main/articleJson/{}".format(self.url, article_id)) + return self.get(f"{self.url}/main/articleJson/{article_id}") def _post_main_article_comments(self, article_id: int, page: int = 1) -> Response: data = dict(_token=self.token, articleId=article_id, page=page) if page: data.update({'page': page}) - return self.post("{}/main/articleComments".format(self.url), data=data) + return self.post(f"{self.url}/main/articleComments", data=data) def _post_main_article_comments_create(self, message: str, article_id: int, parent: int = 0) -> Response: data = dict(_token=self.token, message=message, articleId=article_id) if parent: data.update({"parentId": parent}) - return self.post("{}/main/articleComments/create".format(self.url), data=data) + return self.post(f"{self.url}/main/articleComments/create", data=data) def _post_main_donate_article(self, article_id: int, amount: int) -> Response: data = dict(_token=self.token, articleId=article_id, amount=amount) - return self.post("{}/main/donate-article".format(self.url), data=data) + return self.post(f"{self.url}/main/donate-article", data=data) def _post_main_write_article(self, title: str, content: str, country_id: int, kind_id: int) -> Response: data = dict(_token=self.token, article_name=title, article_body=content, article_location=country_id, article_category=kind_id) - return self.post("{}/main/write-article".format(self.url), data=data) + return self.post(f"{self.url}/main/write-article", data=data) def _post_main_vote_article(self, article_id: int) -> Response: data = dict(_token=self.token, articleId=article_id) - return self.post("{}/main/vote-article".format(self.url), data=data) + return self.post(f"{self.url}/main/vote-article", data=data) class ErepublikCompanyAPI(CitizenBaseAPI): def _post_economy_assign_to_holding(self, factory_id: int, holding_id: int) -> Response: data = dict(_token=self.token, factoryId=factory_id, action="assign", holdingCompanyId=holding_id) - return self.post("{}/economy/assign-to-holding".format(self.url), data=data) + return self.post(f"{self.url}/economy/assign-to-holding", data=data) def _post_economy_create_company(self, industry_id: int, building_type: int = 1) -> Response: data = {"_token": self.token, "company[industry_id]": industry_id, "company[building_type]": building_type} - return self.post("{}/economy/create-company".format(self.url), data=data, - headers={"Referer": "{}/economy/create-company".format(self.url)}) + return self.post(f"{self.url}/economy/create-company", data=data, + headers={"Referer": f"{self.url}/economy/create-company"}) def _get_economy_inventory_items(self) -> Response: - return self.get("{}/economy/inventory-items/".format(self.url)) + return self.get(f"{self.url}/economy/inventory-items/") - def _get_economy_job_market_json(self, country: int) -> Response: - return self.get("{}/economy/job-market-json/{}/1/desc".format(self.url, country)) + def _get_economy_job_market_json(self, country_id: int) -> Response: + return self.get(f"{self.url}/economy/job-market-json/{country_id}/1/desc") def _get_economy_my_companies(self) -> Response: - return self.get("{}/economy/myCompanies".format(self.url)) + return self.get(f"{self.url}/economy/myCompanies") def _post_economy_train(self, tg_ids: List[int]) -> Response: data: Dict[str, Union[int, str]] = {} @@ -213,11 +213,11 @@ class ErepublikCompanyAPI(CitizenBaseAPI): data["grounds[%i][train]" % idx] = 1 if data: data['_token'] = self.token - return self.post("{}/economy/train".format(self.url), data=data) + return self.post(f"{self.url}/economy/train", data=data) def _post_economy_upgrade_company(self, factory: int, level: int, pin: str = None) -> Response: data = dict(_token=self.token, type="upgrade", companyId=factory, level=level, pin="" if pin is None else pin) - return self.post("{}/economy/upgrade-company".format(self.url), data=data) + return self.post(f"{self.url}/economy/upgrade-company", data=data) def _post_economy_work(self, action_type: str, wam: List[int] = None, employ: Dict[int, int] = None) -> Response: data: Dict[str, Union[int, str]] = dict(action_type=action_type, _token=self.token) @@ -241,174 +241,169 @@ class ErepublikCompanyAPI(CitizenBaseAPI): f"companies[{max_idx}][own_work]": 0 }) max_idx += 1 - return self.post("{}/economy/work".format(self.url), data=data) + return self.post(f"{self.url}/economy/work", data=data) def _post_economy_work_overtime(self) -> Response: data = dict(action_type="workOvertime", _token=self.token) - return self.post("{}/economy/workOvertime".format(self.url), data=data) + return self.post(f"{self.url}/economy/workOvertime", data=data) - def _post_economy_job_market_apply(self, citizen: int, salary: float) -> Response: - data = dict(_token=self.token, citizenId=citizen, salary=salary) - return self.post("{}/economy/job-market-apply".format(self.url), data=data) + def _post_economy_job_market_apply(self, citizen_id: int, salary: float) -> Response: + data = dict(_token=self.token, citizenId=citizen_id, salary=salary) + return self.post(f"{self.url}/economy/job-market-apply", data=data) def _post_economy_resign(self) -> Response: - return self.post("{}/economy/resign".format(self.url), + return self.post(f"{self.url}/economy/resign", headers={"Content-Type": "application/x-www-form-urlencoded"}, data={"_token": self.token, "action_type": "resign"}) - def _post_economy_sell_company(self, factory: int, pin: int = None, sell: bool = True) -> Response: + def _post_economy_sell_company(self, factory_id: int, pin: int = None, sell: bool = True) -> Response: data = dict(_token=self.token, pin="" if pin is None else pin) if sell: data.update({"sell": "sell"}) else: - data.update({"dissolve": factory}) - return self.post("{}/economy/sell-company/{}".format(self.url, factory), + data.update({"dissolve": factory_id}) + return self.post(f"{self.url}/economy/sell-company/{factory_id}", data=data, headers={"Referer": self.url}) class ErepublikCountryAPI(CitizenBaseAPI): - def _get_country_military(self, country: str) -> Response: - return self.get("{}/country/military/{}".format(self.url, country)) + def _get_country_military(self, country_name: str) -> Response: + return self.get(f"{self.url}/country/military/{country_name}") - def _post_main_country_donate(self, country: int, action: str, value: Union[int, float], + def _post_main_country_donate(self, country_id: int, action: str, value: Union[int, float], quality: int = None) -> Response: - json = dict(countryId=country, action=action, _token=self.token, value=value, quality=quality) - return self.post("{}/main/country-donate".format(self.url), data=json, - headers={"Referer": "{}/country/economy/Latvia".format(self.url)}) + + data = dict(countryId=country_id, action=action, _token=self.token, value=value, quality=quality) + return self.post(f"{self.url}/main/country-donate", data=data, + headers={"Referer": f"{self.url}/country/economy/Latvia"}) class ErepublikEconomyAPI(CitizenBaseAPI): def _get_economy_citizen_accounts(self, organisation_id: int) -> Response: - return self.get("{}/economy/citizen-accounts/{}".format(self.url, organisation_id)) + return self.get(f"{self.url}/economy/citizen-accounts/{organisation_id}") def _get_economy_my_market_offers(self) -> Response: - return self.get("{}/economy/myMarketOffers".format(self.url)) + return self.get(f"{self.url}/economy/myMarketOffers") def _get_main_job_data(self) -> Response: - return self.get("{}/main/job-data".format(self.url)) + return self.get(f"{self.url}/main/job-data") def _post_main_buy_gold_items(self, currency: str, item: str, amount: int) -> Response: data = dict(itemId=item, currency=currency, amount=amount, _token=self.token) - return self.post("{}/main/buyGoldItems".format(self.url), data=data) + return self.post(f"{self.url}/main/buyGoldItems", data=data) def _post_economy_activate_booster(self, quality: int, duration: int, kind: str) -> Response: data = dict(type=kind, quality=quality, duration=duration, fromInventory=True) - return self.post("{}/economy/activateBooster".format(self.url), data=data) + return self.post(f"{self.url}/economy/activateBooster", data=data) def _post_economy_activate_house(self, quality: int) -> Response: data = {"action": "activate", "quality": quality, "type": "house", "_token": self.token} - return self.post("{}/economy/activateHouse".format(self.url), data=data) + return self.post(f"{self.url}/economy/activateHouse", data=data) - def _post_economy_donate_items_action(self, citizen: int, amount: int, industry: int, + def _post_economy_donate_items_action(self, citizen_id: int, amount: int, industry: int, quality: int) -> Response: - data = dict(citizen_id=citizen, amount=amount, industry_id=industry, quality=quality, _token=self.token) - return self.post("{}/economy/donate-items-action".format(self.url), data=data, - headers={"Referer": "{}/economy/donate-items/{}".format(self.url, citizen)}) + data = dict(citizen_id=citizen_id, amount=amount, industry_id=industry, quality=quality, _token=self.token) + return self.post(f"{self.url}/economy/donate-items-action", data=data, + headers={"Referer": f"{self.url}/economy/donate-items/{citizen_id}"}) - def _post_economy_donate_money_action(self, citizen: int, amount: float = 0.0, + def _post_economy_donate_money_action(self, citizen_id: int, amount: float = 0.0, currency: int = 62) -> Response: - data = dict(citizen_id=citizen, _token=self.token, currency_id=currency, amount=amount) - return self.post("{}/economy/donate-money-action".format(self.url), data=data, - headers={"Referer": "{}/economy/donate-money/{}".format(self.url, citizen)}) + data = dict(citizen_id=citizen_id, _token=self.token, currency_id=currency, amount=amount) + return self.post(f"{self.url}/economy/donate-money-action", data=data, + headers={"Referer": f"{self.url}/economy/donate-money/{citizen_id}"}) def _post_economy_exchange_purchase(self, amount: float, currency: int, offer: int) -> Response: data = dict(_token=self.token, amount=amount, currencyId=currency, offerId=offer) - return self.post("{}/economy/exchange/purchase/".format(self.url), data=data) + return self.post(f"{self.url}/economy/exchange/purchase/", data=data) def _post_economy_exchange_retrieve(self, personal: bool, page: int, currency: int) -> Response: data = dict(_token=self.token, personalOffers=int(personal), page=page, currencyId=currency) - return self.post("{}/economy/exchange/retrieve/".format(self.url), data=data) + return self.post(f"{self.url}/economy/exchange/retrieve/", data=data) def _post_economy_game_tokens_market(self, action: str) -> Response: assert action in ['retrieve', ] data = dict(_token=self.token, action=action) - return self.post("{}/economy/gameTokensMarketAjax".format(self.url), data=data) + return self.post(f"{self.url}/economy/gameTokensMarketAjax", data=data) def _post_economy_marketplace(self, country: int, industry: int, quality: int, order_asc: bool = True) -> Response: data = dict(countryId=country, industryId=industry, quality=quality, ajaxMarket=1, orderBy="price_asc" if order_asc else "price_desc", _token=self.token) - return self.post("{}/economy/marketplaceAjax".format(self.url), data=data) + return self.post(f"{self.url}/economy/marketplaceAjax", data=data) def _post_economy_marketplace_actions(self, amount: int, buy: bool = False, **kwargs) -> Response: if buy: data = dict(_token=self.token, offerId=kwargs['offer'], amount=amount, orderBy="price_asc", currentPage=1, buyAction=1) else: - data = dict(_token=self.token, countryId=kwargs["country"], price=kwargs["price"], + data = dict(_token=self.token, countryId=kwargs["country_id"], price=kwargs["price"], industryId=kwargs["industry"], quality=kwargs["quality"], amount=amount, sellAction='postOffer') - return self.post("{}/economy/marketplaceActions".format(self.url), data=data) + return self.post(f"{self.url}/economy/marketplaceActions", data=data) class ErepublikLeaderBoardAPI(CitizenBaseAPI): - def _get_main_leaderboards_damage_aircraft_rankings(self, country: int, weeks: int = 0, mu: int = 0) -> Response: - data = (country, weeks, mu) - return self.get("{}/main/leaderboards-damage-aircraft-rankings/{}/{}/{}/0".format(self.url, *data)) + def _get_main_leaderboards_damage_aircraft_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0) -> Response: + return self.get(f"{self.url}/main/leaderboards-damage-aircraft-rankings/{country_id}/{weeks}/{mu_id}/0") - def _get_main_leaderboards_damage_rankings(self, country: int, weeks: int = 0, mu: int = 0, - div: int = 0) -> Response: - data = (country, weeks, mu, div) - return self.get("{}/main/leaderboards-damage-rankings/{}/{}/{}/{}".format(self.url, *data)) + def _get_main_leaderboards_damage_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0, div: int = 0) -> Response: + return self.get(f"{self.url}/main/leaderboards-damage-rankings/{country_id}/{weeks}/{mu_id}/{div}") - def _get_main_leaderboards_kills_aircraft_rankings(self, country: int, weeks: int = 0, mu: int = 0) -> Response: - data = (country, weeks, mu) - return self.get("{}/main/leaderboards-kills-aircraft-rankings/{}/{}/{}/0".format(self.url, *data)) + def _get_main_leaderboards_kills_aircraft_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0) -> Response: + return self.get(f"{self.url}/main/leaderboards-kills-aircraft-rankings/{country_id}/{weeks}/{mu_id}/0") - def _get_main_leaderboards_kills_rankings(self, country: int, weeks: int = 0, mu: int = 0, - div: int = 0) -> Response: - data = (country, weeks, mu, div) - return self.get("{}/main/leaderboards-kills-rankings/{}/{}/{}/{}".format(self.url, *data)) + def _get_main_leaderboards_kills_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0, div: int = 0) -> Response: + return self.get(f"{self.url}/main/leaderboards-kills-rankings/{country_id}/{weeks}/{mu_id}/{div}") class ErepublikLocationAPI(CitizenBaseAPI): - def _get_main_city_data_residents(self, city: int, page: int = 1, params: Mapping[str, Any] = None) -> Response: + def _get_main_city_data_residents(self, city_id: int, page: int = 1, params: Mapping[str, Any] = None) -> Response: if params is None: params = {} - return self.get("{}/main/city-data/{}/residents".format(self.url, city), params={"currentPage": page, **params}) + return self.get(f"{self.url}/main/city-data/{city_id}/residents", params={"currentPage": page, **params}) class ErepublikMilitaryAPI(CitizenBaseAPI): - def _get_military_battlefield_choose_side(self, battle: int, side: int) -> Response: - return self.get("{}/military/battlefield-choose-side/{}/{}".format(self.url, battle, side)) + def _get_military_battlefield_choose_side(self, battle_id: int, side_id: int) -> Response: + return self.get(f"{self.url}/military/battlefield-choose-side/{battle_id}/{side_id}") - def _get_military_show_weapons(self, battle: int) -> Response: - return self.get("{}/military/show-weapons".format(self.url), params={'_token': self.token, 'battleId': battle}) + def _get_military_show_weapons(self, battle_id: int) -> Response: + return self.get(f"{self.url}/military/show-weapons", params={'_token': self.token, 'battleId': battle_id}) def _get_military_campaigns(self) -> Response: - return self.get("{}/military/campaigns-new/".format(self.url)) + return self.get(f"{self.url}/military/campaigns-new/") def _get_military_campaigns_json_list(self) -> Response: - return self.get("{}/military/campaignsJson/list".format(self.url)) + return self.get(f"{self.url}/military/campaignsJson/list") def _get_military_campaigns_json_citizen(self) -> Response: - return self.get("{}/military/campaignsJson/citizen".format(self.url)) + return self.get(f"{self.url}/military/campaignsJson/citizen") def _get_military_unit_data(self, unit_id: int, **kwargs) -> Response: params = {"groupId": unit_id, "panel": "members", **kwargs} - return self.get("{}/military/military-unit-data/".format(self.url), params=params) + return self.get(f"{self.url}/military/military-unit-data/", params=params) - def _post_main_activate_battle_effect(self, battle: int, kind: str, citizen_id: int) -> Response: - data = dict(battleId=battle, citizenId=citizen_id, type=kind, _token=self.token) - return self.post("{}/main/fight-activateBattleEffect".format(self.url), data=data) + def _post_main_activate_battle_effect(self, battle_id: int, kind: str, citizen_id: int) -> Response: + data = dict(battleId=battle_id, citizenId=citizen_id, type=kind, _token=self.token) + return self.post(f"{self.url}/main/fight-activateBattleEffect", data=data) def _post_main_battlefield_travel(self, side_id: int, battle_id: int) -> Response: data = dict(_token=self.token, sideCountryId=side_id, battleId=battle_id) - return self.post("{}/main/battlefieldTravel".format(self.url), data=data) + return self.post(f"{self.url}/main/battlefieldTravel", data=data) def _post_main_battlefield_change_division(self, battle_id: int, division_id: int) -> Response: data = dict(_token=self.token, battleZoneId=division_id, battleId=battle_id) - return self.post("{}/main/battlefieldTravel".format(self.url), data=data) + return self.post(f"{self.url}/main/battlefieldTravel", data=data) def _get_wars_show(self, war_id: int) -> Response: - return self.get("{}/wars/show/{}".format(self.url, war_id)) + return self.get(f"{self.url}/wars/show/{war_id}") - def _post_military_fight_activate_booster(self, battle: int, quality: int, duration: int, kind: str) -> Response: - data = dict(type=kind, quality=quality, duration=duration, battleId=battle, _token=self.token) - return self.post("{}/military/fight-activateBooster".format(self.url), data=data) + def _post_military_fight_activate_booster(self, battle_id: int, quality: int, duration: int, kind: str) -> Response: + data = dict(type=kind, quality=quality, duration=duration, battleId=battle_id, _token=self.token) + return self.post(f"{self.url}/military/fight-activateBooster", data=data) - def _post_military_change_weapon(self, battle: int, battle_zone: int, weapon_level: int, ) -> Response: - data = dict(battleId=battle, _token=self.token, battleZoneId=battle_zone, customizationLevel=weapon_level) - return self.post("{}/military/change-weapon".format(self.url), data=data) + def _post_military_change_weapon(self, battle_id: int, battle_zone: int, weapon_level: int, ) -> Response: + data = dict(battleId=battle_id, _token=self.token, battleZoneId=battle_zone, customizationLevel=weapon_level) + return self.post(f"{self.url}/military/change-weapon", data=data) def _post_military_battle_console(self, battle_id: int, action: str, page: int = 1, **kwargs) -> Response: data = dict(battleId=battle_id, action=action, _token=self.token) @@ -417,19 +412,19 @@ class ErepublikMilitaryAPI(CitizenBaseAPI): division=kwargs["division"], type=kwargs.get("type", 'damage'), ) elif action == "warList": data.update(page=page) - return self.post("{}/military/battle-console".format(self.url), data=data) + return self.post(f"{self.url}/military/battle-console", data=data) def _post_military_deploy_bomb(self, battle_id: int, bomb_id: int) -> Response: data = dict(battleId=battle_id, bombId=bomb_id, _token=self.token) - return self.post("{}/military/deploy-bomb".format(self.url), data=data) + return self.post(f"{self.url}/military/deploy-bomb", data=data) def _post_military_fight_air(self, battle_id: int, side_id: int, zone_id: int) -> Response: data = dict(sideId=side_id, battleId=battle_id, _token=self.token, battleZoneId=zone_id) - return self.post("{}/military/fight-shoooot/{}".format(self.url, battle_id), data=data) + return self.post(f"{self.url}/military/fight-shoooot/{battle_id}", data=data) def _post_military_fight_ground(self, battle_id: int, side_id: int, zone_id: int) -> Response: data = dict(sideId=side_id, battleId=battle_id, _token=self.token, battleZoneId=zone_id) - return self.post("{}/military/fight-shooot/{}".format(self.url, battle_id), data=data) + return self.post(f"{self.url}/military/fight-shooot/{battle_id}", data=data) def _post_fight_deploy_deploy_report_data(self, deployment_id: int): data = dict(_token=self.token, deploymentId=deployment_id) @@ -438,17 +433,17 @@ class ErepublikMilitaryAPI(CitizenBaseAPI): class ErepublikPoliticsAPI(CitizenBaseAPI): def _get_candidate_party(self, party_slug: str) -> Response: - return self.post("{}/candidate/{}".format(self.url, party_slug)) + return self.post(f"{self.url}/candidate/{party_slug}") - def _get_main_party_members(self, party: int) -> Response: - return self.get("{}/main/party-members/{}".format(self.url, party)) + def _get_main_party_members(self, party_id: int) -> Response: + return self.get(f"{self.url}/main/party-members/{party_id}") - def _get_main_rankings_parties(self, country: int) -> Response: - return self.get("{}/main/rankings-parties/1/{}".format(self.url, country)) + def _get_main_rankings_parties(self, country_id: int) -> Response: + return self.get(f"{self.url}/main/rankings-parties/1/{country_id}") def _post_candidate_for_congress(self, presentation: str = "") -> Response: data = dict(_token=self.token, presentation=presentation) - return self.post("{}/candidate-for-congress".format(self.url), data=data) + return self.post(f"{self.url}/candidate-for-congress", data=data) def _get_presidential_elections(self, country_id: int, timestamp: int) -> Response: return self.get(f"{self.url}/main/presidential-elections/{country_id}/{timestamp}") @@ -462,50 +457,50 @@ class ErepublikPresidentAPI(CitizenBaseAPI): def _post_new_war(self, self_country_id: int, attack_country_id: int, debate: str = "") -> Response: data = dict(requirments=1, _token=self.token, debate=debate, countryNameConfirm=constants.COUNTRIES[attack_country_id].link) - return self.post("{}/{}/new-war".format(self.url, constants.COUNTRIES[self_country_id].link), data=data) + return self.post(f"{self.url}/{constants.COUNTRIES[self_country_id].link}/new-war", data=data) def _post_new_donation(self, country_id: int, amount: int, org_name: str, debate: str = "") -> Response: data = dict(requirments=1, _token=self.token, debate=debate, currency=1, value=amount, commit='Propose', type_name=org_name) - return self.post("{}/{}/new-donation".format(self.url, constants.COUNTRIES[country_id].link), data=data) + return self.post(f"{self.url}/{constants.COUNTRIES[country_id].link}/new-donation", data=data) class ErepublikProfileAPI(CitizenBaseAPI): - def _get_main_citizen_hovercard(self, citizen: int) -> Response: - return self.get("{}/main/citizen-hovercard/{}".format(self.url, citizen)) + def _get_main_citizen_hovercard(self, citizen_id: int) -> Response: + return self.get(f"{self.url}/main/citizen-hovercard/{citizen_id}") - def _get_main_citizen_profile_json(self, player_id: int) -> Response: - return self.get("{}/main/citizen-profile-json/{}".format(self.url, player_id)) + def _get_main_citizen_profile_json(self, citizen_id: int) -> Response: + return self.get(f"{self.url}/main/citizen-profile-json/{citizen_id}") def _get_main_citizen_notifications(self) -> Response: - return self.get("{}/main/citizenDailyAssistant".format(self.url)) + return self.get(f"{self.url}/main/citizenDailyAssistant") def _get_main_citizen_daily_assistant(self) -> Response: - return self.get("{}/main/citizenNotifications".format(self.url)) + return self.get(f"{self.url}/main/citizenNotifications") def _get_main_messages_paginated(self, page: int = 1) -> Response: - return self.get("{}/main/messages-paginated/{}".format(self.url, page)) + return self.get(f"{self.url}/main/messages-paginated/{page}") def _get_main_money_donation_accept(self, donation_id: int) -> Response: - return self.get("{}/main/money-donation/accept/{}".format(self.url, donation_id), params={"_token": self.token}) + return self.get(f"{self.url}/main/money-donation/accept/{donation_id}", params={"_token": self.token}) def _get_main_money_donation_reject(self, donation_id: int) -> Response: - return self.get("{}/main/money-donation/reject/{}".format(self.url, donation_id), params={"_token": self.token}) + return self.get(f"{self.url}/main/money-donation/reject/{donation_id}", params={"_token": self.token}) def _get_main_notifications_ajax_community(self, page: int = 1) -> Response: - return self.get("{}/main/notificationsAjax/community/{}".format(self.url, page)) + return self.get(f"{self.url}/main/notificationsAjax/community/{page}") def _get_main_notifications_ajax_system(self, page: int = 1) -> Response: - return self.get("{}/main/notificationsAjax/system/{}".format(self.url, page)) + return self.get(f"{self.url}/main/notificationsAjax/system/{page}") def _get_main_notifications_ajax_report(self, page: int = 1) -> Response: - return self.get("{}/main/notificationsAjax/report/{}".format(self.url, page)) + return self.get(f"{self.url}/main/notificationsAjax/report/{page}") def _get_main_training_grounds_json(self) -> Response: - return self.get("{}/main/training-grounds-json".format(self.url)) + return self.get(f"{self.url}/main/training-grounds-json") def _get_main_weekly_challenge_data(self) -> Response: - return self.get("{}/main/weekly-challenge-data".format(self.url)) + return self.get(f"{self.url}/main/weekly-challenge-data") def _post_main_citizen_add_remove_friend(self, citizen: int, add: bool) -> Response: data = dict(_token=self.token, citizenId=citizen, url="//www.erepublik.com/en/main/citizen-addRemoveFriend") @@ -513,60 +508,60 @@ class ErepublikProfileAPI(CitizenBaseAPI): data.update({"action": "addFriend"}) else: data.update({"action": "removeFriend"}) - return self.post("{}/main/citizen-addRemoveFriend".format(self.url), data=data) + return self.post(f"{self.url}/main/citizen-addRemoveFriend", data=data) def _post_main_daily_task_reward(self) -> Response: - return self.post("{}/main/daily-tasks-reward".format(self.url), data=dict(_token=self.token)) + return self.post(f"{self.url}/main/daily-tasks-reward", data=dict(_token=self.token)) def _post_delete_message(self, msg_id: list) -> Response: data = {"_token": self.token, "delete_message[]": msg_id} - return self.post("{}/main/messages-delete".format(self.url), data) + return self.post(f"{self.url}/main/messages-delete", data) def _post_eat(self, color: str) -> Response: data = dict(_token=self.token, buttonColor=color) - return self.post("{}/main/eat".format(self.url), params=data) + return self.post(f"{self.url}/main/eat", params=data) def _post_main_global_alerts_close(self, alert_id: int) -> Response: data = dict(_token=self.token, alert_id=alert_id) - return self.post("{}/main/global-alerts/close".format(self.url), data=data) + return self.post(f"{self.url}/main/global-alerts/close", data=data) def _post_forgot_password(self, email: str) -> Response: data = dict(_token=self.token, email=email, commit="Reset password") - return self.post("{}/forgot-password".format(self.url), data=data) + return self.post(f"{self.url}/forgot-password", data=data) def _post_login(self, email: str, password: str) -> Response: data = dict(csrf_token=self.token, citizen_email=email, citizen_password=password, remember='on') - return self.post("{}/login".format(self.url), data=data) + return self.post(f"{self.url}/login", data=data) def _post_main_messages_alert(self, notification_ids: List[int]) -> Response: data = {"_token": self.token, "delete_alerts[]": notification_ids, "deleteAllAlerts": "1", "delete": "Delete"} - return self.post("{}/main/messages-alerts/1".format(self.url), data=data) + return self.post(f"{self.url}/main/messages-alerts/1", data=data) def _post_main_notifications_ajax_community(self, notification_ids: List[int], page: int = 1) -> Response: data = {"_token": self.token, "delete_alerts[]": notification_ids} - return self.post("{}/main/notificationsAjax/community/{}".format(self.url, page), data=data) + return self.post(f"{self.url}/main/notificationsAjax/community/{page}", data=data) def _post_main_notifications_ajax_system(self, notification_ids: List[int], page: int = 1) -> Response: data = {"_token": self.token, "delete_alerts[]": notification_ids} - return self.post("{}/main/notificationsAjax/system/{}".format(self.url, page), data=data) + return self.post(f"{self.url}/main/notificationsAjax/system/{page}", data=data) def _post_main_notifications_ajax_report(self, notification_ids: List[int], page: int = 1) -> Response: data = {"_token": self.token, "delete_alerts[]": notification_ids} - return self.post("{}/main/notificationsAjax/report/{}".format(self.url, page), data=data) + return self.post(f"{self.url}/main/notificationsAjax/report/{page}", data=data) def _post_main_messages_compose(self, subject: str, body: str, citizens: List[int]) -> Response: url_pk = 0 if len(citizens) > 1 else str(citizens[0]) data = dict(citizen_name=",".join([str(x) for x in citizens]), citizen_subject=subject, _token=self.token, citizen_message=body) - return self.post("{}/main/messages-compose/{}".format(self.url, url_pk), data=data) + return self.post(f"{self.url}/main/messages-compose/{url_pk}", data=data) def _post_military_group_missions(self) -> Response: data = dict(action="check", _token=self.token) - return self.post("{}/military/group-missions".format(self.url), data=data) + return self.post(f"{self.url}/military/group-missions", data=data) def _post_main_weekly_challenge_reward(self, reward_id: int) -> Response: data = dict(_token=self.token, rewardId=reward_id) - return self.post("{}/main/weekly-challenge-collect-reward".format(self.url), data=data) + return self.post(f"{self.url}/main/weekly-challenge-collect-reward", data=data) def _post_main_profile_update(self, action: str, params: str): data = {"action": action, "params": params, "_token": self.token} @@ -576,10 +571,10 @@ class ErepublikProfileAPI(CitizenBaseAPI): class ErepublikTravelAPI(CitizenBaseAPI): def _post_main_travel(self, check: str, **kwargs) -> Response: data = dict(_token=self.token, check=check, **kwargs) - return self.post("{}/main/travel".format(self.url), data=data) + return self.post(f"{self.url}/main/travel", data=data) def _post_main_travel_data(self, **kwargs) -> Response: - return self.post("{}/main/travelData".format(self.url), data=dict(_token=self.token, **kwargs)) + return self.post(f"{self.url}/main/travelData", data=dict(_token=self.token, **kwargs)) class ErepublikWallPostAPI(CitizenBaseAPI): @@ -587,78 +582,78 @@ class ErepublikWallPostAPI(CitizenBaseAPI): def _post_main_country_comment_retrieve(self, post_id: int) -> Response: data = {"_token": self.token, "postId": post_id} - return self.post("{}/main/country-comment/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/country-comment/retrieve/json", data=data) def _post_main_country_comment_create(self, post_id: int, comment_message: str) -> Response: data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message} - return self.post("{}/main/country-comment/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/country-comment/create/json", data=data) def _post_main_country_post_create(self, body: str, post_as: int) -> Response: data = {"_token": self.token, "post_message": body, "post_as": post_as} - return self.post("{}/main/country-post/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/country-post/create/json", data=data) def _post_main_country_post_retrieve(self) -> Response: data = {"_token": self.token, "page": 1, "switchedFrom": False} - return self.post("{}/main/country-post/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/country-post/retrieve/json", data=data) # ## Military Unit def _post_main_military_unit_comment_retrieve(self, post_id: int) -> Response: data = {"_token": self.token, "postId": post_id} - return self.post("{}/main/military-unit-comment/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/military-unit-comment/retrieve/json", data=data) def _post_main_military_unit_comment_create(self, post_id: int, comment_message: str) -> Response: data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message} - return self.post("{}/main/military-unit-comment/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/military-unit-comment/create/json", data=data) def _post_main_military_unit_post_create(self, body: str, post_as: int) -> Response: data = {"_token": self.token, "post_message": body, "post_as": post_as} - return self.post("{}/main/military-unit-post/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/military-unit-post/create/json", data=data) def _post_main_military_unit_post_retrieve(self) -> Response: data = {"_token": self.token, "page": 1, "switchedFrom": False} - return self.post("{}/main/military-unit-post/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/military-unit-post/retrieve/json", data=data) # ## Party def _post_main_party_comment_retrieve(self, post_id: int) -> Response: data = {"_token": self.token, "postId": post_id} - return self.post("{}/main/party-comment/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/party-comment/retrieve/json", data=data) def _post_main_party_comment_create(self, post_id: int, comment_message: str) -> Response: data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message} - return self.post("{}/main/party-comment/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/party-comment/create/json", data=data) def _post_main_party_post_create(self, body: str) -> Response: data = {"_token": self.token, "post_message": body} - return self.post("{}/main/party-post/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/party-post/create/json", data=data) def _post_main_party_post_retrieve(self) -> Response: data = {"_token": self.token, "page": 1, "switchedFrom": False} - return self.post("{}/main/party-post/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/party-post/retrieve/json", data=data) # ## Friend's Wall def _post_main_wall_comment_retrieve(self, post_id: int) -> Response: data = {"_token": self.token, "postId": post_id} - return self.post("{}/main/wall-comment/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/wall-comment/retrieve/json", data=data) def _post_main_wall_comment_create(self, post_id: int, comment_message: str) -> Response: data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message} - return self.post("{}/main/wall-comment/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/wall-comment/create/json", data=data) def _post_main_wall_post_create(self, body: str) -> Response: data = {"_token": self.token, "post_message": body} - return self.post("{}/main/wall-post/create/json".format(self.url), data=data) + return self.post(f"{self.url}/main/wall-post/create/json", data=data) def _post_main_wall_post_retrieve(self) -> Response: data = {"_token": self.token, "page": 1, "switchedFrom": False} - return self.post("{}/main/wall-post/retrieve/json".format(self.url), data=data) + return self.post(f"{self.url}/main/wall-post/retrieve/json", data=data) # ## Medal posting def _post_main_wall_post_automatic(self, message: str, achievement_id: int) -> Response: - return self.post("{}/main/wall-post/automatic".format(self.url), data=dict(_token=self.token, message=message, - achievementId=achievement_id)) + return self.post(f"{self.url}/main/wall-post/automatic", data=dict(_token=self.token, message=message, + achievementId=achievement_id)) class CitizenAPI(