Commit Graph

534 Commits

Author SHA1 Message Date
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
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
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
1b8ad9f731 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-09 16:49:32 +01:00
Roger Braun
266d9c008d MastoAPI: Fetch statuses in search. 2017-11-09 16:48:45 +01:00
lambda
2247d7580e Merge branch 'fix-tootdon-image-uploads' into 'develop'
Correct mimetype on bad uploads.

See merge request pleroma/pleroma!12
2017-11-09 14:41:44 +00:00
eal
e942e1e552 Correct mimetype on bad uploads. 2017-11-09 15:01:59 +02: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
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
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
7da978f3f5 Linkify fixes. 2017-11-07 12:06:37 +01:00
eal
f85566324e Allow profile fetching for authenticated users only. 2017-11-07 00:33:44 +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
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
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
632da6c927 Don't create notifications if the user is blocked. 2017-11-02 22:08:22 +01:00
Roger Braun
6a5f087174 Add blocks to User. 2017-11-02 21:57:37 +01:00
Roger Braun
345ad870f7 Clean up user_test.exs. 2017-11-02 21:57:21 +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
0c871e5c6e Fix specs. 2017-10-31 17:57:26 +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
968a546d4a MastoAPI: Return id as string instead of integer. 2017-10-31 14:51:41 +01:00
Roger Braun
2f39bb6b43 Typo. 2017-10-31 14:46:01 +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
eal
71f66bd458 Fix follow test semantics. 2017-10-29 14:25:11 +02:00
eal
c56d28f96c Fix return type of /api/v1/follows 2017-10-29 00:07:38 +03:00
eal
8e94936553 Add tests. 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
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
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
255a681782 TwitterAPI: Add tag timeline. 2017-09-17 11:45:16 +02:00
Roger Braun
003cb17b16 Add missing fixtures. 2017-09-17 00:33:58 +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
79aeb219d8 Small emoji refactor. 2017-09-16 15:47:45 +02:00
Roger Braun
5d1f8dcd1c TwitterAPI: Add search. 2017-09-16 14:33:47 +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
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
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
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
7f3ce5c1a0 Cleanup. 2017-09-14 08:11:51 +02:00
Roger Braun
641c24cdd4 Add media upload endpoint. 2017-09-14 08:08:32 +02:00
Roger Braun
d168ef5a9e MastoAPI: Add accounts getting. 2017-09-13 17:36:02 +02:00
Roger Braun
94be93aad0 Allign datetime format with mastodon. 2017-09-13 16:26:02 +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
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
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
fc10875895 Add attachments to mastoapi statuses. 2017-09-10 11:51:01 +02:00
Roger Braun
e8975d06be Add header image to masto api. 2017-09-10 10:37:34 +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
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
95cedd6000 Make auth tokens usable once and expire them. 2017-09-09 12:02:59 +02:00
Roger Braun
d1c10ad2fb Fix specs. 2017-09-05 09:35:00 +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
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
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
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
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
Roger Braun
a32784fe6d Cowboy and Elixir don't seem to agree on uri encoding... 2017-08-09 16:45:05 +02:00
Roger Braun
9c35456d77 URI encode filenames... 2017-08-09 15:21:34 +02:00
Roger Braun
763756f879 Also fetch atom links. 2017-08-04 16:57:38 +02:00
Roger Braun
25c733f402 Add href to in-reply-to.
THis should enable fetching from pleroma posts.
2017-08-01 17:35:19 +02:00
Roger Braun
f226f46a09 Add basic incoming deletions. 2017-08-01 17:05:07 +02:00
Roger Braun
558ab6e74e Display html links correctly for remote activies. 2017-08-01 14:05: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
fc269fd319 Add html alternate link to atom. 2017-07-29 22:07:02 +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
44aef2183e Add follower / friend fetching to user. 2017-07-20 19:37:41 +02:00
Roger Braun
140f72725d Use follower address in user entry. 2017-07-19 19:06:49 +02:00
Roger Braun
396c32a6da Add follower_address to users, add on generation. 2017-07-19 18:49:25 +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
9cda5b897a Fix test. 2017-07-01 16:39:12 +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
6a44427915 Add tests for public recipients. 2017-06-30 16:08:59 +02:00
Roger Braun
fc7016a88c Don't add public recipient to notes that don't contain it. 2017-06-30 15:54:32 +02:00
Roger Braun
1c074efeaf Add external links to twapi. 2017-06-25 12:07:08 +02:00
Roger Braun
429992fcc9 Save external link for notes. 2017-06-25 11:57:34 +02:00
Roger Braun
6935fc3e01 Update user data on fetch if it changed. 2017-06-24 13:09:46 +02:00
Roger Braun
6a184115a2 Longer timeouts for outgoing federation. 2017-06-23 12:25:53 +02:00
dtluna
069daf644d Replace UserRepresenter with UserView 2017-06-20 00:12:37 +03:00
Roger Braun
66b4fee80e Add finmoji. 2017-06-19 17:51:43 +02:00
Roger Braun
6cac8e3c8b Downcase tags coming in through the TwAPI. 2017-06-18 19:04:46 +02:00
Roger Braun
5ff4a5eee3 Save incoming tags as lowercase. 2017-06-18 19:01:54 +02: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
a9bfbcae80 Slightly better html link regex. 2017-06-18 13:29:30 +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
6342fcd5dc Save correct date for incoming notes. 2017-06-08 16:44:12 +02:00
Roger Braun
00c032783d Fix NaN statuses per day. 2017-06-05 15:47:37 +02:00
Roger Braun
cdcb201bf5 Represent object publishing date in notes. 2017-06-02 22:47:49 +02:00
Roger Braun
c7fdd1b7ff Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-06-01 11:24:03 +02:00
Roger Braun
c6aa60c829 Shorten names in links. 2017-05-30 14:26:31 +02:00
Roger Braun
bdcf42180f Save remote user bio and update if we see new data. 2017-05-24 17:34:38 +02:00
Roger Braun
94e980d6b4 Output proper published data in ostatus. 2017-05-24 13:54:25 +02:00
Roger Braun
869e5ccfe1 Fix factory. 2017-05-24 13:53:20 +02:00
Roger Braun
87c2c42bad Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-05-22 19:08:46 +02:00
Roger Braun
47684c2a2c Make email and nickname case insensitive. 2017-05-22 18:10:50 +02:00
Roger Braun
1085675ec4 Output ref instead of href for conversation. 2017-05-20 10:44:57 +02:00
Roger Braun
03b7b2fa24 Also show activities in OStatus. 2017-05-19 15:53:02 +02:00
Roger Braun
f972966385 Fix specs. 2017-05-18 19:10:51 +02:00
Roger Braun
8e02fa100f Add categories to ostatus output. 2017-05-18 18:18:27 +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
beb7b0ef07 Handle incoming tags. 2017-05-18 15:58:18 +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
dcfd494e97 Add Formatter. 2017-05-17 18:00:09 +02:00
Roger Braun
70024632ba AP refactoring. 2017-05-16 18:19:04 +02:00
Roger Braun
423194520e Fix mention replacing. 2017-05-15 18:25:21 +02:00
Roger Braun
dd12cf7296 Fix cws. 2017-05-11 17:59:11 +02:00
Roger Braun
1b67a59795 Repair retweets. 2017-05-10 19:29:25 +02:00
Roger Braun
f73cd6f3ce Add problematic mastodon message. 2017-05-10 19:24:00 +02:00
Roger Braun
153995f832 Correct active state websub name. 2017-05-10 18:54:43 +02:00
Roger Braun
05f2cd0d93 Handle incoming follows.
Also Mastodon CWs.
2017-05-10 18:46:23 +02:00
Roger Braun
34a1ce00ec Set valid_until date. 2017-05-10 18:45:55 +02:00
Roger Braun
36448d6483 Add externalprofile to TwAPI. 2017-05-10 18:44:57 +02:00
Roger Braun
2e753e8cd7 Refresh subscriptions. 2017-05-10 18:44:06 +02:00
Roger Braun
118c572006 Use changeset for remote user creation. 2017-05-10 10:16:20 +02:00
Roger Braun
373753e595 Add some basic changesets. 2017-05-09 18:11:51 +02:00
Roger Braun
1418d72749 Add class=attachment to attachment links. 2017-05-08 20:12:36 +02:00
Roger Braun
3320c9b176 Fix remote users retweeting local stuff. 2017-05-08 18:19:45 +02:00
Roger Braun
7303786160 Add some twapi fixes. 2017-05-07 20:20:53 +02:00
Roger Braun
db08498a9f Prevent double insertions. 2017-05-07 20:13:10 +02:00
Roger Braun
4f9328c622 Preserve ids on favorites / retweets. 2017-05-07 20:05:03 +02:00
Roger Braun
b403ea4d2b Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity 2017-05-07 19:28:23 +02:00
Roger Braun
a41aa4e489 Federate follow salmons. 2017-05-07 14:45:37 +02:00
Roger Braun
95ab0dc3c5 Add conversation ids to twapi announce representer. 2017-05-07 12:46:21 +02:00
Roger Braun
c51e15975a Fix user fetching error. 2017-05-07 12:45:37 +02:00
Roger Braun
7db76a0f0e Address incoming messages to followers. 2017-05-06 14:23:39 +02:00
Roger Braun
bda389d7d9 Subscribe to remote users on following. 2017-05-06 14:09:39 +02:00
Roger Braun
2d9fdbcc0d Don't call out if we have the favorited notice locally. 2017-05-05 16:27:03 +02:00
Roger Braun
fa2610c795 Handle incoming favorites, fetch potentially missing messages. 2017-05-05 16:07:44 +02:00
Roger Braun
d982f04a65 Mock HTTPoison in testing. 2017-05-05 14:16:54 +02:00
Roger Braun
c85998ab8a Parse incoming retweets. 2017-05-04 18:42:29 +02:00