build(nix): Update package vendorHash

implement Telegram message templates for notifications
feat: Add enabled status to sites and enabled toggle
2026-03-16 22:07:41 +03:00 · 2026-02-16 00:33:15 +03:00 · 2026-02-10 20:56:01 +03:00 · 2026-01-12 00:17:13 +03:00 · 2026-01-08 03:45:17 +03:00 · 2026-01-08 03:45:07 +03:00
59 changed files with 4101 additions and 995 deletions
--- a/.env.template
+++ b/.env.template
@ -1,4 +1,4 @@
-PORT=8000
+PORT=8080
 DB_CONNECTION_STRING=postgres://postgres:postgres@localhost:5432/webring?sslmode=disable
 DASHBOARD_USER=admin
 DASHBOARD_PASSWORD=admin
@ -7,3 +7,9 @@ TELEGRAM_BOT_TOKEN=your_bot_token
 TELEGRAM_BOT_USERNAME=your_bot_username
 SESSION_TTL_HOURS=2160 # 90 days
 SESSION_SECURE_COOKIE=true # Set to true if using HTTPS, false for HTTP
+CSRF_AUTH_KEY=your_csrf_auth_key
+CSRF_TRUSTED_ORIGINS=
+REQUIRE_LOGIN_FOR_SUBMIT=false
+CHECKER_WORKERS=5
+CHECKER_DOWN_THRESHOLD=3
+MESSAGES_DIR=messages
--- a/.gitguardian.yml
+++ b/.gitguardian.yml
@ -22,7 +22,7 @@ secret_scanning:
      pattern: 'postgres://postgres:postgres@localhost'

    - name: "Test credentials"
-      pattern: 'testuser|testpass|test_.*'
+      pattern: 'postgres|postgres|test_.*'

 additional_config:
  high_entropy_threshold: 4.5
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@ -8,7 +8,7 @@ on:
  workflow_dispatch:

 env:
-  GO_VERSION: '1.22'
+  GO_VERSION: '1.25.0'

 permissions:
  contents: read
@ -28,7 +28,7 @@ jobs:
          cache: true

      - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v8
        with:
          version: latest
          args: --timeout=5m
@ -42,8 +42,8 @@ jobs:
      postgres:
        image: postgres:15
        env:
-          POSTGRES_PASSWORD: testpass
-          POSTGRES_USER: testuser
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
          POSTGRES_DB: webring_test
        options: >-
          --health-cmd pg_isready
@ -68,22 +68,29 @@ jobs:

      - name: Run migrations
        env:
-          DB_CONNECTION_STRING: postgres://testuser:testpass@localhost:5432/webring_test?sslmode=disable
+          DB_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/webring_test?sslmode=disable
        run: |
          migrate -database "$DB_CONNECTION_STRING" -path migrations up

      - name: Run tests
        env:
-          DB_CONNECTION_STRING: postgres://testuser:testpass@localhost:5432/webring_test?sslmode=disable
-          CHECKER_DEBUG: false
+          DB_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/webring_test?sslmode=disable
+          CHECKER_DEBUG: "false"
          LOG_FILE_PATH: test.log
+          TELEGRAM_BOT_TOKEN: ""
+          TELEGRAM_BOT_USERNAME: ""
+          PORT: "8080"
+          MEDIA_FOLDER: "media"
+          SESSION_TTL_HOURS: "2160"
+          SESSION_SECURE_COOKIE: "false"
        run: go test -v -race -coverprofile=coverage.out ./...

      - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
        with:
          file: ./coverage.out
          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}

  build:
    name: Build
@ -199,7 +206,7 @@ jobs:
          echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT

      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ steps.tag.outputs.tag }}
          name: Release ${{ steps.tag.outputs.date }}
--- a/.golangci.yml
+++ b/.golangci.yml
--- a/4
+++ b/4
@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.22-alpine AS builder
+FROM golang:1.25-alpine AS builder

 # Install git and ca-certificates
 RUN apk add --no-cache git ca-certificates tzdata
@ -29,6 +29,8 @@ WORKDIR /root/

 # Copy the binary from builder stage
 COPY --from=builder /build/webring .
+COPY --from=builder /build/docs ./docs
+COPY --from=builder /build/messages ./messages

 # Create media directory
 RUN mkdir -p media
--- a/27
+++ b/27
@ -85,6 +85,28 @@ db-reset:
 	@$(MIGRATE) down -all
 	@$(MIGRATE) up

+# Docker commands
+docker-build:
+	@echo "Building Docker image..."
+	@docker build -t webring:latest .
+
+docker-run:
+	@echo "Running Docker container..."
+	@docker run -p 8080:8080 --env-file .env webring:latest
+
+# Go module management
+mod-tidy:
+	@echo "Tidying Go modules..."
+	@go mod tidy
+
+mod-download:
+	@echo "Downloading Go modules..."
+	@go mod download
+
+mod-verify:
+	@echo "Verifying Go modules..."
+	@go mod verify
+
 # Help
 help:
 	@echo "Available commands:"
@ -105,4 +127,9 @@ help:
 	@echo "  clean          - Clean build artifacts"
 	@echo "  install-tools  - Install development tools"
 	@echo "  db-reset       - Reset database (down-all then up)"
+	@echo "  docker-build   - Build Docker image"
+	@echo "  docker-run     - Run Docker container"
+	@echo "  mod-tidy       - Tidy Go modules"
+	@echo "  mod-download   - Download Go modules"
+	@echo "  mod-verify     - Verify Go modules"
 	@echo "  help           - Show this help message"
--- a/README.md
+++ b/README.md
@ -7,6 +7,10 @@ This project is a webring relay service built with Go. It manages a list of webs
 - Dashboard for managing websites in the webring
 - Automatic uptime checking of websites (with proxy support)
 - API endpoints for navigating the webring
+- Telegram authentication and user management
+- Site submission and update request workflow with admin approval
+- Telegram notifications for status changes, submissions and approvals
+- Customizable notification messages via template files
 - Basic authentication for the dashboard

 ## Prerequisites
@ -17,7 +21,6 @@ This project is a webring relay service built with Go. It manages a list of webs
 ## Installation

 edit .env to set correct path to database
-
 ```
 go install -tags 'postgres' github.com/golang-migrate/migrate/v4/cmd/migrate@latest
 go mod tidy
@ -26,20 +29,40 @@ make migrate-up
 ```

 ## Local Run
-
 ```
 go run cmd/server/main.go
 ```

 or download prebuild version
-
 ```
 wget https://github.com/Alexander-D-Karpov/webring/releases/latest/download/webring
 chmod +x webring
 ./webring
 ```

+## Customizing Notification Messages

+Telegram notification templates live in the `messages/` directory (configurable via `MESSAGES_DIR` env var). 
+Each file is plain text with Go template syntax and MarkdownV2 formatting. 
+
+To customize a message, edit the corresponding `.txt` file. 
+
+Available templates:
+
+| File                        | Event                                       |
+|-----------------------------|---------------------------------------------|
+| `new_request_create.txt`    | Admin notification: new site submitted      |
+| `new_request_update.txt`    | Admin notification: site update requested   |
+| `approved_create.txt`       | User notification: site submission approved |
+| `approved_update.txt`       | User notification: site update approved     |
+| `declined_create.txt`       | User notification: site submission declined |
+| `declined_update.txt`       | User notification: site update declined     |
+| `admin_approved_create.txt` | Other admins: site creation approved        |
+| `admin_approved_update.txt` | Other admins: site update approved          |
+| `admin_declined_create.txt` | Other admins: site creation declined        |
+| `admin_declined_update.txt` | Other admins: site update declined          |
+| `site_online.txt`           | Owner notification: site back online        |
+| `site_offline.txt`          | Owner notification: site went offline       |

 ## Usage

--- a/cmd/server/main.go
+++ b/cmd/server/main.go
--- a/docs/index.html
+++ b/docs/index.html
@ -17,7 +17,7 @@
 <script>
    window.onload = function() {
        const ui = SwaggerUIBundle({
-      url: '/docs/swagger.json',
+            url: '/api/docs/swagger.json',
            dom_id: '#swagger-ui',
            deepLinking: true,
            presets: [ SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset ],
--- a/embedded.go
+++ b/embedded.go
@ -4,5 +4,5 @@ import (
 	"embed"
 )

-//go:embed static internal/dashboard/templates internal/public/templates internal/user/templates
+//go:embed static internal/dashboard/templates internal/public/templates internal/user/templates docs
 var Files embed.FS
--- a/flake.lock
+++ b/flake.lock
@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1762844143,
+        "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake.nix
+++ b/flake.nix
@ -0,0 +1,44 @@
+{
+  description = "webring";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+  flake-utils.lib.eachDefaultSystem (system:
+    let
+      pkgs = nixpkgs.legacyPackages.${system};
+      webring = pkgs.callPackage ./nix/package.nix {};
+    in
+    {
+      devShells.default = pkgs.mkShell {
+        packages = with pkgs; [
+          go
+          postgresql
+          gnumake
+          go-migrate.overrideAttrs(oldAttrs: {
+            tags = ["postgres"];
+          })
+        ];
+
+        shellHook = ''
+          ${pkgs.go}/bin/go mod tidy
+        '';
+      };
+
+      apps.default = { type = "app"; program = "${webring}/bin/webring-server"; };
+      apps.webring = self.apps.${system}.default;
+
+      packages = {
+        inherit webring;
+        default = webring;
+      };
+    }) // {
+      overlays.default = final: prev: {
+        webring = prev.callPackage ./nix/package.nix {};
+      };
+      nixosModules.default = { imports = [./nix/module.nix]; };
+    };
+}
--- a/go.mod
+++ b/go.mod
@ -1,15 +1,17 @@
 module webring

-go 1.22.4
+go 1.25.0

 require (
-	github.com/PuerkitoBio/goquery v1.9.2
+	github.com/PuerkitoBio/goquery v1.11.0
+	github.com/gorilla/csrf v1.7.3
 	github.com/gorilla/mux v1.8.1
 	github.com/joho/godotenv v1.5.1
-	github.com/lib/pq v1.10.9
+	github.com/lib/pq v1.11.2
 )

 require (
-	github.com/andybalholm/cascadia v1.3.2 // indirect
-	golang.org/x/net v0.24.0 // indirect
+	github.com/andybalholm/cascadia v1.3.3 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
+	golang.org/x/net v0.50.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,28 +1,59 @@
 github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4yPeE=
 github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
+github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw=
+github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ=
 github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
 github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
+github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/csrf v1.7.3 h1:BHWt6FTLZAb2HtWT5KDBf6qgpZzvtbp9QWDRKZMXJC0=
+github.com/gorilla/csrf v1.7.3/go.mod h1:F1Fj3KG23WYHE6gozCmBAezKookxbIvUJT+121wTuLk=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.11.2 h1:x6gxUeu39V0BHZiugWe8LXZYZ+Utk7hSJGThs8sdzfs=
+github.com/lib/pq v1.11.2/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@ -30,17 +61,34 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/internal/api/handlers.go
+++ b/internal/api/handlers.go
--- a/internal/api/handlers_test.go
+++ b/internal/api/handlers_test.go
--- a/internal/api/swagger.go
+++ b/internal/api/swagger.go
@ -1,35 +1,32 @@
 package api

 import (
+	"io/fs"
 	"log"
 	"net/http"
-	"os"
+
+	"webring"

 	"github.com/gorilla/mux"
 )

-const dirPerm = 0o755
-
 // @title Webring API
 // @version 1.0
 // @description API for the webring
-// @host localhost:8000
+// @host localhost:8080
 // @contact.url mailto://sanspie@akarpov.ru
 // @BasePath /

 func RegisterSwaggerHandlers(r *mux.Router) {
-	ensureDocsDirectory()
+	r.HandleFunc("/api/docs/swagger.json", swaggerJSONHandler).Methods("GET")

-	// Register specific JSON endpoint BEFORE the PathPrefix handler
-	r.HandleFunc("/docs/swagger.json", swaggerJSONHandler).Methods("GET")
-	r.PathPrefix("/docs/").Handler(http.StripPrefix("/docs/", http.FileServer(http.Dir("./docs/"))))
+	docsFS, err := fs.Sub(webring.Files, "docs")
+	if err != nil {
+		log.Printf("Warning: Could not access docs directory: %v", err)
+		return
 	}

-func ensureDocsDirectory() {
-	docsDir := "docs"
-	if err := os.MkdirAll(docsDir, dirPerm); err != nil {
-		log.Printf("Warning: Could not create docs directory: %v", err)
-	}
+	r.PathPrefix("/api/docs/").Handler(http.StripPrefix("/api/docs/", http.FileServer(http.FS(docsFS))))
 }

 func swaggerJSONHandler(w http.ResponseWriter, _ *http.Request) {
--- a/internal/auth/session.go
+++ b/internal/auth/session.go
@ -59,18 +59,24 @@ func CreateSession(db *sql.DB, userID int) (*models.Session, error) {

 func GetSessionUser(db *sql.DB, sessionID string) (*models.User, error) {
 	var user models.User
+	var telegramID sql.NullInt64
 	err := db.QueryRow(`
 		SELECT u.id, u.telegram_id, u.telegram_username, u.first_name, u.last_name, u.is_admin, u.created_at
 		FROM users u
 		JOIN sessions s ON u.id = s.user_id
 		WHERE s.id = $1 AND s.expires_at > NOW()
 	`, sessionID).Scan(
-		&user.ID, &user.TelegramID, &user.TelegramUsername,
+		&user.ID, &telegramID, &user.TelegramUsername,
 		&user.FirstName, &user.LastName, &user.IsAdmin, &user.CreatedAt)

 	if err != nil {
 		return nil, err
 	}
+
+	if telegramID.Valid {
+		user.TelegramID = telegramID.Int64
+	}
+
 	return &user, nil
 }

--- a/internal/auth/telegram.go
+++ b/internal/auth/telegram.go
@ -9,6 +9,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 )

 type TelegramUser struct {
@ -58,6 +59,9 @@ func VerifyTelegramAuth(values url.Values, botToken string) (*TelegramUser, erro
 	if err != nil {
 		return nil, fmt.Errorf("invalid auth_date")
 	}
+	if time.Since(time.Unix(authDate, 0)) > 24*time.Hour {
+		return nil, fmt.Errorf("stale login payload")
+	}

 	return &TelegramUser{
 		ID:        id,
--- a/internal/dashboard/handlers.go
+++ b/internal/dashboard/handlers.go
--- a/internal/dashboard/templates/dashboard.html
+++ b/internal/dashboard/templates/dashboard.html
@ -42,10 +42,17 @@
                    <i class="ri-global-line"></i>
                    <span>Public</span>
                </a>
-                <a href="/docs/" class="nav-item secondary">
+                <a href="/api/docs/" class="nav-item secondary">
                    <i class="ri-book-line"></i>
                    <span>API</span>
                </a>
+                <form action="/logout" method="POST" style="display: inline;">
+                    {{csrfField .Request}}
+                    <button type="submit" class="nav-item logout-btn">
+                        <i class="ri-logout-circle-line"></i>
+                        <span>Logout</span>
+                    </button>
+                </form>
            </nav>
        </div>
    </div>
@ -62,6 +69,7 @@
                <th class="col-url">URL</th>
                <th class="col-telegram">TELEGRAM</th>
                <th class="col-status">STATUS</th>
+                <th class="col-enabled">ENABLED</th>
                <th class="col-ping">PING</th>
                <th class="col-actions">ACTIONS</th>
            </tr>
@ -90,27 +98,32 @@
                    <span class="status-badge new">New</span>
                </td>
                <td></td>
+                <td></td>
                <td>
                    <div class="actions">
                        <button type="submit" form="form-new" class="btn btn-primary btn-sm">
                            <i class="ri-check-line"></i>
                        </button>
                    </div>
-                    <form action="/admin/add" method="POST" style="display: none" id="form-new"></form>
+                    <form action="/admin/add" method="POST" style="display: none" id="form-new">
+                        {{csrfField .Request}}
+                    </form>
                </td>
            </tr>
-            {{range .}}
+            {{range .Sites}}
            <tr class="row-site">
                <td>
                    <div class="order-controls">
                        <span class="order-number">{{.ID}}</span>
                        <div class="order-actions">
                            <form action="/admin/reorder/{{.ID}}/up" method="POST">
+                                {{csrfField $.Request}}
                                <button type="submit" class="btn-order">
                                    <i class="ri-arrow-up-s-line"></i>
                                </button>
                            </form>
                            <form action="/admin/reorder/{{.ID}}/down" method="POST">
+                                {{csrfField $.Request}}
                                <button type="submit" class="btn-order">
                                    <i class="ri-arrow-down-s-line"></i>
                                </button>
@ -158,6 +171,18 @@
                    <span class="status-badge down">DOWN</span>
                    {{end}}
                </td>
+                <td>
+                    <form action="/admin/toggle-enabled/{{.ID}}" method="POST" style="display: inline;">
+                        {{csrfField $.Request}}
+                        <button type="submit" class="btn btn-sm {{if .Enabled}}btn-success{{else}}btn-warning{{end}}" title="{{if .Enabled}}Click to disable{{else}}Click to enable{{end}}">
+                            {{if .Enabled}}
+                            <i class="ri-check-line"></i>
+                            {{else}}
+                            <i class="ri-close-line"></i>
+                            {{end}}
+                        </button>
+                    </form>
+                </td>
                <td class="ping-cell">
                    {{if .LastCheck}}
                    <span class="ping-value">{{.LastCheck}}</span>
@ -170,8 +195,11 @@
                        <button type="submit" form="form-{{.ID}}" class="btn btn-primary btn-sm">
                            <i class="ri-save-3-line"></i>
                        </button>
-                        <form action="/admin/update/{{.ID}}" method="POST" id="form-{{.ID}}"></form>
+                        <form action="/admin/update/{{.ID}}" method="POST" id="form-{{.ID}}">
+                            {{csrfField $.Request}}
+                        </form>
                        <form action="/admin/remove/{{.ID}}" method="POST" style="display: inline;" onsubmit="return confirm('Are you sure you want to delete this site?')">
+                            {{csrfField $.Request}}
                            <button type="submit" class="btn btn-danger btn-sm">
                                <i class="ri-delete-bin-line"></i>
                            </button>
--- a/internal/favicon/favicon.go
+++ b/internal/favicon/favicon.go
--- a/internal/models/site.go
+++ b/internal/models/site.go
@ -6,6 +6,7 @@ type Site struct {
 	Name             string  `json:"name"`
 	URL              string  `json:"url"`
 	IsUp             bool    `json:"is_up"`
+	Enabled          bool    `json:"enabled"`
 	LastCheck        float64 `json:"last_check"`
 	Favicon          *string `json:"favicon"`
 	UserID           *int    `json:"user_id"`
@ -14,7 +15,6 @@ type Site struct {
 }

 type PublicSite struct {
-	ID      int     `json:"id"`
 	Slug    string  `json:"slug"`
 	Name    string  `json:"name"`
 	URL     string  `json:"url"`
--- a/internal/public/handlers.go
+++ b/internal/public/handlers.go
--- a/internal/public/templates/sites.html
+++ b/internal/public/templates/sites.html
@ -34,11 +34,12 @@
                My Dashboard
            </a>
            {{end}}
-            <a href="/docs/" class="user-action docs">
+            <a href="/api/docs/" class="user-action docs">
                <i class="ri-book-line"></i>
                API Docs
            </a>
            <form action="/logout" method="POST" style="display: inline;">
+                {{csrfField .Request}}
                <button type="submit" class="user-action logout">
                    <i class="ri-logout-circle-line"></i>
                    Logout
@ -85,7 +86,7 @@
                </div>
            </a>

-            <a href="/docs/" class="action-card">
+            <a href="/api/docs/" class="action-card">
                <i class="ri-book-line"></i>
                <div class="action-content">
                    <div class="action-title">API Docs</div>
--- a/internal/public/templates/submit_site.html
+++ b/internal/public/templates/submit_site.html
@ -17,7 +17,16 @@
    </h1>
 </header>
 <main>
+    {{if .Error}}
+    <div style="max-width: 400px; margin: 0 auto 1.5rem auto; padding: 1rem; background: rgba(185, 28, 28, 0.1); border: 1px solid rgba(185, 28, 28, 0.3); border-left: 4px solid #b91c1c; border-radius: 6px;">
+        <div style="display: flex; align-items: center; gap: 0.75rem;">
+            <i class="ri-error-warning-line" style="color: #fca5a5; font-size: 1.25rem;"></i>
+            <span style="color: #fecaca; font-size: 0.875rem;">{{.Error}}</span>
+        </div>
+    </div>
+    {{end}}
    <form action="/submit" method="POST" style="max-width: 400px; margin: 0 auto;">
+        {{csrfField .Request}}
        <div style="margin-bottom: 1rem;">
            <label for="slug">Slug (unique identifier):</label>
            <input type="text" id="slug" name="slug" pattern="[a-z0-9-]{3,50}" required
--- a/internal/telegram/notifications.go
+++ b/internal/telegram/notifications.go
--- a/internal/telegram/templates.go
+++ b/internal/telegram/templates.go
--- a/internal/uptime/checker.go
+++ b/internal/uptime/checker.go
--- a/internal/user/admin.go
+++ b/internal/user/admin.go
--- a/internal/user/dashboard.go
+++ b/internal/user/dashboard.go
--- a/internal/user/handlers.go
+++ b/internal/user/handlers.go
--- a/internal/user/templates/admin_dashboard.html
+++ b/internal/user/templates/admin_dashboard.html
@ -42,11 +42,12 @@
                    <i class="ri-global-line"></i>
                    <span>Public</span>
                </a>
-        <a href="/docs/" class="nav-item secondary">
+                <a href="/api/docs/" class="nav-item secondary">
                    <i class="ri-book-line"></i>
                    <span>API</span>
                </a>
                <form action="/logout" method="POST" style="display: inline;">
+                    {{csrfField .Request}}
                    <button type="submit" class="nav-item logout-btn">
                        <i class="ri-logout-circle-line"></i>
                        <span>Logout</span>
@ -123,12 +124,14 @@

            <div class="request-actions">
                <form action="/admin/requests/{{.ID}}/approve" method="POST" style="display: inline;">
+                    {{csrfField $.Request}}
                    <button type="submit" class="btn btn-success">
                        <i class="ri-check-line"></i>
                        Approve
                    </button>
                </form>
                <form action="/admin/requests/{{.ID}}/reject" method="POST" style="display: inline;" onsubmit="return confirm('Are you sure you want to reject this request?')">
+                    {{csrfField $.Request}}
                    <button type="submit" class="btn btn-danger">
                        <i class="ri-close-line"></i>
                        Reject
--- a/internal/user/templates/request_error.html
+++ b/internal/user/templates/request_error.html
@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Request Error - Webring</title>
+    <link rel="stylesheet" href="/static/dashboard.css">
+    <link rel="preconnect" href="https://rsms.me/">
+    <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/remixicon@4.3.0/fonts/remixicon.css">
+</head>
+<body>
+<header class="admin-header">
+    <div class="header-content">
+        <div class="header-left">
+            <a href="/admin" class="logo-link">
+                <div class="logo">
+                    <i class="ri-bubble-chart-fill"></i>
+                    <span class="logo-text">Webring</span>
+                </div>
+            </a>
+            <div class="page-info">
+                <h1>Request Error</h1>
+            </div>
+        </div>
+        <div class="header-right">
+            <nav class="header-nav">
+                <a href="/admin/requests" class="nav-item">
+                    <i class="ri-arrow-left-line"></i>
+                    <span>Back to Requests</span>
+                </a>
+            </nav>
+        </div>
+    </div>
+</header>
+
+<main>
+    <div class="error-card">
+        <div class="error-icon">
+            <i class="ri-error-warning-line"></i>
+        </div>
+        <div class="error-content">
+            <h2>Unable to Process Request</h2>
+            <p class="error-message">{{.Error}}</p>
+
+            {{if .Request}}
+            <div class="error-details">
+                <h3>Request Details</h3>
+                {{if eq .Request.RequestType "create"}}
+                <p><strong>Type:</strong> Site Creation</p>
+                {{else}}
+                <p><strong>Type:</strong> Site Update</p>
+                {{end}}
+
+                {{if .Request.ChangedFields}}
+                <div class="changed-fields">
+                    <strong>Requested Fields:</strong>
+                    <ul>
+                        {{range $key, $value := .Request.ChangedFields}}
+                        <li><strong>{{$key}}:</strong> {{$value}}</li>
+                        {{end}}
+                    </ul>
+                </div>
+                {{end}}
+            </div>
+            {{end}}
+
+            <div class="error-actions">
+                <a href="/admin/requests" class="btn btn-primary">
+                    <i class="ri-arrow-left-line"></i>
+                    Back to Requests
+                </a>
+            </div>
+
+            <div class="error-note">
+                <p><strong>Note:</strong> The request has not been deleted and can still be reviewed. You may need to contact the user to choose a different slug or make other changes.</p>
+            </div>
+        </div>
+    </div>
+</main>
+</body>
+</html>
--- a/internal/user/templates/user_dashboard.html
+++ b/internal/user/templates/user_dashboard.html
@ -35,6 +35,7 @@
                    <span>Public</span>
                </a>
                <form action="/logout" method="POST" style="display: inline;">
+                    {{csrfField .Request}}
                    <button type="submit" class="nav-item logout-btn">
                        <i class="ri-logout-circle-line"></i>
                        <span>Logout</span>
@ -46,6 +47,17 @@
 </header>

 <main>
+    {{if .Error}}
+    <div class="error-banner">
+        <div class="error-banner-icon">
+            <i class="ri-error-warning-line"></i>
+        </div>
+        <div class="error-banner-content">
+            <span class="error-banner-text">{{.Error}}</span>
+        </div>
+    </div>
+    {{end}}
+
    <div class="content-header">
        <div class="content-title">
            <h2>Your Sites</h2>
@ -83,7 +95,9 @@
                            <i class="ri-check-line"></i>
                        </button>
                    </div>
-          <form action="/user/sites/create" method="POST" style="display: none" id="form-new"></form>
+                    <form action="/user/sites/create" method="POST" style="display: none" id="form-new">
+                        {{csrfField .Request}}
+                    </form>
                </td>
            </tr>
            {{range .Sites}}
@ -124,7 +138,9 @@
                            <i class="ri-save-3-line"></i>
                        </button>
                    </div>
-          <form action="/user/sites/{{.ID}}/update" method="POST" id="form-{{.ID}}"></form>
+                    <form action="/user/sites/{{.ID}}/update" method="POST" id="form-{{.ID}}">
+                        {{csrfField $.Request}}
+                    </form>
                </td>
            </tr>
            {{end}}
--- a/internal/user/templates/users_management.html
+++ b/internal/user/templates/users_management.html
@ -42,12 +42,13 @@
                    <i class="ri-global-line"></i>
                    <span>Public</span>
                </a>
-                <a href="/docs/" class="nav-item secondary">
+                <a href="/api/docs/" class="nav-item secondary">
                    <i class="ri-book-line"></i>
                    <span>API</span>
                </a>
                {{if ne .CurrentUser.ID -1}}
                <form action="/logout" method="POST" style="display: inline;">
+                    {{csrfField .Request}}
                    <button type="submit" class="nav-item logout-btn">
                        <i class="ri-logout-circle-line"></i>
                        <span>Logout</span>
@ -122,6 +123,12 @@
                        {{if ne .TelegramID 0}}{{.TelegramID}}{{else}}<em>Not set</em>{{end}}
                    </span>
                </div>
+                <div class="detail-item">
+                    <span class="detail-label">Username:</span>
+                    <span class="detail-value">
+        {{if .TelegramUsername}}@{{.TelegramUsername}}{{else}}<em>Not set</em>{{end}}
+                </span>
+                </div>
                <div class="detail-item">
                    <span class="detail-label">Joined:</span>
                    <span class="detail-value">{{.CreatedAt.Format "Jan 2, 2006"}}</span>
@ -139,7 +146,9 @@
                    Make Admin
                    {{end}}
                </button>
-                <form action="/admin/users/{{.ID}}/toggle-admin" method="POST" id="form-{{.ID}}"></form>
+                <form action="/admin/users/{{.ID}}/toggle-admin" method="POST" id="form-{{.ID}}">
+                    {{csrfField $.Request}}
+                </form>
                {{else}}
                <div class="self-indicator">
                    <i class="ri-user-star-line"></i>
--- a/messages/admin_approved_create.txt
+++ b/messages/admin_approved_create.txt
@ -0,0 +1,6 @@
+*Request Approved*
+
+*Admin:* {{.AdminName}}
+*Action:* Approved site creation
+*User:* {{.UserName}}
+*Site:* {{.SiteName}}
--- a/messages/admin_approved_update.txt
+++ b/messages/admin_approved_update.txt
@ -0,0 +1,13 @@
+*Update Approved*
+
+*Admin:* {{.AdminName}}
+*Action:* Approved site update
+*User:* {{.UserName}}
+*Site:* {{.SiteName}}
+{{- if .Changes}}
+
+*Changes:*
+{{- range .Changes}}
+  • *{{.Key}}:* {{.Value}}
+{{- end}}
+{{- end}}
--- a/messages/admin_declined_create.txt
+++ b/messages/admin_declined_create.txt
@ -0,0 +1,6 @@
+*Request Declined*
+
+*Admin:* {{.AdminName}}
+*Action:* Declined site creation
+*User:* {{.UserName}}
+*Site:* {{.SiteName}}
--- a/messages/admin_declined_update.txt
+++ b/messages/admin_declined_update.txt
@ -0,0 +1,6 @@
+*Update Declined*
+
+*Admin:* {{.AdminName}}
+*Action:* Declined site update
+*User:* {{.UserName}}
+*Site:* {{.SiteName}}
--- a/messages/approved_create.txt
+++ b/messages/approved_create.txt
@ -0,0 +1,7 @@
+*Request Approved*
+
+Your site submission has been approved!
+
+*Site:* {{.SiteName}}
+
+Your site is now part of the webring.
--- a/messages/approved_update.txt
+++ b/messages/approved_update.txt
@ -0,0 +1,10 @@
+*Update Approved*
+
+Your site update request has been approved and the changes have been applied.
+{{- if .Changes}}
+
+*Applied changes:*
+{{- range .Changes}}
+  • *{{.Key}}:* {{.Value}}
+{{- end}}
+{{- end}}
--- a/messages/declined_create.txt
+++ b/messages/declined_create.txt
@ -0,0 +1,5 @@
+*Request Declined*
+
+Your site submission request for *{{.SiteName}}* has been declined by an administrator.
+
+If you have questions, please contact the webring administrator.
--- a/messages/declined_update.txt
+++ b/messages/declined_update.txt
@ -0,0 +1,5 @@
+*Update Request Declined*
+
+Your update request for *{{.SiteName}}* has been declined by an administrator\.
+
+If you have questions, please contact the webring administrator\.
--- a/messages/new_request_create.txt
+++ b/messages/new_request_create.txt
@ -0,0 +1,8 @@
+*New Site Submission Request*
+
+*User:* {{.UserName}}
+*Slug:* `{{.Slug}}`
+*Site Name:* {{.SiteName}}
+*URL:* {{.URL}}
+
+*Submitted:* {{.Date}}
--- a/messages/new_request_update.txt
+++ b/messages/new_request_update.txt
@ -0,0 +1,11 @@
+*Site Update Request*
+
+*User:* {{.UserName}}
+*Site:* {{.SiteName}} (`{{.SiteSlug}}`)
+
+*Changes:*
+{{- range .Changes}}
+  • *{{.Key}}:* {{.Value}}
+{{- end}}
+
+*Submitted:* {{.Date}}
--- a/messages/site_offline.txt
+++ b/messages/site_offline.txt
@ -0,0 +1,3 @@
+*Site Status: Offline*
+
+Your site *{{.SiteName}}* is currently not responding after {{.DownThreshold}} consecutive checks. Please check your server.
--- a/messages/site_online.txt
+++ b/messages/site_online.txt
@ -0,0 +1,3 @@
+*Site Status: Online*
+
+Your site *{{.SiteName}}* is now responding and back online.
--- a/migrations/011_make_telegram_username_unique.down.sql
+++ b/migrations/011_make_telegram_username_unique.down.sql
@ -0,0 +1 @@
+DROP INDEX IF EXISTS users_telegram_username_unique;
--- a/migrations/011_make_telegram_username_unique.up.sql
+++ b/migrations/011_make_telegram_username_unique.up.sql
@ -0,0 +1,53 @@
+DO $$
+    DECLARE
+        dup_record RECORD;
+        keep_id INTEGER;
+        merge_ids INTEGER[];
+    BEGIN
+        FOR dup_record IN
+            SELECT telegram_username, array_agg(id ORDER BY
+                CASE
+                    WHEN telegram_id IS NOT NULL THEN 0
+                    ELSE 1
+                    END,
+                created_at ASC
+                                      ) as user_ids
+            FROM users
+            WHERE telegram_username IS NOT NULL
+            GROUP BY telegram_username
+            HAVING COUNT(*) > 1
+            LOOP
+                keep_id := dup_record.user_ids[1];
+                merge_ids := dup_record.user_ids[2:array_length(dup_record.user_ids, 1)];
+
+                UPDATE users SET
+                                 telegram_id = COALESCE(
+                                         users.telegram_id,
+                                         (SELECT telegram_id FROM users WHERE id = ANY(merge_ids) AND telegram_id IS NOT NULL LIMIT 1)
+                                               ),
+                                 first_name = COALESCE(
+                                         users.first_name,
+                                         (SELECT first_name FROM users WHERE id = ANY(merge_ids) AND first_name IS NOT NULL LIMIT 1)
+                                              ),
+                                 last_name = COALESCE(
+                                         users.last_name,
+                                         (SELECT last_name FROM users WHERE id = ANY(merge_ids) AND last_name IS NOT NULL LIMIT 1)
+                                             ),
+                                 is_admin = users.is_admin OR EXISTS(
+                                     SELECT 1 FROM users WHERE id = ANY(merge_ids) AND is_admin = true
+                                 )
+                WHERE id = keep_id;
+
+                UPDATE sites SET user_id = keep_id WHERE user_id = ANY(merge_ids);
+                UPDATE update_requests SET user_id = keep_id WHERE user_id = ANY(merge_ids);
+                UPDATE sessions SET user_id = keep_id WHERE user_id = ANY(merge_ids);
+
+                DELETE FROM users WHERE id = ANY(merge_ids);
+
+                RAISE NOTICE 'Merged users with username %: kept ID %, merged IDs %',
+                    dup_record.telegram_username, keep_id, merge_ids;
+            END LOOP;
+    END $$;
+
+CREATE UNIQUE INDEX users_telegram_username_unique ON users(telegram_username)
+    WHERE telegram_username IS NOT NULL;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Damir Modyarov	65d4d3c3fc	build(nix): Update package vendorHash	2026-02-16 00:33:15 +03:00
sanspie	12fdd0ba64	implement Telegram message templates for notifications	2026-02-10 20:56:01 +03:00
sanspie	f774fa993f	feat: Add enabled status to sites and enabled toggle	2026-01-12 00:17:13 +03:00
sanspie	d4607434d4	Merge remote-tracking branch 'origin/master'	2026-01-08 03:45:17 +03:00
sanspie	7ed6a23b63	remove HTML escaping from input sanitization	2026-01-08 03:45:07 +03:00
Damir Modyarov	d324c9490d	fix: Change server error code from 500 to 400 (#6 ) * fix: Change server error code from 500 to 400 * fix: Change checker HTTP method to GET	2026-01-03 20:54:53 +03:00
sanspie	499c4a807b	update down threshold configuration and enhance site status handling	2025-12-23 23:54:18 +03:00
sanspie	bd346671b8	add down threshold configuration and enhance site status handling	2025-12-23 23:49:55 +03:00
sanspie	e98dd6e64b	refactor checker to use workers	2025-12-16 16:39:54 +03:00
sanspie	6bd5393c0c	refactor checker to use workers	2025-12-16 16:32:54 +03:00
sanspie	d605bd37b7	moved docs to api/docs	2025-12-08 18:51:34 +03:00
sanspie	3110c00e71	add user agent header to HTTP requests in checker	2025-12-05 00:24:11 +03:00
sanspie	5d14f42352	normalize telegram usernames to lowercase and enhance favicon handling	2025-12-04 18:30:55 +03:00
sanspie	0acd6686cc	enhance error handling and user feedback for site requests	2025-12-02 00:14:00 +03:00
sanspie	2c1885e6de	feat: update user handling to use sql.NullInt64 for telegram_id	2025-12-01 01:06:32 +03:00
sanspie	aba05aa6b6	enhance user handling with improved telegram username processing and error logging	2025-12-01 00:51:10 +03:00
sanspie	73347edc67	enhance user handling with improved telegram username processing and error logging	2025-12-01 00:31:10 +03:00
sanspie	c1eed46f6d	feat: implement unique constraint for telegram_username and update user handling	2025-11-30 20:48:49 +03:00
sanspie	e1bc69205b	Merge remote-tracking branch 'origin/master'	2025-11-30 18:21:33 +03:00
sanspie	90c129d606	refactor: update swagger handlers to use embedded file system for api docs	2025-11-30 18:21:20 +03:00
Damir Modyarov	be8340b8a9	build: Implement nix flake (#5 )	2025-11-27 19:18:51 +03:00
sanspie	ba3474e214	add logout to navbar	2025-11-10 16:39:03 +03:00
sanspie	1fcb4e35f7	refactor: update site structure, add CSRF, tests, telegram notifications	2025-11-10 14:43:25 +03:00
sanspie	14c6e6c4d3	update ci	2025-11-10 02:01:23 +03:00
sanspie	34cb69b047	update navbar, minor lint update & refactoring	2025-11-10 01:57:22 +03:00
				`@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS users_telegram_username_unique;`