ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
2018-02-03 20:43:14 +09: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
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
2018-01-30 12:20:39 +01:00
4501094606
Make specs less breaky.
2018-01-30 12:20:14 +01:00
1bb3ba02f3
Fix specs.
2018-01-30 12:17:01 +01: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
6e1cb86166
Fix instance test.
2018-01-14 08:28:35 +02: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
1969773fb4
Fix follower/following lists.
...
Add tests.
2017-12-18 16:37:26 +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
9223038319
Fix some more tests.
2017-12-11 21:01:36 +02:00
e2e6365035
ActivityPub: Add controller tests.
2017-12-11 18:22:48 +01:00
da005d3332
ActivityPub: Add Objects View.
2017-12-11 18:19:46 +01:00
79b3397c17
Fix tests.
2017-12-11 18:41:03 +02:00
c3bcafc51b
HTTPSig: Add method to validate conn
2017-12-11 10:37:40 +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
bad499b3fd
Basic user deletion.
2017-12-08 17:50:11 +01:00
a3e68f0233
Allow parentheses in links.
2017-12-07 21:38:31 +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
66c3813ea6
Add basic queue prioritization.
2017-12-05 18:21:30 +01:00
e7c2472abd
Fix tests.
2017-12-05 12:18:04 +01: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
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01: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
3d29fc5462
Make /api/friends/ids test deterministic.
2017-11-20 19:16:43 +02:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
8d4e7b32c9
Ensure correct state in self-unfollow.
2017-11-20 09:26:31 +02:00
bd921ca5d7
Fix posts being streamed to non-local websocket channels.
2017-11-20 07:58:43 +02:00
edc3e5bc30
Make users in tests follow themselves by default.
...
Also fix the semantics of all tests to match.
2017-11-20 07:52:02 +02:00
4db5954786
Don't let the user unfollow their own account.
2017-11-20 07:50:56 +02:00
40ca379357
Fix flakey test.
2017-11-19 13:07:29 +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
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +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
a743940463
MastoAPI: Implement all streaming functions.
2017-11-16 16:49:51 +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
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
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
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
fc7483cb3c
MastoAPI: Add update credentials endpoint.
2017-11-12 00:27:09 +02:00
a1923d20e8
MastoAPI: Fix reblog emojis.
2017-11-11 11:18:05 +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
f7fc048aeb
TwitterAPI user view: add follows_you.
2017-11-08 19:13:03 +02: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
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
7da978f3f5
Linkify fixes.
2017-11-07 12:06:37 +01:00
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +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
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
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
345ad870f7
Clean up user_test.exs.
2017-11-02 21:57:21 +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
0c871e5c6e
Fix specs.
2017-10-31 17:57:26 +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
968a546d4a
MastoAPI: Return id as string instead of integer.
2017-10-31 14:51:41 +01:00
2f39bb6b43
Typo.
2017-10-31 14:46:01 +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
71f66bd458
Fix follow test semantics.
2017-10-29 14:25:11 +02:00
c56d28f96c
Fix return type of /api/v1/follows
2017-10-29 00:07:38 +03:00
8e94936553
Add tests.
2017-10-28 17:09:32 +03:00
64bc38e009
MastoAPI: Add emoji output.
2017-10-23 16:27:51 +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
6000f61727
MastoAPI: Add repeats to statusview.
2017-09-17 13:54:14 +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
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
003cb17b16
Add missing fixtures.
2017-09-17 00:33:58 +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
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
0872f5f394
Add undocumented default user default settings.
2017-09-16 11:52:33 +02:00
c36229c4aa
Add remote user fetching to search.
2017-09-16 11:26:20 +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
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +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
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
7f3ce5c1a0
Cleanup.
2017-09-14 08:11:51 +02:00
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
94be93aad0
Allign datetime format with mastodon.
2017-09-13 16:26:02 +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
1bc58230ee
Remove milliseconds from mastodon api response.
2017-09-12 13:31:17 +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
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
fc10875895
Add attachments to mastoapi statuses.
2017-09-10 11:51:01 +02:00
e8975d06be
Add header image to masto api.
2017-09-10 10:37:34 +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
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
95cedd6000
Make auth tokens usable once and expire them.
2017-09-09 12:02:59 +02:00
d1c10ad2fb
Fix specs.
2017-09-05 09:35:00 +02:00
3438a120cc
Don't delete new delete activity...
2017-09-04 20:47:43 +02:00
fcf3128a56
Add TwAPI representer for deletes.
2017-09-04 20:03:28 +02:00
2348b272e0
Create deletes activities for incoming deletes.
2017-09-04 18:47:46 +02:00
5db535c0b1
Add delete to ActivityPub.
2017-09-04 18:47:33 +02:00
540dfb4617
Add delete activity representer.
2017-09-04 17:56:09 +02:00
Hakaba Hitoyo