lambda
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
eal
146ec80285
Merge branch 'fix/mastofe-login-redirect' into 'develop'
...
Redirect to Getting Started on login.
See merge request pleroma/pleroma!21
2017-11-18 14:38:05 +00:00
eal
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +02:00
eal
31e4277ba5
Don't add summary if empty.
2017-11-18 15:25:22 +02:00
eal
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
2017-11-18 14:46:54 +02:00
eal
66e78c3ec4
Escape HTML instead of discarding it.
2017-11-18 14:43:41 +02:00
eal
9c60cc88df
Redirect to Getting Started on login.
2017-11-16 20:47:44 +02:00
Roger Braun
a743940463
MastoAPI: Implement all streaming functions.
2017-11-16 16:49:51 +01:00
Roger Braun
5719f69ae3
MastodonAPI: Stream fixes.
2017-11-16 13:48:58 +01:00
Roger Braun
43499848d0
Small css fix.
2017-11-16 12:58:33 +01:00
Shpuld Shpuldson
189513e4ff
Add styles to make login page resemble mastodon's
2017-11-16 13:26:56 +02:00
Roger Braun
8de890a0d9
Add custom emoji to Mastodon UI initial state.
2017-11-16 09:40:06 +01:00
Roger Braun
ced0d64d75
MastoAPI: Make attachment ids strings.
2017-11-15 18:58:39 +01:00
lambda
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
eal
f9828e578c
TwitterAPI: Add /users/show.
2017-11-14 17:34:48 +02:00
eal
163c658202
TwitterAPI: Add unimplemented /mutes/users/ids.
2017-11-14 16:12:52 +02:00
eal
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
2017-11-14 16:10:13 +02:00
eal
3533bf7eac
TwitterAPI: Add /friends/ids.
2017-11-14 16:04:58 +02:00
eal
06c3ee3bac
Accept 1 as true.
2017-11-14 15:54:50 +02:00
eal
c84723b679
MastoAPI: Add media timelines.
2017-11-14 15:41:16 +02:00
Roger Braun
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
Roger Braun
5fc6e9d467
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-12 14:25:15 +01:00
Roger Braun
d293ceb1b5
Add Mastodon frontend.
2017-11-12 14:23:05 +01:00
lambda
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
lambda
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
eal
fc7483cb3c
MastoAPI: Add update credentials endpoint.
2017-11-12 00:27:09 +02:00
Roger Braun
414c52509b
MastoAPI: Websocket streaming for federated timeline.
2017-11-11 20:00:11 +01:00
Roger Braun
bd5bdc4c24
MastoAPI: Basic streaming.
2017-11-11 14:59:25 +01:00
Roger Braun
a1923d20e8
MastoAPI: Fix reblog emojis.
2017-11-11 11:18:05 +01:00
Roger Braun
fd12e585c9
Handle existing redirect params.
2017-11-10 18:24:50 +01:00
Roger Braun
1d3d66a841
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-10 17:37:54 +01:00
Roger Braun
6e9c22c0af
MastoAPI: Use string ids everywhere.
2017-11-10 17:18:19 +01:00
eal
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
2017-11-10 15:24:52 +02:00
Roger Braun
266d9c008d
MastoAPI: Fetch statuses in search.
2017-11-09 16:48:45 +01:00
Roger Braun
f1d27a5fbb
Add actor column to activities.
2017-11-09 10:41:19 +01:00
Roger Braun
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
lambda
77e272df2d
Merge branch 'following-you-in-user-view' into 'develop'
...
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
2017-11-08 17:57:13 +00:00
eal
f7fc048aeb
TwitterAPI user view: add follows_you.
2017-11-08 19:13:03 +02:00
Roger Braun
d2430d5007
Look through whole db for user timelines.
...
They already have an index that's good enough.
2017-11-08 17:25:18 +01:00
eal
4656cb9b99
TwitterAPI user view: add blocks.
2017-11-08 13:02:00 +02:00
eal
6c0758e041
TwitterAPI: Add blocks.
2017-11-08 00:04:53 +02:00
lambda
be67db5547
Merge branch 'mastodon-emoji-endpoint' into 'develop'
...
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
2017-11-07 20:01:15 +00:00
eal
c6210183e1
Add mastodon API endpoint for custom emoji.
2017-11-07 21:55:01 +02:00
lambda
d761b1543a
Merge branch 'authenticated-profile-fetching' into 'develop'
...
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
2017-11-07 18:58:22 +00:00
Roger Braun
722c4614ad
Allow self-rt.
2017-11-07 16:45:27 +01:00
Roger Braun
6dfa62800a
Revert "Longer timeouts for user fetching."
...
Breaks too many tests.
This reverts commit 7de3a65214
2017-11-07 09:41:35 +01:00
Roger Braun
7de3a65214
Longer timeouts for user fetching.
2017-11-07 09:11:19 +01:00
eal
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +02:00
lambda
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
eal
b0e27b21dd
Fix tootdon logins.
2017-11-06 21:51:31 +02:00
Roger Braun
7252f6b054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-05 12:12:19 +01:00
Roger Braun
046bee34d3
Fix bug when no posts are in the db.
2017-11-05 12:11:59 +01:00
lambda
fa1f11e8e9
Merge branch 'feature/blocks' into 'develop'
...
Feature/blocks
See merge request pleroma/pleroma!5
2017-11-03 08:56:44 +00:00
Roger Braun
c6b9b777da
MastoAPI: Add list of blocked users.
2017-11-03 08:51:17 +01:00
Roger Braun
5bf92e50be
MastoAPI: Add blocking.
2017-11-03 08:38:05 +01:00
Roger Braun
33beb51da4
MastoAPI: Add blocking to AccountView.
2017-11-03 08:23:31 +01:00
Roger Braun
8a1a7191fd
MastoAPI: Fix mentions always being for an anonymous user.
2017-11-03 08:13:39 +01:00
Roger Braun
9b63647aff
MastoApi: Add blocking to fetches.
2017-11-02 22:53:34 +01:00
Roger Braun
d89a7a0b34
TwitterAPI: Add blocking to fetches.
2017-11-02 22:50:42 +01:00
Roger Braun
867ac1e4f5
Handle nil cases.
2017-11-02 22:47:48 +01:00
Roger Braun
8ef58a266b
Don't return blocked users' activities in contexts.
2017-11-02 22:44:36 +01:00
Roger Braun
a47727adde
Don't return activities from blocked users.
2017-11-02 22:37:26 +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
e014cc6ed8
Allow using cws in mastodon api.
2017-10-31 19:44:36 +01:00
Roger Braun
44295dd49a
MastoAPI: Include CW.
2017-10-31 17:49:47 +01:00
Roger Braun
04217f52c9
TwitterAPI: Display cws.
2017-10-31 17:43:37 +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
3037814fde
Only search through last 100_000 activities for fetches.
...
This is purely a performance enhancement
2017-10-31 15:26:37 +01:00
Roger Braun
968a546d4a
MastoAPI: Return id as string instead of integer.
2017-10-31 14:51:41 +01:00
Roger Braun
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
2017-10-31 14:40:12 +01:00
Roger Braun
502cb38cd6
Move user search to User module.
2017-10-30 19:23:16 +01:00
Mark Felder
efe12e1a73
Fix /api/v1/accounts/search by splitting account search into its own function
2017-10-30 03:37:07 +00:00
eal
2ffc6da207
Clean style.
...
Use 'follow' instead of 'follows' and correct indentation.
2017-10-29 00:30:10 +03:00
eal
c56d28f96c
Fix return type of /api/v1/follows
2017-10-29 00:07:38 +03:00
eal
11d2287476
Return error message on errors
2017-10-28 17:09:32 +03:00
eal
813d2eaaf0
Add mastodon API endpoint for follow
2017-10-28 17:09:32 +03:00
Roger Braun
5293516730
Use more efficient query to fetch likes.
2017-10-24 14:39:01 +02:00
Roger Braun
9f417fd5e9
Speed up deletion and related queries.
2017-10-23 18:30:09 +02:00
Roger Braun
5912dd0f5d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-10-23 16:28:32 +02:00
Roger Braun
64bc38e009
MastoAPI: Add emoji output.
2017-10-23 16:27:51 +02:00
eal
fe7804e42d
Add an API endpoint for emoji.
2017-10-19 22:51:56 +03:00
Roger Braun
38f3908c14
Revert "Simplify query."
...
This reverts commit a17b261379
2017-10-19 17:56:27 +02:00
Roger Braun
6af164f27b
Add password reset.
2017-10-19 17:37:24 +02:00
Roger Braun
a17b261379
Simplify query.
2017-10-18 11:56:47 +02:00
Roger Braun
b4f055b604
Don't reject already accepted subscriptions.
2017-10-05 12:53:16 +02:00
Roger Braun
6268b7e0eb
HTTP Signatures: Work with all test vectors.
2017-09-18 18:10:21 +02:00
Roger Braun
9cefbaf016
Start of HTTP Signatures.
2017-09-18 11:39:57 +02:00
Roger Braun
2b980dea2f
Remove tag links for now, they break some regular links.
2017-09-17 23:03:03 +02:00
Roger Braun
270c903220
Add tag links.
2017-09-17 15:21:44 +02:00
Roger Braun
d009a79df5
TwitterAPI: Return proper error.
...
Fixes #32 .
2017-09-17 14:37:00 +02:00
Roger Braun
ae38b72e24
MastoAPI: Fix reblog view.
2017-09-17 14:25:34 +02:00
Roger Braun
260f09dd6c
MastoAPI: Return reblogs, too.
2017-09-17 14:20:54 +02:00
Roger Braun
6000f61727
MastoAPI: Add repeats to statusview.
2017-09-17 13:54:14 +02:00
Roger Braun
422d0f324f
MastodonAPI: Add user favorites endpoint.
2017-09-17 13:09:49 +02:00
Roger Braun
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
2017-09-17 13:03:46 +02:00
Roger Braun
6877d7aaad
Fix typo.
2017-09-17 12:08:50 +02:00
Roger Braun
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
Roger Braun
b7b3e3f263
Use inserted_at as sort in search.
2017-09-17 11:32:24 +02: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
7c82b82197
Make emoji configurable in files.
2017-09-16 16:49:46 +02:00
Roger Braun
959e993c7d
Apply incoming custom emoji.
2017-09-16 16:40:20 +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
c17c8ce36d
Don't check limit twice in TwitterAPIController.
2017-09-16 15:47:07 +02:00
Roger Braun
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
Roger Braun
f039c9c19a
Don't specify order in results for now.
2017-09-16 14:40:53 +02:00
Roger Braun
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +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
0872f5f394
Add undocumented default user default settings.
2017-09-16 11:52:33 +02:00
Roger Braun
5602293690
Fix callback state.
2017-09-16 11:37:55 +02:00
Roger Braun
c36229c4aa
Add remote user fetching to search.
2017-09-16 11:26:20 +02:00
Roger Braun
73bdfd6c2b
Set search config to 'english'.
2017-09-16 10:50:43 +02:00
Roger Braun
9f0a2a714b
Add basic search.
2017-09-16 10:42:24 +02:00
Roger Braun
d659fcc195
MastoAPI: Fix date in account view.
2017-09-15 17:50:47 +02:00
Roger Braun
c20530e708
Add configuration option for registrations.
2017-09-15 14:39:32 +02:00
Roger Braun
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
Roger Braun
ac2893a945
Add instance config options.
2017-09-15 10:26:28 +02:00
Roger Braun
3aaf6608c6
MastoAPI: Set user id on replies.
2017-09-15 08:49:31 +02:00
Roger Braun
f445a1b376
Don't die on fetching problems.
2017-09-15 08:18:29 +02:00
Roger Braun
3ca853fb61
MastoAPI: Follower-related changes
2017-09-14 18:30:05 +02:00
Roger Braun
fc85c9f086
Add tag timelines.
2017-09-14 13:22:09 +02:00
Roger Braun
b0363e8055
MastoAPI: Add favourited_by/reblogged_by.
2017-09-14 09:50:49 +02:00
Roger Braun
ac3f32da7e
Preserve state in oauth
2017-09-14 09:29:51 +02:00
Roger Braun
a8701282d4
MastoAPI: fake out 'application' property.
2017-09-14 09:14:08 +02:00
Roger Braun
6258c6b6b3
MastoAPI: Also return text_url in attachments.
2017-09-14 08:38:48 +02:00
Roger Braun
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
Roger Braun
3184939055
Ensure non-null bio.
2017-09-13 17:45:59 +02:00
Roger Braun
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
Roger Braun
ad5001828e
Oh no! More datetime fixes!
2017-09-13 17:18:08 +02:00
Roger Braun
14b4029b1d
Reparse time to ensure correct format.
2017-09-13 16:38:29 +02:00
Roger Braun
94be93aad0
Allign datetime format with mastodon.
2017-09-13 16:26:02 +02:00
Roger Braun
d2faee01ee
Return iso8601 date.
2017-09-13 16:09:57 +02:00
Roger Braun
e6286152b9
Fix logic.
2017-09-13 16:05:39 +02:00
Roger Braun
49929321c7
Add relationships to masto api.
2017-09-13 15:55:10 +02:00
Roger Braun
f03524805f
Try host-meta call over https.
2017-09-13 11:59:56 +02:00
Roger Braun
07b694814e
Optimize conversation fetching.
2017-09-12 13:48:48 +02:00
Roger Braun
1bc58230ee
Remove milliseconds from mastodon api response.
2017-09-12 13:31:17 +02:00
Roger Braun
7331733d30
Use signed integer as attachment id.
2017-09-12 11:43:36 +02:00
Roger Braun
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
Roger Braun
44a650235b
MastoAPI: Remove domain ending from account name.
2017-09-12 09:34:39 +02:00
Roger Braun
f1d9f2f6cd
MastoAPI: More link headers.
2017-09-12 09:06:32 +02:00
Roger Braun
0df4a0f26d
Add parentheses.
2017-09-12 08:53:21 +02:00
Roger Braun
02f824f9d5
MastoAPI: Add link headers to home timeline
2017-09-12 08:51:56 +02:00
Roger Braun
cd6cba2f67
log ostatus handling errors.
2017-09-11 21:50:46 +02:00
Roger Braun
f0d41a3abf
Merge branch 'develop' into oauth2
2017-09-11 20:54:44 +02:00
Roger Braun
464c33e9a1
Add follow notifications.
2017-09-11 20:53:11 +02:00
Roger Braun
3bad294058
Add reblogs to notifications.
2017-09-11 20:43:25 +02:00
Roger Braun
bcce3e5dd2
Add favorites to notifications.
2017-09-11 20:41:05 +02:00
Roger Braun
61adf676d5
Add basic mastodon notification support.
2017-09-11 18:53:19 +02:00
Roger Braun
7616b202ea
Add user timelines to Masto Api.
2017-09-10 17:49:13 +02:00
Roger Braun
b8912ff954
Fix masto api context.
2017-09-10 17:20:53 +02:00
Roger Braun
8672d4d12b
Add context to mastodonAPI.
2017-09-10 15:00:13 +02:00
Roger Braun
fc10875895
Add attachments to mastoapi statuses.
2017-09-10 11:51:01 +02:00
Roger Braun
96473dfac0
Reverse mastodon timeline data.
2017-09-10 10:49:15 +02:00
Roger Braun
e8975d06be
Add header image to masto api.
2017-09-10 10:37:34 +02:00
Roger Braun
d66d69c3b4
Small hack to make notifications return empty for now.
2017-09-09 19:19:13 +02:00
Roger Braun
5fe9e4dd3f
Do oauth redirect.
2017-09-09 19:03:57 +02:00
Roger Braun
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
Roger Braun
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
Roger Braun
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
Roger Braun
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
Roger Braun
be04f725e9
Add more Mastodon API methods.
2017-09-09 13:15:01 +02:00
Roger Braun
59dd240c08
Use token exchange method.
2017-09-09 12:10:46 +02:00
Roger Braun
2b7efff71b
Add Mastodon StatusView.
2017-09-09 12:10:29 +02:00
Roger Braun
c6bdc5960c
Test for Mastodon AccountView
...
Handles users and mentions.
2017-09-09 12:09:53 +02:00
Roger Braun
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
Roger Braun
95cedd6000
Make auth tokens usable once and expire them.
2017-09-09 12:02:59 +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
2652d9e4ed
Slight cleanup.
2017-09-07 08:58:10 +02:00
Roger Braun
2a298d70f9
Add very basic oauth and mastodon api support.
2017-09-06 19:06:25 +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
632e1f7943
Add delete to TwAPI representer correctly.
2017-09-04 20:48:29 +02:00
Roger Braun
1f9a5272e1
Add delete to TwAPI.
2017-09-04 20:48:14 +02:00
Roger Braun
3438a120cc
Don't delete new delete activity...
2017-09-04 20:47:43 +02:00
Roger Braun
fcf3128a56
Add TwAPI representer for deletes.
2017-09-04 20:03:28 +02:00
Roger Braun
2348b272e0
Create deletes activities for incoming deletes.
2017-09-04 18:47:46 +02:00
Roger Braun
5db535c0b1
Add delete to ActivityPub.
2017-09-04 18:47:33 +02:00
Roger Braun
540dfb4617
Add delete activity representer.
2017-09-04 17:56:09 +02:00
Roger Braun
10e40206c6
Output mastodon-style conversation ids.
2017-09-04 11:04:04 +02:00
Roger Braun
1b1f861bad
Handle mastodon conversation ids.
2017-09-04 11:03:51 +02:00
Roger Braun
6c3a0ffae4
Add banner and background updating.
2017-08-29 17:18:33 +02:00
Roger Braun
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
Roger Braun
171ef33cbb
More sensible attachment names.
2017-08-28 19:17:38 +02:00
Roger Braun
fecbd099cd
Ignore padding for salmon public keys.
2017-08-25 15:09:05 +02:00
Roger Braun
67bfa19b35
Set twitter-style possibly_sensitive boolena.
2017-08-24 16:27:37 +02:00
Roger Braun
5dc278b1a6
Add activity_type to twitter api output.
2017-08-24 16:18:26 +02:00
Roger Braun
d95b78c72f
Remove email from mastoinfo.
2017-08-24 14:19:54 +02:00
Roger Braun
d1f86ad69f
Basic masto-style info.
2017-08-24 14:15:16 +02:00
Roger Braun
8a97bebc53
More meta info fixes.
2017-08-24 14:07:05 +02:00
Roger Braun
7ccdebe180
Small meta info fixes.
2017-08-24 13:36:28 +02:00
Roger Braun
08bd59e446
Extend webfinger capabilities.
2017-08-24 12:54:53 +02:00
Roger Braun
1a001588e8
Don't break on empty mentions.
2017-08-24 12:54:01 +02:00
Roger Braun
e477608b7e
add correct content type for catch-all
2017-08-22 14:22:36 +02:00
Roger Braun
552cfdbe11
Fix deletion not deleting relevant actions.
2017-08-16 16:29:25 +02:00
Roger Braun
7d34cec58d
escape attachment urls on creation.
2017-08-09 16:55:18 +02:00
