c443aec83d
Add banner image to user json.
2018-02-22 08:24:18 +01:00
37e406ae36
Get avatar and banner from AP users.
2018-02-22 08:14:15 +01:00
1555b7fab5
Add AP fixup task.
2018-02-21 22:59:00 +01:00
8895088029
Fix for following type change.
2018-02-21 22:27:16 +01:00
4816b09fa7
Add user upgrade function.
2018-02-21 22:21:40 +01:00
f48bc5c3e1
Make User.following a postgres array.
2018-02-21 22:20:29 +01:00
ec07e087bc
Make user bio optional
2018-02-21 23:31:57 +03:00
94db9ac4db
Merge branch 'develop' into feature/activitypub
2018-02-21 18:34:19 +01:00
56cfe71858
Add moderator task.
2018-02-21 18:33:36 +01:00
765671a5b0
Add password reset task.
2018-02-21 18:24:17 +01:00
a06b9a3e0b
Logging.
2018-02-21 16:22:20 +01:00
67afd024a7
Streamer: Make it less chatty.
2018-02-21 15:44:00 +01:00
810cf8618f
ActivityPub: Fetch missing activities on reply.
2018-02-21 15:22:24 +01:00
947ba6495d
More TwAPI fixes.
2018-02-21 10:31:13 +01:00
92021fd00c
Logging, put incoming ap docs into incoming queue.
2018-02-21 08:57:14 +01:00
279e1ce556
Typo.
2018-02-21 08:54:48 +01:00
66aa35903e
Add missing alias.
2018-02-21 08:51:50 +01:00
b52672294e
Move incoming AP to Federator.
2018-02-21 08:51:03 +01:00
391b3e3586
TwitterAPI: Fix some bugz.
2018-02-21 08:16:04 +01:00
fd95075e32
TwitterAPI: Fix mentions.
2018-02-20 19:50:34 +01:00
eec6a87dbb
Allow moderators to delete posts.
2018-02-20 18:54:13 +01:00
5bc810c452
Add moderator function.
2018-02-20 18:44:50 +01:00
486e205810
Remove some noise.
2018-02-20 08:52:31 +01:00
9c89916969
ActivityPub: One queue item per server.
2018-02-20 08:51:19 +01:00
297a2c7d3f
Ignore duplicate create activities.
2018-02-19 17:37:45 +01:00
ffa2f57c36
Salmons can't carry private information.
2018-02-19 11:14:46 +01:00
6b6ab592ab
AP: Fix incoming conversations.
2018-02-19 10:39:03 +01:00
6b32b9e346
Notifications: Use all recipients, not just "to".
2018-02-19 10:05:26 +01:00
01faa7c555
TwitterAPI: support follow activities without published date.
2018-02-19 09:50:57 +01:00
1633470e4a
TwitterAPI: Only fetch creates, announces, follows.
2018-02-19 09:50:41 +01:00
313f186a66
Ostatus: Use all recipients as mentions.
2018-02-19 08:34:55 +01:00
932d346d35
fix typo.
2018-02-18 23:13:19 +01:00
8b11546334
For existing users, just replace info.
2018-02-18 23:11:31 +01:00
decbf3a47f
fix typo.
2018-02-18 23:02:44 +01:00
342d0b01d1
Only push to followers if they are addressed.
2018-02-18 23:01:37 +01:00
78516a8daa
Salmon: Take both versions of public keys.
2018-02-18 22:57:07 +01:00
dc1d3ceb72
Fix log.
2018-02-18 22:41:38 +01:00
e368b68dcf
Log but ignore signature errors.
2018-02-18 22:40:08 +01:00
76e71f47d3
Inbox: Don't add the same thing twice.
2018-02-18 22:37:44 +01:00
010f818a29
Fix conversations.
2018-02-18 20:52:07 +01:00
deaad6d97a
Fix delivery to CC.
2018-02-18 16:59:41 +01:00
8567feed47
Salmon is ok!
2018-02-18 16:15:04 +01:00
803bdc1a67
Federate non-public over ActivityPub only, do some better signing.
2018-02-18 16:05:25 +01:00
4bc57ef20c
Don't relay non-public messages.
2018-02-18 15:58:18 +01:00
5d89997a70
Respect visibility in API.
2018-02-18 15:50:34 +01:00
5729233c36
Don't show unlisted in public.
2018-02-18 15:32:11 +01:00
c974f6544f
Show users their own posts in timeline.
2018-02-18 15:20:36 +01:00
44586f2967
ActivityPub: Fallback for unhandled outgoing activities.
2018-02-18 15:20:03 +01:00
2997fe1ba9
CommonAPI: If no visibility is given, return parent visibility.
2018-02-18 15:04:26 +01:00
d4b08dd838
MastodonAPI: Post with visibility settings
2018-02-18 14:56:36 +01:00
539340d914
Handle sensitive property.
2018-02-18 14:14:16 +01:00
20e6190ead
Transmogrify outgoing nsfw.
2018-02-18 14:07:13 +01:00
8ca66b5961
ActivityPub: Add conversation id.
2018-02-18 13:58:52 +01:00
912ca56e59
Mastodon StatusView: Return correct visibility.
2018-02-18 13:51:51 +01:00
6ab0aba50a
Transmogrify outgoing hashtags.
2018-02-18 13:51:03 +01:00
6046f10431
Actually fix incoming attachments.
2018-02-18 13:06:51 +01:00
6352dffd13
Drop unhandle activities.
2018-02-18 12:51:35 +01:00
b99eeb2bdf
Try to fetch AP user data first.
2018-02-18 12:27:05 +01:00
68752b2047
Switch protocols to AP when post come in through AP.
2018-02-18 12:04:59 +01:00
77c6c424a6
ActivityPub: Make fake Create activities for objects without one.
2018-02-18 11:24:54 +01:00
81ea359a7c
ActivityPub: Handle incoming announces.
2018-02-17 21:57:31 +01:00
5e36b750c1
ActivityPub: Fetch an object from an id.
2018-02-17 21:56:33 +01:00
0f2ad25a7b
AcitvityPub: Outgoing Announces.
2018-02-17 20:47:45 +01:00
32b995fbb6
ActivityPub: Implement outgoing likes.
2018-02-17 20:22:14 +01:00
e1b12a7782
ActivityPub: Handle incoming likes.
2018-02-17 20:13:12 +01:00
1f98de2079
ActivityPub: Use shared inbox.
2018-02-17 18:39:12 +01:00
ab27c90c9f
ActivityPub: Handle attachments.
2018-02-17 18:38:58 +01:00
fb7b926be3
Handle black name fields on incoming users.
2018-02-17 18:15:48 +01:00
c2d0cb1a29
ActivtyPub Delivery: Use shared inbox if possible.
2018-02-17 16:18:10 +01:00
7b26443a76
ActivityPub: Send out Accept after Follow.
2018-02-17 16:08:55 +01:00
e7b73359e3
ActivityPub: Partly handle incoming follows.
2018-02-17 14:55:44 +01:00
5682e48a25
ActivityPub: tags -> tag.
2018-02-17 14:20:53 +01:00
05ba6ca1b8
Do some transmogrifying for the output.
2018-02-17 14:11:20 +01:00
5a371892a0
Fix specs.
2018-02-17 10:26:44 +01:00
7851b9ba81
ActivityPub: Use recipients fields.
2018-02-15 20:32:07 +01:00
5454ec6a6c
ActivityPubController: Handle inbox data.
2018-02-15 20:00:43 +01:00
ef0300889d
Transmogrifier: Handle basic notice creation.
2018-02-15 20:00:06 +01:00
ae26604378
ActivityPub: Refactor create function.
2018-02-15 19:59:35 +01:00
38b61fddfe
HttpSignature Plug: Skip if already valid.
2018-02-15 19:58:26 +01:00
b331cb449a
Merge branch 'develop' into feature/activitypub
2018-02-12 10:24:15 +01:00
26ccb768d3
Make test output easier to read.
2018-02-12 10:14:11 +01:00
91928b06ab
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop
2018-02-12 08:15:37 +01:00
8cf97ee8e1
ActivityPub: Basic note federation with Mastodon.
2018-02-11 20:43:33 +01:00
ce31f3a922
Twitter Representers: Handle Mastodon attachments.
2018-02-11 17:21:06 +01:00
ae1ec858f4
Basic AP user building.
2018-02-11 17:20:43 +01:00
52200998c9
Merge branch 'develop' into feature/activitypub
2018-02-11 09:50:55 +01:00
a61f21ff4f
print <link rel="next"> element in atom.feed
2018-02-09 23:10:32 +09:00
7124f12a94
introduce max_id parameter in feed.atom (debug)
2018-02-09 21:46:05 +09:00
08f458e6df
UtilController: Fix statusnet config api compatibility.
2018-02-09 13:43:12 +01:00
9c61f60558
introduce max_id parameter in feed.atom
2018-02-09 21:41:30 +09:00
af854f7e01
Merge branch 'develop' into 'develop'
...
action_fallback for OAuth Controller
See merge request pleroma/pleroma!63
2018-02-09 08:57:54 +00:00
f0cde24f71
Merge branch 'fix/config-disable-chat' into 'develop'
...
Add config option for enabling/disabling chat.
See merge request pleroma/pleroma!58
2018-02-08 18:18:28 +00:00
73249fa5ff
Changed fallback controller to handle all cases from OAuthController
2018-02-08 18:15:59 +00:00
314f4775c5
Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
2018-02-08 16:58:31 +00:00
bdb5dd2194
Create action_fallback for username/password incorrect input
2018-02-08 16:57:30 +00:00
2f291576e4
Fix compile errors on 1.4.5
2018-02-08 16:03:30 +01:00
286f6698ee
Detect file type if none given.
2018-02-04 15:22:30 +02:00
61c16193de
Merge branch 'move-backend-images' into 'develop'
...
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
c8a2931549
add backend endpoint /images
2018-02-03 20:52:01 +09:00
ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
2018-02-03 20:43:14 +09:00
f0745148a3
Add config option for enabling/disabling chat.
2018-02-03 13:42:37 +02:00
29be70c008
Add remote following of local profiles.
2018-02-02 00:14:05 +02:00
ab83e0de6d
TwitterAPI: Add is_local to user view.
2018-02-01 21:41:19 +02:00
0f194dc56b
Merge branch 'feature/instance-thumbnail-api' into 'develop'
...
Provide instance thumbnail in /api/v1/instance
See merge request pleroma/pleroma!55
2018-01-31 18:34:52 +00:00
ab8b9ababa
Split emoji to default and custom.
2018-01-31 16:29:22 +02:00
03c15a54f5
provide instance thumbnail at /api/v1/instance (debug)
2018-01-31 23:09:47 +09:00
e47f60c053
provide instance thumbnail at /api/v1/instance (debug)
2018-01-31 23:04:34 +09:00
a4335e391f
provide instance thumbnail at /api/v1/instance
2018-01-31 22:51:25 +09:00
5e37adedfb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-01-30 12:21:05 +01:00
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
2018-01-30 12:20:39 +01:00
cefb6cfea1
provide logo at feed.atom (debug)
2018-01-30 19:37:04 +09:00
b713b28dfd
provide logo at feed.atom
2018-01-30 19:26:07 +09:00
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
64e51c2cfa
Fix incoming Pleroma CWs. Closes #96 .
2018-01-29 17:44:35 +01:00
066fe1a697
use nil instead of empty string
2018-01-29 10:06:16 -05:00
dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
2018-01-24 13:15:54 -05:00
0f722a8c22
Stats: Make less crashy and improve query.
2018-01-20 18:38:30 +01:00
beb13bf3a9
Revert "Revert "Add remote follow pages.""
...
This reverts commit b259b4e4d1
2018-01-18 18:42:44 +02:00
57d413e655
Revert "Revert "Add remote follow path to webfinger.""
...
This reverts commit fb5aa34092
2018-01-18 18:42:32 +02:00
b259b4e4d1
Revert "Add remote follow pages."
...
This reverts commit 47e8c8db05
2018-01-18 03:42:18 +02:00
fb5aa34092
Revert "Add remote follow path to webfinger."
...
This reverts commit bc689740f0
2018-01-18 03:42:09 +02:00
47e8c8db05
Add remote follow pages.
2018-01-18 03:11:03 +02:00
bc689740f0
Add remote follow path to webfinger.
2018-01-18 02:38:02 +02:00
b3e7d7ae6d
Fetch external profile in the background.
2018-01-16 15:31:03 +02:00
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
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
d8db39564e
Move user count to stats agent.
2018-01-14 08:15:11 +02:00
9717166d10
Add a stats agent for storing data from expensive queries.
2018-01-13 18:24:16 +02:00
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
29b7e822fb
added question about activating mediaproxy to config generator
2018-01-09 12:31:11 +01:00
1e185b9301
apply proxy settings to media_proxy
2017-12-31 09:25:00 -05:00
5ddd15d794
make httppoison use configurable http proxy
2017-12-30 13:08:36 -05:00
5c09d8d3f1
Unlink follow import process from the one processing request.
...
Mistakes were made.
2017-12-23 16:40:43 +02:00
0ccd0e5cc9
Remove a useless URI.encode call in MediaProxy
2017-12-21 20:59:10 +01:00
35ac549a99
Merge branch 'media-proxy' into 'develop'
...
Media proxy
See merge request pleroma/pleroma!34
2017-12-20 14:22:24 +00:00
2a744cdff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-12-19 16:15:45 +01:00
f1f79c0dca
Fix timelines in subway tooter.
2017-12-19 16:15:07 +01:00
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
47887ac848
MastoAPI: Fix always-sensitive bugs.
2017-12-18 16:56:03 +01:00
846d59a536
Send out salmons before websub.
2017-12-18 16:16:22 +01:00
1969773fb4
Fix follower/following lists.
...
Add tests.
2017-12-18 16:37:26 +02:00
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
fdfb508259
Run follow import in the background.
2017-12-12 21:04:41 +02:00
d89193a8d7
Allow uploading a file for follow import.
2017-12-12 21:03:28 +02:00
4a13b84887
Add recipients field to activities.
...
Also do some very basic checks for AP message insertion.
2017-12-12 18:07:14 +01:00
39ccfdc084
Add follow import.
2017-12-12 18:35:23 +02:00
f909aec050
proxy emojis
...
(i fix emojos better than gargon but sshhhhh)
2017-12-12 12:30:24 +01:00
8e82547179
fix content-type and fallback to image/jpeg
2017-12-12 11:45:55 +01:00
888ec9e579
ActivityPub: Check inbox requests for valid signature.
2017-12-12 10:17:50 +01:00
a9c23e1c32
Add plug to validate signed http requests.
2017-12-12 10:17:21 +01:00
64330d9455
ActivityPub: Add object routes / controller.
2017-12-11 18:21:33 +01:00
a89a613e4e
ActivityPub: Use only string keys in views.
2017-12-11 18:20:41 +01:00
da005d3332
ActivityPub: Add Objects View.
2017-12-11 18:19:46 +01:00
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
b00e230760
Add a bunch of useless HTML to mentions.
2017-12-11 18:14:33 +02:00
c3bcafc51b
HTTPSig: Add method to validate conn
2017-12-11 10:37:40 +01:00
5599c5920c
Basic incoming AP support.
2017-12-11 10:37:22 +01:00
9093b2cf49
Merge remote-tracking branch 'upstream/develop' into media-proxy
2017-12-11 02:45:28 +01:00
077faaed8c
Limit body size to 25MB
2017-12-11 02:31:37 +01:00
25118aeef7
Add link to AP address in webfinger.
2017-12-09 15:34:43 +01:00
30e9b22f96
Merge branch 'develop' into feature/activitypub
2017-12-09 11:00:56 +01:00
d5a13c10ac
Merge branch 'feature/user_deletion' into develop
2017-12-09 10:10:45 +01:00
ef2322bdb7
Delete notifications on activity deletion.
2017-12-08 18:17:30 +01:00
bad499b3fd
Basic user deletion.
2017-12-08 17:50:11 +01:00
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
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
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
a3e68f0233
Allow parentheses in links.
2017-12-07 21:38:31 +02:00
bf91e5659f
Fix HTML escape breaking some links.
2017-12-07 21:36:06 +02:00
5436dbaeaf
MastoAPI: don't add attachment links.
2017-12-07 20:44:09 +02:00
6df6ad0b42
User deletion: Remove relationships.
2017-12-07 18:13:05 +01:00
a78ae2a685
Don't follow deactivated users.
2017-12-07 17:51:55 +01:00
b727ecc5e7
Add function to deactivate users.
2017-12-07 17:47:23 +01:00
0ec5aeb8a7
Don't log in deactivated users.
2017-12-07 17:41:34 +01:00
e31a5ff4af
Priority queue fixes.
2017-12-06 16:51:11 +01:00
66c3813ea6
Add basic queue prioritization.
2017-12-05 18:21:30 +01:00
72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy
2017-12-05 14:12:15 +01:00
1c90bfb4f6
Merge remote-tracking branch 'origin/develop' into feature/chat
2017-12-05 10:20:00 +01:00
5945ec84e9
Don't save user in socket, just save the name.
2017-12-05 10:01:36 +01:00
69f1024bb0
Add basic channel state.
2017-12-05 09:36:26 +01:00
c1fa1e8844
Fix basic auth for passwords with a colon.
2017-12-04 22:45:16 +02:00
5c40986120
Basic backend chat.
2017-12-04 19:10:15 +01:00
964e2dd2f0
unfuck
2017-12-04 04:06:52 +03:00
6b60f5f64a
made psql script compatible with migrations or generate_config reruns
2017-12-04 03:56:54 +03:00
071f518028
reverts config gen
2017-12-04 03:56:54 +03:00
a884e08271
fix
2017-12-04 03:56:54 +03:00
4071403117
fixes
2017-12-04 03:56:54 +03:00
0673511d39
first version of safe DB setup
2017-12-04 03:56:54 +03:00
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
5637d163e6
MastodonAPI: Add proper user count.
2017-11-30 14:59:44 +01:00
1cb5cbdc6c
Improve error handling, add configuration
2017-11-28 21:44:25 +01:00
e28c110eba
mandatory typo fix...
2017-11-28 20:50:42 +01:00
5f35fdcf5d
media proxy: good enough wip
2017-11-28 20:50:34 +01:00
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
4524721fba
Salmon: generate private key with native crypto if available.
2017-11-28 16:50:12 +01:00
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
44dc694882
Add configuration generation tool, update readme.
2017-11-23 16:22:20 +01:00
d16b613929
MastodonUI login: Show error message on error.
2017-11-23 12:06:14 +01:00
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
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
e9037ffc8d
Do not include user in their own follower count.
2017-11-21 15:33:09 +02:00
fa19de97ba
MastoAPI: no more than 4 attachments.
2017-11-20 22:49:20 +02:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
cf0bbf320d
MastoAPI: Add max_toot_chars.
2017-11-20 08:54:47 +01:00
bd921ca5d7
Fix posts being streamed to non-local websocket channels.
2017-11-20 07:58:43 +02:00
4db5954786
Don't let the user unfollow their own account.
2017-11-20 07:50:56 +02:00
aadf54e0df
Don't show the user in their own following count.
2017-11-20 00:31:39 +02:00
36011fee4e
Add Custom Pleroma-dark theme
2017-11-19 19:07:19 +00:00
52aa65fe6e
Federator Queue: Add seperate in/out queues.
2017-11-19 15:10:51 +01:00
5ff5d583b6
MastodonAPI: Streaming fixes.
...
Now shows repeats in the home tl.
2017-11-19 13:47:50 +01:00
0f099dac67
MastodonAPI: Add sign out.
...
Close #79
2017-11-19 13:23:16 +01:00
c336a13d2c
MastoAPI: Only return create activties in contexts.
2017-11-19 12:59:23 +01:00
59770c3f5c
Fix all compilation warnings
2017-11-19 02:22:07 +01:00
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
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
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +02:00
31e4277ba5
Don't add summary if empty.
2017-11-18 15:25:22 +02:00
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
2017-11-18 14:46:54 +02:00
66e78c3ec4
Escape HTML instead of discarding it.
2017-11-18 14:43:41 +02:00
4647bcd6e6
Don't start streamer during tests.
2017-11-18 12:22:07 +01:00
9c60cc88df
Redirect to Getting Started on login.
2017-11-16 20:47:44 +02:00
a743940463
MastoAPI: Implement all streaming functions.
2017-11-16 16:49:51 +01:00
5719f69ae3
MastodonAPI: Stream fixes.
2017-11-16 13:48:58 +01:00
43499848d0
Small css fix.
2017-11-16 12:58:33 +01:00
189513e4ff
Add styles to make login page resemble mastodon's
2017-11-16 13:26:56 +02:00
8de890a0d9
Add custom emoji to Mastodon UI initial state.
2017-11-16 09:40:06 +01:00
ced0d64d75
MastoAPI: Make attachment ids strings.
2017-11-15 18:58:39 +01:00
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
f9828e578c
TwitterAPI: Add /users/show.
2017-11-14 17:34:48 +02:00
163c658202
TwitterAPI: Add unimplemented /mutes/users/ids.
2017-11-14 16:12:52 +02:00
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
2017-11-14 16:10:13 +02:00
3533bf7eac
TwitterAPI: Add /friends/ids.
2017-11-14 16:04:58 +02:00
06c3ee3bac
Accept 1 as true.
2017-11-14 15:54:50 +02:00
c84723b679
MastoAPI: Add media timelines.
2017-11-14 15:41:16 +02:00
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
5fc6e9d467
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-12 14:25:15 +01:00
d293ceb1b5
Add Mastodon frontend.
2017-11-12 14:23:05 +01:00
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
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
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
18a95cd375
Add common video and audio types.
2017-11-12 01:20:50 +02:00
fc7483cb3c
MastoAPI: Add update credentials endpoint.
2017-11-12 00:27:09 +02:00
260b148b92
Use headers for file content type recognition.
2017-11-11 23:24:54 +02:00
414c52509b
MastoAPI: Websocket streaming for federated timeline.
2017-11-11 20:00:11 +01:00
bd5bdc4c24
MastoAPI: Basic streaming.
2017-11-11 14:59:25 +01:00
a1923d20e8
MastoAPI: Fix reblog emojis.
2017-11-11 11:18:05 +01:00
fd12e585c9
Handle existing redirect params.
2017-11-10 18:24:50 +01:00
1d3d66a841
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-10 17:37:54 +01:00
6e9c22c0af
MastoAPI: Use string ids everywhere.
2017-11-10 17:18:19 +01:00
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
2017-11-10 15:24:52 +02:00
1b8ad9f731
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-09 16:49:32 +01:00
266d9c008d
MastoAPI: Fetch statuses in search.
2017-11-09 16:48:45 +01:00
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
e942e1e552
Correct mimetype on bad uploads.
2017-11-09 15:01:59 +02:00
f1d27a5fbb
Add actor column to activities.
2017-11-09 10:41:19 +01:00
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
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
f7fc048aeb
TwitterAPI user view: add follows_you.
2017-11-08 19:13:03 +02:00
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
4656cb9b99
TwitterAPI user view: add blocks.
2017-11-08 13:02:00 +02:00
6c0758e041
TwitterAPI: Add blocks.
2017-11-08 00:04:53 +02:00
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
c6210183e1
Add mastodon API endpoint for custom emoji.
2017-11-07 21:55:01 +02:00
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
722c4614ad
Allow self-rt.
2017-11-07 16:45:27 +01:00
7da978f3f5
Linkify fixes.
2017-11-07 12:06:37 +01:00
6dfa62800a
Revert "Longer timeouts for user fetching."
...
Breaks too many tests.
This reverts commit 7de3a65214
2017-11-07 09:41:35 +01:00
7de3a65214
Longer timeouts for user fetching.
2017-11-07 09:11:19 +01:00
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +02:00
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
b0e27b21dd
Fix tootdon logins.
2017-11-06 21:51:31 +02:00
7252f6b054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-05 12:12:19 +01:00
046bee34d3
Fix bug when no posts are in the db.
2017-11-05 12:11:59 +01:00
fa1f11e8e9
Merge branch 'feature/blocks' into 'develop'
...
Feature/blocks
See merge request pleroma/pleroma!5
2017-11-03 08:56:44 +00:00
c6b9b777da
MastoAPI: Add list of blocked users.
2017-11-03 08:51:17 +01:00
5bf92e50be
MastoAPI: Add blocking.
2017-11-03 08:38:05 +01:00
33beb51da4
MastoAPI: Add blocking to AccountView.
2017-11-03 08:23:31 +01:00
8a1a7191fd
MastoAPI: Fix mentions always being for an anonymous user.
2017-11-03 08:13:39 +01:00
9b63647aff
MastoApi: Add blocking to fetches.
2017-11-02 22:53:34 +01:00
d89a7a0b34
TwitterAPI: Add blocking to fetches.
2017-11-02 22:50:42 +01:00
867ac1e4f5
Handle nil cases.
2017-11-02 22:47:48 +01:00
8ef58a266b
Don't return blocked users' activities in contexts.
2017-11-02 22:44:36 +01:00
a47727adde
Don't return activities from blocked users.
2017-11-02 22:37:26 +01:00
632da6c927
Don't create notifications if the user is blocked.
2017-11-02 22:08:22 +01:00
6a5f087174
Add blocks to User.
2017-11-02 21:57:37 +01:00
9be286a900
Handle empty terms / tags.
2017-11-01 09:33:29 +01:00
6f05367325
Federate out content warnings.
2017-10-31 19:51:58 +01:00
e014cc6ed8
Allow using cws in mastodon api.
2017-10-31 19:44:36 +01:00
44295dd49a
MastoAPI: Include CW.
2017-10-31 17:49:47 +01:00
04217f52c9
TwitterAPI: Display cws.
2017-10-31 17:43:37 +01:00
4cbf17dac6
Save cws in the activitypub data.
2017-10-31 17:30:46 +01:00
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
3037814fde
Only search through last 100_000 activities for fetches.
...
This is purely a performance enhancement
2017-10-31 15:26:37 +01:00
968a546d4a
MastoAPI: Return id as string instead of integer.
2017-10-31 14:51:41 +01:00
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
2017-10-31 14:40:12 +01:00
502cb38cd6
Move user search to User module.
2017-10-30 19:23:16 +01:00
efe12e1a73
Fix /api/v1/accounts/search by splitting account search into its own function
2017-10-30 03:37:07 +00:00
2ffc6da207
Clean style.
...
Use 'follow' instead of 'follows' and correct indentation.
2017-10-29 00:30:10 +03:00
c56d28f96c
Fix return type of /api/v1/follows
2017-10-29 00:07:38 +03:00
11d2287476
Return error message on errors
2017-10-28 17:09:32 +03:00
813d2eaaf0
Add mastodon API endpoint for follow
2017-10-28 17:09:32 +03:00
5293516730
Use more efficient query to fetch likes.
2017-10-24 14:39:01 +02:00
9af560083f
Use more efficient user note count update query.
2017-10-24 14:16:17 +02:00
ec546baee9
Use different index for object fetching.
2017-10-24 10:39:23 +02:00
261ec82451
Return nil for nil object requests.
2017-10-24 08:39:24 +02:00
b35ff8f755
Use index in basic activity query.
2017-10-23 18:36:53 +02:00
9f417fd5e9
Speed up deletion and related queries.
2017-10-23 18:30:09 +02:00
5912dd0f5d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-10-23 16:28:32 +02:00
64bc38e009
MastoAPI: Add emoji output.
2017-10-23 16:27:51 +02:00
fe7804e42d
Add an API endpoint for emoji.
2017-10-19 22:51:56 +03:00
38f3908c14
Revert "Simplify query."
...
This reverts commit a17b261379
2017-10-19 17:56:27 +02:00
6af164f27b
Add password reset.
2017-10-19 17:37:24 +02:00
a17b261379
Simplify query.
2017-10-18 11:56:47 +02:00
b4f055b604
Don't reject already accepted subscriptions.
2017-10-05 12:53:16 +02:00
6268b7e0eb
HTTP Signatures: Work with all test vectors.
2017-09-18 18:10:21 +02:00
9cefbaf016
Start of HTTP Signatures.
2017-09-18 11:39:57 +02:00
2b980dea2f
Remove tag links for now, they break some regular links.
2017-09-17 23:03:03 +02:00
270c903220
Add tag links.
2017-09-17 15:21:44 +02:00
d009a79df5
TwitterAPI: Return proper error.
...
Fixes #32 .
2017-09-17 14:37:00 +02:00
ae38b72e24
MastoAPI: Fix reblog view.
2017-09-17 14:25:34 +02:00
260f09dd6c
MastoAPI: Return reblogs, too.
2017-09-17 14:20:54 +02:00
6000f61727
MastoAPI: Add repeats to statusview.
2017-09-17 13:54:14 +02:00
fb46d6fbc4
Prefer post-specific emoji.
2017-09-17 13:24:52 +02:00
422d0f324f
MastodonAPI: Add user favorites endpoint.
2017-09-17 13:09:49 +02:00
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
2017-09-17 13:03:46 +02:00
6877d7aaad
Fix typo.
2017-09-17 12:08:50 +02:00
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
b7b3e3f263
Use inserted_at as sort in search.
2017-09-17 11:32:24 +02:00
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
7c82b82197
Make emoji configurable in files.
2017-09-16 16:49:46 +02:00
959e993c7d
Apply incoming custom emoji.
2017-09-16 16:40:20 +02:00
16b1fcd271
Handle incoming emoji.
2017-09-16 16:27:48 +02:00
884006a9e9
Federate emoji out.
2017-09-16 16:14:23 +02:00
79aeb219d8
Small emoji refactor.
2017-09-16 15:47:45 +02:00
c17c8ce36d
Don't check limit twice in TwitterAPIController.
2017-09-16 15:47:07 +02:00
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
f039c9c19a
Don't specify order in results for now.
2017-09-16 14:40:53 +02:00
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
44693c100d
Federate banners out.
2017-09-16 13:44:08 +02:00
0fbf1911f5
Banners are objects.
2017-09-16 13:24:15 +02:00
abac96f41d
Update banner from remote accounts.
2017-09-16 13:16:54 +02:00
0872f5f394
Add undocumented default user default settings.
2017-09-16 11:52:33 +02:00
5602293690
Fix callback state.
2017-09-16 11:37:55 +02:00
c36229c4aa
Add remote user fetching to search.
2017-09-16 11:26:20 +02:00
73bdfd6c2b
Set search config to 'english'.
2017-09-16 10:50:43 +02:00
9f0a2a714b
Add basic search.
2017-09-16 10:42:24 +02:00
d659fcc195
MastoAPI: Fix date in account view.
2017-09-15 17:50:47 +02:00
c20530e708
Add configuration option for registrations.
2017-09-15 14:39:32 +02:00
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
ac2893a945
Add instance config options.
2017-09-15 10:26:28 +02:00
3aaf6608c6
MastoAPI: Set user id on replies.
2017-09-15 08:49:31 +02:00
f445a1b376
Don't die on fetching problems.
2017-09-15 08:18:29 +02:00
3ca853fb61
MastoAPI: Follower-related changes
2017-09-14 18:30:05 +02:00
fc85c9f086
Add tag timelines.
2017-09-14 13:22:09 +02:00
b0363e8055
MastoAPI: Add favourited_by/reblogged_by.
2017-09-14 09:50:49 +02:00
ac3f32da7e
Preserve state in oauth
2017-09-14 09:29:51 +02:00
a8701282d4
MastoAPI: fake out 'application' property.
2017-09-14 09:14:08 +02:00
6258c6b6b3
MastoAPI: Also return text_url in attachments.
2017-09-14 08:38:48 +02:00
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
3184939055
Ensure non-null bio.
2017-09-13 17:45:59 +02:00
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
ad5001828e
Oh no! More datetime fixes!
2017-09-13 17:18:08 +02:00
14b4029b1d
Reparse time to ensure correct format.
2017-09-13 16:38:29 +02:00
94be93aad0
Allign datetime format with mastodon.
2017-09-13 16:26:02 +02:00
d2faee01ee
Return iso8601 date.
2017-09-13 16:09:57 +02:00
e6286152b9
Fix logic.
2017-09-13 16:05:39 +02:00
49929321c7
Add relationships to masto api.
2017-09-13 15:55:10 +02:00
f03524805f
Try host-meta call over https.
2017-09-13 11:59:56 +02:00
07b694814e
Optimize conversation fetching.
2017-09-12 13:48:48 +02:00
1bc58230ee
Remove milliseconds from mastodon api response.
2017-09-12 13:31:17 +02:00
7331733d30
Use signed integer as attachment id.
2017-09-12 11:43:36 +02:00
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
44a650235b
MastoAPI: Remove domain ending from account name.
2017-09-12 09:34:39 +02:00
cda01285f4
Add pagination to notifications.
2017-09-12 09:11:36 +02:00
f1d9f2f6cd
MastoAPI: More link headers.
2017-09-12 09:06:32 +02:00
0df4a0f26d
Add parentheses.
2017-09-12 08:53:21 +02:00
02f824f9d5
MastoAPI: Add link headers to home timeline
2017-09-12 08:51:56 +02:00
cd6cba2f67
log ostatus handling errors.
2017-09-11 21:50:46 +02:00
f0d41a3abf
Merge branch 'develop' into oauth2
2017-09-11 20:54:44 +02:00
464c33e9a1
Add follow notifications.
2017-09-11 20:53:11 +02:00
3bad294058
Add reblogs to notifications.
2017-09-11 20:43:25 +02:00
bcce3e5dd2
Add favorites to notifications.
2017-09-11 20:41:05 +02:00
61adf676d5
Add basic mastodon notification support.
2017-09-11 18:53:19 +02:00
7616b202ea
Add user timelines to Masto Api.
2017-09-10 17:49:13 +02:00
b8912ff954
Fix masto api context.
2017-09-10 17:20:53 +02:00
8672d4d12b
Add context to mastodonAPI.
2017-09-10 15:00:13 +02:00
fc10875895
Add attachments to mastoapi statuses.
2017-09-10 11:51:01 +02:00
96473dfac0
Reverse mastodon timeline data.
2017-09-10 10:49:15 +02:00
e8975d06be
Add header image to masto api.
2017-09-10 10:37:34 +02:00
d66d69c3b4
Small hack to make notifications return empty for now.
2017-09-09 19:19:13 +02:00
5fe9e4dd3f
Do oauth redirect.
2017-09-09 19:03:57 +02:00
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
be04f725e9
Add more Mastodon API methods.
2017-09-09 13:15:01 +02:00
59dd240c08
Use token exchange method.
2017-09-09 12:10:46 +02:00
2b7efff71b
Add Mastodon StatusView.
2017-09-09 12:10:29 +02:00
c6bdc5960c
Test for Mastodon AccountView
...
Handles users and mentions.
2017-09-09 12:09:53 +02:00
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
lain
Ekaterina Vaartis
Roger Braun
hakabahitoyo
Hakaba Hitoyo
lambda
Calv Collins
eal
Jeff Becker
Sebastian Huebner
href
Henry Jameson
Roger Braun
Hyper! (Stitch)
Thog
Shpuld Shpuldson
Mark Felder