Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: server management and server list #95

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft
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
7 changes: 5 additions & 2 deletions dev-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ services:
ports:
- "5432:5432"

memcached:
image: memcached:1.6-alpine
ports:
- "11211:11211"

web:
depends_on:
- db
Expand All @@ -23,5 +28,3 @@ services:

volumes:
db-data:
static-volume:
media-volume:
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ services:
volumes:
- db-data:/var/lib/postgresql/data

memcached:
image: memcached:1.6-alpine

web:
image: unitystation/central-command:latest
environment:
Expand Down
2 changes: 2 additions & 0 deletions example.env
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ DB_ENGINE=django.db.backends.postgresql
DB_NAME=postgres
DB_HOST=db
DB_PORT=5432
MEMCACHED_LOCATION=127.0.0.1
MEMCACHED_PORT=11211

# Links to stuff
WEBSITE_URL = http://localhost:8000
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies = [
"psycopg2-binary~=2.9.9",
"python-dotenv~=0.19.2",
"whitenoise~=6.6.0",
"pymemcache>=4.0.0",
]

[build-system]
Expand Down
11 changes: 11 additions & 0 deletions src/central_command/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"post_office",
"accounts",
"persistence",
"server",
"drf_spectacular",
]

Expand Down Expand Up @@ -154,6 +155,16 @@
}
}

MEMCACHED_HOST = os.environ.get("MEMCACHED_HOST", "127.0.0.1")
MEMCACHED_PORT = os.environ.get("MEMCACHED_PORT", 11211)

CACHES = {
"default": {
"BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
"LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
}
}

REST_FRAMEWORK = {
"DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
"DEFAULT_AUTHENTICATION_CLASSES": ["knox.auth.TokenAuthentication"],
Expand Down
29 changes: 0 additions & 29 deletions src/persistence/migrations/0001_initial.py

This file was deleted.

18 changes: 0 additions & 18 deletions src/persistence/migrations/0002_character_last_updated.py

This file was deleted.

Empty file added src/server/__init__.py
Empty file.
37 changes: 37 additions & 0 deletions src/server/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
from django.contrib import admin

from .models import (
AccountModerationInfo,
CodeScanInformation,
ServerAdmonition,
ServerInformation,
)


class ServerAdmonitionInline(admin.TabularInline):
model = ServerAdmonition
extra = 1
raw_id_fields = ["server"]
fields = ["server", "created_at", "reason", "severity"]
readonly_fields = ["created_at"]


@admin.register(CodeScanInformation)
class CodeScanInformationAdmin(admin.ModelAdmin):
list_display = ["version"]


@admin.register(ServerInformation)
class ServerInformationAdmin(admin.ModelAdmin):
list_display = ["name", "owner", "is_18_plus", "is_delisted"]
search_fields = ["name", "owner__username"]
list_filter = ["is_18_plus", "is_delisted"]
raw_id_fields = ["owner", "code_scan_version"]


@admin.register(AccountModerationInfo)
class AccountModerationInfoAdmin(admin.ModelAdmin):
list_display = ["account", "can_create_servers", "can_list_servers"]
search_fields = ["account__username"]
list_filter = ["can_create_servers", "can_list_servers"]
raw_id_fields = ["account"]
Empty file added src/server/api/__init__.py
Empty file.
1 change: 1 addition & 0 deletions src/server/api/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app_name = "server"
Empty file added src/server/api/views.py
Empty file.
6 changes: 6 additions & 0 deletions src/server/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class ServerConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "server"
Empty file.
Empty file.
13 changes: 13 additions & 0 deletions src/server/management/commands/create_moderation_info.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from django.core.management.base import BaseCommand

from accounts.models import Account
from server.models import AccountModerationInfo


class Command(BaseCommand):
help = "creates AccountModerationInfo for existing accounts"

def handle(self, *args, **options):
for account in Account.objects.all():
AccountModerationInfo.objects.get_or_create(account=account)
self.stdout.write(self.style.SUCCESS("Successfully created AccountModerationInfo for all accounts"))
59 changes: 59 additions & 0 deletions src/server/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Generated by Django 3.2.24 on 2024-06-19 10:17

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='AccountModerationInfo',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('can_create_servers', models.BooleanField(default=True)),
('can_list_servers', models.BooleanField(default=True)),
('account', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='moderation_info', to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='CodeScanInformation',
fields=[
('version', models.TextField(primary_key=True, serialize=False)),
],
),
migrations.CreateModel(
name='ServerInformation',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.TextField(help_text='Name this server uses to present itself in the servers list', max_length=50, verbose_name='Name')),
('description', models.TextField(help_text='A brief description of what this server is about', max_length=200, verbose_name='Description')),
('icon', models.URLField(blank=True, help_text='URL of the image this server uses to present itself in the servers list', verbose_name='Icon')),
('rules', models.TextField(blank=True, help_text='The rules that players must follow on this server', verbose_name='Rules')),
('motd', models.TextField(help_text='Message displayed to players when they join the server', verbose_name='Message of the Day (MOTD)')),
('is_18_plus', models.BooleanField(default=False, help_text='Indicates if this server is intended for players aged 18 and above', verbose_name='18+')),
('is_delisted', models.BooleanField(help_text='Indicates if this server is delisted from the servers list', verbose_name='Is Delisted')),
('listing_key', models.TextField(blank=True, help_text='A unique key used for listing this server. Do not lose this key!', null=True, unique=True, verbose_name='Listing Key')),
('code_scan_version', models.ForeignKey(help_text='What version should this build of the game be tested against in CodeScan', on_delete=django.db.models.deletion.PROTECT, to='server.codescaninformation', verbose_name='CodeScan Version')),
('owner', models.ForeignKey(help_text='Who created and/or is responsible for this server', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')),
],
),
migrations.CreateModel(
name='ServerAdmonition',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True, help_text='When was this admonition created', verbose_name='Created at')),
('reason', models.TextField(help_text='Why was this server warned?', verbose_name='Reason')),
('severity', models.CharField(choices=[('low', 'Low'), ('medium', 'Medium'), ('high', 'High')], default='low', help_text='The severity level of the admonition', max_length=6)),
('owner_moderation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='admonitions', to='server.accountmoderationinfo')),
('server', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='admonitions', to='server.serverinformation')),
],
),
]
42 changes: 42 additions & 0 deletions src/server/migrations/0002_auto_20241019_2259.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Generated by Django 3.2.25 on 2024-10-20 01:59

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('server', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='serverinformation',
name='description',
field=models.CharField(help_text='A brief description of what this server is about', max_length=200, verbose_name='Description'),
),
migrations.AlterField(
model_name='serverinformation',
name='listing_key',
field=models.CharField(blank=True, help_text='A unique key used for listing this server. Do not lose this key!', max_length=30, null=True, unique=True, verbose_name='Listing Key'),
),
migrations.AlterField(
model_name='serverinformation',
name='motd',
field=models.CharField(help_text='Message displayed to players when they join the server', max_length=255, verbose_name='Message of the Day (MOTD)'),
),
migrations.AlterField(
model_name='serverinformation',
name='name',
field=models.CharField(help_text='Name this server uses to present itself in the servers list', max_length=50, verbose_name='Name'),
),
migrations.CreateModel(
name='ServerTag',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.TextField(max_length=50, verbose_name='Name')),
('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tags', to='server.serverinformation')),
],
),
]
Empty file.
Loading