hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bugfix/federation-kroeg' into 'develop'

Browse source 
fix federation with kroeg

See merge request pleroma/pleroma!272
This commit is contained in:
kaniini 2018-08-16 15:20:15 +00:00
commit 5fbb14f5ec
5 changed files with 94 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/fixtures/httpoison_mock/puckipedia.com.json vendored Normal file
View file

@ -0,0 +1 @@
{"@context":["https://www.w3.org/ns/activitystreams","https://puckipedia.com/-/context"],"endpoints":"https://puckipedia.com/#endpoints","followers":"https://puckipedia.com/followers","following":"https://puckipedia.com/following","icon":{"mediaType":"image/png","type":"Image","url":"https://puckipedia.com/images/avatar.png"},"id":"https://puckipedia.com/","inbox":"https://puckipedia.com/inbox","kroeg:blocks":{"id":"https://puckipedia.com/blocks"},"liked":"https://puckipedia.com/liked","manuallyApprovesFollowers":false,"name":"HACKER TEEN PUCKIPEDIA 👩‍💻","outbox":"https://puckipedia.com/outbox","preferredUsername":"puckipedia","publicKey":{"id":"https://puckipedia.com/#key","owner":"https://puckipedia.com/","publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvN05xIcFE0Qgany7Rht4\n0ZI5wu++IT7K5iSqRimBYkpoeHbVcT9RFlW+aWH/QJJW/YgZ7+LMr8AMCrKrwSpS\nCndyrpx4O4lZ3FNRLu7tbklh01rGZfE6R1SFfYBpvMvImc9nYT6iezYDbv6NkHku\no3aVhjql216XlA0OhIrqQme9sAdrLbjbMrTUS8douCTkDOX+JFj1ghHCqdYEMZJI\nOY9kovtgnqyxFLm0RsPGsO1+g/OVojqG+VqHz6O2lceaTVQLlnZ4gOhLVG1tVsA2\nRfXQK+R/VgXncYE+BlQVd/tcdGAz7CDL7PP3rP65gmARnafhGR96cCOi/KzlAXSO\nMwIDAQAB\n-----END PUBLIC KEY-----","type":[]},"summary":"<p>federated hacker teen<br/>\n[<a href=\"https://pronoun.is/she\">she</a>/<a href=\"https://pronoun.is/they\">they</a>]</p>","type":"Person","updated":"2017-12-19T16:56:29.7576707+00:00"}

50
test/fixtures/kroeg-post-activity.json vendored Normal file
View file

@ -0,0 +1,50 @@
{
"@context": [
"https://www.w3.org/ns/activitystreams",
"https://puckipedia.com/-/context"
],
"actor": {
"endpoints": "https://puckipedia.com/#endpoints",
"followers": "https://puckipedia.com/followers",
"following": "https://puckipedia.com/following",
"icon": {
"mediaType": "image/png",
"type": "Image",
"url": "https://puckipedia.com/images/avatar.png"
},
"id": "https://puckipedia.com/",
"inbox": "https://puckipedia.com/inbox",
"kroeg:blocks": {
"id": "https://puckipedia.com/blocks"
},
"liked": "https://puckipedia.com/liked",
"manuallyApprovesFollowers": false,
"name": "HACKER TEEN PUCKIPEDIA \ud83d\udc69\u200d\ud83d\udcbb",
"outbox": "https://puckipedia.com/outbox",
"preferredUsername": "puckipedia",
"publicKey": {
"id": "https://puckipedia.com/#key",
"owner": "https://puckipedia.com/",
"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvN05xIcFE0Qgany7Rht4\n0ZI5wu++IT7K5iSqRimBYkpoeHbVcT9RFlW+aWH/QJJW/YgZ7+LMr8AMCrKrwSpS\nCndyrpx4O4lZ3FNRLu7tbklh01rGZfE6R1SFfYBpvMvImc9nYT6iezYDbv6NkHku\no3aVhjql216XlA0OhIrqQme9sAdrLbjbMrTUS8douCTkDOX+JFj1ghHCqdYEMZJI\nOY9kovtgnqyxFLm0RsPGsO1+g/OVojqG+VqHz6O2lceaTVQLlnZ4gOhLVG1tVsA2\nRfXQK+R/VgXncYE+BlQVd/tcdGAz7CDL7PP3rP65gmARnafhGR96cCOi/KzlAXSO\nMwIDAQAB\n-----END PUBLIC KEY-----",
"type": []
},
"summary": "<p>federated hacker teen<br/>\n[<a href=\"https://pronoun.is/she\">she</a>/<a href=\"https://pronoun.is/they\">they</a>]</p>",
"type": "Person",
"updated": "2017-12-19T16:56:29.7576707+00:00"
},
"cc": "https://puckipedia.com/followers",
"id": "https://puckipedia.com/ae4ee4e8be/activity",
"object": {
"attributedTo": "https://puckipedia.com/",
"cc": "https://puckipedia.com/followers",
"content": "<p>henlo from my Psion netBook</p><p>message sent from my Psion netBook</p>",
"id": "https://puckipedia.com/ae4ee4e8be",
"likes": "https://puckipedia.com/ae4ee4e8be/likes",
"replies": "https://puckipedia.com/ae4ee4e8be/replies",
"shares": "https://puckipedia.com/ae4ee4e8be/shares",
"to": "https://www.w3.org/ns/activitystreams#Public",
"type": "Note"
},
"to": "https://www.w3.org/ns/activitystreams#Public",
"type": "Create"
}