diff --git a/data/db.sqlite3 b/data/db.sqlite3 index e3662c8..c92850c 100644 Binary files a/data/db.sqlite3 and b/data/db.sqlite3 differ diff --git a/links/migrations/0040_site_settings.py b/links/migrations/0040_site_settings.py new file mode 100644 index 0000000..a88124a --- /dev/null +++ b/links/migrations/0040_site_settings.py @@ -0,0 +1,23 @@ +# Generated by Django 5.2.11 on 2026-03-21 10:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('links', '0039_file_upload'), + ] + + operations = [ + migrations.CreateModel( + name='SiteSettings', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('public_sharing_domain', models.CharField(blank=True, default='', help_text='Domain (with protocol) used for public sharing links, e.g. https://go.example.com. Leave blank to use the same domain as the app.', max_length=255, verbose_name='Public Sharing Domain')), + ], + options={ + 'verbose_name': 'Site Settings', + }, + ), + ] diff --git a/links/models.py b/links/models.py index a5939f7..d46f6ec 100644 --- a/links/models.py +++ b/links/models.py @@ -387,9 +387,16 @@ class FileUpload(models.Model): @property def public_url(self): - import re - safe_name = re.sub(r'[^\w.\-]', '-', self.name) - return f'/public/files/{self.pk}-{safe_name}' + import re as _re + safe_name = _re.sub(r'[^\w.\-]', '-', self.name) + path = f'/public/files/{self.pk}-{safe_name}' + if not self.is_public: + return path + try: + domain = SiteSettings.get().public_sharing_domain.rstrip('/') + except Exception: + domain = '' + return f'{domain}{path}' if domain else path def formatted_size(self): if self.size < 1024: @@ -399,3 +406,35 @@ class FileUpload(models.Model): elif self.size < 1024 * 1024 * 1024: return f"{self.size / (1024 * 1024):.1f} MB" return f"{self.size / (1024 * 1024 * 1024):.2f} GB" + + +class SiteSettings(models.Model): + """ + Singleton model for app-wide configuration. + Always use SiteSettings.get() to retrieve the instance. + """ + public_sharing_domain = models.CharField( + _('Public Sharing Domain'), + max_length=255, + blank=True, + default='', + help_text=_( + 'Domain (with protocol) used for public sharing links, e.g. https://go.example.com. ' + 'Leave blank to use the same domain as the app.' + ), + ) + + class Meta: + verbose_name = _('Site Settings') + + def __str__(self): + return 'Site Settings' + + @classmethod + def get(cls): + obj, _ = cls.objects.get_or_create(pk=1) + return obj + + def save(self, *args, **kwargs): + self.pk = 1 + super().save(*args, **kwargs) diff --git a/links/templates/links/settings.html b/links/templates/links/settings.html new file mode 100644 index 0000000..7a67495 --- /dev/null +++ b/links/templates/links/settings.html @@ -0,0 +1,56 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} +
+

{% trans "Settings" %}

+ +
+ {% csrf_token %} + + +
+

{% trans "Public Sharing Domain" %}

+

+ {% trans "Domain (with protocol) used for public file sharing links. Leave blank to use the same domain as the app." %} +
+ {% trans "Example:" %} https://go.example.com +

+ + {% if site_settings.public_sharing_domain %} +

+ {% trans "Active. Public links will use:" %} + {{ site_settings.public_sharing_domain }}/public/files/… +

+ {% else %} +

+ {% trans "Not set. Public links will use the app's own domain." %} +

+ {% endif %} +
+ +
+ +
+
+
+{% endblock %} diff --git a/links/urls.py b/links/urls.py index 2549273..ffbade2 100644 --- a/links/urls.py +++ b/links/urls.py @@ -21,6 +21,7 @@ urlpatterns = [ path('ui/tools/', views.ToolsView.as_view(), name='tools'), path('tools/export-database/', views.export_database, name='export_database'), path('ui/help/', views.HelpView.as_view(), name='help'), + path('ui/settings/', views.SiteSettingsView.as_view(), name='site-settings'), # Pages path('ui/pages/', page_views.PageListView.as_view(), name='page-list'), diff --git a/links/views.py b/links/views.py index d9c43d2..93dff08 100644 --- a/links/views.py +++ b/links/views.py @@ -4,7 +4,7 @@ from django.views import View # Add this import from django.urls import reverse_lazy, reverse # Add 'reverse' here from django.db.models import F, Count, Q, Case, When, Value, IntegerField from django.db.models.functions import TruncDate -from .models import Link, ClickLog, LinkChangeLog, Page, Post +from .models import Link, ClickLog, LinkChangeLog, Page, Post, SiteSettings from .forms import LinkForm, PageForm import json from django.core.serializers.json import DjangoJSONEncoder @@ -533,6 +533,21 @@ def export_database(request): class HelpView(TemplateView): template_name = 'links/help.html' + +class SiteSettingsView(View): + template_name = 'links/settings.html' + + def get(self, request): + site_settings = SiteSettings.get() + return render(request, self.template_name, {'site_settings': site_settings}) + + def post(self, request): + site_settings = SiteSettings.get() + site_settings.public_sharing_domain = request.POST.get('public_sharing_domain', '').strip() + site_settings.save() + messages.success(request, _('Settings saved.')) + return redirect('site-settings') + @require_http_methods(["POST"]) def generate_tts(request, post_id): """Generate TTS audio for a post""" diff --git a/templates/base.html b/templates/base.html index f8bd0a4..05aaba5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -177,6 +177,15 @@ {% trans "Help" %} + + +
+ + + + {% trans "Settings" %} +
+