Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def create_app(test_config: dict | None = None) -> Flask:
else:
app.logger.setLevel(logging.INFO)

if app.config["ENALBE_PROFILER"]:
if app.config["ENABLE_PROFILER"]:
from werkzeug.middleware.profiler import ProfilerMiddleware

app.wsgi_app = ProfilerMiddleware(app.wsgi_app)
Expand Down
15 changes: 11 additions & 4 deletions backend/app/blueprints/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from app.services.pixyship import PixyShipService
from app.services.player import PlayerService
from app.services.prestige import PrestigeService
from app.services.reasearch import ResearchService
from app.services.research import ResearchService
from app.services.room import RoomService
from app.services.ship import ShipService
from app.services.skin import SkinService
Expand Down Expand Up @@ -315,13 +315,20 @@ def api_rooms() -> Response:
@cache.cached()
def api_skins() -> Response:
"""Return all skins."""
# keep only skins with sprite_type = "Interior"
skin_service = SkinService()
skins = [skin for skin in skin_service.skins.values() if skin["sprite_type"] == "Interior"]
skins = skin_service.skins

# Remove duplicate skins with the same name
skins_filtered = {}
known_names = set()
for skin_id, skin in skins.items():
if skin["name"] not in known_names:
skins_filtered[skin_id] = skin
known_names.add(skin["name"])

return jsonify(
{
"data": skins,
"data": skins_filtered,
"status": "success",
"current_time": time.time(),
},
Expand Down
2 changes: 1 addition & 1 deletion backend/app/commands/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from app.services.item import ItemService
from app.services.market import MarketService
from app.services.missile import MissileService
from app.services.reasearch import ResearchService
from app.services.research import ResearchService
from app.services.room import RoomService
from app.services.ship import ShipService
from app.services.skin import SkinService
Expand Down
2 changes: 1 addition & 1 deletion backend/app/commands/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from app.services.missile import MissileService
from app.services.player import PlayerService
from app.services.prestige import PrestigeService
from app.services.reasearch import ResearchService
from app.services.research import ResearchService
from app.services.room import RoomService
from app.services.ship import ShipService
from app.services.skin import SkinService
Expand Down
3 changes: 2 additions & 1 deletion backend/app/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class DefaultConfig:
CHANGES_MAX_ASSETS = 5000

# Generated with `python -c 'import os; print(os.urandom(16))'`, must be kept secret
# Warning: never use this key value in production!
SECRET_KEY = "dev"

# Generated from PSS website (only available for Savy trusted third-party developers),
Expand Down Expand Up @@ -52,4 +53,4 @@ class DefaultConfig:
DONATION_URL = "https://example.donate/"

# Profiler
ENALBE_PROFILER = False
ENABLE_PROFILER = False
4 changes: 2 additions & 2 deletions backend/app/services/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
from app.services.pixyship import PixyShipService
from app.services.player import PlayerService
from app.services.prestige import PrestigeService
from app.services.reasearch import ResearchService
from app.services.record import RecordService
from app.services.record_details import RecordDetailsService
from app.services.research import ResearchService
from app.services.room import RoomService
from app.services.ship import ShipService
from app.services.skin import SkinService
Expand Down Expand Up @@ -88,7 +88,7 @@ def item_service(self) -> ItemService:
@cached_property
def research_service(self) -> ResearchService:
"""Get research service."""
from app.services.reasearch import ResearchService
from app.services.research import ResearchService

return ResearchService()

Expand Down
2 changes: 1 addition & 1 deletion backend/app/services/record_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from app.services.craft import CraftService
from app.services.item import ItemService
from app.services.missile import MissileService
from app.services.reasearch import ResearchService
from app.services.research import ResearchService
from app.services.room import RoomService
from app.services.ship import ShipService
from app.services.skin import SkinService
Expand Down
File renamed without changes.
11 changes: 9 additions & 2 deletions backend/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sync:

# Run server
run:
uv run flask run
uv run flask run --debug

# Generate pip-compatible requirements.lock for production
lock:
Expand All @@ -26,4 +26,11 @@ test:

# Run linter with ruff
lint:
uv run ruff check
uv run ruff check --fix

# Type check with mypy
typecheck:
uv run mypy app/

# Run all checks
check: lint typecheck test
2 changes: 1 addition & 1 deletion backend/tests/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from app.services.market import MarketService
from app.services.missile import MissileService
from app.services.player import PlayerService
from app.services.reasearch import ResearchService
from app.services.research import ResearchService
from app.services.room import RoomService
from app.services.ship import ShipService
from app.services.sprite import SpriteService
Expand Down