diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5e9c891..9cdf3f9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -5,7 +5,7 @@ body: - type: markdown attributes: value: | - 遇到问题请先尝试使用[Action](https://github.com/tindy2013/subconverter/actions)中的最新版本 + 遇到问题请先尝试使用[Action](https://github.com/metacubex/subconverter/actions)中的最新版本 如果是使用公共转换服务中遇到的问题,请先联系服务的提供者。 - type: checkboxes id: version-check diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 0c8d115..2f4ed60 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: 阅读文档 - url: https://github.com/tindy2013/subconverter/blob/master/README-cn.md + url: https://github.com/metacubex/subconverter/blob/master/README-cn.md about: 建议您发布issue前先仔细阅读项目文档 \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 104c170..a4523d0 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -8,9 +8,9 @@ body: label: verify description: 在提交之前,请确认完成以下选项 options: - - label: 我已经仔细阅读[项目文档](https://github.com/tindy2013/subconverter/blob/master/README-cn.md),确认现有功能无法解决我的需求 + - label: 我已经仔细阅读[项目文档](https://github.com/metacubex/subconverter/blob/master/README-cn.md),确认现有功能无法解决我的需求 required: true - - label: 我已经检索过现有[issue](https://github.com/tindy2013/subconverter/issues),确认与现有issue的内容并不重复 + - label: 我已经检索过现有[issue](https://github.com/metacubex/subconverter/issues),确认与现有issue的内容并不重复 required: true - label: 我已经尝试自行解决,确认自己没有能力解决 required: true diff --git a/README-cn.md b/README-cn.md index a6a1421..50c5a08 100644 --- a/README-cn.md +++ b/README-cn.md @@ -2,10 +2,10 @@ 在各种订阅格式之间进行转换的实用程序. -[![Build Status](https://github.com/tindy2013/subconverter/actions/workflows/build.yml/badge.svg)](https://github.com/tindy2013/subconverter/actions) -[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/tags) -[![GitHub release](https://img.shields.io/github/release/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/releases) -[![GitHub license](https://img.shields.io/github/license/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/blob/master/LICENSE) +[![Build Status](https://github.com/metacubex/subconverter/actions/workflows/build.yml/badge.svg)](https://github.com/metacubex/subconverter/actions) +[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/metacubex/subconverter.svg)](https://github.com/metacubex/subconverter/tags) +[![GitHub release](https://img.shields.io/github/release/metacubex/subconverter.svg)](https://github.com/metacubex/subconverter/releases) +[![GitHub license](https://img.shields.io/github/license/metacubex/subconverter.svg)](https://github.com/metacubex/subconverter/blob/master/LICENSE) * * * @@ -150,7 +150,7 @@ 3. 目标类型为 `mixed` 时,会输出所有支持的节点的单链接组成的普通订阅(Base64编码) -4. 目标类型为 `auto` 时,会根据请求的 `User-Agent` 自动判断输出的目标类型,匹配规则可参见 [此处](https://github.com/tindy2013/subconverter/blob/master/src/handler/interfaces.cpp#L121) (该链接有可能因为代码修改而不能准确指向相应的代码) +4. 目标类型为 `auto` 时,会根据请求的 `User-Agent` 自动判断输出的目标类型,匹配规则可参见 [此处](https://github.com/metacubex/subconverter/blob/master/src/handler/interfaces.cpp#L121) (该链接有可能因为代码修改而不能准确指向相应的代码) * * * @@ -402,7 +402,7 @@ http://127.0.0.1:25500/getprofile?name=%NAME%&token=%TOKEN% 应当注意的是,此处文件内的参数**无需进行 URLEncode**,且此处的 `token` 与 `api_mode` 的状态无关。 -在程序目录内的任意位置创建一个新的文档文件(推荐保存至 `profiles` 文件夹内,以使整洁目录及便于后续维护),如 `formyairport.ini`,并仿照 [示例文档](https://github.com/tindy2013/subconverter/blob/master/base/profiles/example_profile.ini) 根据配置好的参数填写进去即可。 +在程序目录内的任意位置创建一个新的文档文件(推荐保存至 `profiles` 文件夹内,以使整洁目录及便于后续维护),如 `formyairport.ini`,并仿照 [示例文档](https://github.com/metacubex/subconverter/blob/master/base/profiles/example_profile.ini) 根据配置好的参数填写进去即可。
举个例子: @@ -428,7 +428,7 @@ exclude=(流量|官网) > 关于 subconverter 主程序目录中 `pref.ini` 文件的解释,其余格式的配置文件不再赘述,与之相仿。 -注:本部分内容以本程序中的 [`pref.example.ini`](https://github.com/tindy2013/subconverter/blob/master/base/pref.example.ini) 或 [`pref.example.yml`](https://github.com/tindy2013/subconverter/blob/master/base/pref.example.yml) 或 [`pref.example.toml`](https://github.com/tindy2013/subconverter/blob/master/base/pref.example.toml) 为准,本文档可能由于更新不及时,内容不适用于新版本。 +注:本部分内容以本程序中的 [`pref.example.ini`](https://github.com/metacubex/subconverter/blob/master/base/pref.example.ini) 或 [`pref.example.yml`](https://github.com/metacubex/subconverter/blob/master/base/pref.example.yml) 或 [`pref.example.toml`](https://github.com/metacubex/subconverter/blob/master/base/pref.example.toml) 为准,本文档可能由于更新不及时,内容不适用于新版本。 加载配置文件时会按照`pref.toml`、`pref.yml`、`pref.ini`的优先级顺序加载优先级高的配置文件 @@ -1155,7 +1155,7 @@ custom_proxy_group=节点选择`select`(^(?!.*(美国|日本)).*) > 本部分用于 链接参数 **`&config=`** -注:本部分内容以本程序中的 [`/config/example_external_config.ini`](https://github.com/tindy2013/subconverter/blob/master/base/config/example_external_config.ini) 或 [`/config/example_external_config.yml`](https://github.com/tindy2013/subconverter/blob/master/base/config/example_external_config.yml) 或 [`/config/example_external_config.toml`](https://github.com/tindy2013/subconverter/blob/master/base/config/example_external_config.toml) 为准,本文档可能由于更新不及时,内容不适用于新版本。 +注:本部分内容以本程序中的 [`/config/example_external_config.ini`](https://github.com/metacubex/subconverter/blob/master/base/config/example_external_config.ini) 或 [`/config/example_external_config.yml`](https://github.com/metacubex/subconverter/blob/master/base/config/example_external_config.yml) 或 [`/config/example_external_config.toml`](https://github.com/metacubex/subconverter/blob/master/base/config/example_external_config.toml) 为准,本文档可能由于更新不及时,内容不适用于新版本。 将文件按照以下格式写好,上传至 Github Gist 或者 其他**可访问**网络位置 经过 [URLEncode](https://www.urlencoder.org/) 处理后,添加至 `&config=` 即可调用 @@ -1387,7 +1387,7 @@ http://127.0.0.1:25500/render?path=xxx&额外的调试或控制参数 > 启动程序后,在本地生成对应的配置文件文本 -在程序目录内的 [generate.ini](https://github.com/tindy2013/subconverter/blob/master/base/generate.ini) 中设定文件块(`[xxx]`),生成的文件名(path=xxx)以及其所需要包含的参数,例如: +在程序目录内的 [generate.ini](https://github.com/metacubex/subconverter/blob/master/base/generate.ini) 中设定文件块(`[xxx]`),生成的文件名(path=xxx)以及其所需要包含的参数,例如: ```ini [test] @@ -1409,7 +1409,7 @@ profile=profiles/example_profile.ini > 自动上传 gist ,可以用于 Clash For Android / Surge 等进行远程订阅 -在程序目录内的 [gistconf.ini](https://github.com/tindy2013/subconverter/blob/master/base/gistconf.ini) 中添加 `Personal Access Token`([在此创建](https://github.com/settings/tokens/new?scopes=gist&description=Subconverter))例如: +在程序目录内的 [gistconf.ini](https://github.com/metacubex/subconverter/blob/master/base/gistconf.ini) 中添加 `Personal Access Token`([在此创建](https://github.com/settings/tokens/new?scopes=gist&description=Subconverter))例如: ```ini [common] diff --git a/README-docker.md b/README-docker.md index 65b6544..320feac 100644 --- a/README-docker.md +++ b/README-docker.md @@ -1,11 +1,11 @@ # subconverter-docker -This is a minimized image to run https://github.com/tindy2013/subconverter. +This is a minimized image to run https://github.com/metacubex/subconverter. For running this docker, simply use the following commands: ```bash # run the container detached, forward internal port 25500 to host port 25500 -docker run -d --restart=always -p 25500:25500 tindy2013/subconverter:latest +docker run -d --restart=always -p 25500:25500 metacubex/subconverter:latest # then check its status curl http://localhost:25500/version # if you see `subconverter vx.x.x backend` then the container is up and running @@ -16,7 +16,7 @@ Or run in docker-compose: version: '3' services: subconverter: - image: tindy2013/subconverter:latest + image: metacubex/subconverter:latest container_name: subconverter ports: - "15051:25500" @@ -34,7 +34,7 @@ For those who want to use their own `pref` configuration and/or rules, snippets, ```txt # you can save the files you want to replace to a folder, then copy it into to the docker # using the latest build of the official docker -FROM tindy2013/subconverter:latest +FROM metacubex/subconverter:latest # assume your files are inside replacements/ # subconverter folder is located in /base/, which has the same structure as the base/ folder in the repository COPY replacements/ /base/ diff --git a/README.md b/README.md index cc61f81..b302acf 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ Utility to convert between various proxy subscription formats. -[![Build Status](https://github.com/tindy2013/subconverter/actions/workflows/build.yml/badge.svg)](https://github.com/tindy2013/subconverter/actions) -[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/tags) -[![GitHub release](https://img.shields.io/github/release/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/releases) -[![GitHub license](https://img.shields.io/github/license/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/blob/master/LICENSE) +[![Build Status](https://github.com/metacubex/subconverter/actions/workflows/build.yml/badge.svg)](https://github.com/metacubex/subconverter/actions) +[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/metacubex/subconverter.svg)](https://github.com/metacubex/subconverter/tags) +[![GitHub release](https://img.shields.io/github/release/metacubex/subconverter.svg)](https://github.com/metacubex/subconverter/releases) +[![GitHub license](https://img.shields.io/github/license/metacubex/subconverter.svg)](https://github.com/metacubex/subconverter/blob/master/LICENSE) -[Docker README](https://github.com/tindy2013/subconverter/blob/master/README-docker.md) +[Docker README](https://github.com/metacubex/subconverter/blob/master/README-docker.md) -[中文文档](https://github.com/tindy2013/subconverter/blob/master/README-cn.md) +[中文文档](https://github.com/metacubex/subconverter/blob/master/README-cn.md) - [subconverter](#subconverter) - [Supported Types](#supported-types) @@ -95,7 +95,7 @@ Finally subscribe this link in Clash and you are done! ## Advanced Usage -Please refer to [中文文档](https://github.com/tindy2013/subconverter/blob/master/README-cn.md#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95). +Please refer to [中文文档](https://github.com/metacubex/subconverter/blob/master/README-cn.md#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95). ## Auto Upload diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 048956c..c8c37ee 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.16 AS builder -LABEL maintainer="tindy.it@gmail.com" +LABEL maintainer="metacubex.official@gmail.com" ARG THREADS="4" ARG SHA="" @@ -35,7 +35,7 @@ RUN set -xe && \ cmake -DCMAKE_CXX_STANDARD=11 . && \ make install -j $THREADS && \ cd .. && \ - git clone https://github.com/tindy2013/subconverter --depth=1 && \ + git clone https://github.com/metacubex/subconverter --depth=1 && \ cd subconverter && \ [ -n "$SHA" ] && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h;\ python3 -m ensurepip && \ @@ -46,7 +46,7 @@ RUN set -xe && \ # build final image FROM alpine:3.16 -LABEL maintainer="tindy.it@gmail.com" +LABEL maintainer="metacubex.official@gmail.com" RUN apk add --no-cache --virtual subconverter-deps pcre2 libcurl yaml-cpp diff --git a/scripts/merge_manifest.py b/scripts/merge_manifest.py index 29f0cf5..8b3b31f 100644 --- a/scripts/merge_manifest.py +++ b/scripts/merge_manifest.py @@ -1,7 +1,7 @@ import glob import os, sys -MAIN_IMAGE_NAME="tindy2013/subconverter" +MAIN_IMAGE_NAME="metacubex/subconverter" TARGET_TAG="latest" if len(sys.argv) < 2 else sys.argv[1] args=["docker manifest create {}:{}".format(MAIN_IMAGE_NAME, TARGET_TAG)]