Commit Graph

274 Commits

Author SHA1 Message Date
William Pitcock e80d91c64a introduce User.maybe_direct_follow() and use it where we used to call User.follow() 2018-05-25 09:40:10 +00:00
William Pitcock 502ba33d01 activitypub: fix up accept/reject semantics for following
fixes #175
2018-05-25 06:14:18 +00:00
William Pitcock c0ca9f82b9 mastodon api: properly track if an account is locked or not 2018-05-25 06:14:09 +00:00
lambda f3a71f2986 Merge branch 'feature/lists' into 'develop'
Mastodon List API

See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
lambda 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
eal 3dbd9809d4 MastoAPI: add lists. 2018-05-24 15:34:39 +03:00
eal a8369db4f2 MastoAPI: add lists. 2018-05-24 13:18:39 +03:00
Francis Dinh b2c6ae7d82 Hook up unfollow and (un)block to MastoAPI + tests 2018-05-22 04:27:40 -04:00
csaurus 4fd9df100f Merge branch 'develop' into feature/mstdn-direct-api 2018-05-21 20:19:37 -04:00
Thog 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
lain 434601a5c3 Return private / direct posts on user timelines, too. 2018-05-20 16:15:18 +02:00
Thog 6f39ecc41b
Support Undo like activities (Fix #139) 2018-05-19 22:14:15 +02:00
csaurus 2ce48c1a42 Formatting 2018-05-13 15:36:41 -04:00
csaurus 9aabff4883 Fix tests. 2018-05-13 15:33:59 -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
csaurus c8d418acdd api/v1/timelines/direct implementation 2018-05-12 21:50:59 -04:00
csaurus c60a5405db Detect and try to stream incoming "direct" messages 2018-05-12 17:40:59 -04:00
lambda 6c2903d9a1 Merge branch 'feld-warnings' into 'develop'
Clean up warnings

See merge request pleroma/pleroma!144
2018-05-06 18:42:31 +00:00
eal bfad57c7c9 Get rid of unsafe variables. 2018-05-06 09:58:59 +03:00
lain 96add86b50 Unify wss uri generation. 2018-05-05 13:40:31 +02:00
lain c464355d1a Idempotency: Use special cache, keep for 6 hours. 2018-05-05 11:15:57 +02:00
Mark Felder 31ea9cbcd8 Group def renders together to fix warning 2018-05-04 22:28:13 +00:00
Mark Felder aaacebd906 Fix unused variables, imports, and aliases 2018-05-04 21:42:20 +00:00
lain 90c4bed0af Don't expire idempotency cache for five minutes. 2018-05-04 21:15:39 +02:00
lain fcd3eca167 MastodonAPI: Support idempotency key. 2018-05-04 20:30:29 +02:00
Francis Dinh 9e0dd21ed6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-25 00:46:28 -04:00
lain ff5e957476 Make search use id index too.
Seems to be faster in general, query planner chooses well.
2018-04-21 09:22:31 +02:00
Francis Dinh c5dc7e6e31 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-20 16:48:18 -04:00
lain a61e8ac154 Formatting. 2018-04-20 13:10:57 +02:00
eal 947431e9aa MastoAPI and OAuth: allow login with either email or username. 2018-04-18 13:13:57 +03:00
Francis Dinh 7b4f55238e Handle unrepeats via the TwitterAPI 2018-04-18 06:00:40 -04:00
Francis Dinh 687db1bc3a Expose unannounce activity so that it can be tested 2018-04-18 03:39:42 -04:00
Francis Dinh 42279f54cf Return target status in MastoAPI endpoint instead of reblog activity 2018-04-16 23:30:52 -04:00
Francis Dinh b949577472 Add unrepeat functionality 2018-04-14 20:19:48 -04:00
Gian Sass 907df9b8ed Fix issue #124 2018-04-11 14:55:49 -04:00
lain 1dd2c8163f Order masto searches by date. 2018-04-10 18:38:52 +02:00
lambda 9998b4519d Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
mastodon api emulation improvements for tootstream

Closes #101

See merge request pleroma/pleroma!100
2018-04-08 06:02:11 +00:00
lambda 9a2d3705c6 Merge branch 'fix/persisted-mastofe-settings' into 'develop'
MastoAPI: Persist frontend timelines and settings.

Closes #113

See merge request pleroma/pleroma!98
2018-04-08 06:01:06 +00:00
William Pitcock 1857f403be mastodon api: report version as the Mastodon API version supported with the real version in parenthesis 2018-04-07 17:29:28 -05:00
lain 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
eal 7c47534970 MastoAPI: Persist frontend timelines and settings. 2018-04-07 17:26:56 +03:00
lain 303289d7da MastodonAPI search: return only create activities. 2018-04-05 13:59:53 +02:00
lain b3b7ab5d9a Load all users at once in timelines. 2018-04-02 16:35:41 +02:00
Morgan Bazalgette 5e4bb4ad92
masto api: run emojis through mediaproxy
fixes #107
2018-04-02 12:04:11 +02:00
William Pitcock 2dcc6037d0 mastodon search api: implement a reasonable hashtags stub 2018-04-01 02:12:10 -05:00
lain 4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
Morgan Bazalgette 457e040473
Add char_limit to initial-state of mastofe 2018-03-30 00:59:49 +02:00
lain 37e5014d3e Reduce OP fetching queries. 2018-03-27 18:18:24 +02:00
lain ff7afe46b9 Don't try to fetch OP if none is there. 2018-03-27 17:43:08 +02:00
lain d2099c849d More Jason changes. 2018-03-27 16:45:38 +02:00
lain 09de76ad5a Return "audio" info in mastodon api. 2018-03-25 17:08:54 +02:00
lain fbe9aa3506 Strip html from emoji stuff. 2018-03-23 19:52:08 +01:00
William Pitcock 000b3f1837 mastodon api: fix rendering the mentions JSON
Signed-off-by: lain <lain@soykaf.club>
2018-03-16 11:25:41 +01:00
eal 18e1202a3b MastoAPI: Add unimplemented status card endpoint. 2018-03-09 20:58:00 +02:00
eal 2e32012d57 Add next and previous headers to user pages and tag timelines. 2018-03-09 16:54:10 +02:00
lain e1b0ccce77 Mastodon API context fix. 2018-02-25 21:25:33 +01:00
lain e9de04b74b Add support for outgoing update. 2018-02-25 21:08:32 +01:00
lain 8a47974217 Fix specs. 2018-02-25 18:11:03 +01:00
lain 95e6e82138 Correctly display accounts without name. 2018-02-22 19:22:10 +01:00
lain 486e205810 Remove some noise. 2018-02-20 08:52:31 +01:00
lain 5d89997a70 Respect visibility in API. 2018-02-18 15:50:34 +01:00
lain c974f6544f Show users their own posts in timeline. 2018-02-18 15:20:36 +01:00
lain d4b08dd838 MastodonAPI: Post with visibility settings 2018-02-18 14:56:36 +01:00
lain 539340d914 Handle sensitive property. 2018-02-18 14:14:16 +01:00
lain 912ca56e59 Mastodon StatusView: Return correct visibility. 2018-02-18 13:51:51 +01:00
Hakaba Hitoyo e47f60c053 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:04:34 +09:00
Hakaba Hitoyo a4335e391f provide instance thumbnail at /api/v1/instance 2018-01-31 22:51:25 +09:00
eal 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
eal 14b086eec2 Add a default profile picture and banner.
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
eal d8db39564e Move user count to stats agent. 2018-01-14 08:15:11 +02:00
eal 9717166d10 Add a stats agent for storing data from expensive queries. 2018-01-13 18:24:16 +02:00
lambda 35ac549a99 Merge branch 'media-proxy' into 'develop'
Media proxy

See merge request pleroma/pleroma!34
2017-12-20 14:22:24 +00:00
Lain Iwakura f1f79c0dca Fix timelines in subway tooter. 2017-12-19 16:15:07 +01:00
Lain Iwakura 47887ac848 MastoAPI: Fix always-sensitive bugs. 2017-12-18 16:56:03 +01:00
href 9093b2cf49
Merge remote-tracking branch 'upstream/develop' into media-proxy 2017-12-11 02:45:28 +01:00
eal 5436dbaeaf MastoAPI: don't add attachment links. 2017-12-07 20:44:09 +02:00
href 72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy 2017-12-05 14:12:15 +01:00
Lain Iwakura 5637d163e6 MastodonAPI: Add proper user count. 2017-11-30 14:59:44 +01:00
href 5f35fdcf5d
media proxy: good enough wip 2017-11-28 20:50:34 +01:00
Roger Braun d16b613929 MastodonUI login: Show error message on error. 2017-11-23 12:06:14 +01:00
eal fa19de97ba MastoAPI: no more than 4 attachments. 2017-11-20 22:49:20 +02:00
Roger Braun cf0bbf320d MastoAPI: Add max_toot_chars. 2017-11-20 08:54:47 +01:00
Roger Braun 0f099dac67 MastodonAPI: Add sign out.
Close #79
2017-11-19 13:23:16 +01:00
Roger Braun c336a13d2c MastoAPI: Only return create activties in contexts. 2017-11-19 12:59:23 +01:00
Thog 59770c3f5c
Fix all compilation warnings 2017-11-19 02:22:07 +01: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 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
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 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 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 c6210183e1 Add mastodon API endpoint for custom emoji. 2017-11-07 21:55:01 +02: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 44295dd49a MastoAPI: Include CW. 2017-10-31 17:49:47 +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 64bc38e009 MastoAPI: Add emoji output. 2017-10-23 16:27:51 +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 0872f5f394 Add undocumented default user default settings. 2017-09-16 11:52:33 +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 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 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 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 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