Skip to content

Commit

Permalink
🍻 重命名项目
Browse files Browse the repository at this point in the history
  • Loading branch information
KomoriDev committed Jan 15, 2025
1 parent 0aaaa14 commit bbd3b48
Show file tree
Hide file tree
Showing 29 changed files with 32 additions and 171 deletions.
14 changes: 7 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# 贡献指南
首先,感谢大家为 Ascension 贡献代码
本张旨在引导你更规范地向 Ascension 提交贡献,请务必认真阅读。

首先,感谢大家为 Marisa 贡献代码
本张旨在引导你更规范地向 Marisa 提交贡献,请务必认真阅读。

**我们欢迎一切贡献!并对每个愿意贡献的人表示衷心的感谢!** 💖

> 如果你喜欢这个项目,可以为本项目点亮 ⭐️,这是对我们最大的鼓励。
## 提交 Issue

在提交 Issue 前,我们建议你先查看 [已有的 Issues](https://github.com/MyXiaoNan/nonebot-plugin-ascension/issues),以防重复提交。
在提交 Issue 前,我们建议你先查看 [已有的 Issues](https://github.com/MyXiaoNan/Marisa/issues),以防重复提交。

### 报告问题

Expand All @@ -35,22 +36,21 @@ pre-commit install

### 使用 GitHub Codespaces(Dev Container)

[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MyXiaoNan/nonebot-plugin-ascension)
[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MyXiaoNan/Marisa)

### 使用 GitPod

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#/https://github.com/MyXiaoNan/nonebot-plugin-ascension)
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#/https://github.com/MyXiaoNan/Marisa)

### Commit 规范

请确保你的每一个 commit 都能清晰地描述其意图,一个 commit 尽量只有一个意图。

本插件 的 commit message 格式遵循 [gitmoji](https://gitmoji.dev/) 规范,在创建 commit 时请牢记这一点。


### 工作流概述

`master` 分支为 本插件 的开发分支,在任何情况下都请不要直接修改 `master` 分支,而是创建一个目标分支为 `nonebot-plugin-ascension:master` 的 Pull Request 来提交修改。Pull Request 标题请尽量更改成中文,以便阅读。
`master` 分支为 本插件 的开发分支,在任何情况下都请不要直接修改 `master` 分支,而是创建一个目标分支为 `Marisa:master` 的 Pull Request 来提交修改。Pull Request 标题请尽量更改成中文,以便阅读。

如果你不是 本团队 的成员,可在 fork 本仓库后,向本仓库的 master 分支发起 Pull Request,注意遵循先前提到的 commit message 规范创建 commit。我们将在 code review 通过后通过 squash merge 方式将您的贡献合并到主分支。

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pyright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
pull_request:
paths:
- "nonebot_plugin_ascension/**"
- "marisa/**"

jobs:
pyright:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
pull_request:
paths:
- "nonebot_plugin_ascension/**"
- "marisa/**"

jobs:
ruff:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ cython_debug/
.ruff_cache
data
/ascension.db
/marisa.db

# VScode
.vscode
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<div align="center">

# NoneBot-Plugin-Ascension
# Marisa

_✨ 欢迎来到修真界 ✨_

Expand All @@ -23,8 +23,7 @@ _✨ 欢迎来到修真界 ✨_

## 📖 介绍

NoneBot2 修真插件

NoneBot2 修真机器人

## 👥 贡献

Expand All @@ -43,4 +42,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
```

8 changes: 4 additions & 4 deletions nonebot_plugin_ascension/__init__.py → marisa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from .models import User as User

# from .handlers import buff as buff
from .handlers import base as base
from .handlers import info as info
from .plugins import base as base
from .plugins import info as info
from .models import UserCD as UserCD
from .models import Backpack as Backpack
from .utils.resource import check_resource
Expand All @@ -27,10 +27,10 @@
usage="详见文档",
type="application",
config=Config,
homepage="https://github.com/MyXiaoNan/nonebot-plugin-ascension",
homepage="https://github.com/MyXiaoNan/Marisa",
supported_adapters=inherit_supported_adapters("nonebot_plugin_alconna"),
extra={
"unique_name": "Ascension",
"unique_name": "Marisa",
"orm_version_location": migrations,
"author": "Komorebi <[email protected]>",
"version": "0.1.0",
Expand Down
8 changes: 4 additions & 4 deletions nonebot_plugin_ascension/config.py → marisa/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
BOT_DIR = Path.cwd()
"""Bot 根目录"""

DATA_DIR = BOT_DIR / "data" / "ascension"
DATA_DIR = BOT_DIR / "data" / "marisa"
"""数据保存目录"""
TEMPLATE_DIR = DATA_DIR / "templates"
"""模板保存目录"""
Expand Down Expand Up @@ -79,8 +79,8 @@ class ScopedConfig(BaseModel):


class Config(BaseModel):
ascension: ScopedConfig = Field(default_factory=ScopedConfig)
"""Ascension Config"""
marisa: ScopedConfig = Field(default_factory=ScopedConfig)
"""Marisa Config"""


config: ScopedConfig = get_plugin_config(Config).ascension
config: ScopedConfig = get_plugin_config(Config).marisa
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from nonebot_plugin_alconna import Match, Button, Command, UniMessage, FallbackStrategy

from ..models import User
from ..schema import Root
from ..schemas import Root
from ..config import config
from ..utils.jsondata import jsondata
from ..utils.annotated import UserInfo, EventUserInfo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
FallbackStrategy,
)

from nonebot_plugin_ascension.models import Buff, Sect, User
from nonebot_plugin_ascension.utils.jsondata import jsondata
from marisa.models import Buff, Sect, User
from marisa.utils.jsondata import jsondata

from .render import render

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from nonebot_plugin_htmlrender import template_to_pic

from nonebot_plugin_ascension.config import DATA_DIR
from marisa.config import DATA_DIR


async def render(info: dict[str, Any]) -> bytes:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import ujson as json

from ..config import DATA_DIR
from ..schema import (
from ..schemas import (
Root,
SecBuff,
SubBuff,
Expand Down
File renamed without changes.
144 changes: 0 additions & 144 deletions nonebot_plugin_ascension/migrations/03e79c58c810_first_revision.py

This file was deleted.

8 changes: 7 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[project]
name = "nonebot-plugin-ascension"
name = "marisa"
version = "0.1.0"
description = "Welcome to the world of cultivation."
authors = [
Expand All @@ -24,6 +24,12 @@ adapters = [
"nonebot-adapter-telegram>=0.1.0b17",
]

[tool.nonebot]
adapters = [
{ name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11" }
]
plugins = ["marisa"]

[tool.pdm]
distribution = true

Expand Down

0 comments on commit bbd3b48

Please sign in to comment.