Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,393 Commits 1 Branch 0 Tags 222 MiB
e3bf6655ba
Commit Graph

3059 Commits

Author SHA1 Message Date
Roger Braun
ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop 2018-01-30 12:20:39 +01:00
Hakaba Hitoyo
cefb6cfea1 provide logo at feed.atom (debug) 2018-01-30 19:37:04 +09:00
Hakaba Hitoyo
b713b28dfd provide logo at feed.atom 2018-01-30 19:26:07 +09:00
lambda
2f23ae5b68 Merge branch 'pr-upstream-http-proxy' into 'develop' 
Pr upstream http proxy

See merge request pleroma/pleroma!43
 2018-01-30 08:16:31 +00:00
Roger Braun
64e51c2cfa Fix incoming Pleroma CWs. Closes #96. 2018-01-29 17:44:35 +01:00
Jeff Becker
066fe1a697
use nil instead of empty string 2018-01-29 10:06:16 -05:00
Jeff Becker
dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy 2018-01-24 13:15:54 -05:00
Roger Braun
0f722a8c22 Stats: Make less crashy and improve query. 2018-01-20 18:38:30 +01:00
eal
beb13bf3a9 Revert "Revert "Add remote follow pages."" 
This reverts commit b259b4e4d1.
 2018-01-18 18:42:44 +02:00
eal
57d413e655 Revert "Revert "Add remote follow path to webfinger."" 
This reverts commit fb5aa34092.
 2018-01-18 18:42:32 +02:00
eal
b259b4e4d1 Revert "Add remote follow pages." 
This reverts commit 47e8c8db05.
 2018-01-18 03:42:18 +02:00
eal
fb5aa34092 Revert "Add remote follow path to webfinger." 
This reverts commit bc689740f0.
 2018-01-18 03:42:09 +02:00
eal
47e8c8db05 Add remote follow pages. 2018-01-18 03:11:03 +02:00
eal
bc689740f0 Add remote follow path to webfinger. 2018-01-18 02:38:02 +02:00
eal
b3e7d7ae6d Fetch external profile in the background. 2018-01-16 15:31:03 +02: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
eal
d56ab43609 Ask for proxy URL if proxy enabled. 
Also change the true/false question to y/n
 2018-01-12 22:38:14 +02:00
Sebastian Huebner
29b7e822fb
added question about activating mediaproxy to config generator 2018-01-09 12:31:11 +01:00
Jeff Becker
1e185b9301
apply proxy settings to media_proxy 2017-12-31 09:25:00 -05:00
Jeff Becker
5ddd15d794
make httppoison use configurable http proxy 2017-12-30 13:08:36 -05:00
eal
5c09d8d3f1 Unlink follow import process from the one processing request. 
Mistakes were made.
 2017-12-23 16:40:43 +02:00
href
0ccd0e5cc9
Remove a useless URI.encode call in MediaProxy 2017-12-21 20:59:10 +01: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
2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-12-19 16:15:45 +01:00
Lain Iwakura
f1f79c0dca Fix timelines in subway tooter. 2017-12-19 16:15:07 +01:00
lambda
29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop' 
Fix follower/following lists.

Closes #29

See merge request pleroma/pleroma!41
 2017-12-18 22:44:15 +00:00
Lain Iwakura
47887ac848 MastoAPI: Fix always-sensitive bugs. 2017-12-18 16:56:03 +01:00
Lain Iwakura
846d59a536 Send out salmons before websub. 2017-12-18 16:16:22 +01:00
eal
1969773fb4 Fix follower/following lists. 
Add tests.
 2017-12-18 16:37:26 +02:00
lambda
6b48489237 Merge branch 'feature/follow-import' into 'develop' 
Add follow import.

See merge request pleroma/pleroma!40
 2017-12-18 10:59:57 +00:00
eal
fdfb508259 Run follow import in the background. 2017-12-12 21:04:41 +02:00
eal
d89193a8d7 Allow uploading a file for follow import. 2017-12-12 21:03:28 +02:00
Lain Iwakura
4a13b84887 Add recipients field to activities. 
Also do some very basic checks for AP message insertion.
 2017-12-12 18:07:14 +01:00
eal
39ccfdc084 Add follow import. 2017-12-12 18:35:23 +02:00
href
f909aec050
proxy emojis 
(i fix emojos better than gargon but sshhhhh)
 2017-12-12 12:30:24 +01:00
href
8e82547179
fix content-type and fallback to image/jpeg 2017-12-12 11:45:55 +01:00
Roger Braun
888ec9e579 ActivityPub: Check inbox requests for valid signature. 2017-12-12 10:17:50 +01:00
Roger Braun
a9c23e1c32 Add plug to validate signed http requests. 2017-12-12 10:17:21 +01:00
Lain Iwakura
64330d9455 ActivityPub: Add object routes / controller. 2017-12-11 18:21:33 +01:00
Lain Iwakura
a89a613e4e ActivityPub: Use only string keys in views. 2017-12-11 18:20:41 +01:00
Lain Iwakura
da005d3332 ActivityPub: Add Objects View. 2017-12-11 18:19:46 +01:00
lambda
4b06e46a3a Merge branch 'fix/tootdon-mentions' into 'develop' 
Fix Tootdon linking the whole status when mentioning someone.

See merge request pleroma/pleroma!39
 2017-12-11 16:21:43 +00:00
eal
b00e230760 Add a bunch of useless HTML to mentions. 2017-12-11 18:14:33 +02:00
Roger Braun
c3bcafc51b HTTPSig: Add method to validate conn 2017-12-11 10:37:40 +01:00
Roger Braun
5599c5920c Basic incoming AP support. 2017-12-11 10:37:22 +01:00
href
9093b2cf49
Merge remote-tracking branch 'upstream/develop' into media-proxy 2017-12-11 02:45:28 +01:00
href
077faaed8c
Limit body size to 25MB 2017-12-11 02:31:37 +01:00
Roger Braun
25118aeef7 Add link to AP address in webfinger. 2017-12-09 15:34:43 +01:00
Roger Braun
30e9b22f96 Merge branch 'develop' into feature/activitypub 2017-12-09 11:00:56 +01:00
Roger Braun
d5a13c10ac Merge branch 'feature/user_deletion' into develop 2017-12-09 10:10:45 +01:00
Lain Iwakura
ef2322bdb7 Delete notifications on activity deletion. 2017-12-08 18:17:30 +01:00
Lain Iwakura
bad499b3fd Basic user deletion. 2017-12-08 17:50:11 +01:00
lambda
35cfbf43a0 Merge branch 'fix/linkify' into 'develop' 
Fix links with HTML elements and/or parentheses.

See merge request pleroma/pleroma!38
 2017-12-08 12:34:03 +00:00
lambda
40c30ab895 Merge branch 'fix/mastoapi-attachment-linking' into 'develop' 
MastoAPI: don't add attachment links.

Closes #92

See merge request pleroma/pleroma!37
 2017-12-08 12:32:33 +00:00
lambda
d7da3ca05d Merge branch 'postgresetup' into 'develop' 
first version of safe DB setup

See merge request pleroma/pleroma!32
 2017-12-08 12:31:14 +00:00
eal
a3e68f0233 Allow parentheses in links. 2017-12-07 21:38:31 +02:00
eal
bf91e5659f Fix HTML escape breaking some links. 2017-12-07 21:36:06 +02:00
eal
5436dbaeaf MastoAPI: don't add attachment links. 2017-12-07 20:44:09 +02:00
Lain Iwakura
6df6ad0b42 User deletion: Remove relationships. 2017-12-07 18:13:05 +01:00
Lain Iwakura
a78ae2a685 Don't follow deactivated users. 2017-12-07 17:51:55 +01:00
Lain Iwakura
b727ecc5e7 Add function to deactivate users. 2017-12-07 17:47:23 +01:00
Lain Iwakura
0ec5aeb8a7 Don't log in deactivated users. 2017-12-07 17:41:34 +01:00
Lain Iwakura
e31a5ff4af Priority queue fixes. 2017-12-06 16:51:11 +01:00
Lain Iwakura
66c3813ea6 Add basic queue prioritization. 2017-12-05 18:21:30 +01:00
href
72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy 2017-12-05 14:12:15 +01:00
Roger Braun
1c90bfb4f6 Merge remote-tracking branch 'origin/develop' into feature/chat 2017-12-05 10:20:00 +01:00
Roger Braun
5945ec84e9 Don't save user in socket, just save the name. 2017-12-05 10:01:36 +01:00
Roger Braun
69f1024bb0 Add basic channel state. 2017-12-05 09:36:26 +01:00
eal
c1fa1e8844 Fix basic auth for passwords with a colon. 2017-12-04 22:45:16 +02:00
Lain Iwakura
5c40986120 Basic backend chat. 2017-12-04 19:10:15 +01:00
Henry Jameson
964e2dd2f0 unfuck 2017-12-04 04:06:52 +03:00
Henry Jameson
6b60f5f64a made psql script compatible with migrations or generate_config reruns 2017-12-04 03:56:54 +03:00
Henry Jameson
071f518028 reverts config gen 2017-12-04 03:56:54 +03:00
Henry Jameson
a884e08271 fix 2017-12-04 03:56:54 +03:00
Henry Jameson
4071403117 fixes 2017-12-04 03:56:54 +03:00
Henry Jameson
0673511d39 first version of safe DB setup 2017-12-04 03:56:54 +03:00
Roger Braun
d08a34e88b OStatus: Add user bio as summary field 
Fixes problem with bio federation.
 2017-12-03 13:34:17 +01:00
Lain Iwakura
5637d163e6 MastodonAPI: Add proper user count. 2017-11-30 14:59:44 +01:00
href
1cb5cbdc6c
Improve error handling, add configuration 2017-11-28 21:44:25 +01:00
href
e28c110eba
mandatory typo fix... 2017-11-28 20:50:42 +01:00
href
5f35fdcf5d
media proxy: good enough wip 2017-11-28 20:50:34 +01:00
lambda
9d1c0ec18d Merge branch 'salmon-native-keys' into 'develop' 
Salmon: generate private key with native crypto if available.

See merge request pleroma/pleroma!33
 2017-11-28 16:46:01 +00:00
href
4524721fba
Salmon: generate private key with native crypto if available. 2017-11-28 16:50:12 +01:00
Lain Iwakura
c680ae581d Return xml notice at /notice path. 2017-11-27 17:24:52 +01:00
Lain Iwakura
44dc694882 Add configuration generation tool, update readme. 2017-11-23 16:22:20 +01:00
Roger Braun
d16b613929 MastodonUI login: Show error message on error. 2017-11-23 12:06:14 +01:00
lambda
698a75cb39 Merge branch 'develop' into 'develop' 
Pleroma-Dark default theme for the Mastodon Frontend

See merge request pleroma/pleroma!27
 2017-11-22 14:19:27 +00:00
eal
1625021a9c Merge branch 'fix/self-follow' into 'develop' 
Dont include the user in their own follower count.

See merge request pleroma/pleroma!29
 2017-11-21 23:09:59 +00:00
eal
e9037ffc8d Do not include user in their own follower count. 2017-11-21 15:33:09 +02:00
eal
fa19de97ba MastoAPI: no more than 4 attachments. 2017-11-20 22:49:20 +02:00
Roger Braun
747a68a075 Treat internal emoji like external. 2017-11-20 17:53:21 +01:00
Roger Braun
cf0bbf320d MastoAPI: Add max_toot_chars. 2017-11-20 08:54:47 +01:00
eal
bd921ca5d7 Fix posts being streamed to non-local websocket channels. 2017-11-20 07:58:43 +02:00
eal
4db5954786 Don't let the user unfollow their own account. 2017-11-20 07:50:56 +02:00
eal
aadf54e0df Don't show the user in their own following count. 2017-11-20 00:31:39 +02:00
Hyper! (Stitch)
36011fee4e Add Custom Pleroma-dark theme 2017-11-19 19:07:19 +00:00
Roger Braun
52aa65fe6e Federator Queue: Add seperate in/out queues. 2017-11-19 15:10:51 +01:00
Roger Braun
5ff5d583b6 MastodonAPI: Streaming fixes. 
Now shows repeats in the home tl.
 2017-11-19 13:47:50 +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
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
Roger Braun
4647bcd6e6 Don't start streamer during tests. 2017-11-18 12: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
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
87dee3902a Merge branch 'filetype-recognition' into 'develop' 
Use headers for file content type recognition.

See merge request pleroma/pleroma!14
 2017-11-12 09:27:59 +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
18a95cd375 Add common video and audio types. 2017-11-12 01:20:50 +02:00
eal
fc7483cb3c MastoAPI: Add update credentials endpoint. 2017-11-12 00:27:09 +02:00
eal
260b148b92 Use headers for file content type recognition. 2017-11-11 23:24:54 +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
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
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
7da978f3f5 Linkify fixes. 2017-11-07 12:06:37 +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
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
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
9af560083f Use more efficient user note count update query. 2017-10-24 14:16:17 +02:00
Roger Braun
ec546baee9 Use different index for object fetching. 2017-10-24 10:39:23 +02:00
Roger Braun
261ec82451 Return nil for nil object requests. 2017-10-24 08:39:24 +02:00
Roger Braun
b35ff8f755 Use index in basic activity query. 2017-10-23 18:36:53 +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
fb46d6fbc4 Prefer post-specific emoji. 2017-09-17 13:24:52 +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
79aeb219d8 Small emoji refactor. 2017-09-16 15:47:45 +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
cda01285f4 Add pagination to notifications. 2017-09-12 09:11:36 +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
lambadalambda
8004ee8ccf Merge branch 'patch-1' into 'develop' 
Fix finmoji title attribute.

See merge request !23
 2017-08-18 05:33:42 -04:00
Roger Braun
552cfdbe11 Fix deletion not deleting relevant actions. 2017-08-16 16:29:25 +02:00
Roger Braun
2ab1d915e3 Use unicode regex in mentions and links. 2017-08-14 17:56:45 +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
9fd8640202 Order by id instead of inserted_at to better use indexes. 2017-08-08 12:24:20 +02:00
Roger Braun
763756f879 Also fetch atom links. 2017-08-04 16:57:38 +02:00
Roger Braun
27b8e3affb Revert "Better error handling for user feeds." 
This reverts commit 11714fbaa2.
 2017-08-03 17:49:18 +02:00
Roger Braun
11714fbaa2 Better error handling for user feeds. 2017-08-03 17:46:01 +02:00
Roger Braun
7b0dd964be Slightly nicer webfinger error handling. 2017-08-03 14:14:48 +02:00
Roger Braun
571f07abe3 Try refresh all invalid subscriptions. 
This is a temporary fix to prevent intermittent problems from cutting
off subscriptions.
 2017-08-02 12:42:12 +02:00
Roger Braun
e4a4135c1d Handle subscriptions in queue. 2017-08-02 12:34:48 +02:00
Roger Braun
54af9e145a Add some debug info to websub. 2017-08-02 12:03:45 +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
c3dfa1970f Don't crash on activity handling problems. 2017-08-01 12:41:46 +02:00
Roger Braun
368fa25f1f Strip all newlines in atom html content to work around mastodon bug. 2017-07-31 13:31:21 +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
エーロ
6c70980bff Fix finmoji title attribute. 2017-07-09 11:00:02 -04: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
5e17e04144 Make user timelines faster for users with few statuses. 2017-07-01 16:43:10 +02:00
Roger Braun
ac04ba240a Larger bio length limit for remote accounts. 2017-07-01 02:00:12 +02:00
Roger Braun
9bdea19d83 For non-create activities, grab the create activity to fav/rt 2017-06-30 16:59:54 +02:00
Roger Braun
cd522d2139 Also fetch posts by id in fav/rts. 2017-06-30 16:53:25 +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
fc7016a88c Don't add public recipient to notes that don't contain it. 2017-06-30 15:54:32 +02:00
Roger Braun
d8bbbeb03a Bio can actually be nil. 2017-06-26 17:00:58 +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
39bacba280 More resilient xml parsing. 2017-06-24 14:35:32 +02:00
Roger Braun
6935fc3e01 Update user data on fetch if it changed. 2017-06-24 13:09:46 +02:00
Roger Braun
ffc9d7708b Handle webpubs in queue. 2017-06-23 16:37:34 +02:00
Roger Braun
6ee0ca21e2 Some salmon debug fixes. 
Plus httpoison update.
 2017-06-23 16:22:19 +02:00
Roger Braun
4ba6746820 use correct arity .post. 2017-06-23 12:27:40 +02:00
Roger Braun
6a184115a2 Longer timeouts for outgoing federation. 2017-06-23 12:25:53 +02:00
Roger Braun
42633406b3 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-06-20 17:49:15 +02:00
Roger Braun
14d9de39e8 Better debugging. 2017-06-20 17:28:36 +02:00
dtluna
b76001ded3 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-06-20 17:57:04 +03:00
dtluna
08e53df91e Move util functions to UtilController 2017-06-20 17:55:57 +03:00
Roger Braun
9cf38d6796 Use more efficient queries. 2017-06-20 16:18:42 +02:00
Roger Braun
14a9dd468b Use more efficient query. 2017-06-20 16:02:17 +02:00
Roger Braun
fe27b61a72 Add some debugging to federations. 2017-06-20 14:10:44 +02:00
Roger Braun
1e6491ec96 Merge branch 'develop' into refactor/user-view 2017-06-20 11:49:41 +02:00
Roger Braun
af49c11193 Work around upserting problems in context mapping. 2017-06-20 09:50:22 +02:00
dtluna
069daf644d Replace UserRepresenter with UserView 2017-06-20 00:12:37 +03:00
Roger Braun
45c751985e Move finmojis to representation. 2017-06-19 18:06:58 +02: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
a1cabeea4a Redirect html user profile request. 2017-06-12 12:52:40 +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
4cfe1e0c9b Make timeouts longer, some servers are very slow. 2017-05-31 18:24:50 +02:00
Roger Braun
80705c7a20 Redirect to frontend on html notice path. 2017-05-31 17:48:22 +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
4854a604ef Extract note handler. 2017-05-20 13:41:33 +02:00
Roger Braun
1085675ec4 Output ref instead of href for conversation. 2017-05-20 10:44:57 +02:00
Roger Braun
9d97be4413 Try fetching shares. 2017-05-19 16:08:46 +02:00
Roger Braun
03b7b2fa24 Also show activities in OStatus. 2017-05-19 15:53:02 +02:00
Roger Braun
8e02fa100f Add categories to ostatus output. 2017-05-18 18:18:27 +02:00
Roger Braun
b74125900c save correct inReplyToStatusId. 2017-05-18 17:03:21 +02:00
Roger Braun
042cdf09ca Wire up inReplyToStatusIds for ostatus. 2017-05-18 16:58:30 +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
d95ac274d6 On user making, check if we have a user with that uri. 2017-05-12 18:58:25 +02:00
Roger Braun
04544da8f1 Fetch user on externalprofile if we don't know him 2017-05-12 18:50:47 +02:00
Roger Braun
dd12cf7296 Fix cws. 2017-05-11 17:59:11 +02:00
Roger Braun
932e0e87db More debugging code. 2017-05-11 09:34:11 +02:00
Roger Braun
2154f729b0 Don't fetch if we don't even have a inReplyTo. 2017-05-11 09:32:03 +02:00
Roger Braun
312772df7c Add debugging help. 2017-05-11 09:13:14 +02:00
Roger Braun
1b67a59795 Repair retweets. 2017-05-10 19:29:25 +02:00
Roger Braun
9f15937fe6 Actually guess 3 days... 2017-05-10 19:12:40 +02:00
Roger Braun
d2c4a427f1 Only try refreshing every 6 hours. 2017-05-10 19:08:42 +02:00
Roger Braun
ae0e6d8003 Handle cases where we don't get lease_seconds returned. 2017-05-10 19:04:27 +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
a2ca3b8605 Add option to keep id for follows. 2017-05-10 18:45:38 +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
fca7390c69 Only kick off websubs for local users. 2017-05-10 18:43:14 +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
e12a6d5666 Get fresh objects on changes. 
This will count retweets / favs correctly again.
 2017-05-09 18:11:11 +02:00
Roger Braun
71362acb93 Quick fix for database filling. 2017-05-09 00:20:05 +02:00
Roger Braun
1418d72749 Add class=attachment to attachment links. 2017-05-08 20:12:36 +02:00
Roger Braun
8f9c43343e Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-05-08 19:35:16 +02:00
Roger Braun
3320c9b176 Fix remote users retweeting local stuff. 2017-05-08 18:19:45 +02:00
Roger Braun
b9da7d3219 typo. 2017-05-07 20:30:34 +02:00
Roger Braun
7303786160 Add some twapi fixes. 2017-05-07 20:20:53 +02:00
Roger Braun
e49770ee88 Add some debugging info. 2017-05-07 20:16:07 +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
60b4b0d725 Safety measures. 2017-05-07 14:52:19 +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
fcd34096db Add one more alias for twapi twkn. 2017-05-06 22:26:36 +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
9cafb67fc1 Follow redirects when fetching activities. 
This can happen for site that started as http and now switched to https.
 2017-05-06 13:18:08 +02:00
Roger Braun
22ddddce76 Handle incoming items through the queue. 2017-05-06 12:34:40 +02:00
Roger Braun
7e65cad9fe Do recursive fetching in-band for now. 
This is to prevent conversation id problems.
 2017-05-06 12:15:48 +02:00
Roger Braun
04f6ece99e Send salmons and websub in background tasks. 2017-05-05 20:38:10 +02:00
Roger Braun
7752f103f6 Add basic thread fetching. 2017-05-05 20:15:26 +02:00
Roger Braun
00a7183118 Basic queue. 2017-05-05 18:58:29 +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
7269c51f3a Some refactoring. 2017-05-05 12:07:38 +02:00
Roger Braun
c48c381e90 Merge branch 'develop' into dtluna/pleroma-refactor/1 2017-05-05 11:46:59 +02:00
Roger Braun
c85998ab8a Parse incoming retweets. 2017-05-04 18:42:29 +02:00
Roger Braun
5d9f3df714 Just sign with an empty string if needed. 2017-05-04 09:57:11 +02:00
Roger Braun
151da344be Add debugging logs. 2017-05-04 09:54:22 +02:00
Roger Braun
97257c692c Fix specs. 2017-05-03 20:06:20 +02:00
Roger Braun
1077c5c58d Remove reply-to for shares, mastodon gets confused. 2017-05-03 20:06:00 +02:00
Roger Braun
53d05af5b6 Fix Mastodon signature bug. 2017-05-03 19:23:12 +02:00
Roger Braun
5d7831ee3e Add self links to federated statuses. 2017-05-03 18:10:19 +02:00
Roger Braun
b34b046f16 Add user to announced status. 2017-05-03 17:51:36 +02:00
Roger Braun
861a294cda Add announce federation. 2017-05-03 17:41:55 +02:00
Roger Braun
138641589d OStatus announce representer. 2017-05-03 17:39:12 +02:00
Roger Braun
df71c142cf Remove doubled 'to' recipients. 2017-05-03 16:08:24 +02:00
Roger Braun
8141024259 Attachment parsing, better magic key fetching. 2017-05-03 14:26:49 +02:00
Roger Braun
16afea399d Just give out the entry, not the whole feed. 2017-05-03 10:02:29 +02:00
Roger Braun
9c42453e06 Return note objects as ostatus post activities. 2017-05-03 09:54:17 +02:00
Roger Braun
018a1a390f Use inReplyTo to find context. 2017-05-02 21:31:01 +02:00
Roger Braun
33c803d6da Add attachment link to posts. 2017-05-02 18:25:39 +02:00
Roger Braun
b104348fa5 Follow webfinger redirects. 2017-05-02 17:44:55 +02:00
Roger Braun
96014f8e0b Update incoming new avatars. 2017-05-02 17:16:01 +02:00
Roger Braun
102455bf29 Add avatar updating from incoming messages. 2017-05-02 17:13:41 +02:00
Roger Braun
945b4b55e6 Federate likes. 2017-05-02 16:45:54 +02:00
Roger Braun
93de603966 Add an ostatus representer for like activities. 2017-05-02 16:35:53 +02:00
Roger Braun
a3e82c5c24 Save context in likes / announces. 2017-05-02 15:54:14 +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
6dd8335477 Mark incoming activties as non-local. 2017-05-02 10:47:04 +02:00
Roger Braun
56bacc90d1 Fix specs, add local marker to actitivies. 2017-05-02 10:43:35 +02:00
Roger Braun
89c1e90eb2 Don't crypt raw iolists. 2017-05-01 22:02:07 +02:00
Roger Braun
8ae13d94dc Use empty context id if we get none 
Thanks mastodon.
 2017-05-01 20:38:01 +02:00
Roger Braun
aa20941416 Some servers send empty lease_seconds requests... 2017-05-01 20:09:00 +02:00
Roger Braun
703d9f3628 Not enough h. 2017-05-01 20:04:32 +02:00
Roger Braun
76e653b0d8 Add user profile page link. 2017-05-01 20:02:32 +02:00
Roger Braun
ceb2f68432 Add type to rel=self link in feed. 2017-05-01 18:40:36 +02:00
Roger Braun
e88062494e Revert "Also accept user id as feed topic." 
This reverts commit 97d11dec0e.
 2017-05-01 18:34:15 +02:00
Roger Braun
97d11dec0e Also accept user id as feed topic. 2017-05-01 18:07:50 +02:00
Roger Braun
92a8944dfe Redirect to user feed instead of directly serving it. 2017-05-01 18:05:02 +02:00
Roger Braun
1854842b09 Log subscription error. 2017-05-01 17:28:49 +02:00
Roger Braun
108573265a Don't commit nil values in object cache. 2017-05-01 16:28:40 +02:00
Roger Braun
3cb518270a Remove superfluous transaction. 2017-05-01 16:15:21 +02:00
Roger Braun
f169de3454 Cache objects in dev and prod. 2017-05-01 16:12:20 +02:00
Roger Braun
d187a4965f Return feed for xml requests of the user. 2017-05-01 14:07:41 +02:00
Roger Braun
35938656ab Make user keys on usage. 2017-05-01 14:07:29 +02:00
Roger Braun
e54e592d6c Return webfinger for ap_ids. 2017-05-01 13:51:17 +02:00
Roger Braun
6843755834 Make outgoing salmons work. 2017-05-01 13:14:58 +02:00
Roger Braun
bed0b39813 Add function to fetch users from fqn. 2017-04-30 18:48:48 +02:00
Roger Braun
eb12a89d22 Rename wrongly-named function. 2017-04-30 15:06:22 +02:00
Roger Braun
a173fb9e41 Get users fresh, might so we don't make new keys all the time. 2017-04-30 15:05:16 +02:00
Roger Braun
bb1d08a47c Return keys in webfinger. 2017-04-30 15:00:04 +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
379caca01d Wrap context creation in transaction. 2017-04-30 13:58:40 +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
f9912599c4 Pull in remote avatar on federation. 2017-04-30 12:53:49 +02:00
Roger Braun
18edc299b2 Handle duplicates. 2017-04-30 12:36:47 +02:00
Roger Braun
62607f37dc Federate object id for posts in ostatus. 
This is because ostatus doens't have an id for the activities.
 2017-04-30 11:55:19 +02:00
Roger Braun
84027ff00b Handle comments. 2017-04-30 11:39:27 +02:00
Roger Braun
d937a8e695 Add thr:in-reply-to to ostatus representer. 2017-04-30 11:17:34 +02:00
Roger Braun
9d7c3190cc Get create activity from created object id. 
This is useful for Ostatus federation because ostatus doesn't have
different ids for objects and activities...
 2017-04-30 11:16:41 +02:00
Roger Braun
11ea08649d Make cache bigger and longer lived. 2017-04-30 10:06:57 +02:00
Roger Braun
ffc604a2c2 Use cache for user info data. 
Later these should be persisted in the user.
 2017-04-30 10:04:54 +02:00
Roger Braun
8a0d2b33d8 Keep ostatus id as activity id. 2017-04-30 09:25:46 +02:00
Roger Braun
a16da387d2 Handle full incoming feeds. 2017-04-29 21:13:21 +02:00
Roger Braun
20015b4b67 Save remote users with fqn as nickname. 2017-04-29 20:08:45 +02:00
Roger Braun
ba1ea77001 Make key fetching use ostatus fetching. 2017-04-29 19:47:56 +02:00
Roger Braun
427bac0966 Rework remote user subscription. 2017-04-29 19:06:01 +02:00
Roger Braun
69922bc724 Add user info gathering. 2017-04-29 17:51:59 +02:00
Roger Braun
ca40dda04c Add some basic webfingering. 2017-04-28 17:41:12 +02:00
Roger Braun
59d4cc6036 normalize hex number. 2017-04-28 15:53:45 +02:00
Roger Braun
1422e7aa84 Handle incoming websub subscriptions. 2017-04-28 15:45:10 +02:00
dtluna
a9b2ad1759 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity 2017-04-28 16:06:57 +03:00
Roger Braun
451d18af63 Add proper callback route for websub confirmation. 2017-04-28 09:51:47 +02:00
dtluna
6cf7c13228 Refactor code to comply with credo suggestions 2017-04-27 16:18:50 +03:00
Roger Braun
90da25505f Add discovery and subscription requests to websub. 2017-04-27 09:46:45 +02:00
Roger Braun
e8a311ecff Add user and hub to websub client subscriptions. 2017-04-27 09:44:20 +02:00
Roger Braun
d1dce56a85 Refactor XML parsing. 2017-04-27 09:43:58 +02:00
Roger Braun
9e9d95ec99 Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus 2017-04-26 19:17:51 +02:00
Roger Braun
7561158ab1 Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus 2017-04-26 18:34:14 +02:00
Roger Braun
c5fa682c31 Refactor, add beginnings of websub client subscriptions. 2017-04-26 18:33:10 +02:00
Roger Braun
57bd59e407 Salmon creation. 2017-04-26 14:25:44 +02:00
Roger Braun
f1ebf812ee Add inReplyTo to incoming messages. 2017-04-26 10:22:51 +02:00
Roger Braun
d9ebd785ab Ostatus doesn't distinguish between activities / objects on create. 2017-04-26 10:08:13 +02:00
Roger Braun
e8882ab3da Merge branch 'develop' into feature/incoming_ostatus 2017-04-26 09:18:49 +02:00
Roger Braun
fb5cebc1b5 Merge branch 'dtluna/pleroma-bugfix/deny-self-repeats' into develop 2017-04-26 08:56:34 +02:00
Roger Braun
c844799822 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-26 08:56:18 +02:00
Roger Braun
2f0e13abe2 Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats 2017-04-26 08:49:26 +02:00
Roger Braun
b91ccef237 Output conversation id. 2017-04-26 08:47:22 +02:00
dtluna
c3655d1c47 Remove unnecessary status_update definition 2017-04-25 19:47:16 +03:00
Roger Braun
f980f6778b Wire up mentions. 2017-04-25 18:03:14 +02:00
Roger Braun
b438ea24ee Add ostatus conversation as context. 2017-04-25 17:45:34 +02:00
Roger Braun
6c5f5e18ec Even more refactoring. 2017-04-25 17:36:53 +02:00
Roger Braun
4771962a5d More refactoring. 2017-04-25 17:32:36 +02:00
Roger Braun
ef4190b3ab Clean up status create method. 2017-04-25 17:26:05 +02:00
Roger Braun
a25adfbfee Remove superflous function. 2017-04-25 11:33:32 +02:00
Roger Braun
6529cab982 Merge branch 'develop' into dtluna/pleroma-bugfix/deny-empty-posts 2017-04-25 11:09:14 +02:00
Roger Braun
ab0114fbaa Return salmon path for users, basic incoming salmon handling. 2017-04-24 18:46:34 +02:00
dtluna
668b01da0b Add restriction on names 2017-04-24 15:34:54 +03: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
Roger Braun
43d7a4b2cf Add basic fields to support remote users. 2017-04-24 08:49:09 +02: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
Roger Braun
7424310e14 Basic key fetching. 2017-04-23 16:35:17 +02:00
lambadalambda
a3b9741a62 Merge branch 'feature/follow-unfollow-by-screen-name' into 'develop' 
Follow and unfollow using screen_name

See merge request !9
 2017-04-23 10:26:27 -04:00
Roger Braun
4c216cba9c Decode and verify salmons. 2017-04-23 15:21:58 +02:00
Roger Braun
8a07ddef8f Don't break feed if user has no posts. 2017-04-23 10:38:24 +02:00
Roger Braun
cef4a4d709 Fix utf8 problems with iolists. 2017-04-22 15:34:29 +02:00
Roger Braun
04fb4f9c47 Add poco data to user. 2017-04-22 15:11:13 +02:00
Roger Braun
923584d046 Remove unknown activities from feed. 2017-04-22 14:37:54 +02:00
Roger Braun
c585f9e26c Only handle subscription requests for now. 2017-04-22 13:48:10 +02:00
Roger Braun
8fb73c28bb Only have one subscription per callback. 2017-04-22 13:44:21 +02:00
Roger Braun
1feb193731 Add rel=self link too feed. 2017-04-22 12:11:36 +02:00
Roger Braun
ece85fc8bc Add attachments to feed. 2017-04-22 12:09:13 +02:00
Roger Braun
a2b79ce7d1 Add outgoin federation to twitter api. 
Doesn't really belong there, find a different place for it. Should
federate on every activity insertion.
 2017-04-22 12:08:20 +02:00
Roger Braun
77cb260628 add basic federation to websub. 2017-04-22 12:07:51 +02:00
Roger Braun
39dc74f967 Add callback to websub subscription. 2017-04-22 12:05:48 +02:00
dtluna
28b203d08f Add Undo of Follow Activity insertion 2017-04-21 19:54:21 +03:00
Roger Braun
1c00eb4a90 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus 2017-04-21 18:42:28 +02: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
f51a672ac4 Return object id in Ostatus create activties. 2017-04-21 04:22:02 +02:00
Roger Braun
424e0e7779 Add Websub verification. 2017-04-21 03:59:11 +02:00
Roger Braun
9afc672009 Quick fix for activities without 'to'. 2017-04-21 01:01:58 +02:00
Roger Braun
1e88f102c4 Fix specs, add some user info. 2017-04-21 00:51:09 +02:00
dtluna
7a018a8d3b Add /statuses/mentions_timeline route 2017-04-21 00:29:08 +03:00
Roger Braun
1b9cc721a0 Websub controller beginnings. 2017-04-20 17:47:33 +02:00
dtluna
3a56d7318f Add statuses/mentions endpoint 2017-04-20 15:18:54 +03:00
Roger Braun
5e7ceeba94 Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus 2017-04-20 10:16:41 +02:00
Roger Braun
cc330421fd Better activities in ostatus. 2017-04-20 10:16:06 +02:00
dtluna
b248fc7dfb Refactor unfollow/2 2017-04-20 10:57:37 +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
Roger Braun
9167a2ebe3 Send frontend through phoenix. 2017-04-19 15:25:18 +02: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
Roger Braun
d23f3e3cf3 Add webfinger and basic feed support. 2017-04-18 18:41:51 +02:00
Roger Braun
36e883cd4b Add basic Ostatus user representer. 2017-04-17 14:12:36 +02:00
Roger Braun
ce6cc84a4a Add basic webfinger. 2017-04-17 13:44:41 +02: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
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
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
Roger Braun
7617a593b9 Support data uris in uploads. 2017-04-16 14:23:30 +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
40706b4c4f Use changeset in user registration mix task. 2017-04-15 16:42:02 +02:00
Roger Braun
03c6148bb3 Add user registration changeset. 2017-04-15 16:40:09 +02:00
Roger Braun
4f7adb343c Address liking / announcing to the original author. 2017-04-15 14:16:01 +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
21c397820f Add announcements to activitypub. 2017-04-15 12:11:20 +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
a926038cd0 Add unliking to activitypub. 2017-04-14 18:09:30 +02:00
Roger Braun
8c2aad1cab Make new users follow themselves. 2017-04-14 17:29:27 +02:00
Roger Braun
03ddaead7e Add basic user caching. 
Expires after 5 seconds.
 2017-04-14 17:13:51 +02:00
Roger Braun
90b38fd51b Fix uploads and favorites in twidere / twittnuker. 2017-04-14 16:13:34 +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
dtluna
443381d0a0 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline 2017-04-13 17:15:02 +03:00
Roger Braun
1388054796 Add liking to ActivityPub. 2017-04-13 15:50:05 +02:00
Roger Braun
f97c8e4379 Add utility functions for objects and activities. 2017-04-13 15:49:42 +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
594dd01ab2 Refactor follow API 2017-04-13 15:32:13 +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
f3e7771fd6 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-12 17:47:56 +02:00
Roger Braun
129e30f465 Add basic config endpoint. 2017-04-12 17:47:05 +02:00
lambadalambda
bf22b1547c Merge branch 'feature/home-timeline' into 'develop' 
Add home timeline

See merge request !6
 2017-04-12 11:30:46 -04:00
lambadalambda
7469616f44 Merge branch 'bugfix/verify_credentials_get' into 'develop' 
account/verify_credentials bugfix

See merge request !2
 2017-04-12 11:29:35 -04:00
Roger Braun
1b086834bd Don't return html in the text field. 2017-04-12 17:22:29 +02:00
Roger Braun
b666f11d2f Add max_id fetching to activity fetching. 2017-04-12 17:12:00 +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
a7e74ee012 Add user timeline 2017-04-10 20:08:14 +03:00
dtluna
6f99765fba Add home timeline 2017-04-10 18:26:14 +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
9383c0aada Add help/test resource 2017-04-10 15:54:53 +03:00
dtluna
48b6ae2314 Add GET route for verify_credentials 2017-04-10 15:41:21 +03:00
dtluna
0016589aea Remove ambiguity in call to make_date/0 2017-04-10 15:22:49 +03:00
dtluna
57795f7332 Refactor lib/pleroma/web/twitter_api/twitter_api.ex 2017-04-08 17:19:57 +03:00
dtluna
8f43992121 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-08 16:28:50 +03:00
Roger Braun
567ec494c5 Add user registration mix task. 2017-04-05 12:27:25 +02:00
Roger Braun
f45dc475c7 Fix replies. 2017-04-05 11:59:38 +02:00
dtluna
b502d7981c Add Follow Activity representer 2017-04-05 02:04:54 +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
ddaaab115e Use standard base url in User. 2017-04-03 18:27:47 +02:00
Roger Braun
2e89d505d3 Connect attachments with objects, not activities. 2017-03-30 18:07:38 +02:00
Roger Braun
6aa1523bb3 Put objects in inserted activties into the db. 2017-03-30 18:07:29 +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
4a6d48b0fe Return mimetype with attachment. 2017-03-30 16:08:23 +02:00
Roger Braun
32aa83f3a2 Short circuit user verification if cookie is present. 2017-03-30 15:29:49 +02:00
Roger Braun
d18473f0c3 Add port if specified. 2017-03-30 14:32:36 +02:00
Roger Braun
e7dc39e40c Basic file uploading via TwAPI. 2017-03-29 02:07:56 +02:00
Roger Braun
08fdbd6f3a Add Uploads. 2017-03-29 01:39:01 +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
e4de0ddc77 Add single status fetching to TwAPI. 2017-03-24 01:16:28 +01:00
Roger Braun
866a2663d4 Add fetching of activities in context. 2017-03-24 00:09:08 +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
Roger Braun
74112ef99e Add id to objects, too. 2017-03-23 21:22:49 +01:00
Roger Braun
1f0f79d959 Generate ids for activities. 2017-03-23 17:56:49 +01:00
Roger Braun
9ad045fd58 Return user specific json for logged in users. 2017-03-23 15:51:34 +01:00
Roger Braun
30650e5bc6 Add unfollowing to TwAPI. 2017-03-23 13:13:09 +01:00
Roger Braun
75e51b190d Add following TwAPI endpoint. 2017-03-23 12:09:27 +01:00
Roger Braun
e2e0cd75b7 Add friends timeline. 2017-03-22 17:25:59 +01:00
Roger Braun
37e443ce6c Add friends status fetching. 2017-03-22 16:51:20 +01:00
Roger Braun
569d9bac17 Add fetching for recipients. 2017-03-22 14:45:17 +01:00
Roger Braun
2db28df4cf Add public timeline TwAPI. 2017-03-21 21:09:20 +01:00
Roger Braun
b9d0e34506 Add since_id for activitypub fetching. 2017-03-21 20:31:48 +01:00
Roger Braun
d4cf273f28 Add limiting to activity pub fetching. 2017-03-21 20:22:05 +01:00
Roger Braun
ad303783af Add status posting via TwAPI. 2017-03-21 18:17:35 +01:00
Roger Braun
9a8850eb9e Basic status creation and retrieval. 2017-03-21 17:53:20 +01:00
Roger Braun
8de523c8ae Basic AP objects. 2017-03-21 09:21:52 +01:00
Roger Braun
093fd1832d Add Twitter API verify_credentials endpoint. 2017-03-20 21:30:44 +01:00
Roger Braun
980717fdce Add Twitter API user representer. 2017-03-20 21:30:18 +01:00
Roger Braun
142e8f8f3e Don't use fetch access in plug. 
This makes it work with structs.
 2017-03-20 21:28:38 +01:00
Roger Braun
66f536ecba Add user schema. 2017-03-20 21:28:31 +01:00
Roger Braun
e32dbfc9a5 Add basic auth. 2017-03-20 17:56:45 +01:00
Roger Braun
a93f3421a7 Phoenix skeleton 2017-03-17 17:09:58 +01:00