merge: merged master branch

* origin/master: (21 commits) chores: fix format docs: reinforce bug report usage Update config.yml Update config.yml Delete bug_report.md Update bug-report.md Update issue templates Update README.md Update qv2ray.metainfo.xml Update README.md Update project translations url actions: unsafe { deb } actions: { unsafe } Update -----.md Update ----.md Update ----.md remove built-in plugin in snap package README.md: GPL-Compliance 更新 Issue 模板 aur: overwrite update ...
2025-05-18 01:40:18 +08:00 · 2021-08-17 09:54:32 +08:00 · 2021-08-17 09:54:32 +08:00 · 928e8a690f
commit 928e8a690f
parent 2b9a5ecc23 7cfd904ef7
12 changed files with 106 additions and 313 deletions
--- a/.github/ISSUE_TEMPLATE/-----.md
+++ b/.github/ISSUE_TEMPLATE/-----.md
@ -1,29 +0,0 @@
---
-name: 功能请求
-about: 使用此模板提建议
-title: 功能请求：<你的鬼点子>
-labels: NewFeature
-assignees: ''
-
---
-
-<!--
-功能请求的注意事项：
-1. 请务必确定你的 Issue 类型分类正确。请不要用功能请求的模板来咨询使用问题，或是报告软件缺陷。分类不正确的 Issue 可能会被无理由立即关闭。
-2. 请务必按模板填写。未按模板填写的 Issue 可能会被无理由立刻关闭。
-3. Qv2ray 只是 V2Ray 核心的一个图形界面。他只是一个壳子，所以对 Qv2ray 的代理功能性建议（如自动切换节点、按规则的负载均衡等）需要前往 V2Ray 核心上游反馈，Qv2ray 会直接关闭此类 Issue。
-4. Qv2ray 项目组不收经济赞助，也不接有偿的定制功能。一切功能实现与否由开发者定夺，也可以通过 Pull Request 方式加入我们贡献代码。陈述需求请客观理性，切勿道德绑架开发者。
-5. Qv2ray 是用户中心而非用户友好哲学，功能请求的重要性不以提出者为准，而是以其活跃维护的开发者为准。若没人想实现这个功能请求，请求随时可能会被关闭。 
-->
-
-**你的功能请求与使用中遇到的麻烦有关吗？若有，请描述？**
-请尽可能清晰简洁地描述问题。例：每次吃饭都要出门穿衣收拾打扮，太烦了……
-
-**简单描述你预期的解决方案？**
-请尽可能清晰简洁描述问题。例：我想打电话给餐馆让他们直接给我送过来……
-
-**你有想到其他比较容易实现的解决方案吗？**
-请简单清晰描述。例：或者直接给餐馆签个协议也行……
-
-**补充内容**
-请在此附加任何你认为对你的描述有所帮助的内容。
--- a/.github/ISSUE_TEMPLATE/----.md
+++ b/.github/ISSUE_TEMPLATE/----.md
@ -1,33 +0,0 @@
---
-name: 使用疑问
-about: 使用此模板提出使用上的疑问
-title: 使用疑问：<你有咩问题>
-labels: help wanted
-assignees: ''
-
---
-
-<!-- 我们的 Telegram 讨论群：https://t.me/qv2ray -->
-<!--
-敬请注意：
-
-1. 发 Issue 之前先看文档，先看过往 Issue，如果文档里明确有的还问，可能被不加提示直接关闭；
-   如果 Issue 里有的还问，可能被发一个链接直接关闭；
-   也可能根据开发者心情，给你多回几句关闭。
-
-2. 加入我们的 Telegram 群组以获得更加优质的体验。
-   GitHub Issue 上的提问和咨询不保证回复的实时性，且随时有可能被清除。
-3. 因非官方渠道下载渠道 / 教程 / 文档造成的一切问题，我们没有义务进行调查、解答和回复。
-4. 给特别特别白的小白的建议：Qv2ray 的使用有一定门槛，如果发现非常吃力，有一种爱叫做放手。
-->
-
-### 你想做啥？
-*简要描述你的最原始的目的。*
-例：我在学校，校园网能解锁文献数据库，我想对这些地址直连。
-
-### 你目前试了啥？
-*简单叙述你为解决这个问题所进行的操作。*
-例：看完文档，没有相关内容，就过来问一问。
-
-### 其他要补充的信息？
-*在此附加其他需要补充的信息。*
--- a/.github/ISSUE_TEMPLATE/bug---english.md
+++ b/.github/ISSUE_TEMPLATE/bug---english.md
@ -1,86 +0,0 @@
---
-name: Bug Report
-about: Use this template to report a bug
-title: ''
-labels: Bugs, help wanted
-assignees: ''
-
---
-
-<!-- We recommend that you fill out the bug report template so that we can collect enough information to help you.
-     Note: Unqualified issues may be closed.
-     How to check an item: change [ ] to [x]
-     Plese hide sensitive info like your server address / domain / UUID before posting your VMess link/log. -->
-
- [ ] **I'm sure I've tried to reproduce the problem several times and will provide the system environment, each software and its version that is involved in the problem.**
-
-## Briefly describe this bug：
-
-
-
-## How to trigger this bug：
-
-1. 
-2. 
-3. 
-4. 
-
-### If it's a connection issue, has it happened in other V2Ray clients?
-
-
-
-### Related screenshots or logs
-
-<details>
-
-```
-Please paste your Qv2ray log here:
-
-
-```
-
-</details>
-
-## System Information
-
-<!-- Please check all the operating systems and installation sources that you confirmed to have problems. -->
-
-### Open Preferences -> About, and enter the following info
-
-```
-Version: 
-Build info: 
-Extra build info: 
-```
-
-### Operating systems
-
- [ ] Linux
- [ ] macOS
- [ ] Windows
- 
-### Installation source
- 
- [ ] ArchLinuxCN - Stable
- [ ] ArchLinuxCN - Dev-git
- [ ] ArchLinux AUR - Stable
- [ ] ArchLinux AUR - Development
- [ ] Fedora - Stable
- [ ] Fedora - Preview
- [ ] openSUSE - Stable
- [ ] openSUSE - Preview
- [ ] Flathub
- [ ] Snap
- [ ] Homebrew Cask
- [ ] Scoop / Chocolatey / Github Release
- [ ] Compile manually
-
-### Installed plugins, versions and sources
-
-
-
-## Additional Info
-
-<!-- Feel free to write down any info you consider helpful to resolve the bug. -->
-
-*Please hide your server address and UUID if you wish to post the vmess string or your connection setting.*
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@ -0,0 +1,35 @@
+---
+name: 缺陷报告 / Bug Report
+about: 仅用于报告缺陷，滥用将直接关闭，不予回复 / For Bug Reports Only.
+title: 'Bug Report: '
+labels: Bugs
+assignees: ''
+
+---
+
+<!--
+Notes for Bug Report:
+1. Please make sure you are creating a bug report and not a feature request or usage inquiry. Maintainers might have to close or remove your violating issue without further notice.
+2. Please make sure you have read the documentation and searched previous issues before sending out. Maintainers may mark as duplicate or close your violating issue without further notice.
+3. We are not obliged to investigate, answer or respond to any issues caused by unofficial distributions, tutorials and documentation.
+4. Issue will be closed immediately if you don't follow the template.
+-->
+
+### Summary
+_A clear and concise description of what the bug is._
+
+
+### Expected behavior
+_A clear and concise description of what you expected to happen._
+
+
+### How to Reproduce
+_Steps to reproduce the behavior._
+
+
+### Screenshots
+_If applicable, add screenshots to help explain your problem._
+
+
+### Additional Info
+_Add any other context about the problem here._
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@ -1,95 +0,0 @@
---
-name: Bug 反馈
-about: 使用此模板反馈 bug
-title: ''
-labels: Bugs, help wanted
-assignees: ''
-
---
-
-<!-- 推荐读物：https://github.com/tvvocold/How-To-Ask-Questions-The-Smart-Way -->
-
-<!-- 
-反馈 BUG 的注意事项：
-1. 请先确定你的问题是 BUG 反馈，而非功能请求、使用咨询。
-   分类错误的 Issue 根据开发者的心情，可能被不加提示直接关闭。
-2. 发 Issue 之前请确保你已阅读过相关文档、搜索过之前的Issue。
-   如果如果文档里明确有的，那么 Issue 可能被不加提示直接关闭；
-   如果之前的 Issue 已有答案 / 解决方案，可能会被发一个链接直接关闭；
-   当然，也可能根据开发者心情，给你多回几句。我们对此不做任何保证。
-3. 因非官方渠道下载渠道 / 教程 / 文档造成的一切问题，我们没有义务进行调查、解答和回复。
-4. 若不遵守模板，根据开发者的心情，你的 Issue 可能会被直接关闭，不需要进一步解释。
-->
-
- [ ] **我确定我已经尝试多次触发此次问题，并且将会提供涉及此问题的系统环境，每个软件及其版本。**
-
-## 简单描述这个 Bug:
-
-
-
-## 如何触发这个 Bug：
-
-1. 
-2. 
-3. 
-4. 
-
-### 如果是连接问题，在其他 V2Ray 客户端里出现过吗？ 
-
-
-
-### 相关截图或日志
-
-<details>
-
-```
-请从此行下面的行开始粘贴 Qv2ray 日志：
-
-
-```
-
-</details>
-
-## 系统信息
-
-<!-- 请删除所有不符合的操作系统和安装来源，只保留符合的项目 -->
-
-### 打开首选项 -> 关于，填写以下信息
-
-```
-版本: 
-编译信息：
-额外编译信息：
-```
-
-### 操作系统
-
- Linux
- macOS
- Windows
-
-### 安装来源
-
- ArchLinuxCN - 稳定版
- ArchLinuxCN - 开发版
- ArchLinux AUR - 稳定版
- ArchLinux AUR - 开发版
- Fedora - 稳定版
- Fedora - 开发版
- openSUSE - 稳定版
- openSUSE - 开发版
- Flathub 包
- Snap 包
- Homebrew Cask
- Github Release / Scoop / Chocolatey
- 手动编译
-
-### 已安装的插件、版本及安装来源
-
-
-
-## 附加信息
-
-<!-- 你认为对修复 bug 有帮助的任何信息都可以在此写出来。 -->
-
-*请注意打码隐私相关信息。*
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 使用疑问 / Usage Inquiry
+    url: https://github.com/Qv2ray/Qv2ray/discussions
+    about: 使用疑问请前往讨论区 / Please go to Discussion for that.
+  - name: 功能请求 / Feature Request
+    url: https://github.com/Qv2ray/Qv2ray/discussions
+    about: 功能请求请前往讨论区 / Please go to Discussion for that.
+  - name: 加入 Telegram 群组 / Telegram Group
+    url: https://t.me/qv2ray
+    about: 点击加入 Telegram 群组 / Click to join our Telegram chat.
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@ -1,20 +0,0 @@
---
-name: Feature Request
-about: Suggest an idea for this project
-title: 'Feature Request: <Your Awesome Idea>'
-labels: NewFeature
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/usage-questions.md
+++ b/.github/ISSUE_TEMPLATE/usage-questions.md
@ -1,26 +0,0 @@
---
-name: Usage Questions
-about: Use this template if you want to ask something about usage.
-title: 'Question: <Your Awesome Question>'
-labels: ''
-assignees: ''
-
---
-
-<!-- Our Telegram Group: https://t.me/qv2ray -->
-<!--
-Things to notice:
-
-1. Make sure that you've checked out our documentation and past issues before asking. 
-2. There's no guarantee that GitHub Issues would be responded immediately. 
-   Join our Telegram Group to communicate instantly.
-3. Problems caused by adopting unofficial distributions, tutorials and documentation may not be followed.
-4. Qv2ray expects its users to have the basic skills to investigate and solve problem.
-   If you find it rather tough to use, it's not a bad idea to give up. 
-->
-
-### Describe You Purpose
-
-### Describe What Have You Tried
-
-### Any Other Thing
--- a/.github/workflows/aur.yml
+++ b/.github/workflows/aur.yml
@ -0,0 +1,42 @@
+name: Build Qv2ray AUR
+on: 
+  push:
+    paths-ignore:
+      - '.github'
+    branches:
+      - master
+      - dev
+    tags:
+      - 'v**'
+  schedule:
+    - cron: "0 19 * * *"
+
+jobs:
+  check_commit_msg:
+    outputs:
+      commit_message: ${{ steps.get_message.outputs.message }}
+    name: Check if the workflow has been disabled.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Get commit message
+        id: get_message
+        run: |
+          echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
+          echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
+
+  aur:
+    needs: check_commit_msg
+    if: ${{ !contains( needs.check_commit_msg.outputs.commit_message, 'NO_AUR') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        repo: [qv2ray, qv2ray-dev-git]
+    runs-on: [ubuntu-latest]
+    steps:
+      - uses: DuckSoft/build-aur-action@v1.1
+        with:
+          repo-name: ${{ matrix.repo }}
+
+      - name: Post AUR Build Action
+        uses: DuckSoft/post-aur-build-action@0.1.0
--- a/.github/workflows/deb.yml
+++ b/.github/workflows/deb.yml
@ -7,6 +7,11 @@ on:
  release:
    types: [prereleased]

+# unsafe {
+env:
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+# }
+
 jobs:
  check_commit_msg:
    outputs:
--- a/README.md
+++ b/README.md
@ -11,7 +11,7 @@
 [![GitHub Releases](https://img.shields.io/github/downloads/Qv2ray/Qv2ray/latest/total?style=flat-square&logo=github)](https://github.com/Qv2ray/Qv2ray/releases)
 [![GitHub All Releases](https://img.shields.io/github/downloads/Qv2ray/Qv2ray/total?label=downloads-total&logo=github&style=flat-square)](https://github.com/Qv2ray/Qv2ray/releases)

-## Availability & Status
+## Availability & CI/CD Status

 [![Snap Status](https://img.shields.io/travis/com/Qv2ray/Qv2ray?label=snapcraft-travis&logo=github)](https://travis-ci.com/Qv2ray/Qv2ray)
 [![Qv2ray AUR Build](https://github.com/Qv2ray/Qv2ray/workflows/Build%20Qv2ray%20AUR/badge.svg)](https://github.com/Qv2ray/Qv2ray/actions?query=workflow%3A%22Build+Qv2ray+AUR%22)
@ -56,7 +56,6 @@
  </td>
 </tr>

-
 <tr>
  <td>Flathub</td>
  <td><a href="https://flathub.org/apps/details/com.github.Qv2ray"><img alt="flathub" src="https://img.shields.io/badge/flathub-available-success" /></a></td>
@ -92,26 +91,21 @@
 </tr>
 </table>

-## Related Links
- - [Website](https://qv2ray.github.io/en/) and [First Time Usage](https://qv2ray.github.io/en/getting-started/)
- - Latest **[Release](https://github.com/Qv2ray/Qv2ray/releases/latest)**
- - Welcome to translate Qv2ray via: **[Transifex](https://www.transifex.com/qv2ray/qv2ray)**
+Translation Platform: **[Crowdin](https://crowdin.com/project/qv2ray)**

 ## Special Thanks
- **Quality Assurance & User Experience:** [@DuckSoft](https://github.com/DuckSoft/)
- **Debian-based distro Packager:** [@ymshenyu](https://github.com/ymshenyu)
- [**JetBrains Developer Toolbox**](https://www.jetbrains.com/?from=Qv2ray)
+
+**[JetBrains Developer Toolbox](https://www.jetbrains.com/?from=Qv2ray)**
+
 -------------------------------

-## Copyright
-### This is free software, and you are welcome to redistribute it under certain conditions
- ALL credit goes to **Qv2ray User Group** and **Qv2ray Development Group**
-
-### Libraries that have been used in Qv2ray are listed below (Sorted by date added)
- Please see: [assets/credit.html](assets/credit.html)
-
 ## Licences

+This is free software, and you are welcome to redistribute it under certain conditions.
+
+### Third-party Libraries and Resources
+See: [assets/credit.html](assets/credit.html)
+
 Qv2ray is licenced under [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

 ```
@ -130,11 +124,6 @@ Qv2ray is licenced under [![License: GPL v3](https://img.shields.io/badge/Licens
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ```
+## Star History

-***注意：Qv2ray 仅能用于 Qt/C++/Linux/CI/自动化 等相关技术的学习和在法律允许范围内的使用，任何个人或集体不得使用 Qv2ray 进行任何违反相关法律法规的活动。***
-
-> Note: Qv2ray can **ONLY** be used for learning related technologies such as Qt/C++/Linux/CI/automation and use within the scope permitted by law. Any individual or group **MAY NOT** use Qv2ray for any violation of relevant laws and regulations.
-
-*任何尝试下载或下载 Qv2ray 任意分支或发行版即代表您同意本项目作者及贡献者不承担任何由于您违反以上准则所带来的任何法律责任。*
-
-> Any attempt to download of any branch or distribution of Qv2ray constitutes your agreement that the author and the contributor of the project **will not be** liable for any legal liability arising from your breach of the above guidelines.
+![stars](https://starchart.cc/Qv2ray/Qv2ray.svg)
--- a/assets/qv2ray.metainfo.xml
+++ b/assets/qv2ray.metainfo.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
  <id>com.github.Qv2ray</id>
-  <metadata_license>GPL-3.0+</metadata_license>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
  <project_license>GPL-3.0+</project_license>
  <name>Qv2ray</name>
  <summary>Qv2ray is a cross-platform v2ray graphical frontend written in Qt.</summary>