Commit Graph

3304 Commits

Author SHA1 Message Date
Roger Braun
451d18af63 Add proper callback route for websub confirmation. 2017-04-28 09:51:47 +02:00
dtluna
6cf7c13228 Refactor code to comply with credo suggestions 2017-04-27 16:18:50 +03:00
Roger Braun
90da25505f Add discovery and subscription requests to websub. 2017-04-27 09:46:45 +02:00
Roger Braun
1ea4325fec Add user feed fixture. 2017-04-27 09:46:04 +02:00
Roger Braun
e8a311ecff Add user and hub to websub client subscriptions. 2017-04-27 09:44:20 +02:00
Roger Braun
d1dce56a85 Refactor XML parsing. 2017-04-27 09:43:58 +02:00
Roger Braun
9e9d95ec99 Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus 2017-04-26 19:17:51 +02:00
Roger Braun
7561158ab1 Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus 2017-04-26 18:34:14 +02:00
Roger Braun
c5fa682c31 Refactor, add beginnings of websub client subscriptions. 2017-04-26 18:33:10 +02:00
Roger Braun
57bd59e407 Salmon creation. 2017-04-26 14:25:44 +02:00
Roger Braun
f1ebf812ee Add inReplyTo to incoming messages. 2017-04-26 10:22:51 +02:00
Roger Braun
d9ebd785ab Ostatus doesn't distinguish between activities / objects on create. 2017-04-26 10:08:13 +02:00
Roger Braun
e8882ab3da Merge branch 'develop' into feature/incoming_ostatus 2017-04-26 09:18:49 +02:00
Roger Braun
fb5cebc1b5 Merge branch 'dtluna/pleroma-bugfix/deny-self-repeats' into develop 2017-04-26 08:56:34 +02:00
Roger Braun
c844799822 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-26 08:56:18 +02:00
Roger Braun
22e936372e Fix retweet spec. 2017-04-26 08:55:00 +02:00
Roger Braun
2f0e13abe2 Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats 2017-04-26 08:49:26 +02:00
Roger Braun
b91ccef237 Output conversation id. 2017-04-26 08:47:22 +02:00
dtluna
c3655d1c47 Remove unnecessary status_update definition 2017-04-25 19:47:16 +03:00
Roger Braun
f980f6778b Wire up mentions. 2017-04-25 18:03:14 +02:00
Roger Braun
b438ea24ee Add ostatus conversation as context. 2017-04-25 17:45:34 +02:00
Roger Braun
6c5f5e18ec Even more refactoring. 2017-04-25 17:36:53 +02:00
Roger Braun
4771962a5d More refactoring. 2017-04-25 17:32:36 +02:00
Roger Braun
ef4190b3ab Clean up status create method. 2017-04-25 17:26:05 +02:00
Roger Braun
5a3be8ad1b Merge branch 'dtluna/pleroma-bugfix/deny-empty-posts' into develop 2017-04-25 12:01:00 +02:00
Roger Braun
a25adfbfee Remove superflous function. 2017-04-25 11:33:32 +02:00
Roger Braun
6529cab982 Merge branch 'develop' into dtluna/pleroma-bugfix/deny-empty-posts 2017-04-25 11:09:14 +02:00
Roger Braun
ab0114fbaa Return salmon path for users, basic incoming salmon handling. 2017-04-24 18:46:34 +02:00
Roger Braun
34d3aea92f Add incoming xml fixtures. 2017-04-24 18:46:02 +02:00
lambadalambda
aef7e943e7 Merge branch 'bugfix/ascii-alphanumeric-names' into 'develop'
Add restriction on names

Closes #15

See merge request !15
2017-04-24 09:59:44 -04:00
dtluna
668b01da0b Add restriction on names 2017-04-24 15:34:54 +03:00
dtluna
42105497ca Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats 2017-04-24 14:17:23 +03:00
dtluna
5b6070ec40 Deny whitespace statuses 2017-04-24 12:09:11 +03:00
Roger Braun
43d7a4b2cf Add basic fields to support remote users. 2017-04-24 08:49:09 +02:00
dtluna
f723b23691 Add error response to self-repeats 2017-04-24 01:11:38 +03:00
dtluna
6b6bc9435c Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats 2017-04-24 01:05:02 +03:00
dtluna
1e3791877c Add error response on empty status 2017-04-23 19:08:25 +03:00
Roger Braun
7424310e14 Basic key fetching. 2017-04-23 16:35:17 +02:00
lambadalambda
a3b9741a62 Merge branch 'feature/follow-unfollow-by-screen-name' into 'develop'
Follow and unfollow using screen_name

See merge request !9
2017-04-23 10:26:27 -04:00
Roger Braun
4c216cba9c Decode and verify salmons. 2017-04-23 15:21:58 +02:00
Roger Braun
8a07ddef8f Don't break feed if user has no posts. 2017-04-23 10:38:24 +02:00
Roger Braun
4649ba2d62 Merge branch 'ostatus' into develop 2017-04-23 10:37:29 +02:00
Roger Braun
361a8c4219 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-23 10:37:22 +02:00
Roger Braun
cef4a4d709 Fix utf8 problems with iolists. 2017-04-22 15:34:29 +02:00
Roger Braun
04fb4f9c47 Add poco data to user. 2017-04-22 15:11:13 +02:00
Roger Braun
923584d046 Remove unknown activities from feed. 2017-04-22 14:37:54 +02:00
Roger Braun
c585f9e26c Only handle subscription requests for now. 2017-04-22 13:48:10 +02:00
Roger Braun
8fb73c28bb Only have one subscription per callback. 2017-04-22 13:44:21 +02:00
Roger Braun
1feb193731 Add rel=self link too feed. 2017-04-22 12:11:36 +02:00
Roger Braun
ece85fc8bc Add attachments to feed. 2017-04-22 12:09:13 +02:00