-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve #11499
- Loading branch information
Showing
25 changed files
with
238 additions
and
31 deletions.
There are no files selected for viewing
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
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
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
13 changes: 13 additions & 0 deletions
13
packages/backend/migration/1695288787870-following-notify.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| export class FollowingNotify1695288787870 { | ||
| name = 'FollowingNotify1695288787870' | ||
|
|
||
| async up(queryRunner) { | ||
| await queryRunner.query(`ALTER TABLE "following" ADD "notify" character varying(32)`); | ||
| await queryRunner.query(`CREATE INDEX "IDX_5108098457488634a4768e1d12" ON "following" ("notify") `); | ||
| } | ||
|
|
||
| async down(queryRunner) { | ||
| await queryRunner.query(`DROP INDEX "public"."IDX_5108098457488634a4768e1d12"`); | ||
| await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "notify"`); | ||
| } | ||
| } |
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
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
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
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
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
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
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
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
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
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
107 changes: 107 additions & 0 deletions
107
packages/backend/src/server/api/endpoints/following/update.ts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: syuilo and other misskey contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| import ms from 'ms'; | ||
| import { Inject, Injectable } from '@nestjs/common'; | ||
| import { Endpoint } from '@/server/api/endpoint-base.js'; | ||
| import type { FollowingsRepository } from '@/models/_.js'; | ||
| import { UserEntityService } from '@/core/entities/UserEntityService.js'; | ||
| import { UserFollowingService } from '@/core/UserFollowingService.js'; | ||
| import { DI } from '@/di-symbols.js'; | ||
| import { GetterService } from '@/server/api/GetterService.js'; | ||
| import { ApiError } from '../../error.js'; | ||
|
|
||
| export const meta = { | ||
| tags: ['following', 'users'], | ||
|
|
||
| limit: { | ||
| duration: ms('1hour'), | ||
| max: 100, | ||
| }, | ||
|
|
||
| requireCredential: true, | ||
|
|
||
| kind: 'write:following', | ||
|
|
||
| errors: { | ||
| noSuchUser: { | ||
| message: 'No such user.', | ||
| code: 'NO_SUCH_USER', | ||
| id: '14318698-f67e-492a-99da-5353a5ac52be', | ||
| }, | ||
|
|
||
| followeeIsYourself: { | ||
| message: 'Followee is yourself.', | ||
| code: 'FOLLOWEE_IS_YOURSELF', | ||
| id: '4c4cbaf9-962a-463b-8418-a5e365dbf2eb', | ||
| }, | ||
|
|
||
| notFollowing: { | ||
| message: 'You are not following that user.', | ||
| code: 'NOT_FOLLOWING', | ||
| id: 'b8dc75cf-1cb5-46c9-b14b-5f1ffbd782c9', | ||
| }, | ||
| }, | ||
|
|
||
| res: { | ||
| type: 'object', | ||
| optional: false, nullable: false, | ||
| ref: 'UserLite', | ||
| }, | ||
| } as const; | ||
|
|
||
| export const paramDef = { | ||
| type: 'object', | ||
| properties: { | ||
| userId: { type: 'string', format: 'misskey:id' }, | ||
| notify: { type: 'string', enum: ['normal', 'none'] }, | ||
| }, | ||
| required: ['userId', 'notify'], | ||
| } as const; | ||
|
|
||
| @Injectable() | ||
| export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export | ||
| constructor( | ||
| @Inject(DI.followingsRepository) | ||
| private followingsRepository: FollowingsRepository, | ||
|
|
||
| private userEntityService: UserEntityService, | ||
| private getterService: GetterService, | ||
| private userFollowingService: UserFollowingService, | ||
| ) { | ||
| super(meta, paramDef, async (ps, me) => { | ||
| const follower = me; | ||
|
|
||
| // Check if the follower is yourself | ||
| if (me.id === ps.userId) { | ||
| throw new ApiError(meta.errors.followeeIsYourself); | ||
| } | ||
|
|
||
| // Get followee | ||
| const followee = await this.getterService.getUser(ps.userId).catch(err => { | ||
| if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); | ||
| throw err; | ||
| }); | ||
|
|
||
| // Check not following | ||
| const exist = await this.followingsRepository.findOneBy({ | ||
| followerId: follower.id, | ||
| followeeId: followee.id, | ||
| }); | ||
|
|
||
| if (exist == null) { | ||
| throw new ApiError(meta.errors.notFollowing); | ||
| } | ||
|
|
||
| await this.followingsRepository.update({ | ||
| id: exist.id, | ||
| }, { | ||
| notify: ps.notify === 'none' ? null : ps.notify, | ||
| }); | ||
|
|
||
| return await this.userEntityService.pack(follower.id, me); | ||
| }); | ||
| } | ||
| } |
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
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
Oops, something went wrong.