summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-10-30 14:34:32 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-10-30 14:34:32 +0900
commit7afa541a53c1b00e8f7fb6f5d211789b3e4c52bb (patch)
treec436302533b1d4fdae91eb87b31cc003077a4294 /src/services
parentRefactor (diff)
downloadsharkey-7afa541a53c1b00e8f7fb6f5d211789b3e4c52bb.tar.gz
sharkey-7afa541a53c1b00e8f7fb6f5d211789b3e4c52bb.tar.bz2
sharkey-7afa541a53c1b00e8f7fb6f5d211789b3e4c52bb.zip
Fix #3040
Diffstat (limited to 'src/services')
-rw-r--r--src/services/blocking/create.ts8
-rw-r--r--src/services/following/create.ts4
-rw-r--r--src/services/following/delete.ts4
-rw-r--r--src/services/following/requests/accept.ts4
-rw-r--r--src/services/following/requests/reject.ts4
5 files changed, 18 insertions, 6 deletions
diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts
index 11b2954af6..2998cdd78c 100644
--- a/src/services/blocking/create.ts
+++ b/src/services/blocking/create.ts
@@ -60,7 +60,9 @@ async function cancelRequest(follower: IUser, followee: IUser) {
}
if (isLocalUser(follower)) {
- packUser(followee, follower).then(packed => publishMainStream(follower._id, 'unfollow', packed));
+ packUser(followee, follower, {
+ detail: true
+ }).then(packed => publishMainStream(follower._id, 'unfollow', packed));
}
// リモートにフォローリクエストをしていたらUndoFollow送信
@@ -110,7 +112,9 @@ async function unFollow(follower: IUser, followee: IUser) {
// Publish unfollow event
if (isLocalUser(follower)) {
- packUser(followee, follower).then(packed => publishMainStream(follower._id, 'unfollow', packed));
+ packUser(followee, follower, {
+ detail: true
+ }).then(packed => publishMainStream(follower._id, 'unfollow', packed));
}
// リモートにフォローをしていたらUndoFollow送信
diff --git a/src/services/following/create.ts b/src/services/following/create.ts
index f35033a1cb..46b818f8bb 100644
--- a/src/services/following/create.ts
+++ b/src/services/following/create.ts
@@ -87,7 +87,9 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri
// Publish follow event
if (isLocalUser(follower)) {
- packUser(followee, follower).then(packed => publishMainStream(follower._id, 'follow', packed));
+ packUser(followee, follower, {
+ detail: true
+ }).then(packed => publishMainStream(follower._id, 'follow', packed));
}
// Publish followed event
diff --git a/src/services/following/delete.ts b/src/services/following/delete.ts
index 9f82af2bf4..dce178a927 100644
--- a/src/services/following/delete.ts
+++ b/src/services/following/delete.ts
@@ -42,7 +42,9 @@ export default async function(follower: IUser, followee: IUser) {
// Publish unfollow event
if (isLocalUser(follower)) {
- packUser(followee, follower).then(packed => publishMainStream(follower._id, 'unfollow', packed));
+ packUser(followee, follower, {
+ detail: true
+ }).then(packed => publishMainStream(follower._id, 'unfollow', packed));
}
if (isLocalUser(follower) && isRemoteUser(followee)) {
diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts
index 32453c74dc..97cd733b2e 100644
--- a/src/services/following/requests/accept.ts
+++ b/src/services/following/requests/accept.ts
@@ -70,5 +70,7 @@ export default async function(followee: IUser, follower: IUser) {
detail: true
}).then(packed => publishMainStream(followee._id, 'meUpdated', packed));
- packUser(followee, follower).then(packed => publishMainStream(follower._id, 'follow', packed));
+ packUser(followee, follower, {
+ detail: true
+ }).then(packed => publishMainStream(follower._id, 'follow', packed));
}
diff --git a/src/services/following/requests/reject.ts b/src/services/following/requests/reject.ts
index 73dbbb92e0..694663f231 100644
--- a/src/services/following/requests/reject.ts
+++ b/src/services/following/requests/reject.ts
@@ -28,5 +28,7 @@ export default async function(followee: IUser, follower: IUser) {
}
});
- packUser(followee, follower).then(packed => publishMainStream(follower._id, 'unfollow', packed));
+ packUser(followee, follower, {
+ detail: true
+ }).then(packed => publishMainStream(follower._id, 'unfollow', packed));
}