ae26604378
ActivityPub: Refactor create function.
2018-02-15 19:59:35 +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
33a5d0a238
Fix some test warnings.
2018-02-12 09:33:01 +01:00
3c80d9b277
Fix spec.
2018-02-12 08:15:03 +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
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
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
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
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
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
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
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
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
266d9c008d
MastoAPI: Fetch statuses in search.
2017-11-09 16:48:45 +01: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
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
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
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
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
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
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
10e40206c6
Output mastodon-style conversation ids.
2017-09-04 11:04:04 +02:00
1b1f861bad
Handle mastodon conversation ids.
2017-09-04 11:03:51 +02:00
4b03c43fd7
fix specs.
2017-08-29 17:22:22 +02:00
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
171ef33cbb
More sensible attachment names.
2017-08-28 19:17:38 +02:00
fecbd099cd
Ignore padding for salmon public keys.
2017-08-25 15:09:05 +02:00
67bfa19b35
Set twitter-style possibly_sensitive boolena.
2017-08-24 16:27:37 +02:00
5dc278b1a6
Add activity_type to twitter api output.
2017-08-24 16:18:26 +02:00
08bd59e446
Extend webfinger capabilities.
2017-08-24 12:54:53 +02:00
1a001588e8
Don't break on empty mentions.
2017-08-24 12:54:01 +02:00
552cfdbe11
Fix deletion not deleting relevant actions.
2017-08-16 16:29:25 +02:00
7d34cec58d
escape attachment urls on creation.
2017-08-09 16:55:18 +02:00
763756f879
Also fetch atom links.
2017-08-04 16:57:38 +02:00
25c733f402
Add href to in-reply-to.
...
THis should enable fetching from pleroma posts.
2017-08-01 17:35:19 +02:00
f226f46a09
Add basic incoming deletions.
2017-08-01 17:05:07 +02:00
558ab6e74e
Display html links correctly for remote activies.
2017-08-01 14:05:18 +02:00
00b722430f
Revert "Close br tags."
...
This reverts commit 2eba8e74cc
2017-07-31 13:27:38 +02:00
19e8421947
Revert "Wrap in <p>."
...
This reverts commit c81d0b6f89
2017-07-31 13:27:29 +02:00
3063e3b440
Revert "Remove newlines completely so mastodon doesn't bug out."
...
This reverts commit 0ca3ab7b59
2017-07-31 13:27:19 +02:00
0ca3ab7b59
Remove newlines completely so mastodon doesn't bug out.
2017-07-31 13:06:31 +02:00
c81d0b6f89
Wrap in <p>.
2017-07-31 12:16:44 +02:00
2eba8e74cc
Close br tags.
2017-07-31 10:46:29 +02:00
fc269fd319
Add html alternate link to atom.
2017-07-29 22:07:02 +02:00
72ca58c540
Save follower count and note count in user.
2017-07-22 17:42:15 +02:00
a027b0027c
Add friends endpoint.
2017-07-20 20:35:30 +02:00
94a394e3a8
Add followers endpoint.
2017-07-20 20:29:15 +02:00
140f72725d
Use follower address in user entry.
2017-07-19 19:06:49 +02:00
7e9647b146
Fix undo activity.
2017-07-08 11:17:35 +02:00
e343c0c9c4
Add way to update most recent notification id.
2017-07-02 15:01:59 +02:00
201804b836
Only return posts in TwAPI conversations.
2017-06-30 16:41:09 +02:00
d4de38e8ff
Order conversation fetches like GS does.
2017-06-30 16:30:19 +02:00
6a44427915
Add tests for public recipients.
2017-06-30 16:08:59 +02:00
1c074efeaf
Add external links to twapi.
2017-06-25 12:07:08 +02:00
429992fcc9
Save external link for notes.
2017-06-25 11:57:34 +02:00
6935fc3e01
Update user data on fetch if it changed.
2017-06-24 13:09:46 +02:00
6a184115a2
Longer timeouts for outgoing federation.
2017-06-23 12:25:53 +02:00
069daf644d
Replace UserRepresenter with UserView
2017-06-20 00:12:37 +03:00
fa82822932
Revert "Add invisible tags to TwAPI output."
...
This reverts commit a92a9dce94
2017-06-18 18:59:13 +02:00
d00571ff75
Fetch user feed on externalprofile request.
...
This is so we always have something to show.
2017-06-18 17:20:39 +02:00
fafb765c48
Output tags list in TwAPI.
2017-06-18 14:43:44 +02:00
8feec8d390
Strip unsafe html on output in TwAPI.
2017-06-18 13:40:35 +02:00
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
83c657afa5
Do some basic escaping.
2017-06-14 14:46:18 +02:00
1af9c77736
Move mention parsing to Formatter module.
2017-06-14 13:58:56 +02:00
eb18b9ebba
Enable user timelines.
2017-06-12 17:12:55 +02:00
6342fcd5dc
Save correct date for incoming notes.
2017-06-08 16:44:12 +02:00
00c032783d
Fix NaN statuses per day.
2017-06-05 15:47:37 +02:00
cdcb201bf5
Represent object publishing date in notes.
2017-06-02 22:47:49 +02:00
c7fdd1b7ff
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-06-01 11:24:03 +02:00
c6aa60c829
Shorten names in links.
2017-05-30 14:26:31 +02:00
bdcf42180f
Save remote user bio and update if we see new data.
2017-05-24 17:34:38 +02:00
94e980d6b4
Output proper published data in ostatus.
2017-05-24 13:54:25 +02:00
1085675ec4
Output ref instead of href for conversation.
2017-05-20 10:44:57 +02:00
03b7b2fa24
Also show activities in OStatus.
2017-05-19 15:53:02 +02:00
f972966385
Fix specs.
2017-05-18 19:10:51 +02:00
8e02fa100f
Add categories to ostatus output.
2017-05-18 18:18:27 +02:00
48f9df2391
Keep newlines around.
2017-05-18 16:41:16 +02:00
a92a9dce94
Add invisible tags to TwAPI output.
2017-05-18 16:24:41 +02:00
beb7b0ef07
Handle incoming tags.
2017-05-18 15:58:18 +02:00
0da6ade619
Save tags in object.
2017-05-18 15:16:49 +02:00
9033bfffd2
Twitter API refactoring.
2017-05-17 18:00:20 +02:00
70024632ba
AP refactoring.
2017-05-16 18:19:04 +02:00
423194520e
Fix mention replacing.
2017-05-15 18:25:21 +02:00
dd12cf7296
Fix cws.
2017-05-11 17:59:11 +02:00
1b67a59795
Repair retweets.
2017-05-10 19:29:25 +02:00
153995f832
Correct active state websub name.
2017-05-10 18:54:43 +02:00
05f2cd0d93
Handle incoming follows.
...
Also Mastodon CWs.
2017-05-10 18:46:23 +02:00
34a1ce00ec
Set valid_until date.
2017-05-10 18:45:55 +02:00
36448d6483
Add externalprofile to TwAPI.
2017-05-10 18:44:57 +02:00
2e753e8cd7
Refresh subscriptions.
2017-05-10 18:44:06 +02:00
1418d72749
Add class=attachment to attachment links.
2017-05-08 20:12:36 +02:00
3320c9b176
Fix remote users retweeting local stuff.
2017-05-08 18:19:45 +02:00
7303786160
Add some twapi fixes.
2017-05-07 20:20:53 +02:00
db08498a9f
Prevent double insertions.
2017-05-07 20:13:10 +02:00
4f9328c622
Preserve ids on favorites / retweets.
2017-05-07 20:05:03 +02:00
b403ea4d2b
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
2017-05-07 19:28:23 +02:00
a41aa4e489
Federate follow salmons.
2017-05-07 14:45:37 +02:00
95ab0dc3c5
Add conversation ids to twapi announce representer.
2017-05-07 12:46:21 +02:00
c51e15975a
Fix user fetching error.
2017-05-07 12:45:37 +02:00
7db76a0f0e
Address incoming messages to followers.
2017-05-06 14:23:39 +02:00
2d9fdbcc0d
Don't call out if we have the favorited notice locally.
2017-05-05 16:27:03 +02:00
fa2610c795
Handle incoming favorites, fetch potentially missing messages.
2017-05-05 16:07:44 +02:00
c85998ab8a
Parse incoming retweets.
2017-05-04 18:42:29 +02:00
97257c692c
Fix specs.
2017-05-03 20:06:20 +02:00
1077c5c58d
Remove reply-to for shares, mastodon gets confused.
2017-05-03 20:06:00 +02:00
5d7831ee3e
Add self links to federated statuses.
2017-05-03 18:10:19 +02:00
b34b046f16
Add user to announced status.
2017-05-03 17:51:36 +02:00
138641589d
OStatus announce representer.
2017-05-03 17:39:12 +02:00
df71c142cf
Remove doubled 'to' recipients.
2017-05-03 16:08:24 +02:00
8141024259
Attachment parsing, better magic key fetching.
2017-05-03 14:26:49 +02:00
16afea399d
Just give out the entry, not the whole feed.
2017-05-03 10:02:29 +02:00
9c42453e06
Return note objects as ostatus post activities.
2017-05-03 09:54:17 +02:00
018a1a390f
Use inReplyTo to find context.
2017-05-02 21:31:01 +02:00
33c803d6da
Add attachment link to posts.
2017-05-02 18:25:39 +02:00
102455bf29
Add avatar updating from incoming messages.
2017-05-02 17:13:41 +02:00
93de603966
Add an ostatus representer for like activities.
2017-05-02 16:35:53 +02:00
a3e82c5c24
Save context in likes / announces.
2017-05-02 15:54:14 +02:00
16f8406eb6
Add statusnet_profile_url to the TwAPI.
2017-05-02 14:36:04 +02:00
32a95d73da
Add twkn timeline.
2017-05-02 14:12:43 +02:00
6dd8335477
Mark incoming activties as non-local.
2017-05-02 10:47:04 +02:00
56bacc90d1
Fix specs, add local marker to actitivies.
2017-05-02 10:43:35 +02:00
89c1e90eb2
Don't crypt raw iolists.
2017-05-01 22:02:07 +02:00
ceb2f68432
Add type to rel=self link in feed.
2017-05-01 18:40:36 +02:00
e54e592d6c
Return webfinger for ap_ids.
2017-05-01 13:51:17 +02:00
6843755834
Make outgoing salmons work.
2017-05-01 13:14:58 +02:00
bb1d08a47c
Return keys in webfinger.
2017-04-30 15:00:04 +02:00
09f7ed4214
Don't set statusnetConversationIds on replies anymore.
2017-04-30 14:26:29 +02:00
009fcd2acf
Stop adding statusnetConversationIds.
2017-04-30 14:02:04 +02:00
4c8111c334
Use conversation mapping objects to get / retrieve context from TwAPI.
2017-04-30 13:53:26 +02:00
f9912599c4
Pull in remote avatar on federation.
2017-04-30 12:53:49 +02:00
18edc299b2
Handle duplicates.
2017-04-30 12:36:47 +02:00
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
84027ff00b
Handle comments.
2017-04-30 11:39:27 +02:00
d937a8e695
Add thr:in-reply-to to ostatus representer.
2017-04-30 11:17:34 +02:00
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
8a0d2b33d8
Keep ostatus id as activity id.
2017-04-30 09:25:46 +02:00
a16da387d2
Handle full incoming feeds.
2017-04-29 21:13:21 +02:00
20015b4b67
Save remote users with fqn as nickname.
2017-04-29 20:08:45 +02:00
ba1ea77001
Make key fetching use ostatus fetching.
2017-04-29 19:47:56 +02:00
427bac0966
Rework remote user subscription.
2017-04-29 19:06:01 +02:00
69922bc724
Add user info gathering.
2017-04-29 17:51:59 +02:00
ca40dda04c
Add some basic webfingering.
2017-04-28 17:41:12 +02:00
1422e7aa84
Handle incoming websub subscriptions.
2017-04-28 15:45:10 +02:00
a9b2ad1759
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
2017-04-28 16:06:57 +03:00
451d18af63
Add proper callback route for websub confirmation.
2017-04-28 09:51:47 +02:00
90da25505f
Add discovery and subscription requests to websub.
2017-04-27 09:46:45 +02:00
d1dce56a85
Refactor XML parsing.
2017-04-27 09:43:58 +02:00
9e9d95ec99
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 19:17:51 +02:00
7561158ab1
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 18:34:14 +02:00
c5fa682c31
Refactor, add beginnings of websub client subscriptions.
2017-04-26 18:33:10 +02:00
57bd59e407
Salmon creation.
2017-04-26 14:25:44 +02:00
f1ebf812ee
Add inReplyTo to incoming messages.
2017-04-26 10:22:51 +02:00
d9ebd785ab
Ostatus doesn't distinguish between activities / objects on create.
2017-04-26 10:08:13 +02:00
e8882ab3da
Merge branch 'develop' into feature/incoming_ostatus
2017-04-26 09:18:49 +02:00
22e936372e
Fix retweet spec.
2017-04-26 08:55:00 +02:00
2f0e13abe2
Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats
2017-04-26 08:49:26 +02:00
b91ccef237
Output conversation id.
2017-04-26 08:47:22 +02:00
f980f6778b
Wire up mentions.
2017-04-25 18:03:14 +02:00
b438ea24ee
Add ostatus conversation as context.
2017-04-25 17:45:34 +02:00
ab0114fbaa
Return salmon path for users, basic incoming salmon handling.
2017-04-24 18:46:34 +02:00
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
5b6070ec40
Deny whitespace statuses
2017-04-24 12:09:11 +03:00
f723b23691
Add error response to self-repeats
2017-04-24 01:11:38 +03:00
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
1e3791877c
Add error response on empty status
2017-04-23 19:08:25 +03:00
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
4c216cba9c
Decode and verify salmons.
2017-04-23 15:21:58 +02:00
cef4a4d709
Fix utf8 problems with iolists.
2017-04-22 15:34:29 +02:00
04fb4f9c47
Add poco data to user.
2017-04-22 15:11:13 +02:00
923584d046
Remove unknown activities from feed.
2017-04-22 14:37:54 +02:00
c585f9e26c
Only handle subscription requests for now.
2017-04-22 13:48:10 +02:00
8fb73c28bb
Only have one subscription per callback.
2017-04-22 13:44:21 +02:00
1feb193731
Add rel=self link too feed.
2017-04-22 12:11:36 +02:00
77cb260628
add basic federation to websub.
2017-04-22 12:07:51 +02:00
39dc74f967
Add callback to websub subscription.
2017-04-22 12:05:48 +02:00
28b203d08f
Add Undo of Follow Activity insertion
2017-04-21 19:54:21 +03:00
1c00eb4a90
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
2017-04-21 18:42:28 +02:00
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
f51a672ac4
Return object id in Ostatus create activties.
2017-04-21 04:22:02 +02:00
424e0e7779
Add Websub verification.
2017-04-21 03:59:11 +02:00
1e88f102c4
Fix specs, add some user info.
2017-04-21 00:51:09 +02:00
1b9cc721a0
Websub controller beginnings.
2017-04-20 17:47:33 +02:00
3a56d7318f
Add statuses/mentions endpoint
2017-04-20 15:18:54 +03:00
cc330421fd
Better activities in ostatus.
2017-04-20 10:16:06 +02:00
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
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
eda742c78b
Merge branch 'feature/user-timeline' into 'develop'
...
Feature/user timeline
See merge request !8
2017-04-19 05:50:24 -04:00
d23f3e3cf3
Add webfinger and basic feed support.
2017-04-18 18:41:51 +02:00
470f5f7cd6
Add user timeline spec test
2017-04-17 16:31:19 +03:00
36e883cd4b
Add basic Ostatus user representer.
2017-04-17 14:12:36 +02:00
ce6cc84a4a
Add basic webfinger.
2017-04-17 13:44:41 +02:00
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
6a0e69a8a3
Fix syntax error.
2017-04-17 11:43:44 +02:00
a185ea63af
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-17 11:37:21 +02:00
6bfd521974
Switch cache implementation for size limiting.
2017-04-17 11:36:17 +02:00
369be708b2
Remove unnecesary queries
2017-04-16 17:42:15 +03:00
f6e632d25b
Remove unnecesary asserts
2017-04-16 17:39:34 +03:00
ef5033d7a7
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
2017-04-16 17:18:34 +03:00
f6547f7b7f
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 17:13:42 +03:00
82914e1e4d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
2017-04-16 17:12:28 +03:00
85bd480be3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 17:10:25 +03:00
5229b01944
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 17:08:17 +03:00
eb9358c8d6
Add basic Avatar updating code.
2017-04-16 16:06:19 +02:00
63f04b314d
Fix typo
2017-04-16 17:05:48 +03:00
4b4ece2c74
Add user timeline fetching without credentials
2017-04-16 16:44:30 +03:00
03a9c11d25
Display the users avatar if he has one set.
2017-04-16 15:40:50 +02:00
d7e3b72c6a
Add avatar objects to user, fix specs.
2017-04-16 15:28:28 +02:00
7617a593b9
Support data uris in uploads.
2017-04-16 14:23:30 +02:00
7a0046d127
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 13:32:56 +03:00
9a8c348aed
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 13:28:23 +03:00
ce1eef9c98
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 13:25:38 +03:00
b41f3eff84
Preserve newlines in messages.
2017-04-16 11:51:00 +02:00
5dac3727f1
Add registration to the TwAPI controller.
2017-04-16 11:01:24 +02:00
b1edd94baa
Add user registration to TwAPI.
2017-04-16 10:25:27 +02:00
4f7adb343c
Address liking / announcing to the original author.
2017-04-15 14:16:01 +02:00
4799dc6991
Add retweeting to TwAPI controller.
2017-04-15 14:09:54 +02:00
60c60de330
Add announcements / retweets to TwAPI.
2017-04-15 13:54:46 +02:00
21c397820f
Add announcements to activitypub.
2017-04-15 12:11:20 +02:00
7a47afed3c
Update object correctly after setting context.
2017-04-14 18:59:11 +02:00
c83f279a7d
Add unliking to TwAPI controller.
2017-04-14 18:27:17 +02:00
f4eea0847b
Add unfavoriting to TwAPI.
2017-04-14 18:15:15 +02:00
a926038cd0
Add unliking to activitypub.
2017-04-14 18:09:30 +02:00
03ddaead7e
Add basic user caching.
...
Expires after 5 seconds.
2017-04-14 17:13:51 +02:00
18cd04ade5
Add user timeline
2017-04-14 16:09:13 +03:00
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
5cb446a148
Add favoriting to TwAPI controller.
2017-04-13 17:22:44 +02:00
d0da40dc81
Display like activities.
2017-04-13 17:05:53 +02:00
653d605e14
Add favoriting to twitter api.
2017-04-13 16:19:07 +02:00
1388054796
Add liking to ActivityPub.
2017-04-13 15:50:05 +02:00
1ccbe562c9
Add actor to objects.
2017-04-13 14:56:19 +02:00
a8e50d602b
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
2017-04-13 15:36:00 +03:00
3ff917b5dd
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
2017-04-13 15:18:18 +03:00
84c2012810
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-13 15:15:09 +03:00
d2bf099ae6
Fix twitter api date.
2017-04-12 19:34:58 +02:00
1b086834bd
Don't return html in the text field.
2017-04-12 17:22:29 +02:00
b666f11d2f
Add max_id fetching to activity fetching.
2017-04-12 17:12:00 +02:00
6a179a44be
Test friends timeline more thoroughly.
2017-04-12 16:53:46 +02:00
8eea09889b
Return directly addressed activities in friends timeline.
2017-04-12 16:45:23 +02:00
15655d992e
Fix user representation after following.
2017-04-12 16:38:55 +02:00
65ef18a715
Add error messages for repeated follows and unfollows
2017-04-12 17:34:36 +03:00
c0e5b3459f
Add unfollowing using screen_name parameter
2017-04-10 16:45:47 +03:00
896e40cd2b
Add following using screen_name parameter
2017-04-10 16:38:21 +03:00
59a406d94c
Add test for help/test resource
2017-04-10 16:00:57 +03:00
8075badafe
Add Follow activity insertion
2017-04-04 03:30:07 +03:00
a83fa053de
Parse mentions, save them, output them in TwAPI.
2017-04-03 18:28:19 +02:00
2e89d505d3
Connect attachments with objects, not activities.
2017-03-30 18:07:38 +02:00
6aa1523bb3
Put objects in inserted activties into the db.
2017-03-30 18:07:29 +02:00
73df2f8e5e
Add attachments to the TwAPI.
2017-03-30 17:07:22 +02:00
42c90855ba
Basic ObjectRepresenter.
2017-03-30 16:08:49 +02:00
e7dc39e40c
Basic file uploading via TwAPI.
2017-03-29 02:07:56 +02:00
d2cdcc097b
Add conversation fetching to TwAPI controller.
2017-03-28 17:22:44 +02:00
0dd3373304
Return statusnet_conversation_id in TwAPI.
2017-03-28 14:49:21 +02:00
e25aea3fa7
Add conversation id to activities.
...
This is for compatibility with the TwAPI.
2017-03-28 14:40:09 +02:00
bb07efdaab
Fix spec.
2017-03-28 14:04:13 +02:00
e4de0ddc77
Add single status fetching to TwAPI.
2017-03-24 01:16:28 +01:00
866a2663d4
Add fetching of activities in context.
2017-03-24 00:09:08 +01:00
ae50b165cc
Add inReplyToStatus to TwAPI.
2017-03-24 00:00:06 +01:00
e56dba1563
Add context and inReplyTo.
2017-03-23 23:34:10 +01:00
74112ef99e
Add id to objects, too.
2017-03-23 21:22:49 +01:00
1f0f79d959
Generate ids for activities.
2017-03-23 17:56:49 +01:00
9ad045fd58
Return user specific json for logged in users.
2017-03-23 15:51:34 +01:00
30650e5bc6
Add unfollowing to TwAPI.
2017-03-23 13:13:09 +01:00
75e51b190d
Add following TwAPI endpoint.
2017-03-23 12:09:27 +01:00
e2e0cd75b7
Add friends timeline.
2017-03-22 17:25:59 +01:00
37e443ce6c
Add friends status fetching.
2017-03-22 16:51:20 +01:00
569d9bac17
Add fetching for recipients.
2017-03-22 14:45:17 +01:00
2db28df4cf
Add public timeline TwAPI.
2017-03-21 21:09:20 +01:00
b9d0e34506
Add since_id for activitypub fetching.
2017-03-21 20:31:48 +01:00
d4cf273f28
Add limiting to activity pub fetching.
2017-03-21 20:22:05 +01:00
ad303783af
Add status posting via TwAPI.
2017-03-21 18:17:35 +01:00
9a8850eb9e
Basic status creation and retrieval.
2017-03-21 17:53:20 +01:00
8de523c8ae
Basic AP objects.
2017-03-21 09:21:52 +01:00
093fd1832d
Add Twitter API verify_credentials endpoint.
2017-03-20 21:30:44 +01:00
980717fdce
Add Twitter API user representer.
2017-03-20 21:30:18 +01:00
a93f3421a7
Phoenix skeleton
2017-03-17 17:09:58 +01:00
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
2017-01-01 03:10:08 +03:00
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 18:48:10 +07:00
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
36c0a10fdf
adding language tag
2019-04-08 11:03:10 +00:00
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 16:46:59 +07:00
44829d9181
AdminApiControllerTest unused variables fix.
2019-04-08 12:32:55 +03:00
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
2019-04-08 16:29:20 +07:00
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
2019-04-08 12:20:26 +03:00
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
2019-04-08 09:18:01 +00:00
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
feld
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
2019-04-06 22:19:30 +00:00
2056efa714
Add scheduler for sending scheduled activities to the queue
2019-04-06 23:56:29 +03:00
fc92a0fd8d
Added limits and media attachments for scheduled activities.
2019-04-06 23:55:58 +03:00
b3870df51f
Handle `scheduled_at` on status creation.
2019-04-06 23:55:58 +03:00
7bf622ce73
Add scheduled activities
2019-04-06 23:55:58 +03:00
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
2019-04-06 23:27:55 +03:00
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
2019-04-05 09:19:17 +03:00
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
2019-04-04 22:41:03 +03:00
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
lain
feld