60ea29dfe6
Credo fixes: alias grouping/ordering
2019-02-09 14:59:20 +01:00
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
2019-01-31 15:07:49 +07:00
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
2019-01-29 13:12:28 +03:00
55affbca7f
add a job queue
2019-01-28 22:17:17 +07:00
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
2019-01-28 15:39:14 +03:00
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
2019-01-28 11:03:52 +03:00
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
2019-01-27 22:51:50 +01:00
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
2019-01-24 17:37:23 +03:00
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
2019-01-21 08:00:41 +01:00
44693fbf6e
Formating
2019-01-20 01:28:46 +03:00
afd83db0d7
Provide local og:url for remote activities
2019-01-19 10:58:27 +03:00
1b1af4798a
Use object instead of activity for metadata
2019-01-18 09:32:52 +03:00
dd1432d695
Disable previews for any activity, but create
2019-01-16 09:42:24 +03:00
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
2019-01-15 20:00:21 +03:00
4656f433f9
Move metadata.ex out of ostatus
2019-01-15 11:00:17 +03:00
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
20c0dd1e24
Support activity+json request for activity
2019-01-09 09:33:30 +01:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
2018-12-14 21:07:06 +01:00
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
2018-12-14 19:55:40 +01:00
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
2018-12-13 22:21:14 +01:00
9b3a6cdb07
Extract opengraph/oembed into separate module
2018-12-13 22:17:53 +01:00
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
2018-12-13 22:17:53 +01:00
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
2018-12-13 22:17:53 +01:00
e94c3442f4
updates
2018-12-10 13:27:37 +03:00
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
a09ed0f5af
avoid mix format bug
2018-12-06 18:41:29 +09:00
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
27792b2d77
remove pool and timeout options which duplicate with the default
2018-12-06 11:23:15 +09:00
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
d6ab701a14
formatting
2018-12-04 05:01:21 +00:00
f168a2add6
ostatus: fix representing external objects
2018-12-04 04:52:09 +00:00
dd66cc2ca6
ostatus: use Object.normalize() where appropriate when representing activities
2018-12-04 04:52:09 +00:00
d3fde9b5f2
ostatus: note handler: appropriately use Object.normalize()
2018-12-04 04:52:09 +00:00
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
2018-11-30 17:21:58 +01:00
bcecdc3ab1
Various runtime configuration fixes
2018-11-19 10:09:24 +01:00
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
e6d246882d
federator: don't federate anything other than Note objects to OStatus
2018-11-10 10:06:10 +00:00
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
440b459cd1
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
...
activitypub: filter destination list for announce activities differently than normal (closes #164 )
Closes #164
See merge request pleroma/pleroma!227
2018-08-27 08:25:27 +00:00
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
2018-07-12 17:15:47 +00:00
6f4ca7ddf7
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
2018-06-27 13:08:05 +00:00
bc05548370
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:45 +00:00
6f384d35dd
ostatus: we need to include the original author of a message as a mention
...
this is due to the use of activity.recipients which may not necessarily contain the original
author if the actors are not following each other.
2018-06-18 05:27:09 +00:00
fa0c2727d8
Fix users lookup/return type
...
* Allow viewing user in frontend by id on pageload
2018-06-07 23:18:45 -07:00
8073af6e10
Better error handling for OstatusController.
2018-06-03 21:04:44 +02:00
06439f64d0
Better error handling for ActivityPubController
2018-06-03 19:58:59 +02:00
5e76adb07e
Fix url guessing attacks.
2018-05-30 20:00:45 +02:00
d045b96f95
Add tests for incoming unfollow over OStatus
2018-05-21 05:11:13 -04:00
f2d6c3a512
Handle unfollows from OStatus
2018-05-21 04:36:20 -04:00
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
271fb5ccb1
Probably better way of handling non-follow undos in ostatus
2018-05-11 11:59:53 -04:00
4151cbe6b2
Revert "Do not send non-follow undos over ostatus for now"
...
This reverts commit 07fdc07238
2018-05-11 11:53:28 -04:00
0b527b5528
Revert "Use [] instead of nil"
...
This reverts commit 42268b0981
2018-05-11 11:53:06 -04:00
42268b0981
Use [] instead of nil
2018-05-11 01:48:56 -04:00
07fdc07238
Do not send non-follow undos over ostatus for now
2018-05-11 01:45:10 -04:00
4d5ec883b7
Federate correct activity
2018-05-08 21:52:21 -04:00
636f0fa402
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
22bfeac256
Update note count in ActivityPub.create.
2018-04-21 12:58:04 +03:00
9e6ae44729
Formatting fixes.
2018-04-21 09:43:53 +02:00
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
46f63ea8af
Fix atom feed pagination.
2018-03-26 09:51:43 +02:00
9b97b023c5
Merge branch 'feld-Logger' into 'develop'
...
Logging cleanup
See merge request pleroma/pleroma!76
2018-03-20 05:57:47 +00:00
7430ff9173
Capitalize Atom
2018-03-19 17:44:25 +00:00
4d5161b16d
Only fetch if it's http.
2018-03-19 10:28:28 +01:00
fcf1937a40
Correctly handle unlisted messages coming in through Ostatus.
2018-03-07 15:45:13 +01:00
b82637f32d
Don't use special query for feed.
2018-03-06 16:04:29 +01:00
0e9bd6d148
Hotfix for tag problems.
2018-02-24 22:28:22 +01:00
fa3aa59248
Add missing alias.
2018-02-24 13:11:39 +01:00
fb02300234
Pleroma AP detection mechanism.
2018-02-24 13:06:53 +01:00
2583a9f6e8
More logging.
2018-02-23 15:00:19 +01:00
313f186a66
Ostatus: Use all recipients as mentions.
2018-02-19 08:34:55 +01:00
ae26604378
ActivityPub: Refactor create function.
2018-02-15 19:59:35 +01:00
b331cb449a
Merge branch 'develop' into feature/activitypub
2018-02-12 10:24:15 +01:00
ae1ec858f4
Basic AP user building.
2018-02-11 17:20:43 +01:00
52200998c9
Merge branch 'develop' into feature/activitypub
2018-02-11 09:50:55 +01:00
a61f21ff4f
print <link rel="next"> element in atom.feed
2018-02-09 23:10:32 +09:00
7124f12a94
introduce max_id parameter in feed.atom (debug)
2018-02-09 21:46:05 +09:00
9c61f60558
introduce max_id parameter in feed.atom
2018-02-09 21:41:30 +09:00
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
2018-01-30 12:20:39 +01:00
cefb6cfea1
provide logo at feed.atom (debug)
2018-01-30 19:37:04 +09:00
b713b28dfd
provide logo at feed.atom
2018-01-30 19:26:07 +09:00
64e51c2cfa
Fix incoming Pleroma CWs. Closes #96 .
2018-01-29 17:44:35 +01:00
57d413e655
Revert "Revert "Add remote follow path to webfinger.""
...
This reverts commit fb5aa34092
2018-01-18 18:42:32 +02:00
fb5aa34092
Revert "Add remote follow path to webfinger."
...
This reverts commit bc689740f0
2018-01-18 03:42:09 +02:00
bc689740f0
Add remote follow path to webfinger.
2018-01-18 02:38:02 +02:00
64330d9455
ActivityPub: Add object routes / controller.
2017-12-11 18:21:33 +01:00
5599c5920c
Basic incoming AP support.
2017-12-11 10:37:22 +01:00
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
59770c3f5c
Fix all compilation warnings
2017-11-19 02:22:07 +01:00
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
Haelwenn (lanodan) Monnier