Enhance(sensitive-flag):センシティブフラグの機能の強化 #936
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🎉 Snyk checks have passed. No issues have been found so far.✅ security/snyk check is complete. No issues have been found. (View Details) |
mattyatea
changed the title
riku6460
reviewed
Feb 22, 2025
| @@ -1334,6 +1334,8 @@ scheduled: "予約済み" | |||
| unschedule: "予約を解除" | |||
| setScheduledTime: "予約日時を設定" | |||
| willBePostedAt: "{x}に投稿されます" | |||
| sensitiveByModerator: "管理者によって、ドライブのファイルがセンシティブとして設定されました。\n詳細については[NSFWガイドライン](https://go.misskey.io/media-guideline)を確認してください" | |||
There was a problem hiding this comment.
1行目に句点が付いているので2行目にも付けた方が違和感がないと思う
Comment on lines
99
to
101
| if (!await this.roleService.isModerator(me) && file.isSensitiveByModerator) { | ||
| throw new ApiError(meta.errors.restrictedByModerator); | ||
| } |
There was a problem hiding this comment.
ロールでの処理が updateFile の中にあるので、それに合わせてそっちに移動したほうが良いかも
Comment on lines
+687
to
+689
| if (isModerator && file.userId !== updater.id) { | ||
| values.isSensitiveByModerator = values.isSensitive; | ||
| } |
There was a problem hiding this comment.
モデレータがアップロードしたファイルを、別のモデレータがセンシティブに設定し、その後本人がセンシティブを解除した場合、おかしな状態になると思う
（操作ミスなどで起こりうるが、あんまり気にしなくて良いとは思う）
|
riku6460
reviewed
Mar 5, 2025
|
|
||
| if (values.name != null && !this.driveFileEntityService.validateFileName(values.name)) { | ||
| throw new DriveService.InvalidFileNameError(); | ||
| } | ||
|
|
||
| if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive && alwaysMarkNsfw && !values.isSensitive) { | ||
| if ((values.isSensitive !== undefined && values.isSensitive !== file.isSensitive && alwaysMarkNsfw || (!isModerator && file.isSensitiveByModerator)) && !values.isSensitive) { |
There was a problem hiding this comment.
括弧の位置間違ってると思う
多分これだとモデレーターからセンシティブにされた場合にファイル名とか全部いじれなくなる
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Why
Additional info (optional)
Checklist