lain
|
611ca385de
|
Merge branch 'develop' into feature/activitypub
|
2018-03-08 12:37:06 +01:00 |
|
|
lain
|
a91adb146e
|
add test file.
|
2018-03-07 15:46:53 +01:00 |
|
|
lain
|
fcf1937a40
|
Correctly handle unlisted messages coming in through Ostatus.
|
2018-03-07 15:45:13 +01:00 |
|
|
lain
|
b82637f32d
|
Don't use special query for feed.
|
2018-03-06 16:04:29 +01:00 |
|
|
lain
|
d2ad99298e
|
Handle incoming deletes.
|
2018-03-03 18:38:40 +01:00 |
|
|
lain
|
e9de04b74b
|
Add support for outgoing update.
|
2018-02-25 21:08:32 +01:00 |
|
|
lain
|
f61fd00db5
|
Make likes and announces public.
|
2018-02-25 18:20:06 +01:00 |
|
|
lain
|
8a47974217
|
Fix specs.
|
2018-02-25 18:11:03 +01:00 |
|
|
lain
|
4ea2a41014
|
Fix more specs.
|
2018-02-25 17:48:31 +01:00 |
|
|
lain
|
d3b0167854
|
Fix salmon tests.
|
2018-02-25 17:06:12 +01:00 |
|
|
lain
|
4d13cc0dc6
|
Fix specs.
|
2018-02-25 16:52:33 +01:00 |
|
|
lain
|
8e7f63afde
|
Fix specs.
|
2018-02-25 16:40:37 +01:00 |
|
|
lain
|
e3629af4da
|
Handle remote update activities.
|
2018-02-25 16:14:25 +01:00 |
|
|
lain
|
b76de1ecd3
|
Some fixes to AP fetching.
|
2018-02-25 10:56:01 +01:00 |
|
|
lain
|
e5fcc51a06
|
Remove unneccesary subscriptions on update.
|
2018-02-24 17:36:02 +01:00 |
|
|
lain
|
fb02300234
|
Pleroma AP detection mechanism.
|
2018-02-24 13:06:53 +01:00 |
|
|
lain
|
01d5ef65fa
|
More fixes to user upgrading.
|
2018-02-24 10:42:47 +01:00 |
|
|
lain
|
aa79d64e0d
|
Correctly stitch mastodon -> ostatus replies.
|
2018-02-23 15:00:41 +01:00 |
|
|
lain
|
eb3f14da86
|
Missing test skeleton.
|
2018-02-23 08:49:57 +01:00 |
|
|
lain
|
37e406ae36
|
Get avatar and banner from AP users.
|
2018-02-22 08:14:15 +01:00 |
|
|
lain
|
4816b09fa7
|
Add user upgrade function.
|
2018-02-21 22:21:40 +01:00 |
|
|
Ekaterina Vaartis
|
ec07e087bc
|
Make user bio optional
|
2018-02-21 23:31:57 +03:00 |
|
|
lain
|
94db9ac4db
|
Merge branch 'develop' into feature/activitypub
|
2018-02-21 18:34:19 +01:00 |
|
|
lain
|
810cf8618f
|
ActivityPub: Fetch missing activities on reply.
|
2018-02-21 15:22:24 +01:00 |
|
|
lain
|
5bc810c452
|
Add moderator function.
|
2018-02-20 18:44:50 +01:00 |
|
|
lain
|
95f7e7e2d5
|
Add some more tests.
|
2018-02-20 18:42:41 +01:00 |
|
|
lain
|
297a2c7d3f
|
Ignore duplicate create activities.
|
2018-02-19 17:37:45 +01:00 |
|
|
lain
|
6b6ab592ab
|
AP: Fix incoming conversations.
|
2018-02-19 10:39:03 +01:00 |
|
|
lain
|
539340d914
|
Handle sensitive property.
|
2018-02-18 14:14:16 +01:00 |
|
|
lain
|
20e6190ead
|
Transmogrify outgoing nsfw.
|
2018-02-18 14:07:13 +01:00 |
|
|
lain
|
8ca66b5961
|
ActivityPub: Add conversation id.
|
2018-02-18 13:58:52 +01:00 |
|
|
lain
|
6ab0aba50a
|
Transmogrify outgoing hashtags.
|
2018-02-18 13:51:03 +01:00 |
|
|
lain
|
6046f10431
|
Actually fix incoming attachments.
|
2018-02-18 13:06:51 +01:00 |
|
|
lain
|
77c6c424a6
|
ActivityPub: Make fake Create activities for objects without one.
|
2018-02-18 11:24:54 +01:00 |
|
|
lain
|
fc9d361d17
|
Add mock.
|
2018-02-18 10:21:19 +01:00 |
|
|
lain
|
81ea359a7c
|
ActivityPub: Handle incoming announces.
|
2018-02-17 21:57:31 +01:00 |
|
|
lain
|
e3732ea3bc
|
Add test fixtures.
|
2018-02-17 21:56:52 +01:00 |
|
|
lain
|
5e36b750c1
|
ActivityPub: Fetch an object from an id.
|
2018-02-17 21:56:33 +01:00 |
|
|
lain
|
e1b12a7782
|
ActivityPub: Handle incoming likes.
|
2018-02-17 20:13:12 +01:00 |
|
|
lain
|
ab27c90c9f
|
ActivityPub: Handle attachments.
|
2018-02-17 18:38:58 +01:00 |
|
|
lain
|
fb7b926be3
|
Handle black name fields on incoming users.
|
2018-02-17 18:15:48 +01:00 |
|
|
lain
|
7b26443a76
|
ActivityPub: Send out Accept after Follow.
|
2018-02-17 16:08:55 +01:00 |
|
|
lain
|
e7b73359e3
|
ActivityPub: Partly handle incoming follows.
|
2018-02-17 14:55:44 +01:00 |
|
|
lain
|
5682e48a25
|
ActivityPub: tags -> tag.
|
2018-02-17 14:20:53 +01:00 |
|
|
lain
|
05ba6ca1b8
|
Do some transmogrifying for the output.
|
2018-02-17 14:11:20 +01:00 |
|
|
lain
|
5a371892a0
|
Fix specs.
|
2018-02-17 10:26:44 +01:00 |
|
|
lain
|
dea29d707c
|
Add post activity fixture.
|
2018-02-17 09:48:42 +01:00 |
|
|
lain
|
5454ec6a6c
|
ActivityPubController: Handle inbox data.
|
2018-02-15 20:00:43 +01:00 |
|
|
lain
|
ef0300889d
|
Transmogrifier: Handle basic notice creation.
|
2018-02-15 20:00:06 +01:00 |
|
|
lain
|
a15f572800
|
OstatusTest: Remove insert_or_update test (moved to User).
|
2018-02-15 19:59:40 +01:00 |
|
|
lain
|
ae26604378
|
ActivityPub: Refactor create function.
|
2018-02-15 19:59:35 +01:00 |
|
|
lain
|
0aa56a853b
|
UserTest: Move insert_or_update test.
|
2018-02-15 19:58:12 +01:00 |
|
|
lain
|
b331cb449a
|
Merge branch 'develop' into feature/activitypub
|
2018-02-12 10:24:15 +01:00 |
|
|
lain
|
1bc34de4df
|
Add missing support file.
|
2018-02-12 10:23:21 +01:00 |
|
|
lain
|
26ccb768d3
|
Make test output easier to read.
|
2018-02-12 10:14:11 +01:00 |
|
|
lain
|
33a5d0a238
|
Fix some test warnings.
|
2018-02-12 09:33:01 +01:00 |
|
|
lain
|
3c80d9b277
|
Fix spec.
|
2018-02-12 08:15:03 +01:00 |
|
|
lain
|
8cf97ee8e1
|
ActivityPub: Basic note federation with Mastodon.
|
2018-02-11 20:43:33 +01:00 |
|
|
lain
|
ce31f3a922
|
Twitter Representers: Handle Mastodon attachments.
|
2018-02-11 17:21:06 +01:00 |
|
|
Roger Braun
|
ae1ec858f4
|
Basic AP user building.
|
2018-02-11 17:20:43 +01:00 |
|
|
Roger Braun
|
c1d26751e6
|
Mocks: Add mastodon user json example.
|
2018-02-11 17:19:06 +01:00 |
|
|
Roger Braun
|
52200998c9
|
Merge branch 'develop' into feature/activitypub
|
2018-02-11 09:50:55 +01:00 |
|
|
lambda
|
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 |
|
|
Hakaba Hitoyo
|
ea6d1b2b17
|
move avi.png & banner.png from /priv/static/static to /priv/static/images
|
2018-02-03 20:43:14 +09:00 |
|
|
eal
|
29be70c008
|
Add remote following of local profiles.
|
2018-02-02 00:14:05 +02:00 |
|
|
eal
|
ab83e0de6d
|
TwitterAPI: Add is_local to user view.
|
2018-02-01 21:41:19 +02:00 |
|
|
Roger Braun
|
ad0ab3a57b
|
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
|
2018-01-30 12:20:39 +01:00 |
|
|
Roger Braun
|
4501094606
|
Make specs less breaky.
|
2018-01-30 12:20:14 +01:00 |
|
|
Roger Braun
|
1bb3ba02f3
|
Fix specs.
|
2018-01-30 12:17:01 +01: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
|
6e1cb86166
|
Fix instance test.
|
2018-01-14 08:28:35 +02: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 |
|
|
eal
|
1969773fb4
|
Fix follower/following lists.
Add tests.
|
2017-12-18 16:37:26 +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
|
9223038319
|
Fix some more tests.
|
2017-12-11 21:01:36 +02:00 |
|
|
Lain Iwakura
|
e2e6365035
|
ActivityPub: Add controller tests.
|
2017-12-11 18:22:48 +01:00 |
|
|
Lain Iwakura
|
da005d3332
|
ActivityPub: Add Objects View.
|
2017-12-11 18:19:46 +01:00 |
|
|
eal
|
79b3397c17
|
Fix tests.
|
2017-12-11 18:41:03 +02:00 |
|
|
Roger Braun
|
c3bcafc51b
|
HTTPSig: Add method to validate conn
|
2017-12-11 10:37:40 +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
|
bad499b3fd
|
Basic user deletion.
|
2017-12-08 17:50:11 +01:00 |
|
|
eal
|
a3e68f0233
|
Allow parentheses in links.
|
2017-12-07 21:38:31 +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
|
66c3813ea6
|
Add basic queue prioritization.
|
2017-12-05 18:21:30 +01:00 |
|
|
Lain Iwakura
|
e7c2472abd
|
Fix tests.
|
2017-12-05 12:18:04 +01: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 |
|
|
Lain Iwakura
|
c680ae581d
|
Return xml notice at /notice path.
|
2017-11-27 17:24:52 +01: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
|
3d29fc5462
|
Make /api/friends/ids test deterministic.
|
2017-11-20 19:16:43 +02:00 |
|
|
Roger Braun
|
747a68a075
|
Treat internal emoji like external.
|
2017-11-20 17:53:21 +01:00 |
|
|
eal
|
8d4e7b32c9
|
Ensure correct state in self-unfollow.
|
2017-11-20 09:26:31 +02:00 |
|
|
eal
|
bd921ca5d7
|
Fix posts being streamed to non-local websocket channels.
|
2017-11-20 07:58:43 +02:00 |
|
|
eal
|
edc3e5bc30
|
Make users in tests follow themselves by default.
Also fix the semantics of all tests to match.
|
2017-11-20 07:52:02 +02:00 |
|
|
eal
|
4db5954786
|
Don't let the user unfollow their own account.
|
2017-11-20 07:50:56 +02:00 |
|
|
Roger Braun
|
40ca379357
|
Fix flakey test.
|
2017-11-19 13:07:29 +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
|
f53cdabcdf
|
Add #nsfw tag if sensitive content bit is set
|
2017-11-18 16:30:18 +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
|
a743940463
|
MastoAPI: Implement all streaming functions.
|
2017-11-16 16:49:51 +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
|
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 |
|
|
lambda
|
08bc316742
|
Merge branch 'mastodon-notification-endpoints' into 'develop'
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
|
2017-11-12 11:08:06 +00:00 |
|
|
lambda
|
efcf54dc02
|
Merge branch 'mastoapi-update-credentials' into 'develop'
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
|
2017-11-12 09:24:32 +00:00 |
|
|
eal
|
fc7483cb3c
|
MastoAPI: Add update credentials endpoint.
|
2017-11-12 00:27:09 +02:00 |
|
|
Roger Braun
|
a1923d20e8
|
MastoAPI: Fix reblog emojis.
|
2017-11-11 11:18:05 +01:00 |
|
|
Roger Braun
|
1d3d66a841
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-10 17:37:54 +01:00 |
|
|
Roger Braun
|
6e9c22c0af
|
MastoAPI: Use string ids everywhere.
|
2017-11-10 17:18:19 +01:00 |
|
|
eal
|
e6a78c6ed0
|
MastoAPI: Add notification get, clear and dismiss.
|
2017-11-10 15:24:52 +02:00 |
|
|
Roger Braun
|
1b8ad9f731
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-09 16:49:32 +01:00 |
|
|
Roger Braun
|
266d9c008d
|
MastoAPI: Fetch statuses in search.
|
2017-11-09 16:48:45 +01:00 |
|
|
lambda
|
2247d7580e
|
Merge branch 'fix-tootdon-image-uploads' into 'develop'
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
|
2017-11-09 14:41:44 +00:00 |
|
|
eal
|
e942e1e552
|
Correct mimetype on bad uploads.
|
2017-11-09 15:01:59 +02:00 |
|
|
Roger Braun
|
f1d27a5fbb
|
Add actor column to activities.
|
2017-11-09 10:41:19 +01:00 |
|
|
Roger Braun
|
41b8a76e96
|
Re-fetch user data on salmon decode error.
|
2017-11-09 08:32:54 +01:00 |
|
|
eal
|
f7fc048aeb
|
TwitterAPI user view: add follows_you.
|
2017-11-08 19:13:03 +02:00 |
|
|
eal
|
4656cb9b99
|
TwitterAPI user view: add blocks.
|
2017-11-08 13:02:00 +02:00 |
|
|
eal
|
6c0758e041
|
TwitterAPI: Add blocks.
|
2017-11-08 00:04:53 +02:00 |
|
|
lambda
|
d761b1543a
|
Merge branch 'authenticated-profile-fetching' into 'develop'
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
|
2017-11-07 18:58:22 +00:00 |
|
|
Roger Braun
|
7da978f3f5
|
Linkify fixes.
|
2017-11-07 12:06:37 +01:00 |
|
|
eal
|
f85566324e
|
Allow profile fetching for authenticated users only.
|
2017-11-07 00:33:44 +02:00 |
|
|
Roger Braun
|
7252f6b054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-05 12:12:19 +01:00 |
|
|
Roger Braun
|
046bee34d3
|
Fix bug when no posts are in the db.
|
2017-11-05 12:11:59 +01:00 |
|
|
Roger Braun
|
c6b9b777da
|
MastoAPI: Add list of blocked users.
|
2017-11-03 08:51:17 +01:00 |
|
|
Roger Braun
|
5bf92e50be
|
MastoAPI: Add blocking.
|
2017-11-03 08:38:05 +01:00 |
|
|
Roger Braun
|
33beb51da4
|
MastoAPI: Add blocking to AccountView.
|
2017-11-03 08:23:31 +01:00 |
|
|
Roger Braun
|
867ac1e4f5
|
Handle nil cases.
|
2017-11-02 22:47:48 +01:00 |
|
|
Roger Braun
|
8ef58a266b
|
Don't return blocked users' activities in contexts.
|
2017-11-02 22:44:36 +01:00 |
|
|
Roger Braun
|
a47727adde
|
Don't return activities from blocked users.
|
2017-11-02 22:37:26 +01:00 |
|
|
Roger Braun
|
632da6c927
|
Don't create notifications if the user is blocked.
|
2017-11-02 22:08:22 +01:00 |
|
|
Roger Braun
|
6a5f087174
|
Add blocks to User.
|
2017-11-02 21:57:37 +01:00 |
|
|
Roger Braun
|
345ad870f7
|
Clean up user_test.exs.
|
2017-11-02 21:57:21 +01:00 |
|
|
Roger Braun
|
9be286a900
|
Handle empty terms / tags.
|
2017-11-01 09:33:29 +01:00 |
|
|
Roger Braun
|
6f05367325
|
Federate out content warnings.
|
2017-10-31 19:51:58 +01:00 |
|
|
Roger Braun
|
e014cc6ed8
|
Allow using cws in mastodon api.
|
2017-10-31 19:44:36 +01:00 |
|