7da978f3f5
Linkify fixes.
2017-11-07 12:06:37 +01:00
6dfa62800a
Revert "Longer timeouts for user fetching."
...
Breaks too many tests.
This reverts commit 7de3a65214
2017-11-07 09:41:35 +01:00
7de3a65214
Longer timeouts for user fetching.
2017-11-07 09:11:19 +01:00
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +02:00
ed1eb5deea
Merge branch 'fix-tootdon-oauth' into 'develop'
...
Fix tootdon logins.
See merge request pleroma/pleroma!6
2017-11-06 20:27:31 +00:00
b0e27b21dd
Fix tootdon logins.
2017-11-06 21:51:31 +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
fa1f11e8e9
Merge branch 'feature/blocks' into 'develop'
...
Feature/blocks
See merge request pleroma/pleroma!5
2017-11-03 08:56:44 +00: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
8a1a7191fd
MastoAPI: Fix mentions always being for an anonymous user.
2017-11-03 08:13:39 +01:00
9b63647aff
MastoApi: Add blocking to fetches.
2017-11-02 22:53:34 +01:00
d89a7a0b34
TwitterAPI: Add blocking to fetches.
2017-11-02 22:50:42 +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
632da6c927
Don't create notifications if the user is blocked.
2017-11-02 22:08:22 +01:00
6a5f087174
Add blocks to User.
2017-11-02 21:57:37 +01:00
9be286a900
Handle empty terms / tags.
2017-11-01 09:33:29 +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
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
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
3037814fde
Only search through last 100_000 activities for fetches.
...
This is purely a performance enhancement
2017-10-31 15:26:37 +01:00
968a546d4a
MastoAPI: Return id as string instead of integer.
2017-10-31 14:51:41 +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
efe12e1a73
Fix /api/v1/accounts/search by splitting account search into its own function
2017-10-30 03:37:07 +00:00
2ffc6da207
Clean style.
...
Use 'follow' instead of 'follows' and correct indentation.
2017-10-29 00:30:10 +03:00
c56d28f96c
Fix return type of /api/v1/follows
2017-10-29 00:07:38 +03:00
11d2287476
Return error message on errors
2017-10-28 17:09:32 +03:00
813d2eaaf0
Add mastodon API endpoint for follow
2017-10-28 17:09:32 +03:00
5293516730
Use more efficient query to fetch likes.
2017-10-24 14:39:01 +02:00
9af560083f
Use more efficient user note count update query.
2017-10-24 14:16:17 +02:00
ec546baee9
Use different index for object fetching.
2017-10-24 10:39:23 +02:00
261ec82451
Return nil for nil object requests.
2017-10-24 08:39:24 +02:00
b35ff8f755
Use index in basic activity query.
2017-10-23 18:36:53 +02:00
9f417fd5e9
Speed up deletion and related queries.
2017-10-23 18:30:09 +02:00
5912dd0f5d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-10-23 16:28:32 +02:00
64bc38e009
MastoAPI: Add emoji output.
2017-10-23 16:27:51 +02:00
fe7804e42d
Add an API endpoint for emoji.
2017-10-19 22:51:56 +03:00
38f3908c14
Revert "Simplify query."
...
This reverts commit a17b261379
2017-10-19 17:56:27 +02:00
6af164f27b
Add password reset.
2017-10-19 17:37:24 +02:00
a17b261379
Simplify query.
2017-10-18 11:56:47 +02:00
b4f055b604
Don't reject already accepted subscriptions.
2017-10-05 12:53:16 +02:00
2b980dea2f
Remove tag links for now, they break some regular links.
2017-09-17 23:03:03 +02:00
270c903220
Add tag links.
2017-09-17 15:21:44 +02:00
d009a79df5
TwitterAPI: Return proper error.
...
Fixes #32 .
2017-09-17 14:37:00 +02:00
ae38b72e24
MastoAPI: Fix reblog view.
2017-09-17 14:25:34 +02:00
260f09dd6c
MastoAPI: Return reblogs, too.
2017-09-17 14:20:54 +02:00
6000f61727
MastoAPI: Add repeats to statusview.
2017-09-17 13:54:14 +02:00
fb46d6fbc4
Prefer post-specific emoji.
2017-09-17 13:24:52 +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
6877d7aaad
Fix typo.
2017-09-17 12:08:50 +02:00
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
b7b3e3f263
Use inserted_at as sort in search.
2017-09-17 11:32:24 +02:00
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
7c82b82197
Make emoji configurable in files.
2017-09-16 16:49:46 +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
79aeb219d8
Small emoji refactor.
2017-09-16 15:47:45 +02:00
c17c8ce36d
Don't check limit twice in TwitterAPIController.
2017-09-16 15:47:07 +02:00
03952a2760
Sort by updated_at
...
the updated_at column isn't indexed, so postgres won't take the wrong index.
2017-09-16 14:51:55 +02:00
f039c9c19a
Don't specify order in results for now.
2017-09-16 14:40:53 +02:00
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
44693c100d
Federate banners out.
2017-09-16 13:44:08 +02:00
0fbf1911f5
Banners are objects.
2017-09-16 13:24:15 +02:00
abac96f41d
Update banner from remote accounts.
2017-09-16 13:16:54 +02:00
0872f5f394
Add undocumented default user default settings.
2017-09-16 11:52:33 +02:00
5602293690
Fix callback state.
2017-09-16 11:37:55 +02:00
c36229c4aa
Add remote user fetching to search.
2017-09-16 11:26:20 +02:00
73bdfd6c2b
Set search config to 'english'.
2017-09-16 10:50:43 +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
c20530e708
Add configuration option for registrations.
2017-09-15 14:39:32 +02:00
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
ac2893a945
Add instance config options.
2017-09-15 10:26:28 +02:00
3aaf6608c6
MastoAPI: Set user id on replies.
2017-09-15 08:49:31 +02:00
f445a1b376
Don't die on fetching problems.
2017-09-15 08:18:29 +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
b0363e8055
MastoAPI: Add favourited_by/reblogged_by.
2017-09-14 09:50:49 +02:00
ac3f32da7e
Preserve state in oauth
2017-09-14 09:29:51 +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
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
3184939055
Ensure non-null bio.
2017-09-13 17:45:59 +02:00
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
ad5001828e
Oh no! More datetime fixes!
2017-09-13 17:18:08 +02:00
14b4029b1d
Reparse time to ensure correct format.
2017-09-13 16:38:29 +02:00
94be93aad0
Allign datetime format with mastodon.
2017-09-13 16:26:02 +02:00
d2faee01ee
Return iso8601 date.
2017-09-13 16:09:57 +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
f03524805f
Try host-meta call over https.
2017-09-13 11:59:56 +02:00
07b694814e
Optimize conversation fetching.
2017-09-12 13:48:48 +02:00
1bc58230ee
Remove milliseconds from mastodon api response.
2017-09-12 13:31:17 +02:00
7331733d30
Use signed integer as attachment id.
2017-09-12 11:43:36 +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
cda01285f4
Add pagination to notifications.
2017-09-12 09:11:36 +02:00
f1d9f2f6cd
MastoAPI: More link headers.
2017-09-12 09:06:32 +02:00
0df4a0f26d
Add parentheses.
2017-09-12 08:53:21 +02:00
02f824f9d5
MastoAPI: Add link headers to home timeline
2017-09-12 08:51:56 +02:00
cd6cba2f67
log ostatus handling errors.
2017-09-11 21:50:46 +02:00
f0d41a3abf
Merge branch 'develop' into oauth2
2017-09-11 20:54:44 +02:00
464c33e9a1
Add follow notifications.
2017-09-11 20:53:11 +02:00
3bad294058
Add reblogs to notifications.
2017-09-11 20:43:25 +02:00
bcce3e5dd2
Add favorites to notifications.
2017-09-11 20:41:05 +02:00
61adf676d5
Add basic mastodon notification support.
2017-09-11 18:53:19 +02:00
7616b202ea
Add user timelines to Masto Api.
2017-09-10 17:49:13 +02:00
b8912ff954
Fix masto api context.
2017-09-10 17:20:53 +02:00
8672d4d12b
Add context to mastodonAPI.
2017-09-10 15:00:13 +02:00
fc10875895
Add attachments to mastoapi statuses.
2017-09-10 11:51:01 +02:00
96473dfac0
Reverse mastodon timeline data.
2017-09-10 10:49:15 +02:00
e8975d06be
Add header image to masto api.
2017-09-10 10:37:34 +02:00
d66d69c3b4
Small hack to make notifications return empty for now.
2017-09-09 19:19:13 +02:00
5fe9e4dd3f
Do oauth redirect.
2017-09-09 19:03:57 +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
59dd240c08
Use token exchange method.
2017-09-09 12:10:46 +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
a22f2e683b
Add type restriction to activitypub fetcher
...
Mainly because Mastodon only returns notes, not the other activities.
2017-09-09 12:05:17 +02:00
95cedd6000
Make auth tokens usable once and expire them.
2017-09-09 12:02:59 +02:00
95aa6a3c65
Try to fetch from html again if fetching from atom gives no results.
2017-09-08 09:08:31 +02:00
2652d9e4ed
Slight cleanup.
2017-09-07 08:58:10 +02:00
2a298d70f9
Add very basic oauth and mastodon api support.
2017-09-06 19:06:25 +02:00
a441ee7d21
Workaround for masto reply breakage.
2017-09-05 14:01:37 +02:00
e9ebfdb83b
Fix remote profile update code.
2017-09-05 11:40:34 +02:00
632e1f7943
Add delete to TwAPI representer correctly.
2017-09-04 20:48:29 +02:00
1f9a5272e1
Add delete to TwAPI.
2017-09-04 20:48:14 +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
6c3a0ffae4
Add banner and background updating.
2017-08-29 17:18:33 +02:00
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
Roger Braun