feat: チャンネルミュートの実装 #14105
Open
feat: チャンネルミュートの実装 #14105
+3,762
−239
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
github-actions
bot
added
packages/frontend
|
このPRによるapi.jsonの差分 差分はこちら--- base
+++ head
@@ -23161,6 +23161,494 @@
}
}
},
+ "/channels/mute/create": {
+ "post": {
+ "operationId": "channels___mute___create",
+ "summary": "channels/mute/create",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *write:channels*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/channels/mute/create.ts"
+ },
+ "tags": [
+ "channels"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "requestBody": {
+ "required": true,
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "channelId": {
+ "type": "string",
+ "format": "misskey:id"
+ },
+ "expiresAt": {
+ "type": [
+ "integer",
+ "null"
+ ],
+ "description": "A Unix Epoch timestamp that must lie in the future. `null` means an indefinite mute."
+ }
+ },
+ "required": [
+ "channelId"
+ ]
+ }
+ }
+ }
+ },
+ "responses": {
+ "204": {
+ "description": "OK (without any results)"
+ },
+ "400": {
+ "description": "Client error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "NO_SUCH_CHANNEL": {
+ "value": {
+ "error": {
+ "message": "No such Channel.",
+ "code": "NO_SUCH_CHANNEL",
+ "id": "7174361e-d58f-31d6-2e7c-6fb830786a3f"
+ }
+ }
+ },
+ "ALREADY_MUTING_CHANNEL": {
+ "value": {
+ "error": {
+ "message": "You are already muting that user.",
+ "code": "ALREADY_MUTING_CHANNEL",
+ "id": "5a251978-769a-da44-3e89-3931e43bb592"
+ }
+ }
+ },
+ "EXPIRES_AT_IS_PAST": {
+ "value": {
+ "error": {
+ "message": "Cannot set past date to \"expiresAt\".",
+ "code": "EXPIRES_AT_IS_PAST",
+ "id": "42b32236-df2c-a45f-fdbf-def67268f749"
+ }
+ }
+ },
+ "INVALID_PARAM": {
+ "value": {
+ "error": {
+ "message": "Invalid param.",
+ "code": "INVALID_PARAM",
+ "id": "3d81ceae-475f-4600-b2a8-2bc116157532"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "401": {
+ "description": "Authentication error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "CREDENTIAL_REQUIRED": {
+ "value": {
+ "error": {
+ "message": "Credential required.",
+ "code": "CREDENTIAL_REQUIRED",
+ "id": "1384574d-a912-4b81-8601-c7b1c4085df1"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "403": {
+ "description": "Forbidden error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "AUTHENTICATION_FAILED": {
+ "value": {
+ "error": {
+ "message": "Authentication failed. Please ensure your token is correct.",
+ "code": "AUTHENTICATION_FAILED",
+ "id": "b0a7f5f8-dc2f-4171-b91f-de88ad238e14"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "418": {
+ "description": "I'm Ai",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "I_AM_AI": {
+ "value": {
+ "error": {
+ "message": "You sent a request to Ai-chan, Misskey's showgirl, instead of the server.",
+ "code": "I_AM_AI",
+ "id": "60c46cd1-f23a-46b1-bebe-5d2b73951a84"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "500": {
+ "description": "Internal server error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "INTERNAL_ERROR": {
+ "value": {
+ "error": {
+ "message": "Internal error occurred. Please contact us if the error persists.",
+ "code": "INTERNAL_ERROR",
+ "id": "5d37dbcb-891e-41ca-a3d6-e690c97775ac"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/channels/mute/delete": {
+ "post": {
+ "operationId": "channels___mute___delete",
+ "summary": "channels/mute/delete",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *write:channels*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/channels/mute/delete.ts"
+ },
+ "tags": [
+ "channels"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "requestBody": {
+ "required": true,
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "channelId": {
+ "type": "string",
+ "format": "misskey:id"
+ }
+ },
+ "required": [
+ "channelId"
+ ]
+ }
+ }
+ }
+ },
+ "responses": {
+ "204": {
+ "description": "OK (without any results)"
+ },
+ "400": {
+ "description": "Client error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "NO_SUCH_CHANNEL": {
+ "value": {
+ "error": {
+ "message": "No such Channel.",
+ "code": "NO_SUCH_CHANNEL",
+ "id": "e7998769-6e94-d9c2-6b8f-94a527314aba"
+ }
+ }
+ },
+ "NOT_MUTING_CHANNEL": {
+ "value": {
+ "error": {
+ "message": "You are not muting that channel.",
+ "code": "NOT_MUTING_CHANNEL",
+ "id": "14d55962-6ea8-d990-1333-d6bef78dc2ab"
+ }
+ }
+ },
+ "INVALID_PARAM": {
+ "value": {
+ "error": {
+ "message": "Invalid param.",
+ "code": "INVALID_PARAM",
+ "id": "3d81ceae-475f-4600-b2a8-2bc116157532"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "401": {
+ "description": "Authentication error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "CREDENTIAL_REQUIRED": {
+ "value": {
+ "error": {
+ "message": "Credential required.",
+ "code": "CREDENTIAL_REQUIRED",
+ "id": "1384574d-a912-4b81-8601-c7b1c4085df1"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "403": {
+ "description": "Forbidden error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "AUTHENTICATION_FAILED": {
+ "value": {
+ "error": {
+ "message": "Authentication failed. Please ensure your token is correct.",
+ "code": "AUTHENTICATION_FAILED",
+ "id": "b0a7f5f8-dc2f-4171-b91f-de88ad238e14"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "418": {
+ "description": "I'm Ai",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "I_AM_AI": {
+ "value": {
+ "error": {
+ "message": "You sent a request to Ai-chan, Misskey's showgirl, instead of the server.",
+ "code": "I_AM_AI",
+ "id": "60c46cd1-f23a-46b1-bebe-5d2b73951a84"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "500": {
+ "description": "Internal server error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "INTERNAL_ERROR": {
+ "value": {
+ "error": {
+ "message": "Internal error occurred. Please contact us if the error persists.",
+ "code": "INTERNAL_ERROR",
+ "id": "5d37dbcb-891e-41ca-a3d6-e690c97775ac"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/channels/mute/list": {
+ "post": {
+ "operationId": "channels___mute___list",
+ "summary": "channels/mute/list",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *read:channels*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/channels/mute/list.ts"
+ },
+ "tags": [
+ "channels"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK (with results)",
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "$ref": "#/components/schemas/Channel"
+ }
+ }
+ }
+ }
+ },
+ "400": {
+ "description": "Client error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "INVALID_PARAM": {
+ "value": {
+ "error": {
+ "message": "Invalid param.",
+ "code": "INVALID_PARAM",
+ "id": "3d81ceae-475f-4600-b2a8-2bc116157532"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "401": {
+ "description": "Authentication error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "CREDENTIAL_REQUIRED": {
+ "value": {
+ "error": {
+ "message": "Credential required.",
+ "code": "CREDENTIAL_REQUIRED",
+ "id": "1384574d-a912-4b81-8601-c7b1c4085df1"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "403": {
+ "description": "Forbidden error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "AUTHENTICATION_FAILED": {
+ "value": {
+ "error": {
+ "message": "Authentication failed. Please ensure your token is correct.",
+ "code": "AUTHENTICATION_FAILED",
+ "id": "b0a7f5f8-dc2f-4171-b91f-de88ad238e14"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "418": {
+ "description": "I'm Ai",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "I_AM_AI": {
+ "value": {
+ "error": {
+ "message": "You sent a request to Ai-chan, Misskey's showgirl, instead of the server.",
+ "code": "I_AM_AI",
+ "id": "60c46cd1-f23a-46b1-bebe-5d2b73951a84"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "500": {
+ "description": "Internal server error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "INTERNAL_ERROR": {
+ "value": {
+ "error": {
+ "message": "Internal error occurred. Please contact us if the error persists.",
+ "code": "INTERNAL_ERROR",
+ "id": "5d37dbcb-891e-41ca-a3d6-e690c97775ac"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/charts/active-users": {
"get": {
"operationId": "charts___active-users",
@@ -80734,6 +81222,9 @@
"isFavorited": {
"type": "boolean"
},
+ "isMuting": {
+ "type": "boolean"
+ },
"pinnedNotes": {
"type": "array",
"items": { |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #14105 +/- ##
===========================================
+ Coverage 41.74% 41.77% +0.02%
===========================================
Files 1549 1573 +24
Lines 196555 204533 +7978
Branches 2767 3753 +986
===========================================
+ Hits 82055 85441 +3386
- Misses 113939 118487 +4548
- Partials 561 605 +44 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
# Conflicts: # packages/backend/test/e2e/timelines.ts
|
ユーザのフォロー画面のように出来ればいいのかもしれませんが、あまり派手に変えるとチャンネルミュートの本筋から逸れてしまうのでひとまずこの形式で実装しました。 |
|
ready for review |
syuilo
reviewed
Jul 14, 2024
syuilo
reviewed
Sep 25, 2024
| @@ -10,6 +10,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; | |||
| import { bindThis } from '@/decorators.js'; | |||
| import { RoleService } from '@/core/RoleService.js'; | |||
| import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js'; | |||
| import { isChannelRelated } from '@/misc/is-channel-related.js'; | |||
syuilo
reviewed
Sep 25, 2024
| @@ -8,6 +8,7 @@ import type { Packed } from '@/misc/json-schema.js'; | |||
| import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; | |||
| import { bindThis } from '@/decorators.js'; | |||
| import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js'; | |||
| import { isChannelRelated } from '@/misc/is-channel-related.js'; | |||
# Conflicts: # CHANGELOG.md # packages/backend/src/core/CoreModule.ts # packages/backend/src/server/api/endpoints/channels/timeline.ts # packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts # packages/backend/src/server/api/endpoints/notes/local-timeline.ts # packages/backend/src/server/api/endpoints/notes/timeline.ts # packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts # packages/backend/src/server/api/endpoints/users/notes.ts # packages/backend/src/server/api/stream/Connection.ts # packages/backend/src/server/api/stream/channel.ts # packages/backend/src/server/api/stream/channels/channel.ts # packages/backend/src/server/api/stream/channels/home-timeline.ts # packages/backend/src/server/api/stream/channels/hybrid-timeline.ts # packages/backend/test/e2e/timelines.ts
# Conflicts: # CHANGELOG.md # packages/backend/src/core/CoreModule.ts
|
マージするか |
syuilo
reviewed
Oct 19, 2024
| @@ -89,7 +121,8 @@ export class ChannelEntityService { | |||
|
|
|||
| ...(me ? { | |||
| isFollowing, | |||
| isFavorited, | |||
| isFavorite, | |||
anatawa12
reviewed
Oct 19, 2024
| @@ -98,6 +104,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| useDbFallback: true, | |||
| redisTimelines: [`channelTimeline:${channel.id}`], | |||
| excludePureRenotes: false, | |||
| noteFilter: note => { | |||
| // 共通機能を使うと見ているチャンネルそのものもミュートしてしまうので閲覧中のチャンネル以外を除く形にする | |||
There was a problem hiding this comment.
実装の一貫性的にはexcludeAuthorFromMuteみたいな実装の葉法がユーザーミュートと一貫性が取れて良いような茎もする
There was a problem hiding this comment.
"ignoreAuthorFromMuteみたいな実装"の間違いですね。
ユーザミュートにignoreAuthorFromMuteがあるように、ignoreAuthorChannelFromMuteのようなフラグを持ったほうが一貫性がある実装になるかなと思った感じです
anatawa12
reviewed
Oct 19, 2024
| ] = await Promise.all([ | ||
| this.cacheService.userMutingsCache.fetch(ps.me.id), | ||
| this.cacheService.renoteMutingsCache.fetch(ps.me.id), | ||
| this.cacheService.userBlockedCache.fetch(ps.me.id), | ||
| this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)), | ||
| ps.excludeMutedChannels ? this.channelMutingService.mutingChannelsCache.fetch(me.id) : Promise.resolve(new Set<string>()), |
There was a problem hiding this comment.
excludeの方針にするならexcludeMutedChannelsなくなると思いますが、このまま行くならfalse by defaultになってるけど除外するのがデフォルトの実装にするべきだと思う。ミューとしてるのに流れてくるってのを今後の実装などで誘発するので
There was a problem hiding this comment.
excludeよりもincludeのほうが自然ぽいので変更しました
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.
※でかいので本線投入のタイミングは計りたい
fix: #10649
What
チャンネルミュートの機能を実装しました。
Why
fix: #10649
Additional info (optional)
Checklist