c9c1f9dee2
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
...
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
2018-11-10 11:50:02 +00:00
99a8ef967e
Merge branch 'tests/prismo-url-map' into 'develop'
...
Test that prismo url-map transforms into a string
See merge request pleroma/pleroma!414
2018-11-10 11:17:12 +00:00
c9df011215
tests: add tests for new OStatus.is_representable? function
2018-11-10 10:39:42 +00:00
719a8a1f82
tests: flip testing to/cc for mentions
2018-11-08 19:17:15 +00:00
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
2018-11-08 16:23:58 +00:00
34bd411781
Unify json ld header handling.
2018-11-08 16:39:38 +01:00
3b02fd9fb7
Small refactor.
2018-11-08 16:05:28 +01:00
d675b8a16f
tests: add tests for twitterapi endpoint
2018-11-06 23:25:16 +00:00
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
2018-11-06 16:00:48 +01:00
36ca3c1b3e
format
2018-11-06 15:17:29 +01:00
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
2fedd93931
Fix formatting.
2018-11-03 16:40:57 +01:00
81af7fd02d
Test for null-content activities.
2018-11-03 16:28:29 +01:00
7dfe611620
Test for case-insensitive mastodon hashtag timelines.
2018-11-03 11:41:40 +01:00
45ebc8dd9a
Check for empty string in_reply_to ids.
2018-11-02 17:33:51 +01:00
c5f26f3ce2
Test that prismo url-map transforms into a string
2018-11-01 11:30:50 +01:00
585b29337c
Ensure filters have a filter_id
2018-11-01 09:17:02 +00:00
1e9ced5af4
Test Relay, switch to runtime configuration.
2018-11-01 09:01:43 +00:00
2ac13061af
testsuite: formatting
2018-10-26 06:37:00 +00:00
0d0c1dcf44
tests: add testsuite for broken thread filter
2018-10-26 06:35:06 +00:00
b1d1f9bc27
tests: add test for user inbox
2018-10-25 05:24:17 +00:00
6cfba7db8d
tests: twitterapi: add additional fields
2018-10-25 04:06:42 +00:00
9563f3766d
tests: update for new in_reply_to_screen_name field
2018-10-25 03:03:44 +00:00
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
2018-10-14 02:14:54 +02:00
497814cbbb
test: update test for new html scrub policy
2018-10-05 21:11:22 +00:00
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
2018-09-28 09:25:27 +00:00
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
2018-09-28 11:17:33 +02:00
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
2018-09-28 10:44:45 +02:00
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
2018-09-27 20:00:48 +02:00
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
2018-09-27 20:00:47 +02:00
2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg)
2018-09-27 20:00:47 +02:00
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
2018-09-22 03:24:40 +00:00
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
2018-09-20 16:24:29 +02:00
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
2018-09-20 16:10:46 +02:00
85b8590109
Update status_view_test.exs
2018-09-10 23:40:29 +00:00
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
2018-09-07 16:12:44 +02:00
ff38ffd9f8
Fix the tests
2018-09-05 22:20:59 +02:00
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
2018-09-05 18:20:26 +00:00
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
d3f6814feb
tests: add test for staffAccounts presence in nodeinfo
2018-09-03 14:48:36 +00:00
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
2018-09-02 12:37:00 +00:00
834515fb51
formatter: don't add XSS emoji
2018-09-02 00:04:09 +00:00
303af9ba4c
tests: add regression tests
2018-09-01 23:33:10 +00:00
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
2018-09-01 23:10:48 +02:00
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
2018-08-31 21:04:46 -07:00
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
2018-08-31 09:51:20 +00:00
e7871ed05e
tests: add tests for evil HTML filtering
2018-08-31 03:34:56 +00:00
9cac7c957c
test: add testcase proving lists system does not leak non-public posts
2018-08-29 08:50:23 +00:00
0f1c629d65
better solution, added test.
2018-08-27 17:07:26 +03:00
6e030129fb
[MastodonAPI] Add filters
2018-08-27 15:09:05 +02:00
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
2018-08-27 15:09:04 +02:00
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
2018-08-27 08:29:25 +00:00
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
2018-08-26 23:24:41 +00:00
86dca39640
tests: fix formatting
2018-08-26 23:19:45 +00:00
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
aab2bdddf4
twitter api: provide object descriptions as attachment description field
2018-08-25 00:12:58 +00:00
bc36d40bee
tests: add a testcase for verifying that objects without a valid ID are always rejected
2018-08-23 01:25:27 +00:00
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
2018-08-21 16:58:44 +00:00
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
2018-08-21 16:56:24 +00:00
74c74decf5
Basic peertube support.
2018-08-21 18:24:09 +02:00
2b5db840ee
attempt to add html validation to mastodon api test case
2018-08-21 15:41:32 +01:00
e883587cc3
this should be looking at the follower's bio, not the user's bio.
...
fixes test.
2018-08-21 15:25:21 +01:00
f533daffdb
sync bio sanitization code in tests
2018-08-21 15:24:06 +01:00
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
2018-08-16 15:20:15 +00:00
38361e7b5e
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
...
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
2018-08-16 15:19:46 +00:00
7fbcd4caaf
test: add kroeg fixtures
2018-08-14 17:09:17 +00:00
92caa2632b
Use Image type for emoji icons.
2018-08-13 16:21:18 +03:00
f9d13558c8
CommonAPI: add emoji to user source data on update
2018-08-13 15:27:20 +03:00
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
2018-08-08 09:24:50 +03:00
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
2018-08-08 08:38:25 +03:00
3026177206
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
2018-08-06 11:29:03 +00:00
9c1b6f11c5
improve test
2018-07-21 02:57:56 +09:00
908cefd84a
debug
2018-07-21 02:19:20 +09:00
9c2afb2e71
improve test
2018-07-21 01:44:35 +09:00
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
2018-07-19 07:35:34 +00:00
54963a6379
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
...
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
2018-07-19 07:31:33 +00:00
18cac1e36b
test: mastodon attachments: update for added description field
2018-07-17 03:40:48 +00:00
489453c246
tests: verify media description api support is working
2018-07-17 03:40:47 +00:00
24b5a75d09
Add test for Plume Articles
2018-07-12 23:08:28 +02:00
f1a29fc43c
test: ostatus controller: add AS2 fetching tests
2018-07-12 20:32:56 +00:00
4fb64c1d86
testsuite: twitter api: add summary where necessary
2018-07-12 16:12:25 +00:00
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
2018-07-12 05:59:12 +00:00
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
2018-07-12 05:58:39 +00:00
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
2018-07-12 03:30:22 +00:00
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
2018-06-27 13:38:07 +00:00
32211c4ada
tests: add default_scope where appropriate
2018-06-27 13:17:07 +00:00
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
2018-06-25 08:45:42 +00:00
6160a1b3c0
mix format
2018-06-24 15:24:41 -07:00
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
2018-06-23 23:20:30 -07:00
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
2018-06-23 23:05:54 -07:00
359093d73b
Fake 2.4.0 API
2018-06-23 16:12:57 +02:00
be800d7936
Merge branch 'bugfix/block-follow-relationships' into 'develop'
...
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
2018-06-19 09:42:45 +00:00
590e8d5555
tests: fix a completely bogus mastodon api test
2018-06-19 08:53:54 +00:00
3707a7fa42
tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
2018-06-19 00:59:28 +00:00
a2c6778ce6
tests: add regression test for contentMap-only posts
2018-06-18 22:14:51 +00:00
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
2018-06-15 22:14:17 +02:00
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
fc15f30a3c
fixup test
2018-06-13 21:45:27 -04:00
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
9c1cf1befb
formatting
2018-06-12 15:01:40 +03:00
f42ffbe9a8
Initial invites support + tests.
2018-06-12 14:55:16 +03:00
c773f42ca4
tests: update twitterapi user view tests for new locked variable
2018-06-11 22:15:53 +00:00
f8e0942745
twitter api: add approve/deny endpoints
2018-06-11 22:15:53 +00:00
d116af3bee
tests: add tests for /api/pleroma/friend_requests
2018-06-11 22:15:53 +00:00
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
2018-06-11 22:15:53 +00:00
a0c5b42e29
tests: assert the state prior to mutating it as well as afterward
2018-06-11 22:15:53 +00:00
c99b9b9d92
testsuite: add mastodon api tests
2018-06-11 22:15:53 +00:00
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
2018-06-11 11:19:45 +00:00
299ef74f2e
tests: add regression test for locking/unlocking account updates
2018-06-08 02:52:34 +00:00
2cebaa7d3a
Add OAuth controller tests
...
Tests for Pleroma.Web.OAuth.OAuthController
2018-06-06 03:18:11 +02:00
4856962434
MastoAPI: add domain blocking.
2018-06-03 22:21:23 +03: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
4856ba596f
Better error handling for MastodonApiController.
2018-06-03 19:28:11 +02:00
0f70e83e8c
Better error handling in TwitterApiController.
2018-06-03 19:11:22 +02:00
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
2018-06-01 08:51:04 +00:00
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
2018-05-31 15:27:42 +03:00
349400c06a
Fix url guessing attacks.
2018-05-30 20:00:27 +02:00
f569b67cda
tests: update for html changes
2018-05-27 13:03:34 +00:00
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
2018-05-26 16:25:32 +02:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
0a6c897c94
Formatting.
2018-05-26 15:11:50 +02:00
bfce29866f
Make Mastodon follow hack more explicit.
2018-05-26 15:07:21 +02:00
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
2018-05-26 14:07:46 +02:00
1db0dc3072
tests: add tests to verify the accept request is discarded if no follow activity could be found
2018-05-26 11:20:53 +00:00
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
2018-05-25 12:53:12 +00:00
1f3eb0f470
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
2018-05-25 06:12:30 +00:00
5f06a1a3c5
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
2018-05-25 05:29:00 +00:00
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
2018-05-24 19:52:24 +00:00
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
2018-05-24 17:16:37 +00:00
3dbd9809d4
MastoAPI: add lists.
2018-05-24 15:34:39 +03:00
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
2018-05-23 17:25:24 +02:00
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
2018-05-23 09:03:11 +00:00
72b93d13f8
Hook up block/unblock to TwitterAPI
2018-05-22 05:41:17 -04:00
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
2018-05-22 04:27:40 -04:00
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
2018-05-21 20:19:37 -04:00
69aa7c213a
Fixed test
2018-05-21 23:06:03 +01:00
d0690622cd
Added endpoint for changing passwords
2018-05-21 23:06:03 +01:00
75cfd9d34d
webfinger: fix finding the XRD uri for statusnet instances
2018-05-21 12:41:31 +00:00
d045b96f95
Add tests for incoming unfollow over OStatus
2018-05-21 05:11:13 -04:00
cc5373b846
Fix unblock handling
2018-05-21 05:00:58 -04:00
89c5de9096
Fix unfollows
2018-05-20 21:01:14 -04:00
56de0216ae
pass user to User.blocks?/2 instead of ap_id
2018-05-20 19:45:05 -04:00
1afd6d37bd
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
...
Fixed some conflicts in transmogrifier.ex
2018-05-20 19:17:15 -04:00
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
2018-05-20 20:08:40 +02:00
413de8e4bc
More fixes.
2018-05-20 19:26:09 +02:00
ff007af0c2
Return visilility in twitter api, too.
2018-05-20 18:01:24 +02:00
434601a5c3
Return private / direct posts on user timelines, too.
2018-05-20 16:15:18 +02:00
8b0c222b43
Merge branch 'feature/account-deletion' into 'develop'
...
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
2018-05-20 10:57:19 +00:00
d46393f6ef
Fix test for blocks
2018-05-20 02:15:56 -04:00
1e43de0f86
Formatting and add tests for blocks/unblocks
2018-05-19 21:23:52 -04:00
6f39ecc41b
Support Undo like activities ( Fix #139 )
2018-05-19 22:14:15 +02:00
d1366f8d46
Modified deleting an account to run as a task
2018-05-19 13:35:49 +01:00
7831b38705
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
...
webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159
2018-05-19 09:31:08 +00:00
4033ed6714
tests: add test for hubzilla follow activity too
2018-05-19 03:28:32 -05:00
19c96c8a19
tests: add tests for Transmogrifier.maybe_fix_user_object()
2018-05-19 03:28:30 -05:00
f32e19f668
webfinger: add tests
2018-05-19 01:28:27 -05:00
8d11bae0d5
Revert "Undo formatting in user.ex"
...
This reverts commit e6dc15b96c
2018-05-17 23:55:00 -04:00
e6dc15b96c
Undo formatting in user.ex
2018-05-17 23:53:34 -04:00
d8c842a771
Add support for incoming remote unfollows
2018-05-17 22:15:57 -04:00
1d4bbec6b3
Fix User search.
...
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185 .
2018-05-16 17:55:20 +02:00
d0ad13c12e
Add direct_note[_activity]_factory and a couple tests
2018-05-14 21:54:25 -04:00
987a52cf6f
Post direct status test
2018-05-13 21:21:42 -04:00
98b36d359a
Fixed formatting and test
2018-05-13 15:43:42 +01:00
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
2018-05-13 14:36:02 +01:00
a16117225f
Added endpoint for user account deletion
2018-05-13 14:35:48 +01:00
89954a2ce7
Fix format.
2018-05-13 13:02:24 +02:00
c7a85de35c
Revert "Remove 'unlisted' handling for now."
...
This reverts commit 1027d1f696
2018-05-13 12:38:13 +02:00
1027d1f696
Remove 'unlisted' handling for now.
...
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
2018-05-13 12:07:11 +02: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
ec531ca281
Add test.
2018-05-13 11:18:48 +02:00
16b793656d
Add tests for unrepeats
2018-05-11 15:30:47 -04:00
89603eda9e
do not create notification for yourself
2018-05-11 11:31:17 +02:00
9810153aeb
Streamer: Don't send out stream events for blocked users.
2018-05-05 13:40:47 +02:00
c464355d1a
Idempotency: Use special cache, keep for 6 hours.
2018-05-05 11:15:57 +02:00
90c4bed0af
Don't expire idempotency cache for five minutes.
2018-05-04 21:15:39 +02:00
fcd3eca167
MastodonAPI: Support idempotency key.
2018-05-04 20:30:29 +02:00
8b4ee0ea51
Fix formatting
2018-05-04 03:19:48 -04:00
bc215f5684
Fix format.
2018-04-29 11:28:26 +02:00
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
2018-04-29 09:26:47 +00:00
a7a40bb8f1
Merge branch 'fix/blocked-user-boosts' into 'develop'
...
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
2018-04-28 13:49:12 +00:00
6908f29e0a
Added a test (written by @andrewzah) for the MR
2018-04-28 12:01:43 +01:00
2d775bf1be
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
2018-04-25 01:58:50 -04:00
e981280fa7
Formatting fixes
2018-04-25 01:43:45 -04:00
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-25 00:46:28 -04:00
8c0806539c
Embed announce activity data instead of linking to it
2018-04-22 21:28:51 -04:00
0574df273c
Small cleanup.
2018-04-22 10:01:10 +02: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
f0798440de
Use correct activity for undo
2018-04-20 23:22:16 -04:00
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-20 16:48:18 -04:00
a61e8ac154
Formatting.
2018-04-20 13:10:57 +02:00
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
2018-04-19 21:46:59 +03:00
7b4f55238e
Handle unrepeats via the TwitterAPI
2018-04-18 06:00:40 -04:00
687db1bc3a
Expose unannounce activity so that it can be tested
2018-04-18 03:39:42 -04:00
42279f54cf
Return target status in MastoAPI endpoint instead of reblog activity
2018-04-16 23:30:52 -04:00
5b0d0b9ab2
Add unreblogging tests
2018-04-14 22:34:06 -04:00
48380aeccc
ActivityPub.ex: do not return boosted statuses from blocked users.
2018-04-14 14:26:20 +03:00
2de2e29df2
Oops
2018-04-11 15:51:02 -04:00
3a5c0465eb
Add unit test for pinned statuses
2018-04-11 15:48:32 -04:00
70bcdf32bd
Only search in public data for now.
...
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
2018-04-07 16:40:45 +02:00
b3b7ab5d9a
Load all users at once in timelines.
2018-04-02 16:35:41 +02:00
360c51f1f5
Use context_ids directly if we have them.
2018-04-02 15:28:35 +02:00
bc31bee7c4
Generates contexts and ids on insertion time.
2018-04-02 15:17:09 +02:00
a4db3a732f
Pre-fetch conversation ids.
2018-04-02 14:46:56 +02:00
1b57522bba
Fix some test stuff.
2018-04-02 13:13:04 +02:00
2222e5599c
Don't fetch anything except ap_id for follower / following
...
collections.
Should speed up the queries because ecto doesn't have to parse the json.
2018-03-31 20:02:09 +02:00
802736679c
Remove unused ActivityRepresenter module.
2018-03-30 16:50:30 +02:00
e90f8f6c4b
TwApi ActivityView: Add delete activities.
2018-03-30 15:32:43 +02:00
1f32ba052c
TwApi ActivityView: Add follows.
2018-03-30 15:17:13 +02:00
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
c1d529ee94
TwApi ActivityView: Add announces.
2018-03-30 14:46:36 +02:00
1f1caab138
TwApi ActivityView: Add Like rendering.
2018-03-30 13:49:09 +02:00
361016349f
Add ActivityViewTest.
2018-03-30 12:57:55 +02:00
e30752bc79
Add basic activity view.
2018-03-27 22:24:19 +02:00
37e5014d3e
Reduce OP fetching queries.
2018-03-27 18:18:24 +02:00
ff7afe46b9
Don't try to fetch OP if none is there.
2018-03-27 17:43:08 +02:00
9556c8f6e7
Forgot to fix one of the links in a test
2018-03-27 02:08:46 -04:00
5ba2f4b6d8
Update tests to reflect hashtag link changes
2018-03-27 02:07:07 -04:00
2aea3bc632
activitypub transmogrifier: rewrite incoming hashtags
2018-03-24 16:42:17 -05:00
e3a81fe58f
Fetch the same data from json webfinger as from xml webfinger.
2018-03-24 14:45:54 +01:00
eb7ce61ca5
Fix hashtags.
2018-03-24 11:03:10 +01:00
5da2355e71
For outgoing objects, fake mastodon style ap id for ostatus.
2018-03-23 16:07:02 +01:00
32ae918843
Clear caches on test.
2018-03-22 12:44:32 +01:00
ff7afc0465
tests: webfinger: test quering a JSON response for activitypub actor URI
2018-03-22 00:36:13 -05:00
8aa639a450
webfinger: support JSON output
2018-03-22 00:35:51 -05:00
0ee6e8af26
mastodon api tests: invalidate user cache prior to importing a test reply
...
This is needed to ensure the user cache does not throw nil when creating the mentions
list.
Signed-off-by: lain <lain@soykaf.club>
2018-03-16 11:25:41 +01:00
59a76ea464
activitypub transmogrifier: rewrite non-http URLs using the object's external URL
...
Signed-off-by: lain <lain@soykaf.club>
2018-03-14 08:53:29 +01:00
368e085144
Don't validate on missing public key.
2018-03-11 14:47:37 +01:00
f29902a241
More signature debugging.
2018-03-11 14:37:23 +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
d2ad99298e
Handle incoming deletes.
2018-03-03 18:38:40 +01:00
e9de04b74b
Add support for outgoing update.
2018-02-25 21:08:32 +01:00
f61fd00db5
Make likes and announces public.
2018-02-25 18:20:06 +01:00
8a47974217
Fix specs.
2018-02-25 18:11:03 +01:00
4ea2a41014
Fix more specs.
2018-02-25 17:48:31 +01:00
d3b0167854
Fix salmon tests.
2018-02-25 17:06:12 +01:00
8e7f63afde
Fix specs.
2018-02-25 16:40:37 +01:00
e3629af4da
Handle remote update activities.
2018-02-25 16:14:25 +01:00
b76de1ecd3
Some fixes to AP fetching.
2018-02-25 10:56:01 +01:00
e5fcc51a06
Remove unneccesary subscriptions on update.
2018-02-24 17:36:02 +01:00
fb02300234
Pleroma AP detection mechanism.
2018-02-24 13:06:53 +01:00
01d5ef65fa
More fixes to user upgrading.
2018-02-24 10:42:47 +01:00
aa79d64e0d
Correctly stitch mastodon -> ostatus replies.
2018-02-23 15:00:41 +01:00
eb3f14da86
Missing test skeleton.
2018-02-23 08:49:57 +01:00
37e406ae36
Get avatar and banner from AP users.
2018-02-22 08:14:15 +01:00
4816b09fa7
Add user upgrade function.
2018-02-21 22:21:40 +01:00
94db9ac4db
Merge branch 'develop' into feature/activitypub
2018-02-21 18:34:19 +01:00
810cf8618f
ActivityPub: Fetch missing activities on reply.
2018-02-21 15:22:24 +01:00
5bc810c452
Add moderator function.
2018-02-20 18:44:50 +01:00
95f7e7e2d5
Add some more tests.
2018-02-20 18:42:41 +01:00
297a2c7d3f
Ignore duplicate create activities.
2018-02-19 17:37:45 +01:00
6b6ab592ab
AP: Fix incoming conversations.
2018-02-19 10:39:03 +01:00
539340d914
Handle sensitive property.
2018-02-18 14:14:16 +01:00
20e6190ead
Transmogrify outgoing nsfw.
2018-02-18 14:07:13 +01:00
8ca66b5961
ActivityPub: Add conversation id.
2018-02-18 13:58:52 +01:00
6ab0aba50a
Transmogrify outgoing hashtags.
2018-02-18 13:51:03 +01:00
6046f10431
Actually fix incoming attachments.
2018-02-18 13:06:51 +01:00
77c6c424a6
ActivityPub: Make fake Create activities for objects without one.
2018-02-18 11:24:54 +01:00
81ea359a7c
ActivityPub: Handle incoming announces.
2018-02-17 21:57:31 +01:00
5e36b750c1
ActivityPub: Fetch an object from an id.
2018-02-17 21:56:33 +01:00
e1b12a7782
ActivityPub: Handle incoming likes.
2018-02-17 20:13:12 +01:00
e7b73359e3
ActivityPub: Partly handle incoming follows.
2018-02-17 14:55:44 +01:00
5682e48a25
ActivityPub: tags -> tag.
2018-02-17 14:20:53 +01:00
05ba6ca1b8
Do some transmogrifying for the output.
2018-02-17 14:11:20 +01:00
5454ec6a6c
ActivityPubController: Handle inbox data.
2018-02-15 20:00:43 +01:00
ef0300889d
Transmogrifier: Handle basic notice creation.
2018-02-15 20:00:06 +01:00
a15f572800
OstatusTest: Remove insert_or_update test (moved to User).
2018-02-15 19:59:40 +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
26ccb768d3
Make test output easier to read.
2018-02-12 10:14:11 +01:00
33a5d0a238
Fix some test warnings.
2018-02-12 09:33:01 +01:00
3c80d9b277
Fix spec.
2018-02-12 08:15:03 +01:00
8cf97ee8e1
ActivityPub: Basic note federation with Mastodon.
2018-02-11 20:43:33 +01:00
ce31f3a922
Twitter Representers: Handle Mastodon attachments.
2018-02-11 17:21:06 +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
61c16193de
Merge branch 'move-backend-images' into 'develop'
...
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
2018-02-03 20:43:14 +09:00
29be70c008
Add remote following of local profiles.
2018-02-02 00:14:05 +02:00
ab83e0de6d
TwitterAPI: Add is_local to user view.
2018-02-01 21:41:19 +02:00
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
2018-01-30 12:20:39 +01:00
1bb3ba02f3
Fix specs.
2018-01-30 12:17:01 +01:00
b3e7d7ae6d
Fetch external profile in the background.
2018-01-16 15:31:03 +02:00
80f6ac412a
Merge branch 'default-pictures' into 'develop'
...
Add a default profile picture and banner.
See merge request pleroma/pleroma!48
2018-01-15 20:26:49 +00:00
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
6e1cb86166
Fix instance test.
2018-01-14 08:28:35 +02:00
2a744cdff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-12-19 16:15:45 +01:00
f1f79c0dca
Fix timelines in subway tooter.
2017-12-19 16:15:07 +01:00
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
2017-12-18 22:44:15 +00:00
47887ac848
MastoAPI: Fix always-sensitive bugs.
2017-12-18 16:56:03 +01:00
1969773fb4
Fix follower/following lists.
...
Add tests.
2017-12-18 16:37:26 +02:00
4a13b84887
Add recipients field to activities.
...
Also do some very basic checks for AP message insertion.
2017-12-12 18:07:14 +01:00
9223038319
Fix some more tests.
2017-12-11 21:01:36 +02:00
e2e6365035
ActivityPub: Add controller tests.
2017-12-11 18:22:48 +01:00
da005d3332
ActivityPub: Add Objects View.
2017-12-11 18:19:46 +01:00
79b3397c17
Fix tests.
2017-12-11 18:41:03 +02:00
c3bcafc51b
HTTPSig: Add method to validate conn
2017-12-11 10:37:40 +01:00
30e9b22f96
Merge branch 'develop' into feature/activitypub
2017-12-09 11:00:56 +01:00
66c3813ea6
Add basic queue prioritization.
2017-12-05 18:21:30 +01:00
e7c2472abd
Fix tests.
2017-12-05 12:18:04 +01:00
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
5637d163e6
MastodonAPI: Add proper user count.
2017-11-30 14:59:44 +01:00
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
3d29fc5462
Make /api/friends/ids test deterministic.
2017-11-20 19:16:43 +02:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
edc3e5bc30
Make users in tests follow themselves by default.
...
Also fix the semantics of all tests to match.
2017-11-20 07:52:02 +02:00
40ca379357
Fix flakey test.
2017-11-19 13:07:29 +01:00
ed3403ad8b
Merge branch 'formatting-fixes' into 'develop'
...
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
2017-11-18 15:58:44 +00:00
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +02:00
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
2017-11-18 14:46:54 +02:00
66e78c3ec4
Escape HTML instead of discarding it.
2017-11-18 14:43:41 +02:00
ced0d64d75
MastoAPI: Make attachment ids strings.
2017-11-15 18:58:39 +01:00
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
2017-11-14 16:47:54 +00:00
f9828e578c
TwitterAPI: Add /users/show.
2017-11-14 17:34:48 +02:00
3533bf7eac
TwitterAPI: Add /friends/ids.
2017-11-14 16:04:58 +02:00
06c3ee3bac
Accept 1 as true.
2017-11-14 15:54:50 +02:00
c84723b679
MastoAPI: Add media timelines.
2017-11-14 15:41:16 +02:00
083cd169d2
MastoAPI: Fix repeat api bug.
...
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
2017-11-13 09:48:56 +01:00
08bc316742
Merge branch 'mastodon-notification-endpoints' into 'develop'
...
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
2017-11-12 11:08:06 +00:00
efcf54dc02
Merge branch 'mastoapi-update-credentials' into 'develop'
...
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
2017-11-12 09:24:32 +00:00
fc7483cb3c
MastoAPI: Add update credentials endpoint.
2017-11-12 00:27:09 +02:00
a1923d20e8
MastoAPI: Fix reblog emojis.
2017-11-11 11:18:05 +01:00
1d3d66a841
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-10 17:37:54 +01:00
6e9c22c0af
MastoAPI: Use string ids everywhere.
2017-11-10 17:18:19 +01:00
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
2017-11-10 15:24:52 +02:00
266d9c008d
MastoAPI: Fetch statuses in search.
2017-11-09 16:48:45 +01:00
f1d27a5fbb
Add actor column to activities.
2017-11-09 10:41:19 +01:00
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
f7fc048aeb
TwitterAPI user view: add follows_you.
2017-11-08 19:13:03 +02:00
4656cb9b99
TwitterAPI user view: add blocks.
2017-11-08 13:02:00 +02:00
6c0758e041
TwitterAPI: Add blocks.
2017-11-08 00:04:53 +02:00
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +02:00
7252f6b054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-05 12:12:19 +01:00
046bee34d3
Fix bug when no posts are in the db.
2017-11-05 12:11:59 +01:00
c6b9b777da
MastoAPI: Add list of blocked users.
2017-11-03 08:51:17 +01:00
5bf92e50be
MastoAPI: Add blocking.
2017-11-03 08:38:05 +01:00
33beb51da4
MastoAPI: Add blocking to AccountView.
2017-11-03 08:23:31 +01:00
867ac1e4f5
Handle nil cases.
2017-11-02 22:47:48 +01:00
8ef58a266b
Don't return blocked users' activities in contexts.
2017-11-02 22:44:36 +01:00
a47727adde
Don't return activities from blocked users.
2017-11-02 22:37:26 +01:00
6f05367325
Federate out content warnings.
2017-10-31 19:51:58 +01:00
e014cc6ed8
Allow using cws in mastodon api.
2017-10-31 19:44:36 +01:00
0c871e5c6e
Fix specs.
2017-10-31 17:57:26 +01:00
44295dd49a
MastoAPI: Include CW.
2017-10-31 17:49:47 +01:00
04217f52c9
TwitterAPI: Display cws.
2017-10-31 17:43:37 +01:00
4cbf17dac6
Save cws in the activitypub data.
2017-10-31 17:30:46 +01:00
968a546d4a
MastoAPI: Return id as string instead of integer.
2017-10-31 14:51:41 +01:00
2f39bb6b43
Typo.
2017-10-31 14:46:01 +01:00
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
2017-10-31 14:40:12 +01:00
502cb38cd6
Move user search to User module.
2017-10-30 19:23:16 +01:00
71f66bd458
Fix follow test semantics.
2017-10-29 14:25:11 +02:00
c56d28f96c
Fix return type of /api/v1/follows
2017-10-29 00:07:38 +03:00
8e94936553
Add tests.
2017-10-28 17:09:32 +03:00
64bc38e009
MastoAPI: Add emoji output.
2017-10-23 16:27:51 +02:00
b4f055b604
Don't reject already accepted subscriptions.
2017-10-05 12:53:16 +02:00
6268b7e0eb
HTTP Signatures: Work with all test vectors.
2017-09-18 18:10:21 +02:00
9cefbaf016
Start of HTTP Signatures.
2017-09-18 11:39:57 +02:00
6000f61727
MastoAPI: Add repeats to statusview.
2017-09-17 13:54:14 +02:00
422d0f324f
MastodonAPI: Add user favorites endpoint.
2017-09-17 13:09:49 +02:00
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
2017-09-17 13:03:46 +02:00
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
959e993c7d
Apply incoming custom emoji.
2017-09-16 16:40:20 +02:00
16b1fcd271
Handle incoming emoji.
2017-09-16 16:27:48 +02:00
884006a9e9
Federate emoji out.
2017-09-16 16:14:23 +02:00
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
0872f5f394
Add undocumented default user default settings.
2017-09-16 11:52:33 +02:00
c36229c4aa
Add remote user fetching to search.
2017-09-16 11:26:20 +02:00
9f0a2a714b
Add basic search.
2017-09-16 10:42:24 +02:00
d659fcc195
MastoAPI: Fix date in account view.
2017-09-15 17:50:47 +02:00
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
3ca853fb61
MastoAPI: Follower-related changes
2017-09-14 18:30:05 +02:00
fc85c9f086
Add tag timelines.
2017-09-14 13:22:09 +02:00
a8701282d4
MastoAPI: fake out 'application' property.
2017-09-14 09:14:08 +02:00
6258c6b6b3
MastoAPI: Also return text_url in attachments.
2017-09-14 08:38:48 +02:00
7f3ce5c1a0
Cleanup.
2017-09-14 08:11:51 +02:00
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
94be93aad0
Allign datetime format with mastodon.
2017-09-13 16:26:02 +02:00
e6286152b9
Fix logic.
2017-09-13 16:05:39 +02:00
49929321c7
Add relationships to masto api.
2017-09-13 15:55:10 +02:00
1bc58230ee
Remove milliseconds from mastodon api response.
2017-09-12 13:31:17 +02:00
b58b35bf56
Use hash of attachment url as id.
...
Pretty hacky, let's see if we can get away with this.
2017-09-12 11:28:12 +02:00
44a650235b
MastoAPI: Remove domain ending from account name.
2017-09-12 09:34:39 +02:00
7616b202ea
Add user timelines to Masto Api.
2017-09-10 17:49:13 +02:00
fc10875895
Add attachments to mastoapi statuses.
2017-09-10 11:51:01 +02:00
e8975d06be
Add header image to masto api.
2017-09-10 10:37:34 +02:00
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
be04f725e9
Add more Mastodon API methods.
2017-09-09 13:15:01 +02:00
2b7efff71b
Add Mastodon StatusView.
2017-09-09 12:10:29 +02:00
c6bdc5960c
Test for Mastodon AccountView
...
Handles users and mentions.
2017-09-09 12:09:53 +02:00
95cedd6000
Make auth tokens usable once and expire them.
2017-09-09 12:02:59 +02:00
d1c10ad2fb
Fix specs.
2017-09-05 09:35:00 +02:00
3438a120cc
Don't delete new delete activity...
2017-09-04 20:47:43 +02:00
fcf3128a56
Add TwAPI representer for deletes.
2017-09-04 20:03:28 +02:00
2348b272e0
Create deletes activities for incoming deletes.
2017-09-04 18:47:46 +02:00
5db535c0b1
Add delete to ActivityPub.
2017-09-04 18:47:33 +02:00
540dfb4617
Add delete activity representer.
2017-09-04 17:56:09 +02:00
10e40206c6
Output mastodon-style conversation ids.
2017-09-04 11:04:04 +02:00
1b1f861bad
Handle mastodon conversation ids.
2017-09-04 11:03:51 +02:00
4b03c43fd7
fix specs.
2017-08-29 17:22:22 +02:00
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
171ef33cbb
More sensible attachment names.
2017-08-28 19:17:38 +02:00
fecbd099cd
Ignore padding for salmon public keys.
2017-08-25 15:09:05 +02:00
67bfa19b35
Set twitter-style possibly_sensitive boolena.
2017-08-24 16:27:37 +02:00
5dc278b1a6
Add activity_type to twitter api output.
2017-08-24 16:18:26 +02:00
08bd59e446
Extend webfinger capabilities.
2017-08-24 12:54:53 +02:00
1a001588e8
Don't break on empty mentions.
2017-08-24 12:54:01 +02:00
552cfdbe11
Fix deletion not deleting relevant actions.
2017-08-16 16:29:25 +02:00
7d34cec58d
escape attachment urls on creation.
2017-08-09 16:55:18 +02:00
763756f879
Also fetch atom links.
2017-08-04 16:57:38 +02:00
25c733f402
Add href to in-reply-to.
...
THis should enable fetching from pleroma posts.
2017-08-01 17:35:19 +02:00
f226f46a09
Add basic incoming deletions.
2017-08-01 17:05:07 +02:00
558ab6e74e
Display html links correctly for remote activies.
2017-08-01 14:05:18 +02:00
00b722430f
Revert "Close br tags."
...
This reverts commit 2eba8e74cc
2017-07-31 13:27:38 +02:00
19e8421947
Revert "Wrap in <p>."
...
This reverts commit c81d0b6f89
2017-07-31 13:27:29 +02:00
3063e3b440
Revert "Remove newlines completely so mastodon doesn't bug out."
...
This reverts commit 0ca3ab7b59
2017-07-31 13:27:19 +02:00
0ca3ab7b59
Remove newlines completely so mastodon doesn't bug out.
2017-07-31 13:06:31 +02:00
c81d0b6f89
Wrap in <p>.
2017-07-31 12:16:44 +02:00
2eba8e74cc
Close br tags.
2017-07-31 10:46:29 +02:00
fc269fd319
Add html alternate link to atom.
2017-07-29 22:07:02 +02:00
72ca58c540
Save follower count and note count in user.
2017-07-22 17:42:15 +02:00
a027b0027c
Add friends endpoint.
2017-07-20 20:35:30 +02:00
94a394e3a8
Add followers endpoint.
2017-07-20 20:29:15 +02:00
140f72725d
Use follower address in user entry.
2017-07-19 19:06:49 +02:00
7e9647b146
Fix undo activity.
2017-07-08 11:17:35 +02:00
e343c0c9c4
Add way to update most recent notification id.
2017-07-02 15:01:59 +02:00
201804b836
Only return posts in TwAPI conversations.
2017-06-30 16:41:09 +02:00
d4de38e8ff
Order conversation fetches like GS does.
2017-06-30 16:30:19 +02:00
6a44427915
Add tests for public recipients.
2017-06-30 16:08:59 +02:00
1c074efeaf
Add external links to twapi.
2017-06-25 12:07:08 +02:00
429992fcc9
Save external link for notes.
2017-06-25 11:57:34 +02:00
6935fc3e01
Update user data on fetch if it changed.
2017-06-24 13:09:46 +02:00
6a184115a2
Longer timeouts for outgoing federation.
2017-06-23 12:25:53 +02:00
069daf644d
Replace UserRepresenter with UserView
2017-06-20 00:12:37 +03:00
fa82822932
Revert "Add invisible tags to TwAPI output."
...
This reverts commit a92a9dce94
2017-06-18 18:59:13 +02:00
d00571ff75
Fetch user feed on externalprofile request.
...
This is so we always have something to show.
2017-06-18 17:20:39 +02:00
fafb765c48
Output tags list in TwAPI.
2017-06-18 14:43:44 +02:00
8feec8d390
Strip unsafe html on output in TwAPI.
2017-06-18 13:40:35 +02:00
7b41e103e1
Remove html from user bios on display.
...
This is mainly to fix problems of bios coming from mastodong.
2017-06-18 13:17:35 +02:00
83c657afa5
Do some basic escaping.
2017-06-14 14:46:18 +02:00
1af9c77736
Move mention parsing to Formatter module.
2017-06-14 13:58:56 +02:00
eb18b9ebba
Enable user timelines.
2017-06-12 17:12:55 +02:00
6342fcd5dc
Save correct date for incoming notes.
2017-06-08 16:44:12 +02:00
00c032783d
Fix NaN statuses per day.
2017-06-05 15:47:37 +02:00
cdcb201bf5
Represent object publishing date in notes.
2017-06-02 22:47:49 +02:00
c7fdd1b7ff
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-06-01 11:24:03 +02:00
c6aa60c829
Shorten names in links.
2017-05-30 14:26:31 +02:00
bdcf42180f
Save remote user bio and update if we see new data.
2017-05-24 17:34:38 +02:00
94e980d6b4
Output proper published data in ostatus.
2017-05-24 13:54:25 +02:00
1085675ec4
Output ref instead of href for conversation.
2017-05-20 10:44:57 +02:00
03b7b2fa24
Also show activities in OStatus.
2017-05-19 15:53:02 +02:00
f972966385
Fix specs.
2017-05-18 19:10:51 +02:00
8e02fa100f
Add categories to ostatus output.
2017-05-18 18:18:27 +02:00
48f9df2391
Keep newlines around.
2017-05-18 16:41:16 +02:00
a92a9dce94
Add invisible tags to TwAPI output.
2017-05-18 16:24:41 +02:00
beb7b0ef07
Handle incoming tags.
2017-05-18 15:58:18 +02:00
0da6ade619
Save tags in object.
2017-05-18 15:16:49 +02:00
9033bfffd2
Twitter API refactoring.
2017-05-17 18:00:20 +02:00
70024632ba
AP refactoring.
2017-05-16 18:19:04 +02:00
423194520e
Fix mention replacing.
2017-05-15 18:25:21 +02:00
dd12cf7296
Fix cws.
2017-05-11 17:59:11 +02:00
1b67a59795
Repair retweets.
2017-05-10 19:29:25 +02:00
153995f832
Correct active state websub name.
2017-05-10 18:54:43 +02:00
05f2cd0d93
Handle incoming follows.
...
Also Mastodon CWs.
2017-05-10 18:46:23 +02:00
34a1ce00ec
Set valid_until date.
2017-05-10 18:45:55 +02:00
36448d6483
Add externalprofile to TwAPI.
2017-05-10 18:44:57 +02:00
2e753e8cd7
Refresh subscriptions.
2017-05-10 18:44:06 +02:00
1418d72749
Add class=attachment to attachment links.
2017-05-08 20:12:36 +02:00
3320c9b176
Fix remote users retweeting local stuff.
2017-05-08 18:19:45 +02:00
7303786160
Add some twapi fixes.
2017-05-07 20:20:53 +02:00
db08498a9f
Prevent double insertions.
2017-05-07 20:13:10 +02:00
4f9328c622
Preserve ids on favorites / retweets.
2017-05-07 20:05:03 +02:00
b403ea4d2b
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
2017-05-07 19:28:23 +02:00
a41aa4e489
Federate follow salmons.
2017-05-07 14:45:37 +02:00
95ab0dc3c5
Add conversation ids to twapi announce representer.
2017-05-07 12:46:21 +02:00
c51e15975a
Fix user fetching error.
2017-05-07 12:45:37 +02:00
7db76a0f0e
Address incoming messages to followers.
2017-05-06 14:23:39 +02:00
2d9fdbcc0d
Don't call out if we have the favorited notice locally.
2017-05-05 16:27:03 +02:00
fa2610c795
Handle incoming favorites, fetch potentially missing messages.
2017-05-05 16:07:44 +02:00
c85998ab8a
Parse incoming retweets.
2017-05-04 18:42:29 +02:00
97257c692c
Fix specs.
2017-05-03 20:06:20 +02:00
1077c5c58d
Remove reply-to for shares, mastodon gets confused.
2017-05-03 20:06:00 +02:00
5d7831ee3e
Add self links to federated statuses.
2017-05-03 18:10:19 +02:00
b34b046f16
Add user to announced status.
2017-05-03 17:51:36 +02:00
138641589d
OStatus announce representer.
2017-05-03 17:39:12 +02:00
df71c142cf
Remove doubled 'to' recipients.
2017-05-03 16:08:24 +02:00
8141024259
Attachment parsing, better magic key fetching.
2017-05-03 14:26:49 +02:00
16afea399d
Just give out the entry, not the whole feed.
2017-05-03 10:02:29 +02:00
9c42453e06
Return note objects as ostatus post activities.
2017-05-03 09:54:17 +02:00
018a1a390f
Use inReplyTo to find context.
2017-05-02 21:31:01 +02:00
33c803d6da
Add attachment link to posts.
2017-05-02 18:25:39 +02:00
102455bf29
Add avatar updating from incoming messages.
2017-05-02 17:13:41 +02:00
93de603966
Add an ostatus representer for like activities.
2017-05-02 16:35:53 +02:00
a3e82c5c24
Save context in likes / announces.
2017-05-02 15:54:14 +02:00
16f8406eb6
Add statusnet_profile_url to the TwAPI.
2017-05-02 14:36:04 +02:00
32a95d73da
Add twkn timeline.
2017-05-02 14:12:43 +02:00
6dd8335477
Mark incoming activties as non-local.
2017-05-02 10:47:04 +02:00
56bacc90d1
Fix specs, add local marker to actitivies.
2017-05-02 10:43:35 +02:00
89c1e90eb2
Don't crypt raw iolists.
2017-05-01 22:02:07 +02:00
ceb2f68432
Add type to rel=self link in feed.
2017-05-01 18:40:36 +02:00
e54e592d6c
Return webfinger for ap_ids.
2017-05-01 13:51:17 +02:00
6843755834
Make outgoing salmons work.
2017-05-01 13:14:58 +02:00
bb1d08a47c
Return keys in webfinger.
2017-04-30 15:00:04 +02:00
09f7ed4214
Don't set statusnetConversationIds on replies anymore.
2017-04-30 14:26:29 +02:00
009fcd2acf
Stop adding statusnetConversationIds.
2017-04-30 14:02:04 +02:00
4c8111c334
Use conversation mapping objects to get / retrieve context from TwAPI.
2017-04-30 13:53:26 +02:00
f9912599c4
Pull in remote avatar on federation.
2017-04-30 12:53:49 +02:00
18edc299b2
Handle duplicates.
2017-04-30 12:36:47 +02:00
62607f37dc
Federate object id for posts in ostatus.
...
This is because ostatus doens't have an id for the activities.
2017-04-30 11:55:19 +02:00
84027ff00b
Handle comments.
2017-04-30 11:39:27 +02:00
d937a8e695
Add thr:in-reply-to to ostatus representer.
2017-04-30 11:17:34 +02:00
9d7c3190cc
Get create activity from created object id.
...
This is useful for Ostatus federation because ostatus doesn't have
different ids for objects and activities...
2017-04-30 11:16:41 +02:00
8a0d2b33d8
Keep ostatus id as activity id.
2017-04-30 09:25:46 +02:00
a16da387d2
Handle full incoming feeds.
2017-04-29 21:13:21 +02:00
20015b4b67
Save remote users with fqn as nickname.
2017-04-29 20:08:45 +02:00
ba1ea77001
Make key fetching use ostatus fetching.
2017-04-29 19:47:56 +02:00
427bac0966
Rework remote user subscription.
2017-04-29 19:06:01 +02:00
69922bc724
Add user info gathering.
2017-04-29 17:51:59 +02:00
ca40dda04c
Add some basic webfingering.
2017-04-28 17:41:12 +02:00
1422e7aa84
Handle incoming websub subscriptions.
2017-04-28 15:45:10 +02:00
a9b2ad1759
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
2017-04-28 16:06:57 +03:00
451d18af63
Add proper callback route for websub confirmation.
2017-04-28 09:51:47 +02:00
90da25505f
Add discovery and subscription requests to websub.
2017-04-27 09:46:45 +02:00
d1dce56a85
Refactor XML parsing.
2017-04-27 09:43:58 +02:00
9e9d95ec99
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 19:17:51 +02:00
7561158ab1
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 18:34:14 +02:00
c5fa682c31
Refactor, add beginnings of websub client subscriptions.
2017-04-26 18:33:10 +02:00
57bd59e407
Salmon creation.
2017-04-26 14:25:44 +02:00
f1ebf812ee
Add inReplyTo to incoming messages.
2017-04-26 10:22:51 +02:00
d9ebd785ab
Ostatus doesn't distinguish between activities / objects on create.
2017-04-26 10:08:13 +02:00
e8882ab3da
Merge branch 'develop' into feature/incoming_ostatus
2017-04-26 09:18:49 +02:00
22e936372e
Fix retweet spec.
2017-04-26 08:55:00 +02:00
2f0e13abe2
Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats
2017-04-26 08:49:26 +02:00
b91ccef237
Output conversation id.
2017-04-26 08:47:22 +02:00
f980f6778b
Wire up mentions.
2017-04-25 18:03:14 +02:00
b438ea24ee
Add ostatus conversation as context.
2017-04-25 17:45:34 +02:00
ab0114fbaa
Return salmon path for users, basic incoming salmon handling.
2017-04-24 18:46:34 +02:00
42105497ca
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
2017-04-24 14:17:23 +03:00
5b6070ec40
Deny whitespace statuses
2017-04-24 12:09:11 +03:00
kaniini