Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dima Krasner
Sharkey
Commits
cc3704c3
Commit
cc3704c3
authored
7 years ago
by
Akihiko Odaki
Browse files
Options
Downloads
Patches
Plain Diff
Accept remote follow
parent
32c008d0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/remote/activitypub/act/follow.ts
+28
-21
28 additions, 21 deletions
src/remote/activitypub/act/follow.ts
src/remote/activitypub/renderer/accept.ts
+4
-0
4 additions, 0 deletions
src/remote/activitypub/renderer/accept.ts
with
32 additions
and
21 deletions
src/remote/activitypub/act/follow.ts
+
28
−
21
View file @
cc3704c3
...
...
@@ -4,11 +4,13 @@ import Following from '../../../models/following';
import
User
from
'
../../../models/user
'
;
import
config
from
'
../../../config
'
;
import
queue
from
'
../../../queue
'
;
import
context
from
'
../renderer/context
'
;
import
renderAccept
from
'
../renderer/accept
'
;
import
request
from
'
../../request
'
;
export
default
async
(
actor
,
activity
)
=>
{
const
prefix
=
config
.
url
+
'
/@
'
;
const
id
=
activity
.
object
.
id
||
activity
.
object
;
let
following
;
if
(
!
id
.
startsWith
(
prefix
))
{
return
null
;
...
...
@@ -24,28 +26,33 @@ export default async (actor, activity) => {
throw
new
Error
();
}
try
{
following
=
await
Following
.
insert
({
const
accept
=
renderAccept
(
activity
);
accept
[
'
@context
'
]
=
context
;
await
Promise
.
all
([
request
(
followee
,
actor
.
account
.
inbox
,
accept
),
Following
.
insert
({
createdAt
:
new
Date
(),
followerId
:
actor
.
_id
,
followeeId
:
followee
.
_id
});
}
catch
(
exception
)
{
// duplicate key error
if
(
exception
instanceof
MongoError
&&
exception
.
code
===
11000
)
{
return
null
;
}
throw
exception
;
}
await
new
Promise
((
resolve
,
reject
)
=>
{
queue
.
create
(
'
http
'
,
{
type
:
'
follow
'
,
following
:
following
.
_id
}).
save
(
error
=>
{
if
(
error
)
{
reject
(
error
);
}
else
{
resolve
(
null
);
}).
then
(
following
=>
new
Promise
((
resolve
,
reject
)
=>
{
queue
.
create
(
'
http
'
,
{
type
:
'
follow
'
,
following
:
following
.
_id
}).
save
(
error
=>
{
if
(
error
)
{
reject
(
error
);
}
else
{
resolve
();
}
});
}),
error
=>
{
// duplicate key error
if
(
error
instanceof
MongoError
&&
error
.
code
===
11000
)
{
return
;
}
});
});
throw
error
;
})
]);
return
null
;
};
This diff is collapsed.
Click to expand it.
src/remote/activitypub/renderer/accept.ts
0 → 100644
+
4
−
0
View file @
cc3704c3
export
default
object
=>
({
type
:
'
Accept
'
,
object
});
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment