Commit Graph

260 Commits

Author SHA1 Message Date
eal 1969773fb4 Fix follower/following lists.
Add tests.
2017-12-18 16:37:26 +02:00
eal 9223038319 Fix some more tests. 2017-12-11 21:01:36 +02:00
eal 79b3397c17 Fix tests. 2017-12-11 18:41:03 +02:00
Lain Iwakura e7c2472abd Fix tests. 2017-12-05 12:18:04 +01:00
eal 3d29fc5462 Make /api/friends/ids test deterministic. 2017-11-20 19:16:43 +02:00
Roger Braun 747a68a075 Treat internal emoji like external. 2017-11-20 17:53:21 +01:00
eal 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
Roger Braun 40ca379357 Fix flakey test. 2017-11-19 13:07:29 +01: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
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 3533bf7eac TwitterAPI: Add /friends/ids. 2017-11-14 16:04:58 +02:00
eal f7fc048aeb TwitterAPI user view: add follows_you. 2017-11-08 19:13:03 +02: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
eal f85566324e Allow profile fetching for authenticated users only. 2017-11-07 00:33:44 +02:00
Roger Braun 0c871e5c6e Fix specs. 2017-10-31 17:57:26 +01:00
Roger Braun 04217f52c9 TwitterAPI: Display cws. 2017-10-31 17:43:37 +01:00
Roger Braun 6d5bd4dcc0 TwitterAPI: Use correct endpoint for tag timeline. 2017-09-17 13:03:46 +02:00
Roger Braun 255a681782 TwitterAPI: Add tag timeline. 2017-09-17 11:45:16 +02:00
Roger Braun 959e993c7d Apply incoming custom emoji. 2017-09-16 16:40:20 +02:00
Roger Braun 5d1f8dcd1c TwitterAPI: Add search. 2017-09-16 14:33:47 +02:00
Roger Braun 50409326a8 Refactor posting and make character limit configurable. 2017-09-15 14:17:36 +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 d1c10ad2fb Fix specs. 2017-09-05 09:35:00 +02:00
Roger Braun fcf3128a56 Add TwAPI representer for deletes. 2017-09-04 20:03:28 +02:00
Roger Braun 4b03c43fd7 fix specs. 2017-08-29 17:22:22 +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 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 7d34cec58d escape attachment urls on creation. 2017-08-09 16:55:18 +02:00
Roger Braun 00b722430f Revert "Close br tags."
This reverts commit 2eba8e74cc.
2017-07-31 13:27:38 +02:00
Roger Braun 19e8421947 Revert "Wrap in <p>."
This reverts commit c81d0b6f89.
2017-07-31 13:27:29 +02:00
Roger Braun 3063e3b440 Revert "Remove newlines completely so mastodon doesn't bug out."
This reverts commit 0ca3ab7b59.
2017-07-31 13:27:19 +02:00
Roger Braun 0ca3ab7b59 Remove newlines completely so mastodon doesn't bug out. 2017-07-31 13:06:31 +02:00
Roger Braun c81d0b6f89 Wrap in <p>. 2017-07-31 12:16:44 +02:00
Roger Braun 2eba8e74cc Close br tags. 2017-07-31 10:46:29 +02:00
Roger Braun 72ca58c540 Save follower count and note count in user. 2017-07-22 17:42:15 +02:00
Roger Braun a027b0027c Add friends endpoint. 2017-07-20 20:35:30 +02:00
Roger Braun 94a394e3a8 Add followers endpoint. 2017-07-20 20:29:15 +02:00
Roger Braun 140f72725d Use follower address in user entry. 2017-07-19 19:06:49 +02:00
Roger Braun 7e9647b146 Fix undo activity. 2017-07-08 11:17:35 +02:00
Roger Braun e343c0c9c4 Add way to update most recent notification id. 2017-07-02 15:01:59 +02:00
Roger Braun 201804b836 Only return posts in TwAPI conversations. 2017-06-30 16:41:09 +02:00
Roger Braun d4de38e8ff Order conversation fetches like GS does. 2017-06-30 16:30:19 +02:00
Roger Braun 1c074efeaf Add external links to twapi. 2017-06-25 12:07:08 +02:00
dtluna 069daf644d Replace UserRepresenter with UserView 2017-06-20 00:12:37 +03:00
Roger Braun fa82822932 Revert "Add invisible tags to TwAPI output."
This reverts commit a92a9dce94.
2017-06-18 18:59:13 +02:00
Roger Braun d00571ff75 Fetch user feed on externalprofile request.
This is so we always have something to show.
2017-06-18 17:20:39 +02:00
Roger Braun fafb765c48 Output tags list in TwAPI. 2017-06-18 14:43:44 +02:00
Roger Braun 8feec8d390 Strip unsafe html on output in TwAPI. 2017-06-18 13:40:35 +02:00
Roger Braun 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
Roger Braun 83c657afa5 Do some basic escaping. 2017-06-14 14:46:18 +02:00
Roger Braun 1af9c77736 Move mention parsing to Formatter module. 2017-06-14 13:58:56 +02:00
Roger Braun eb18b9ebba Enable user timelines. 2017-06-12 17:12:55 +02:00
Roger Braun 00c032783d Fix NaN statuses per day. 2017-06-05 15:47:37 +02:00
Roger Braun c6aa60c829 Shorten names in links. 2017-05-30 14:26:31 +02:00
Roger Braun 48f9df2391 Keep newlines around. 2017-05-18 16:41:16 +02:00
Roger Braun a92a9dce94 Add invisible tags to TwAPI output. 2017-05-18 16:24:41 +02:00
Roger Braun 0da6ade619 Save tags in object. 2017-05-18 15:16:49 +02:00
Roger Braun 9033bfffd2 Twitter API refactoring. 2017-05-17 18:00:20 +02:00
Roger Braun 423194520e Fix mention replacing. 2017-05-15 18:25:21 +02:00
Roger Braun 36448d6483 Add externalprofile to TwAPI. 2017-05-10 18:44:57 +02:00
Roger Braun 1418d72749 Add class=attachment to attachment links. 2017-05-08 20:12:36 +02:00
Roger Braun 7303786160 Add some twapi fixes. 2017-05-07 20:20:53 +02:00
Roger Braun b403ea4d2b Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity 2017-05-07 19:28:23 +02:00
Roger Braun 95ab0dc3c5 Add conversation ids to twapi announce representer. 2017-05-07 12:46:21 +02:00
Roger Braun 33c803d6da Add attachment link to posts. 2017-05-02 18:25:39 +02:00
Roger Braun 16f8406eb6 Add statusnet_profile_url to the TwAPI. 2017-05-02 14:36:04 +02:00
Roger Braun 32a95d73da Add twkn timeline. 2017-05-02 14:12:43 +02:00
Roger Braun 56bacc90d1 Fix specs, add local marker to actitivies. 2017-05-02 10:43:35 +02:00
Roger Braun 09f7ed4214 Don't set statusnetConversationIds on replies anymore. 2017-04-30 14:26:29 +02:00
Roger Braun 009fcd2acf Stop adding statusnetConversationIds. 2017-04-30 14:02:04 +02:00
Roger Braun 4c8111c334 Use conversation mapping objects to get / retrieve context from TwAPI. 2017-04-30 13:53:26 +02:00
Roger Braun 22e936372e Fix retweet spec. 2017-04-26 08:55:00 +02:00
dtluna 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
dtluna 5b6070ec40 Deny whitespace statuses 2017-04-24 12:09:11 +03:00
dtluna f723b23691 Add error response to self-repeats 2017-04-24 01:11:38 +03:00
dtluna 6b6bc9435c Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats 2017-04-24 01:05:02 +03:00
dtluna 1e3791877c Add error response on empty status 2017-04-23 19:08:25 +03:00
dtluna a9b3f99d48 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name 2017-04-21 18:36:03 +03:00
Roger Braun 1e88f102c4 Fix specs, add some user info. 2017-04-21 00:51:09 +02:00
dtluna 3a56d7318f Add statuses/mentions endpoint 2017-04-20 15:18:54 +03:00
dtluna 01901d9835 Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name 2017-04-20 10:46:27 +03:00
dtluna d952b6cd7b Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name 2017-04-20 10:39:18 +03:00
lambadalambda eda742c78b Merge branch 'feature/user-timeline' into 'develop'
Feature/user timeline

See merge request !8
2017-04-19 05:50:24 -04:00
dtluna 470f5f7cd6 Add user timeline spec test 2017-04-17 16:31:19 +03:00
lambadalambda ac9817bdb0 Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
Add error messages for repeated follows and unfollows

See merge request !7
2017-04-17 05:46:59 -04:00
Roger Braun 6a0e69a8a3 Fix syntax error. 2017-04-17 11:43:44 +02:00
Roger Braun a185ea63af Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-17 11:37:21 +02:00
Roger Braun 6bfd521974 Switch cache implementation for size limiting. 2017-04-17 11:36:17 +02:00
dtluna 369be708b2 Remove unnecesary queries 2017-04-16 17:42:15 +03:00
dtluna f6e632d25b Remove unnecesary asserts 2017-04-16 17:39:34 +03:00
dtluna ef5033d7a7 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow 2017-04-16 17:18:34 +03:00
dtluna f6547f7b7f Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name 2017-04-16 17:13:42 +03:00
dtluna 82914e1e4d Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name 2017-04-16 17:12:28 +03:00
dtluna 85bd480be3 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test 2017-04-16 17:10:25 +03:00
dtluna 5229b01944 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline 2017-04-16 17:08:17 +03:00
Roger Braun eb9358c8d6 Add basic Avatar updating code. 2017-04-16 16:06:19 +02:00
dtluna 63f04b314d Fix typo 2017-04-16 17:05:48 +03:00
dtluna 4b4ece2c74 Add user timeline fetching without credentials 2017-04-16 16:44:30 +03:00
Roger Braun 03a9c11d25 Display the users avatar if he has one set. 2017-04-16 15:40:50 +02:00
Roger Braun d7e3b72c6a Add avatar objects to user, fix specs. 2017-04-16 15:28:28 +02:00
dtluna 7a0046d127 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline 2017-04-16 13:32:56 +03:00
dtluna 9a8c348aed Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name 2017-04-16 13:28:23 +03:00
dtluna ce1eef9c98 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test 2017-04-16 13:25:38 +03:00
Roger Braun b41f3eff84 Preserve newlines in messages. 2017-04-16 11:51:00 +02:00
Roger Braun 5dac3727f1 Add registration to the TwAPI controller. 2017-04-16 11:01:24 +02:00
Roger Braun b1edd94baa Add user registration to TwAPI. 2017-04-16 10:25:27 +02:00
Roger Braun 4799dc6991 Add retweeting to TwAPI controller. 2017-04-15 14:09:54 +02:00
Roger Braun 60c60de330 Add announcements / retweets to TwAPI. 2017-04-15 13:54:46 +02:00
Roger Braun 7a47afed3c Update object correctly after setting context. 2017-04-14 18:59:11 +02:00
Roger Braun c83f279a7d Add unliking to TwAPI controller. 2017-04-14 18:27:17 +02:00
Roger Braun f4eea0847b Add unfavoriting to TwAPI. 2017-04-14 18:15:15 +02:00
Roger Braun 03ddaead7e Add basic user caching.
Expires after 5 seconds.
2017-04-14 17:13:51 +02:00
dtluna 18cd04ade5 Add user timeline 2017-04-14 16:09:13 +03:00
Roger Braun fa0c279139 Favorite changes.
- Add 'likes' to activity, collection of ids of people who liked it.
- show if you favorited something or not.
- Don't allow double favorites
- Address favorites to the followers of the liked activity's author.
2017-04-14 15:07:24 +02:00
Roger Braun 5cb446a148 Add favoriting to TwAPI controller. 2017-04-13 17:22:44 +02:00
Roger Braun d0da40dc81 Display like activities. 2017-04-13 17:05:53 +02:00
Roger Braun 653d605e14 Add favoriting to twitter api. 2017-04-13 16:19:07 +02:00
Roger Braun 1ccbe562c9 Add actor to objects. 2017-04-13 14:56:19 +02:00
dtluna a8e50d602b Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow 2017-04-13 15:36:00 +03:00
dtluna 3ff917b5dd Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name 2017-04-13 15:18:18 +03:00
dtluna 84c2012810 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test 2017-04-13 15:15:09 +03:00
Roger Braun d2bf099ae6 Fix twitter api date. 2017-04-12 19:34:58 +02:00
Roger Braun 1b086834bd Don't return html in the text field. 2017-04-12 17:22:29 +02:00
Roger Braun 6a179a44be Test friends timeline more thoroughly. 2017-04-12 16:53:46 +02:00
Roger Braun 8eea09889b Return directly addressed activities in friends timeline. 2017-04-12 16:45:23 +02:00
Roger Braun 15655d992e Fix user representation after following. 2017-04-12 16:38:55 +02:00
dtluna 65ef18a715 Add error messages for repeated follows and unfollows 2017-04-12 17:34:36 +03:00
dtluna c0e5b3459f Add unfollowing using screen_name parameter 2017-04-10 16:45:47 +03:00
dtluna 896e40cd2b Add following using screen_name parameter 2017-04-10 16:38:21 +03:00
dtluna 59a406d94c Add test for help/test resource 2017-04-10 16:00:57 +03:00
dtluna 8075badafe Add Follow activity insertion 2017-04-04 03:30:07 +03:00
Roger Braun a83fa053de Parse mentions, save them, output them in TwAPI. 2017-04-03 18:28:19 +02:00
Roger Braun 2e89d505d3 Connect attachments with objects, not activities. 2017-03-30 18:07:38 +02:00
Roger Braun 73df2f8e5e Add attachments to the TwAPI. 2017-03-30 17:07:22 +02:00
Roger Braun 42c90855ba Basic ObjectRepresenter. 2017-03-30 16:08:49 +02:00
Roger Braun e7dc39e40c Basic file uploading via TwAPI. 2017-03-29 02:07:56 +02:00
Roger Braun d2cdcc097b Add conversation fetching to TwAPI controller. 2017-03-28 17:22:44 +02:00
Roger Braun 0dd3373304 Return statusnet_conversation_id in TwAPI. 2017-03-28 14:49:21 +02:00
Roger Braun e25aea3fa7 Add conversation id to activities.
This is for compatibility with the TwAPI.
2017-03-28 14:40:09 +02:00
Roger Braun bb07efdaab Fix spec. 2017-03-28 14:04:13 +02:00
Roger Braun e4de0ddc77 Add single status fetching to TwAPI. 2017-03-24 01:16:28 +01:00
Roger Braun ae50b165cc Add inReplyToStatus to TwAPI. 2017-03-24 00:00:06 +01:00
Roger Braun e56dba1563 Add context and inReplyTo. 2017-03-23 23:34:10 +01:00