yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Fix checkbox margins

Browse source
This commit is contained in:
Chocobozzz 2018-11-19 14:34:01 +01:00
parent a8a6322778
commit 361805c48b
No known key found for this signature in database
GPG key ID: 583A612D890159BE
8 changed files with 69 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/helpers/activitypub.ts
View file

@ -1,7 +1,7 @@
import * as Bluebird from 'bluebird'
import * as validator from 'validator'
import { ResultList } from '../../shared/models'
import { Activity, ActivityPubActor } from '../../shared/models/activitypub'
import { Activity } from '../../shared/models/activitypub'
import { ACTIVITY_PUB } from '../initializers'
import { ActorModel } from '../models/activitypub/actor'
import { signJsonLDObject } from './peertube-crypto'
@ -106,10 +106,10 @@ function buildSignedActivity (byActor: ActorModel, data: Object) {
return signJsonLDObject(byActor, activity) as Promise<Activity>
}
function getActorUrl (activityActor: string | ActivityPubActor) {
if (typeof activityActor === 'string') return activityActor
function getAPUrl (activity: string | { id: string }) {
if (typeof activity === 'string') return activity
return activityActor.id
return activity.id
}
function checkUrlsSameHost (url1: string, url2: string) {
@ -123,7 +123,7 @@ function checkUrlsSameHost (url1: string, url2: string) {
export {
checkUrlsSameHost,
getActorUrl,
getAPUrl,
activityPubContextify,
activityPubCollectionPagination,
buildSignedActivity