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

センシティブなメディアを含む投稿をタイムラインから除外できるようにした #1968

Merged
merged 5 commits into from
Nov 17, 2023
Merged

センシティブなメディアを含む投稿をタイムラインから除外できるようにした #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ec554b
feat: センシティブなメディアが含まれている投稿を除外するためのフィルターを実装した
pantasystem Nov 17, 2023
7ac34ed
feat: DBにセンシティブなメディアが含まれてる投稿を排除するオプションを追加
pantasystem Nov 17, 2023
8127cfa
feat: 設定のための文字列リソースを追加
pantasystem Nov 17, 2023
716b3b7
feat: 設定を変更できるようにした
pantasystem Nov 17, 2023
67b73b0
feat: 日本語にした
pantasystem Nov 17, 2023
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
5 changes: 3 additions & 2 deletions modules/common_resource/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,14 +630,15 @@
<string name="notification_sync_download_custom_emoji_title">カスタム絵文字ダウンロード中</string>
<string name="alarm_permission_description_title">アラームの権限を付与してください</string>
<string name="alarm_permission_description_message">予約投稿はアラーム機能の仕組みを利用するため、設定からMilkteaにアラームの権限を付与する必要性があります。</string>
<string name="exclude_replies">Exclude replies</string>
<string name="exclude_reposts">Exclude reposts</string>
<string name="exclude_replies">リプライを除外</string>
<string name="exclude_reposts">リポストを除外</string>
<string name="notify_about_new_posts">投稿の通知を受信する</string>
<string name="stop_notify_about_new_posts">投稿の通知をやめる</string>
<!-- User -->

<string name="settings_user_cache">ユーザキャッシュ</string>
<string name="jump_to_new_post">新着投稿を表示</string>
<string name="exclude_if_exists_sensitive_media">センシティブなメディアを含む投稿を除外</string>


</resources>
1 change: 1 addition & 0 deletions modules/common_resource/src/main/res/values-zh/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@
<!-- User -->
<string name="settings_user_cache">User caches</string>
<string name="jump_to_new_post">Jump to new post</string>
<string name="exclude_if_exists_sensitive_media">Exclude if exists senstive media</string>


</resources>
1 change: 1 addition & 0 deletions modules/common_resource/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@
<string name="stop_notify_about_new_posts">Stop notify about new posts</string>
<string name="settings_user_cache">User cache</string>
<string name="jump_to_new_post">Jump to new post</string>
<string name="exclude_if_exists_sensitive_media">Exclude if exists sensitive media</string>
<!-- reaction-acceptance -->

</resources>
12 changes: 9 additions & 3 deletions modules/data/schemas/net.pantasystem.milktea.data.infrastructure.DataBase/58.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"formatVersion": 1,
"database": {
"version": 58,
"identityHash": "abeea00a832ef048d99e46fb3c1751c6",
"identityHash": "9257b02f1c5fb08f3a6b602d66676be8",
"entities": [
{
"tableName": "reaction_history",
Expand Down Expand Up @@ -475,7 +475,7 @@
},
{
"tableName": "page_table",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountId` INTEGER NOT NULL, `title` TEXT NOT NULL, `weight` INTEGER NOT NULL, `isSavePagePosition` INTEGER, `attachedAccountId` INTEGER, `pageId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `withFiles` INTEGER, `excludeNsfw` INTEGER, `includeLocalRenotes` INTEGER, `includeMyRenotes` INTEGER, `includeRenotedMyRenotes` INTEGER, `listId` TEXT, `following` INTEGER, `visibility` TEXT, `noteId` TEXT, `tag` TEXT, `reply` INTEGER, `renote` INTEGER, `poll` INTEGER, `offset` INTEGER, `markAsRead` INTEGER, `userId` TEXT, `includeReplies` INTEGER, `query` TEXT, `host` TEXT, `antennaId` TEXT, `channelId` TEXT, `clipId` TEXT, `excludeReplies` INTEGER, `excludeReposts` INTEGER)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountId` INTEGER NOT NULL, `title` TEXT NOT NULL, `weight` INTEGER NOT NULL, `isSavePagePosition` INTEGER, `attachedAccountId` INTEGER, `pageId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `withFiles` INTEGER, `excludeNsfw` INTEGER, `includeLocalRenotes` INTEGER, `includeMyRenotes` INTEGER, `includeRenotedMyRenotes` INTEGER, `listId` TEXT, `following` INTEGER, `visibility` TEXT, `noteId` TEXT, `tag` TEXT, `reply` INTEGER, `renote` INTEGER, `poll` INTEGER, `offset` INTEGER, `markAsRead` INTEGER, `userId` TEXT, `includeReplies` INTEGER, `query` TEXT, `host` TEXT, `antennaId` TEXT, `channelId` TEXT, `clipId` TEXT, `excludeReplies` INTEGER, `excludeReposts` INTEGER, `excludeIfExistsSensitiveMedia` INTEGER)",
"fields": [
{
"fieldPath": "accountId",
Expand Down Expand Up @@ -662,6 +662,12 @@
"columnName": "excludeReposts",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "pageParams.excludeIfExistsSensitiveMedia",
"columnName": "excludeIfExistsSensitiveMedia",
"affinity": "INTEGER",
"notNull": false
}
],
"primaryKey": {
Expand Down Expand Up @@ -3265,7 +3271,7 @@
],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'abeea00a832ef048d99e46fb3c1751c6')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9257b02f1c5fb08f3a6b602d66676be8')"
]
}
}
Loading