rinpatch
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
sxsdv1
20c0dd1e24
Support activity+json request for activity
2019-01-09 09:33:30 +01:00
William Pitcock
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
href
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
raeno
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
2018-12-14 21:07:06 +01:00
raeno
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
2018-12-14 19:55:40 +01:00
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
raeno
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
raeno
9b3a6cdb07
Extract opengraph/oembed into separate module
2018-12-13 22:17:53 +01:00
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
2018-12-13 22:17:53 +01:00
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
raeno
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
2018-12-13 22:17:53 +01:00
Maksim Pechnikov
e94c3442f4
updates
2018-12-10 13:27:37 +03:00
Maksim Pechnikov
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
2018-12-06 18:41:29 +09:00
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
2018-12-06 11:23:15 +09:00
Maksim Pechnikov
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
William Pitcock
d6ab701a14
formatting
2018-12-04 05:01:21 +00:00
William Pitcock
f168a2add6
ostatus: fix representing external objects
2018-12-04 04:52:09 +00:00
William Pitcock
dd66cc2ca6
ostatus: use Object.normalize() where appropriate when representing activities
2018-12-04 04:52:09 +00:00
William Pitcock
d3fde9b5f2
ostatus: note handler: appropriately use Object.normalize()
2018-12-04 04:52:09 +00:00
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
2018-11-30 17:21:58 +01:00
href
bcecdc3ab1
Various runtime configuration fixes
2018-11-19 10:09:24 +01:00
William Pitcock
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
William Pitcock
e6d246882d
federator: don't federate anything other than Note objects to OStatus
2018-11-10 10:06:10 +00:00
href
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
lambda
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
William Pitcock
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
2018-07-12 17:15:47 +00:00
William Pitcock
6f4ca7ddf7
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
2018-06-27 13:08:05 +00:00
William Pitcock
bc05548370
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:45 +00:00
William Pitcock
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
Rachel H
fa0c2727d8
Fix users lookup/return type
...
* Allow viewing user in frontend by id on pageload
2018-06-07 23:18:45 -07:00
lain
8073af6e10
Better error handling for OstatusController.
2018-06-03 21:04:44 +02:00
lain
06439f64d0
Better error handling for ActivityPubController
2018-06-03 19:58:59 +02:00
lain
5e76adb07e
Fix url guessing attacks.
2018-05-30 20:00:45 +02:00
Francis Dinh
d045b96f95
Add tests for incoming unfollow over OStatus
2018-05-21 05:11:13 -04:00
Francis Dinh
f2d6c3a512
Handle unfollows from OStatus
2018-05-21 04:36:20 -04:00
lambda
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
Francis Dinh
271fb5ccb1
Probably better way of handling non-follow undos in ostatus
2018-05-11 11:59:53 -04:00
Francis Dinh
4151cbe6b2
Revert "Do not send non-follow undos over ostatus for now"
...
This reverts commit 07fdc07238
2018-05-11 11:53:28 -04:00
Francis Dinh
0b527b5528
Revert "Use [] instead of nil"
...
This reverts commit 42268b0981
2018-05-11 11:53:06 -04:00
Francis Dinh
42268b0981
Use [] instead of nil
2018-05-11 01:48:56 -04:00
Francis Dinh
07fdc07238
Do not send non-follow undos over ostatus for now
2018-05-11 01:45:10 -04:00
Francis Dinh
4d5ec883b7
Federate correct activity
2018-05-08 21:52:21 -04:00
Mark Felder
636f0fa402
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
eal
22bfeac256
Update note count in ActivityPub.create.
2018-04-21 12:58:04 +03:00
lain
9e6ae44729
Formatting fixes.
2018-04-21 09:43:53 +02:00
lain
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
lain
46f63ea8af
Fix atom feed pagination.
2018-03-26 09:51:43 +02:00
lambda
9b97b023c5
Merge branch 'feld-Logger' into 'develop'
...
Logging cleanup
See merge request pleroma/pleroma!76
2018-03-20 05:57:47 +00:00
Mark Felder
7430ff9173
Capitalize Atom
2018-03-19 17:44:25 +00:00
lain
4d5161b16d
Only fetch if it's http.
2018-03-19 10:28:28 +01:00
lain
fcf1937a40
Correctly handle unlisted messages coming in through Ostatus.
2018-03-07 15:45:13 +01:00
lain
b82637f32d
Don't use special query for feed.
2018-03-06 16:04:29 +01:00
lain
0e9bd6d148
Hotfix for tag problems.
2018-02-24 22:28:22 +01:00
lain
fa3aa59248
Add missing alias.
2018-02-24 13:11:39 +01:00
lain
fb02300234
Pleroma AP detection mechanism.
2018-02-24 13:06:53 +01:00
lain
2583a9f6e8
More logging.
2018-02-23 15:00:19 +01:00
lain
313f186a66
Ostatus: Use all recipients as mentions.
2018-02-19 08:34:55 +01:00
lain
ae26604378
ActivityPub: Refactor create function.
2018-02-15 19:59:35 +01:00
lain
b331cb449a
Merge branch 'develop' into feature/activitypub
2018-02-12 10:24:15 +01:00
Roger Braun
ae1ec858f4
Basic AP user building.
2018-02-11 17:20:43 +01:00
Roger Braun
52200998c9
Merge branch 'develop' into feature/activitypub
2018-02-11 09:50:55 +01:00
hakabahitoyo
a61f21ff4f
print <link rel="next"> element in atom.feed
2018-02-09 23:10:32 +09:00
Hakaba Hitoyo
7124f12a94
introduce max_id parameter in feed.atom (debug)
2018-02-09 21:46:05 +09:00
Hakaba Hitoyo
9c61f60558
introduce max_id parameter in feed.atom
2018-02-09 21:41:30 +09:00
Roger Braun
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
2018-01-30 12:20:39 +01:00
Hakaba Hitoyo
cefb6cfea1
provide logo at feed.atom (debug)
2018-01-30 19:37:04 +09:00
Hakaba Hitoyo
b713b28dfd
provide logo at feed.atom
2018-01-30 19:26:07 +09:00
Roger Braun
64e51c2cfa
Fix incoming Pleroma CWs. Closes #96 .
2018-01-29 17:44:35 +01:00
eal
57d413e655
Revert "Revert "Add remote follow path to webfinger.""
...
This reverts commit fb5aa34092
2018-01-18 18:42:32 +02:00
eal
fb5aa34092
Revert "Add remote follow path to webfinger."
...
This reverts commit bc689740f0
2018-01-18 03:42:09 +02:00
eal
bc689740f0
Add remote follow path to webfinger.
2018-01-18 02:38:02 +02:00
Lain Iwakura
64330d9455
ActivityPub: Add object routes / controller.
2017-12-11 18:21:33 +01:00
Roger Braun
5599c5920c
Basic incoming AP support.
2017-12-11 10:37:22 +01:00
Roger Braun
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
Lain Iwakura
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
Roger Braun
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
Thog
59770c3f5c
Fix all compilation warnings
2017-11-19 02:22:07 +01:00
Roger Braun
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
Roger Braun
9be286a900
Handle empty terms / tags.
2017-11-01 09:33:29 +01:00
Roger Braun
6f05367325
Federate out content warnings.
2017-10-31 19:51:58 +01:00
Roger Braun
4cbf17dac6
Save cws in the activitypub data.
2017-10-31 17:30:46 +01:00
Roger Braun
4dcbb64f19
Avoid potentially slow count queries for user note count.
...
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
2017-10-31 16:37:11 +01:00
Roger Braun
678dd4c8ec
Use desc id to sort instead of desc inserted_at
...
Should mean the same and is indexed.
2017-09-17 11:16:08 +02:00
Roger Braun
16b1fcd271
Handle incoming emoji.
2017-09-16 16:27:48 +02:00
Roger Braun
884006a9e9
Federate emoji out.
2017-09-16 16:14:23 +02:00
Roger Braun
44693c100d
Federate banners out.
2017-09-16 13:44:08 +02:00
Roger Braun
0fbf1911f5
Banners are objects.
2017-09-16 13:24:15 +02:00
Roger Braun
abac96f41d
Update banner from remote accounts.
2017-09-16 13:16:54 +02:00
Roger Braun
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
Roger Braun
f445a1b376
Don't die on fetching problems.
2017-09-15 08:18:29 +02:00
Roger Braun
cd6cba2f67
log ostatus handling errors.
2017-09-11 21:50:46 +02:00
Roger Braun
95aa6a3c65
Try to fetch from html again if fetching from atom gives no results.
2017-09-08 09:08:31 +02:00
Roger Braun
a441ee7d21
Workaround for masto reply breakage.
2017-09-05 14:01:37 +02:00
Roger Braun
e9ebfdb83b
Fix remote profile update code.
2017-09-05 11:40:34 +02:00
Roger Braun
2348b272e0
Create deletes activities for incoming deletes.
2017-09-04 18:47:46 +02:00
