pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-10-28 00:34:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(panel): let a sponsor slot start at a scheduled time

Browse Source 
sponsors.json only had an end date, so a booked placement had to be
added to the file on the day it started. An optional `from` now hides
a sponsor (and its logo) until that instant; entries without it show
immediately as before.
This commit is contained in:
MHSanaei
2026-09-27 16:30:20 +02:00
parent 044e2926a0
commit 09617f04f5
11 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/panel/sponsor.go
+5 -3
View File
@@ -26,6 +26,7 @@ type Sponsor struct {
Name string `json:"name" example:"Acme VPS"`
Enable *bool `json:"enable,omitempty" example:"true"`
Slots []string `json:"slots"`
From *time.Time `json:"from,omitempty" example:"2026-10-01T00:00:00Z"`
Until time.Time `json:"until" example:"2026-11-01T00:00:00Z"`
Logo string `json:"logo,omitempty" example:"/sponsors/logo/acme.png"`
Title map[string]string `json:"title"`
@@ -77,8 +78,8 @@ var (
logos = map[string]sponsorLogo{}
)
// GetSponsors returns the currently active sponsors. The remote file is cached,
// but expiry is re-checked on every call so a slot ends exactly at Until.
// GetSponsors returns the currently active sponsors. The remote file is cached, but the
// window is re-checked on every call so a slot starts exactly at From and ends at Until.
func (s *PanelService) GetSponsors() (*SponsorList, error) {
raw, err := cachedSponsors()
if err != nil {
@@ -220,7 +221,8 @@ func activeSponsors(raw *SponsorList, now time.Time) *SponsorList {
for _, sp := range raw.Sponsors {
// A missing enable counts as on, so a forgotten field never hides a paid slot.
disabled := sp.Enable != nil && !*sp.Enable
if disabled || sp.ID == "" || !now.Before(sp.Until) || !strings.HasPrefix(sp.Link, "https://") {
notStarted := sp.From != nil && now.Before(*sp.From)
if disabled || notStarted || sp.ID == "" || !now.Before(sp.Until) || !strings.HasPrefix(sp.Link, "https://") {
continue
}
// A bad logo name drops only the logo; the paid slot still renders with its initial.
internal/web/service/panel/sponsor_test.go
+2
View File
@@ -37,6 +37,8 @@ func TestActiveSponsorsFilters(t *testing.T) {
}{
{"valid", func(*Sponsor) {}, true},
{"expired", func(s *Sponsor) { s.Until = sponsorTestNow }, false},
{"not started yet", func(s *Sponsor) { s.From = new(sponsorTestNow.Add(time.Hour)) }, false},
{"starts exactly now", func(s *Sponsor) { s.From = new(sponsorTestNow) }, true},
{"enable false with future until", func(s *Sponsor) { s.Enable = new(false) }, false},
{"enable true without until", func(s *Sponsor) { s.Enable, s.Until = new(true), time.Time{} }, false},
{"enable true with future until", func(s *Sponsor) { s.Enable = new(true) }, true},