From 335e4bd213d23849ecff193e1143a322bf201708 Mon Sep 17 00:00:00 2001 From: xianon Date: Sun, 28 Nov 2021 13:45:17 +0900 Subject: /antennas/notes API で日付による絞り込みができるようにする (#8015) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/server/api/endpoints/antennas/notes.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'packages/backend/src/server/api') diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index 1759e95b4c..02fec2778b 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts @@ -33,6 +33,14 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + + sinceDate: { + validator: $.optional.num, + }, + + untilDate: { + validator: $.optional.num, + }, }, errors: { @@ -68,7 +76,8 @@ export default define(meta, async (ps, user) => { .select('joining.noteId') .where('joining.antennaId = :antennaId', { antennaId: antenna.id }); - const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) + const query = makePaginationQuery(Notes.createQueryBuilder('note'), + ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) .andWhere(`note.id IN (${ antennaQuery.getQuery() })`) .innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.reply', 'reply') -- cgit v1.2.3-freya From f33ded310751dd1b4bfd6fb792eec9adfde7019e Mon Sep 17 00:00:00 2001 From: nullobsi Date: Thu, 2 Dec 2021 18:14:44 -0800 Subject: feat: Undo Accept (#7980) * allow breaking of follow * send undo * delete by using reject follow --- locales/ja-JP.yml | 1 + .../src/remote/activitypub/kernel/undo/accept.ts | 27 +++++++ .../src/remote/activitypub/kernel/undo/index.ts | 4 +- .../server/api/endpoints/following/invalidate.ts | 82 ++++++++++++++++++++++ packages/backend/src/services/following/delete.ts | 7 ++ packages/client/src/scripts/get-user-menu.ts | 16 +++++ 6 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 packages/backend/src/remote/activitypub/kernel/undo/accept.ts create mode 100644 packages/backend/src/server/api/endpoints/following/invalidate.ts (limited to 'packages/backend/src/server/api') diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index d5fcd2d406..d5c009bbcf 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -792,6 +792,7 @@ pubSub: "Pub/Subのアカウント" lastCommunication: "直近の通信" resolved: "解決済み" unresolved: "未解決" +breakFollow: "フォロワーを解除" itsOn: "オンになっています" itsOff: "オフになっています" emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする" diff --git a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts new file mode 100644 index 0000000000..5112d1d4ea --- /dev/null +++ b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts @@ -0,0 +1,27 @@ +import unfollow from '@/services/following/delete'; +import cancelRequest from '@/services/following/requests/cancel'; +import {IAccept} from '../../type'; +import { IRemoteUser } from '@/models/entities/user'; +import { Followings } from '@/models/index'; +import DbResolver from '../../db-resolver'; + +export default async (actor: IRemoteUser, activity: IAccept): Promise => { + const dbResolver = new DbResolver(); + + const follower = await dbResolver.getUserFromApId(activity.object); + if (follower == null) { + return `skip: follower not found`; + } + + const following = await Followings.findOne({ + followerId: follower.id, + followeeId: actor.id + }); + + if (following) { + await unfollow(follower, actor); + return `ok: unfollowed`; + } + + return `skip: フォローされていない`; +}; diff --git a/packages/backend/src/remote/activitypub/kernel/undo/index.ts b/packages/backend/src/remote/activitypub/kernel/undo/index.ts index 14b1add152..8de78420e3 100644 --- a/packages/backend/src/remote/activitypub/kernel/undo/index.ts +++ b/packages/backend/src/remote/activitypub/kernel/undo/index.ts @@ -1,8 +1,9 @@ import { IRemoteUser } from '@/models/entities/user'; -import { IUndo, isFollow, isBlock, isLike, isAnnounce, getApType } from '../../type'; +import {IUndo, isFollow, isBlock, isLike, isAnnounce, getApType, isAccept} from '../../type'; import unfollow from './follow'; import unblock from './block'; import undoLike from './like'; +import undoAccept from './accept'; import { undoAnnounce } from './announce'; import Resolver from '../../resolver'; import { apLogger } from '../../logger'; @@ -29,6 +30,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise => { if (isBlock(object)) return await unblock(actor, object); if (isLike(object)) return await undoLike(actor, object); if (isAnnounce(object)) return await undoAnnounce(actor, object); + if (isAccept(object)) return await undoAccept(actor, object); return `skip: unknown object type ${getApType(object)}`; }; diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts new file mode 100644 index 0000000000..c0e9df3652 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts @@ -0,0 +1,82 @@ +import $ from 'cafy'; +import { ID } from '@/misc/cafy-id'; +import * as ms from 'ms'; +import deleteFollowing from '@/services/following/delete'; +import define from '../../define'; +import { ApiError } from '../../error'; +import { getUser } from '../../common/getters'; +import { Followings, Users } from '@/models/index'; + +export const meta = { + tags: ['following', 'users'], + + limit: { + duration: ms('1hour'), + max: 100 + }, + + requireCredential: true as const, + + kind: 'write:following', + + params: { + userId: { + validator: $.type(ID), + } + }, + + errors: { + noSuchUser: { + message: 'No such user.', + code: 'NO_SUCH_USER', + id: '5b12c78d-2b28-4dca-99d2-f56139b42ff8' + }, + + followerIsYourself: { + message: 'Follower is yourself.', + code: 'FOLLOWER_IS_YOURSELF', + id: '07dc03b9-03da-422d-885b-438313707662' + }, + + notFollowing: { + message: 'The other use is not following you.', + code: 'NOT_FOLLOWING', + id: '5dbf82f5-c92b-40b1-87d1-6c8c0741fd09' + }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + } +}; + +export default define(meta, async (ps, user) => { + const followee = user; + + // Check if the follower is yourself + if (user.id === ps.userId) { + throw new ApiError(meta.errors.followerIsYourself); + } + + // Get follower + const follower = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + + // Check not following + const exist = await Followings.findOne({ + followerId: follower.id, + followeeId: followee.id + }); + + if (exist == null) { + throw new ApiError(meta.errors.notFollowing); + } + + await deleteFollowing(follower, followee); + + return await Users.pack(followee.id, user); +}); diff --git a/packages/backend/src/services/following/delete.ts b/packages/backend/src/services/following/delete.ts index 29e3372b6a..ea612147df 100644 --- a/packages/backend/src/services/following/delete.ts +++ b/packages/backend/src/services/following/delete.ts @@ -2,6 +2,7 @@ import { publishMainStream, publishUserEvent } from '@/services/stream'; import { renderActivity } from '@/remote/activitypub/renderer/index'; import renderFollow from '@/remote/activitypub/renderer/follow'; import renderUndo from '@/remote/activitypub/renderer/undo'; +import renderReject from '@/remote/activitypub/renderer/reject'; import { deliver } from '@/queue/index'; import Logger from '../logger'; import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; @@ -40,6 +41,12 @@ export default async function(follower: { id: User['id']; host: User['host']; ur const content = renderActivity(renderUndo(renderFollow(follower, followee), follower)); deliver(follower, content, followee.inbox); } + + if (Users.isLocalUser(followee) && Users.isRemoteUser(follower)) { + // local user has null host + const content = renderActivity(renderReject(renderFollow(follower, followee), followee)); + deliver(followee, content, follower.inbox); + } } export async function decrementFollowing(follower: { id: User['id']; host: User['host']; }, followee: { id: User['id']; host: User['host']; }) { diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts index 0c04547101..ebe101bc0f 100644 --- a/packages/client/src/scripts/get-user-menu.ts +++ b/packages/client/src/scripts/get-user-menu.ts @@ -109,6 +109,14 @@ export function getUserMenu(user) { return !confirm.canceled; } + async function invalidateFollow() { + os.apiWithDialog('following/invalidate', { + userId: user.id + }).then(() => { + user.isFollowed = !user.isFollowed; + }) + } + let menu = [{ icon: 'fas fa-at', text: i18n.locale.copyUsername, @@ -153,6 +161,14 @@ export function getUserMenu(user) { action: toggleBlock }]); + if (user.isFollowed) { + menu = menu.concat([{ + icon: 'fas fa-unlink', + text: i18n.locale.breakFollow, + action: invalidateFollow + }]); + } + menu = menu.concat([null, { icon: 'fas fa-exclamation-circle', text: i18n.locale.reportAbuse, -- cgit v1.2.3-freya From e617ced1d35bbc68d685ebdb3be09894621237ec Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 3 Dec 2021 11:43:05 +0900 Subject: refactoring https: //github.com/misskey-dev/misskey/pull/7901 Co-Authored-By: MeiMei <30769358+mei23@users.noreply.github.com> --- .../src/remote/activitypub/kernel/reject/follow.ts | 7 +- .../api/endpoints/following/requests/reject.ts | 2 +- packages/backend/src/services/following/reject.ts | 105 +++++++++++++++++++++ .../src/services/following/requests/reject.ts | 46 --------- 4 files changed, 110 insertions(+), 50 deletions(-) create mode 100644 packages/backend/src/services/following/reject.ts delete mode 100644 packages/backend/src/services/following/requests/reject.ts (limited to 'packages/backend/src/server/api') diff --git a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts index 356547440f..049437b18f 100644 --- a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts +++ b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts @@ -1,8 +1,9 @@ import { IRemoteUser } from '@/models/entities/user'; -import reject from '@/services/following/requests/reject'; +import { remoteReject } from '@/services/following/reject'; import { IFollow } from '../../type'; import DbResolver from '../../db-resolver'; import { relayRejected } from '@/services/relay'; +import { Users } from '@/models'; export default async (actor: IRemoteUser, activity: IFollow): Promise => { // ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある @@ -14,7 +15,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise => return `skip: follower not found`; } - if (follower.host != null) { + if (!Users.isLocalUser(follower)) { return `skip: follower is not a local user`; } @@ -24,6 +25,6 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise => return await relayRejected(match[1]); } - await reject(actor, follower); + await remoteReject(actor, follower); return `ok`; }; diff --git a/packages/backend/src/server/api/endpoints/following/requests/reject.ts b/packages/backend/src/server/api/endpoints/following/requests/reject.ts index 620324361f..30d0e094c3 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/reject.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/reject.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import { ID } from '@/misc/cafy-id'; -import rejectFollowRequest from '@/services/following/requests/reject'; +import { rejectFollowRequest } from '@/services/following/reject'; import define from '../../../define'; import { ApiError } from '../../../error'; import { getUser } from '../../../common/getters'; diff --git a/packages/backend/src/services/following/reject.ts b/packages/backend/src/services/following/reject.ts new file mode 100644 index 0000000000..0ec4d7d00c --- /dev/null +++ b/packages/backend/src/services/following/reject.ts @@ -0,0 +1,105 @@ +import { renderActivity } from '@/remote/activitypub/renderer/index'; +import renderFollow from '@/remote/activitypub/renderer/follow'; +import renderReject from '@/remote/activitypub/renderer/reject'; +import { deliver } from '@/queue/index'; +import { publishMainStream, publishUserEvent } from '@/services/stream'; +import { User, ILocalUser, IRemoteUser } from '@/models/entities/user'; +import { Users, FollowRequests, Followings } from '@/models/index'; +import { decrementFollowing } from './delete'; + +type Local = ILocalUser | { id: User['id']; host: User['host']; uri: User['host'] }; +type Remote = IRemoteUser; +type Both = Local | Remote; + +/** + * API following/request/reject + */ +export async function rejectFollowRequest(user: Local, follower: Both) { + if (Users.isRemoteUser(follower)) { + deliverReject(user, follower); + } + + await removeFollowRequest(user, follower); + + if (Users.isLocalUser(follower)) { + publishUnfollow(user, follower); + } +} + +/** + * API following/reject + */ +export async function rejectFollow(user: Local, follower: Both) { + if (Users.isRemoteUser(follower)) { + deliverReject(user, follower); + } + + await removeFollow(user, follower); + + if (Users.isLocalUser(follower)) { + publishUnfollow(user, follower); + } +} + +/** + * AP Reject/Follow + */ +export async function remoteReject(actor: Remote, follower: Local) { + await removeFollowRequest(actor, follower); + await removeFollow(actor, follower); + publishUnfollow(actor, follower); +} + +/** + * Remove follow request record + */ +async function removeFollowRequest(followee: Both, follower: Both) { + const request = await FollowRequests.findOne({ + followeeId: followee.id, + followerId: follower.id + }); + + if (!request) return; + + await FollowRequests.delete(request.id); +} + +/** + * Remove follow record + */ +async function removeFollow(followee: Both, follower: Both) { + const following = await Followings.findOne({ + followeeId: followee.id, + followerId: follower.id + }); + + if (!following) return; + + await Followings.delete(following.id); + decrementFollowing(follower, followee); +} + +/** + * Deliver Reject to remote + */ +async function deliverReject(followee: Local, follower: Remote) { + const request = await FollowRequests.findOne({ + followeeId: followee.id, + followerId: follower.id + }); + + const content = renderActivity(renderReject(renderFollow(follower, followee, request?.requestId || undefined), followee)); + deliver(followee, content, follower.inbox); +} + +/** + * Publish unfollow to local + */ +async function publishUnfollow(followee: Both, follower: Local) { + const packedFollowee = await Users.pack(followee.id, follower, { + detail: true + }); + + publishUserEvent(follower.id, 'unfollow', packedFollowee); + publishMainStream(follower.id, 'unfollow', packedFollowee); +} diff --git a/packages/backend/src/services/following/requests/reject.ts b/packages/backend/src/services/following/requests/reject.ts deleted file mode 100644 index 41cebd9e41..0000000000 --- a/packages/backend/src/services/following/requests/reject.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { renderActivity } from '@/remote/activitypub/renderer/index'; -import renderFollow from '@/remote/activitypub/renderer/follow'; -import renderReject from '@/remote/activitypub/renderer/reject'; -import { deliver } from '@/queue/index'; -import { publishMainStream, publishUserEvent } from '@/services/stream'; -import { User, ILocalUser } from '@/models/entities/user'; -import { Users, FollowRequests, Followings } from '@/models/index'; -import { decrementFollowing } from '../delete'; - -export default async function(followee: { id: User['id']; host: User['host']; uri: User['host'] }, follower: User) { - if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) { - const request = await FollowRequests.findOne({ - followeeId: followee.id, - followerId: follower.id - }); - - const content = renderActivity(renderReject(renderFollow(follower, followee, request!.requestId!), followee)); - deliver(followee, content, follower.inbox); - } - - const request = await FollowRequests.findOne({ - followeeId: followee.id, - followerId: follower.id - }); - - if (request) { - await FollowRequests.delete(request.id); - } else { - const following = await Followings.findOne({ - followeeId: followee.id, - followerId: follower.id - }); - - if (following) { - await Followings.delete(following.id); - decrementFollowing(follower, followee); - } - } - - Users.pack(followee.id, follower, { - detail: true - }).then(packed => { - publishUserEvent(follower.id, 'unfollow', packed); - publishMainStream(follower.id, 'unfollow', packed); - }); -} -- cgit v1.2.3-freya