Skip to content

Commit 826a05c

Browse files
iqijuniqijun
authored
Merge branch 'master' into master
2 parents 4284c17 + 44e146d commit 826a05c

File tree

7 files changed

+7380
-6095
lines changed

7 files changed

+7380
-6095
lines changed

‎.github/workflows/skip.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
GH_REPO: ${{ github.repository }}
1616
NUMBER: ${{ github.event.issue.number }}
1717
LABELS: Skipped code scan
18-
- run: gh issue edit "$NUMBER" --add-assignee "$ASSIGNEE"
18+
- run: gh issue edit "$NUMBER" --remove-assignee "$ASSIGNEE"
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2121
GH_REPO: ${{ github.repository }}
2222
NUMBER: ${{ github.event.issue.number }}
23-
ASSIGNEE: joethei
23+
ASSIGNEE: ObsidianReviewBot

‎.github/workflows/validate-plugin-entry.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,55 +105,55 @@ jobs:
105105
addError(`It seems like you made a typo in the repository field \`${plugin.repo}\`.`);
106106
}
107107
108-
if (plugin.id.toLowerCase().includes('obsidian')) {
108+
if (plugin.id?.toLowerCase().includes('obsidian')) {
109109
addError(`Please don't use the word \`obsidian\` in the plugin ID. The ID is used for your plugin's folder so keeping it short and simple avoids clutter and helps with sorting.`);
110110
}
111-
if (plugin.id.toLowerCase().endsWith('plugin')) {
111+
if (plugin.id?.toLowerCase().endsWith('plugin')) {
112112
addError(`Please don't use the word \`plugin\` in the plugin ID. The ID is used for your plugin's folder so keeping it short and simple avoids clutter and helps with sorting.`);
113113
}
114-
if (!/^[a-z0-9-_]+$/.test(plugin.id)) {
114+
if (plugin.id && !/^[a-z0-9-_]+$/.test(plugin.id)) {
115115
addError('The plugin ID is not valid. Only alphanumeric lowercase characters and dashes are allowed.');
116116
}
117117
118-
else if (plugin.name.toLowerCase().includes('obsidian')) {
118+
else if (plugin.name?.toLowerCase().includes('obsidian')) {
119119
addError(`Please don't use the word \`Obsidian\` in your plugin name since it's redundant and adds clutter to the plugin list.`);
120120
}
121-
if (plugin.name.toLowerCase().endsWith('plugin')) {
121+
if (plugin.name?.toLowerCase().endsWith('plugin')) {
122122
addError(`Please don't use the word \`Plugin\` in the plugin name since it's redundant and adds clutter to the plugin list.`);
123123
}
124124
125-
if (/^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$/.test(plugin.author)) {
125+
if (plugin.author && /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$/.test(plugin.author)) {
126126
addWarning(`We generally discourage including your email addresses in the \`author\` field.`);
127127
}
128128
129-
if (plugin.description.toLowerCase().includes('obsidian')) {
129+
if (plugin.description?.toLowerCase().includes('obsidian')) {
130130
addError('Please don\'t include `Obsidian` in the plugin description');
131131
}
132-
if (plugin.description.toLowerCase().includes('this plugin') || plugin.description.toLowerCase().includes('this is a plugin') || plugin.description.toLowerCase().includes('this plugin allows')) {
132+
if (plugin.description?.toLowerCase().includes('this plugin') || plugin.description?.toLowerCase().includes('this is a plugin') || plugin.description?.toLowerCase().includes('this plugin allows')) {
133133
addWarning('Avoid including sentences like `This is a plugin that does` in your description');
134134
}
135135
136-
if (plugin.description.length > 250) {
136+
if (plugin.description?.length > 250) {
137137
addError(`Your plugin has a long description. Users typically find it difficult to read a very long description, so you should keep it short and concise.`);
138138
}
139139
140-
if (plugins.filter(p => p.id === plugin.id).length > 1) {
140+
if (plugin.id && plugins.filter(p => p.id === plugin.id).length > 1) {
141141
addError(`There is already a plugin with the id \`${plugin.id}\`.`);
142142
}
143-
if (plugins.filter(p => p.name === plugin.name).length > 1) {
143+
if (plugin.name && plugins.filter(p => p.name === plugin.name).length > 1) {
144144
addError(`There is already a plugin with the name \`${plugin.name}\`.`);
145145
}
146-
if (plugins.filter(p => p.repo === plugin.repo).length > 1) {
146+
if (plugin.repo && plugins.filter(p => p.repo === plugin.repo).length > 1) {
147147
addError(`There is already a entry pointing to the \`${plugin.repo}\` repository.`);
148148
}
149149
150150
const removedPlugins = JSON.parse(fs.readFileSync('community-plugins-removed.json', 'utf8'));
151151
152-
if (removedPlugins.filter(p => p.id === plugin.id).length > 1) {
152+
if (plugin.id && removedPlugins.filter(p => p.id === plugin.id).length > 1) {
153153
addError(`Another plugin used to exist with the id \`${plugin.id}\`. To avoid issues for users that still have the old plugin installed using this plugin ID is not allowed`);
154154
}
155155
156-
if (removedPlugins.filter(p => p.name === plugin.name).length > 1) {
156+
if (plugin.name && removedPlugins.filter(p => p.name === plugin.name).length > 1) {
157157
addWarning(`Another plugin used to exist with the name \`${plugin.name}\`. To avoid confussion we recommend against using this name.`);
158158
}
159159
@@ -178,10 +178,10 @@ jobs:
178178
}
179179
}
180180
181-
if (manifest.id !== plugin.id) {
181+
if (plugin.name && manifest.id !== plugin.id) {
182182
addError(`Plugin ID mismatch, the ID in this PR (\`${plugin.id}\`) is not the same as the one in your repo (\`${manifest.id}\`). If you just changed your plugin ID, remember to change it in the manifest.json in your repo and your latest GitHub release.`);
183183
}
184-
if (manifest.name !== plugin.name) {
184+
if (plugin.name && manifest.name !== plugin.name) {
185185
addError(`Plugin name mismatch, the name in this PR (\`${plugin.name}\`) is not the same as the one in your repo (\`${manifest.name}\`). If you just changed your plugin name, remember to change it in the manifest.json in your repo and your latest GitHub release.`);
186186
}
187187

‎community-css-themes.json

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@
401401
},
402402
{
403403
"name": "Cyber Glow",
404-
"author": "ArtexJay",
405-
"repo": "ArtexJay/Obsidian-CyberGlow",
404+
"author": "ThePharaohArt",
405+
"repo": "ThePharaohArt/Obsidian-CyberGlow",
406406
"screenshot": "Screenshot.png",
407407
"modes": ["dark", "light"]
408408
},
@@ -2439,5 +2439,54 @@
24392439
"repo": "MrParalloid/obsidian-things",
24402440
"screenshot": "things-screenshot.jpg",
24412441
"modes": ["dark", "light"]
2442+
},
2443+
{
2444+
"name": "Enhanced file explorer tree",
2445+
"author": "LennZone",
2446+
"repo": "LennZone/enhanced-file-explorer-tree",
2447+
"screenshot": "thumbnail.png",
2448+
"modes": ["dark", "light"]
2449+
},
2450+
{
2451+
"name": "Planetary",
2452+
"author": "ninetyfive666",
2453+
"repo": "ninetyfive666/Planetary",
2454+
"screenshot": "thumbnail.jpg",
2455+
"modes": ["dark", "light"]
2456+
},
2457+
{
2458+
"name": "Neumorphism",
2459+
"author": "LennZone",
2460+
"repo": "LennZone/Neumorphism",
2461+
"screenshot": "thumbnail.png",
2462+
"modes": ["dark", "light"]
2463+
},
2464+
{
2465+
"name": "cocoa",
2466+
"author": "incantatem2",
2467+
"repo": "incantatem2/Obsidian-cocoa",
2468+
"screenshot": "images/cocoa-thumbnail.jpg",
2469+
"modes": ["dark"]
2470+
},
2471+
{
2472+
"name": "parfait",
2473+
"author": "incantatem2",
2474+
"repo": "incantatem2/Obsidian-parfait",
2475+
"screenshot": "images/parfait-thumbnail.jpg",
2476+
"modes": ["light"]
2477+
},
2478+
{
2479+
"name": "Camena",
2480+
"author": "Bee",
2481+
"repo": "splendidissimemendax/Camena",
2482+
"screenshot": "Thumbnail.png",
2483+
"modes": ["dark", "light"]
2484+
},
2485+
{
2486+
"name": "Pomme Notes",
2487+
"author": "Paralloid",
2488+
"repo": "MrParalloid/pomme-notes",
2489+
"screenshot": "images/screenshot.jpg",
2490+
"modes": ["dark", "light"]
24422491
}
24432492
]

0 commit comments

Comments
 (0)