summaryrefslogtreecommitdiff
path: root/src/services/blocking
diff options
context:
space:
mode:
Diffstat (limited to 'src/services/blocking')
-rw-r--r--src/services/blocking/create.ts14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts
index def4f33585..dec48d26de 100644
--- a/src/services/blocking/create.ts
+++ b/src/services/blocking/create.ts
@@ -1,4 +1,4 @@
-import { publishMainStream } from '../stream';
+import { publishMainStream, publishUserEvent } from '../stream';
import { renderActivity } from '../../remote/activitypub/renderer';
import renderFollow from '../../remote/activitypub/renderer/follow';
import renderUndo from '../../remote/activitypub/renderer/undo';
@@ -18,7 +18,7 @@ export default async function(blocker: User, blockee: User) {
unFollow(blockee, blocker)
]);
- await Blockings.save({
+ await Blockings.insert({
id: genId(),
createdAt: new Date(),
blockerId: blocker.id,
@@ -55,7 +55,10 @@ async function cancelRequest(follower: User, followee: User) {
if (Users.isLocalUser(follower)) {
Users.pack(followee, follower, {
detail: true
- }).then(packed => publishMainStream(follower.id, 'unfollow', packed));
+ }).then(packed => {
+ publishUserEvent(follower.id, 'unfollow', packed);
+ publishMainStream(follower.id, 'unfollow', packed);
+ });
}
// リモートにフォローリクエストをしていたらUndoFollow送信
@@ -97,7 +100,10 @@ async function unFollow(follower: User, followee: User) {
if (Users.isLocalUser(follower)) {
Users.pack(followee, follower, {
detail: true
- }).then(packed => publishMainStream(follower.id, 'unfollow', packed));
+ }).then(packed => {
+ publishUserEvent(follower.id, 'unfollow', packed);
+ publishMainStream(follower.id, 'unfollow', packed);
+ });
}
// リモートにフォローをしていたらUndoFollow送信