Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance(frontend): PostFormのannoying判定でCWを考慮するように #15405

Merged
merged 4 commits into from
Feb 7, 2025
Merged

enhance(frontend): PostFormのannoying判定でCWを考慮するように #15405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee851a9
enhance(frontend): PostFormのannoying判定でCWを考慮するように
kakkokari-gtyih Feb 5, 2025
a77a30e
Update Changelog
kakkokari-gtyih Feb 5, 2025
439f531
Merge branch 'develop' into enh-15380
kakkokari-gtyih Feb 6, 2025
ded05b7
Update CHANGELOG.md
kakkokari-gtyih Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-

### Client
-
- Enhance: 投稿フォームの「迷惑になる可能性があります」のダイアログを表示する条件においてCWを考慮するように

### Server
-
Expand Down
20 changes: 12 additions & 8 deletions packages/frontend/src/components/MkPostForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,14 @@ function deleteDraft() {
miLocalStorage.setItem('drafts', JSON.stringify(draftData));
}

function isAnnoying(text: string): boolean {
return text.includes('$[x2') ||
text.includes('$[x3') ||
text.includes('$[x4') ||
text.includes('$[scale') ||
text.includes('$[position');
}

async function post(ev?: MouseEvent) {
if (useCw.value && (cw.value == null || cw.value.trim() === '')) {
os.alert({
Expand All @@ -745,14 +753,10 @@ async function post(ev?: MouseEvent) {

if (props.mock) return;

const annoying =
text.value.includes('$[x2') ||
text.value.includes('$[x3') ||
text.value.includes('$[x4') ||
text.value.includes('$[scale') ||
text.value.includes('$[position');

if (annoying && visibility.value === 'public') {
if (visibility.value === 'public' && (
(useCw.value && cw.value != null && cw.value.trim() !== '' && isAnnoying(cw.value)) || // CWが迷惑になる場合
((!useCw.value || cw.value == null || cw.value.trim() === '') && text.value != null && text.value.trim() !== '' && isAnnoying(text.value)) // CWが無い かつ 本文が迷惑になる場合
)) {
const { canceled, result } = await os.actions({
type: 'warning',
text: i18n.ts.thisPostMayBeAnnoying,
Expand Down
Loading