Commit Graph

25 Commits

Author SHA1 Message Date
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
Haelwenn (lanodan) Monnier 6a6a5b3251
de-group alias/es 2019-02-09 16:31:17 +01:00
Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
Ivan Tashkinov 92753b0cd9 [#534] Made federation push sender be determined basing on content instead of `referer` header. Updated tests. 2019-01-29 13:12:28 +03:00
Egor Kislitsyn 55affbca7f add a job queue 2019-01-28 22:17:17 +07:00
Ivan Tashkinov 9560abea10 [#534] Refactoring / tweaks per MR review. 2019-01-28 11:03:52 +03:00
Ivan Tashkinov 8654a591f0 [#534] Updating external instances reachability on incoming federation. 2019-01-24 17:37:23 +03:00
William Pitcock 17da432dbb websub: improve error handling 2019-01-15 18:03:49 +00:00
William Pitcock 980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
William Pitcock 2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
href 6fe23c5458
Runtime configured router 2018-11-05 15:19:03 +01:00
lain 4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
Mark Felder 7f77433c0e CamelCase WebSub in log messages 2018-03-19 17:41:04 +00:00
Roger Braun 54af9e145a Add some debug info to websub. 2017-08-02 12:03:45 +02:00
Roger Braun 9f15937fe6 Actually guess 3 days... 2017-05-10 19:12:40 +02:00
Roger Braun ae0e6d8003 Handle cases where we don't get lease_seconds returned. 2017-05-10 19:04:27 +02:00
Roger Braun 34a1ce00ec Set valid_until date. 2017-05-10 18:45:55 +02:00
Roger Braun 22ddddce76 Handle incoming items through the queue. 2017-05-06 12:34:40 +02:00
Roger Braun 97257c692c Fix specs. 2017-05-03 20:06:20 +02:00
Roger Braun 59d4cc6036 normalize hex number. 2017-04-28 15:53:45 +02:00
Roger Braun 1422e7aa84 Handle incoming websub subscriptions. 2017-04-28 15:45:10 +02:00
Roger Braun 451d18af63 Add proper callback route for websub confirmation. 2017-04-28 09:51:47 +02:00
Roger Braun 8fb73c28bb Only have one subscription per callback. 2017-04-22 13:44:21 +02:00
Roger Braun 39dc74f967 Add callback to websub subscription. 2017-04-22 12:05:48 +02:00
Roger Braun 1b9cc721a0 Websub controller beginnings. 2017-04-20 17:47:33 +02:00