Merge branch 'fix/chats/hmmm' into main

Author: chatterchats

.dockerignore

@@ -1,5 +1,4 @@
 .idea/
-**/json/
 .github/
 .venv/
 !env/.env.example

requirements.txt

@@ -1,11 +1,48 @@
-python-dotenv~=1.0.1
-fastapi~=0.110.1
-bcrypt~=4.1.2
-starlette~=0.37.2
-aiohttp~=3.9.3
-requests~=2.31.0
-gitpython~=3.1.43
-gunicorn~=21.2.0
-uvicorn~=0.29.0
-brotli-asgi~=1.4.0
-prometheus-fastapi-instrumentator~=7.0.0
+aiohttp==3.9.5
+aiosignal==1.3.1
+annotated-types==0.6.0
+anyio==4.3.0
+attrs==23.2.0
+bcrypt==4.1.2
+Brotli==1.1.0
+brotli-asgi==1.4.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+click==8.1.7
+colorama==0.4.6
+Deprecated==1.2.14
+fastapi==0.110.2
+fastapi-simple-rate-limiter==0.0.4
+frozenlist==1.4.1
+gitdb==4.0.11
+GitPython==3.1.43
+gunicorn==21.2.0
+h11==0.14.0
+httpcore==1.0.5
+httpx==0.27.0
+idna==3.7
+importlib_resources==6.4.0
+limits==3.11.0
+multidict==6.0.5
+packaging==24.0
+prometheus-fastapi-instrumentator==7.0.0
+prometheus_client==0.20.0
+pydantic==2.7.0
+pydantic_core==2.18.1
+python-dateutil==2.9.0.post0
+python-dotenv==1.0.1
+redis==5.0.4
+requests==2.31.0
+six==1.16.0
+smmap==5.0.1
+sniffio==1.3.1
+starlette==0.37.2
+svix==1.22.0
+types-Deprecated==1.2.9.20240311
+types-python-dateutil==2.9.0.20240316
+typing_extensions==4.11.0
+urllib3==2.2.1
+uvicorn==0.29.0
+websockets==12.0
+wrapt==1.16.0
+yarl==1.9.4

src/cfg/env/.env.example

@@ -10,8 +10,9 @@ STATUS=raw/status
 WAR_INFO=raw/war_info
 PLANET_STATS=raw/planet_stats
 MAJOR_ORDER=raw/major_order
+PERSONAL_ORDER=raw/personal_order
 NEWS_FEED=raw/news_feed
-STEAM_NEWS=raw/updates
+STEAM_NEWS="https://api.diveharder.com/raw/updates"
 LEVEL_SPEC=raw/level_spec
 ITEMS=raw/items
 MISSION_REWARDS=raw/mission_rewards
@@ -26,6 +27,8 @@ SEASON_PASS_SV=raw/season_pass_sv
 SEASON_PASS_CE=raw/season_pass_ce
 # Democratic Detonation
 SEASON_PASS_DD=raw/season_pass_dd
+# Polar Patriots
+SEASON_PASS_PP=raw/season_pass_pp
 MISSION_SCORE_CALC_PARAMS=raw/score_calc
 ELECTION_CANDIDATES=raw/election_candidates
 ELECTION_TERMS=raw/election_terms

src/routes/raw.py

@@ -406,4 +406,4 @@ async def get_raw_dss(request: Request):
         return data
     return JSONResponse(
         status_code=status.HTTP_204_NO_CONTENT, content={"204": "No Content"}
-    )
+    )

src/routes/response_models/items.py

@@ -0,0 +1,71 @@
+from pydantic import BaseModel
+from typing import Dict, List, Any
+
+
+class Passive(BaseModel):
+    name: str
+    description: str
+
+
+class Armor(BaseModel):
+    name: str
+    description: str
+    type: str
+    slot: str
+    armor_rating: int
+    speed: int
+    stamina_regen: int
+    passive: Passive | str
+
+
+class Damage(BaseModel):
+    name: str
+    description: str
+    damage: int
+
+
+class Weapon(BaseModel):
+    name: str
+    description: str
+    damage: int
+    capacity: int
+    recoil: int
+    fire_rate: int
+    fire_mode: List[str]
+    traits: List[str]
+
+
+class Primary(BaseModel):
+    type: str
+
+
+class Grenade(BaseModel):
+    name: str
+    description: str
+    damage: int
+    penetration: int
+    outer_radius: int
+    fuse_time: float
+
+
+class Weapons(BaseModel):
+    primaries: Dict[str, Primary]
+    secondaries: Dict[str, Weapon]
+    grenades: Dict[str, Grenade]
+
+
+class Booster(BaseModel):
+    name: str
+    description: str
+
+
+class Item(BaseModel):
+    name: str
+    mix_id: str
+
+
+class ItemsResponse(BaseModel):
+    armor: Dict[str, Armor]
+    weapons: Weapons
+    boosters: Dict[str, Booster]
+    item_list: Dict[str, Item]

src/routes/response_models/major_order.py

@@ -2,6 +2,7 @@
 from typing import List, Optional
 
 
+
 class Task(BaseModel):
     type: int
     values: List[int]

src/routes/response_models/news_feed.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+from typing import List, Any
+
+
+class NewsFeedResponse(BaseModel):
+    id: int
+    published: int
+    type: int
+    tagIds: List[Any]
+    message: str

src/routes/response_models/planet_stats.py

@@ -0,0 +1,28 @@
+from pydantic import BaseModel
+from typing import List
+
+
+class GalaxyStats(BaseModel):
+    missionsWon: int
+    missionsLost: int
+    missionTime: int
+    bugKills: int
+    automatonKills: int
+    illuminateKills: int
+    bulletsFired: int
+    bulletsHit: int
+    timePlayed: int
+    deaths: int
+    revives: int
+    friendlies: int
+    missionSuccessRate: int
+    accurracy: int
+
+
+class PlanetStats(GalaxyStats):
+    planetIndex: int
+
+
+class PlanetStatsResponse(BaseModel):
+    galaxy_stats: GalaxyStats
+    planets_stats: List[PlanetStats]

src/routes/response_models/status.py

@@ -0,0 +1,79 @@
+from pydantic import BaseModel
+from typing import List
+
+
+class Campaign(BaseModel):
+    id: int
+    planetIndex: int
+    type: int
+    count: int
+
+
+class PlanetAttack(BaseModel):
+    source: int
+    target: int
+
+
+class PlanetStatus(BaseModel):
+    index: int
+    owner: int
+    health: int
+    regenPerSecond: float
+    players: int
+
+
+class JointOperation(BaseModel):
+    id: int
+    planetIndex: int
+    hqNodeIndex: int
+
+
+class PlanetEvent(BaseModel):
+    id: int
+    planetIndex: int
+    eventType: int
+    race: int
+    health: int
+    maxHealth: int
+    startTime: int
+    expireTime: int
+    campaignId: int
+    jointOperationIds: List[int]
+
+
+class GlobalEvent(BaseModel):
+    eventId: int
+    id32: int
+    portraitId32: int
+    title: str
+    titleId32: int
+    message: str
+    messageId32: int
+    race: int
+    flag: int
+    assignmentId32: int
+    effectIds: List[int] | None
+    planetIndices: List[int] | None
+
+
+class PlanetActiveEffects(BaseModel):
+    index: int
+    galacticEffectId: int
+
+
+class StatusResponse(BaseModel):
+    warId: int
+    time: int
+    impactMultiplier: float
+    storyBeatId32: int
+    planetStatus: List[PlanetStatus]
+    planetAttacks: List[PlanetAttack]
+    campaigns: List[Campaign]
+    communityTargets: List[int] | None
+    jointOperations: List[JointOperation]
+    planetEvents: List[PlanetEvent]
+    planetActiveEffects: List[PlanetActiveEffects] | None
+    activeElectionPolicyEffects: List[int] | None
+    globalEvents: list[GlobalEvent]
+    superEarthWarResults: List[int] | None
+    layoutVersion: int

src/routes/response_models/updates.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+from typing import List, Any
+
+
+class UpdateResponse(BaseModel):
+    title: str
+    url: str
+    contents: str
+    date: str