Compare commits

..

3 Commits

Author SHA1 Message Date
hzhex
9f6800b6b2 Remove 'habr' from category-ru (#3087)
Removed 'include:habr' from the category-ru file.

Reasons:

1) habr.com isn't affiliated with Russia directly (even though the habr.com IS hosted in Russia, it's cdn domain - habrastorage.org is hosted in Estonia)
2) the site itself contains a lot of geoblocked articles which can't be accessed without a foreign proxy - so it being in category-ru can lead to routing mishaps in cases such as routing category-ru sites to DIRECT on the client
2025-12-20 20:18:34 +08:00
Loyalsoldier
d014f46c20 Fix: limit workflow concurrency to avoid potential overlap releases (#3088)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-20 20:14:05 +08:00
チセ
6f3acc3ba9 Chore: remove unused key-value attribute feature (#3076)
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2025-12-20 19:38:46 +08:00
3 changed files with 7 additions and 16 deletions

View File

@@ -5,6 +5,11 @@ on:
- master
paths-ignore:
- "**/README.md"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false
jobs:
build:
name: Build

View File

@@ -18,7 +18,6 @@ ru.net
include:category-gov-ru
include:habr
include:mailru-group
include:okko
include:ozon

17
main.go
View File

@@ -8,7 +8,6 @@ import (
"path/filepath"
"regexp"
"sort"
"strconv"
"strings"
router "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
@@ -161,20 +160,8 @@ func parseAttribute(attr string) (*router.Domain_Attribute, error) {
return &attribute, fmt.Errorf("invalid attribute: %s", attr)
}
// Trim attribute prefix `@` character
attr = attr[1:]
parts := strings.Split(attr, "=")
if len(parts) == 1 {
attribute.Key = strings.ToLower(parts[0])
attribute.TypedValue = &router.Domain_Attribute_BoolValue{BoolValue: true}
} else {
attribute.Key = strings.ToLower(parts[0])
intv, err := strconv.Atoi(parts[1])
if err != nil {
return &attribute, fmt.Errorf("invalid attribute: %s: %v", attr, err)
}
attribute.TypedValue = &router.Domain_Attribute_IntValue{IntValue: int64(intv)}
}
attribute.Key = strings.ToLower(attr[1:]) // Trim attribute prefix `@` character
attribute.TypedValue = &router.Domain_Attribute_BoolValue{BoolValue: true}
return &attribute, nil
}