mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-10-30 23:01:48 +09:00
Code

Merge branch 'develop'

Browse Source
This commit is contained in:
syuilo 2022-02-11 19:47:41 +09:00
commit 32500faf6d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -10,6 +10,11 @@
You should also include the user name that made the change. You should also include the user name that made the change.
--> -->
## 12.106.1 (2022/02/11)
### Bugfixes
- クライアント: ワードミュートが保存できない問題を修正 @syuilo
## 12.106.0 (2022/02/11) ## 12.106.0 (2022/02/11)
### Improvements ### Improvements

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.106.0", "version": "12.106.1",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

4
packages/client/src/pages/settings/word-mute.vue
View File

@ -102,7 +102,7 @@ export default defineComponent({
let lines = mutes.trim().split('\n').map(line => line.trim()).filter(line => line != ''); let lines = mutes.trim().split('\n').map(line => line.trim()).filter(line => line != '');
// check each line if it is a RegExp or not // check each line if it is a RegExp or not
for(let i = 0; i < lines.length; i++) { for (let i = 0; i < lines.length; i++) {
const line = lines[i] const line = lines[i]
const regexp = line.match(/^\/(.+)\/(.*)$/); const regexp = line.match(/^\/(.+)\/(.*)$/);
if (regexp) { if (regexp) {
@ -124,6 +124,8 @@ export default defineComponent({
lines[i] = line.split(' '); lines[i] = line.split(' ');
} }
} }
return lines;
}; };
let softMutes, hardMutes; let softMutes, hardMutes;