Commit graph

850 commits

Author SHA1 Message Date
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
4d13cc0dc6 Fix specs. 2018-02-25 16:52:33 +01:00
lain
dfaddeb765 Use update_and_set cache. 2018-02-25 16:34:24 +01:00
lain
e3629af4da Handle remote update activities. 2018-02-25 16:14:25 +01:00
lain
dd97193311 Set conversation to parent conversation. 2018-02-25 13:35:08 +01:00
lain
b76de1ecd3 Some fixes to AP fetching. 2018-02-25 10:56:01 +01:00
lain
0e9bd6d148 Hotfix for tag problems. 2018-02-24 22:28:22 +01:00
lain
7e0ce32f4d Fix external url in twitterapi. 2018-02-24 20:29:57 +01:00
lain
82e34cae95 Unify object representation. 2018-02-24 20:16:41 +01:00
lain
2b5d265954 Don't deliver to local followers. 2018-02-24 19:04:56 +01:00
lain
df73a9c6d6 . 2018-02-24 18:50:02 +01:00
lain
5bc7628022 Fix. 2018-02-24 18:49:09 +01:00
lain
59ad395ffa Better signature errors messages. 2018-02-24 18:47:08 +01:00
lain
a7c3ead9e6 Invalidate user after key creation. 2018-02-24 18:23:47 +01:00
lain
fb5add56fa Bit more signature debugging. 2018-02-24 18:01:49 +01:00
lain
ac67453e8a More logging for signature problems. 2018-02-24 17:36:26 +01:00
lain
e5fcc51a06 Remove unneccesary subscriptions on update. 2018-02-24 17:36:02 +01:00
lain
fa3aa59248 Add missing alias. 2018-02-24 13:11:39 +01:00
lain
fb02300234 Pleroma AP detection mechanism. 2018-02-24 13:06:53 +01:00
lain
9a4d400ff4 Fix remote following. 2018-02-24 12:49:56 +01:00
lain
06b512acf1 Never update local users from foreign sources. 2018-02-24 12:05:40 +01:00
lain
541a4cbbb6 Oh no! More fixes! 2018-02-24 10:51:15 +01:00
lain
01d5ef65fa More fixes to user upgrading. 2018-02-24 10:42:47 +01:00
lain
efd4d04933 Fix user upgrading code. 2018-02-24 10:28:38 +01:00
lain
1331a39d39 Webfinger: Remove leading @s. 2018-02-23 16:55:12 +01:00
lain
aa79d64e0d Correctly stitch mastodon -> ostatus replies. 2018-02-23 15:00:41 +01:00
lain
2583a9f6e8 More logging. 2018-02-23 15:00:19 +01:00
lain
95e6e82138 Correctly display accounts without name. 2018-02-22 19:22:10 +01:00
lain
5dc68d303b Get objects that people you know favorite. 2018-02-22 09:02:34 +01:00
lain
c443aec83d Add banner image to user json. 2018-02-22 08:24:18 +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
lain
94db9ac4db Merge branch 'develop' into feature/activitypub 2018-02-21 18:34:19 +01:00
lain
a06b9a3e0b Logging. 2018-02-21 16:22:20 +01:00
lain
67afd024a7 Streamer: Make it less chatty. 2018-02-21 15:44:00 +01:00
lain
810cf8618f ActivityPub: Fetch missing activities on reply. 2018-02-21 15:22:24 +01:00
lain
947ba6495d More TwAPI fixes. 2018-02-21 10:31:13 +01:00
lain
92021fd00c Logging, put incoming ap docs into incoming queue. 2018-02-21 08:57:14 +01:00
lain
279e1ce556 Typo. 2018-02-21 08:54:48 +01:00
lain
66aa35903e Add missing alias. 2018-02-21 08:51:50 +01:00
lain
b52672294e Move incoming AP to Federator. 2018-02-21 08:51:03 +01:00
lain
391b3e3586 TwitterAPI: Fix some bugz. 2018-02-21 08:16:04 +01:00
lain
fd95075e32 TwitterAPI: Fix mentions. 2018-02-20 19:50:34 +01:00
lain
eec6a87dbb Allow moderators to delete posts. 2018-02-20 18:54:13 +01:00
lain
5bc810c452 Add moderator function. 2018-02-20 18:44:50 +01:00
lain
486e205810 Remove some noise. 2018-02-20 08:52:31 +01:00
lain
9c89916969 ActivityPub: One queue item per server. 2018-02-20 08:51:19 +01:00
lain
297a2c7d3f Ignore duplicate create activities. 2018-02-19 17:37:45 +01:00
lain
ffa2f57c36 Salmons can't carry private information. 2018-02-19 11:14:46 +01:00
lain
6b6ab592ab AP: Fix incoming conversations. 2018-02-19 10:39:03 +01:00
lain
6b32b9e346 Notifications: Use all recipients, not just "to". 2018-02-19 10:05:26 +01:00
lain
01faa7c555 TwitterAPI: support follow activities without published date. 2018-02-19 09:50:57 +01:00
lain
1633470e4a TwitterAPI: Only fetch creates, announces, follows. 2018-02-19 09:50:41 +01:00
lain
313f186a66 Ostatus: Use all recipients as mentions. 2018-02-19 08:34:55 +01:00
lain
932d346d35 fix typo. 2018-02-18 23:13:19 +01:00
lain
8b11546334 For existing users, just replace info. 2018-02-18 23:11:31 +01:00
lain
decbf3a47f fix typo. 2018-02-18 23:02:44 +01:00
lain
342d0b01d1 Only push to followers if they are addressed. 2018-02-18 23:01:37 +01:00
lain
78516a8daa Salmon: Take both versions of public keys. 2018-02-18 22:57:07 +01:00
lain
dc1d3ceb72 Fix log. 2018-02-18 22:41:38 +01:00
lain
e368b68dcf Log but ignore signature errors. 2018-02-18 22:40:08 +01:00
lain
76e71f47d3 Inbox: Don't add the same thing twice. 2018-02-18 22:37:44 +01:00
lain
010f818a29 Fix conversations. 2018-02-18 20:52:07 +01:00
lain
deaad6d97a Fix delivery to CC. 2018-02-18 16:59:41 +01:00
lain
8567feed47 Salmon is ok! 2018-02-18 16:15:04 +01:00
lain
803bdc1a67 Federate non-public over ActivityPub only, do some better signing. 2018-02-18 16:05:25 +01:00
lain
4bc57ef20c Don't relay non-public messages. 2018-02-18 15:58:18 +01:00
lain
5d89997a70 Respect visibility in API. 2018-02-18 15:50:34 +01:00
lain
5729233c36 Don't show unlisted in public. 2018-02-18 15:32:11 +01:00
lain
c974f6544f Show users their own posts in timeline. 2018-02-18 15:20:36 +01:00
lain
44586f2967 ActivityPub: Fallback for unhandled outgoing activities. 2018-02-18 15:20:03 +01:00
lain
2997fe1ba9 CommonAPI: If no visibility is given, return parent visibility. 2018-02-18 15:04:26 +01:00
lain
d4b08dd838 MastodonAPI: Post with visibility settings 2018-02-18 14:56:36 +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
912ca56e59 Mastodon StatusView: Return correct visibility. 2018-02-18 13:51:51 +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
6352dffd13 Drop unhandle activities. 2018-02-18 12:51:35 +01:00
lain
b99eeb2bdf Try to fetch AP user data first. 2018-02-18 12:27:05 +01:00
lain
68752b2047 Switch protocols to AP when post come in through AP. 2018-02-18 12:04:59 +01:00
lain
77c6c424a6 ActivityPub: Make fake Create activities for objects without one. 2018-02-18 11:24:54 +01:00
lain
81ea359a7c ActivityPub: Handle incoming announces. 2018-02-17 21:57:31 +01:00
lain
5e36b750c1 ActivityPub: Fetch an object from an id. 2018-02-17 21:56:33 +01:00
lain
0f2ad25a7b AcitvityPub: Outgoing Announces. 2018-02-17 20:47:45 +01:00
lain
32b995fbb6 ActivityPub: Implement outgoing likes. 2018-02-17 20:22:14 +01:00
lain
e1b12a7782 ActivityPub: Handle incoming likes. 2018-02-17 20:13:12 +01:00
lain
1f98de2079 ActivityPub: Use shared inbox. 2018-02-17 18:39:12 +01:00
lain
ab27c90c9f ActivityPub: Handle attachments. 2018-02-17 18:38:58 +01:00
lain
c2d0cb1a29 ActivtyPub Delivery: Use shared inbox if possible. 2018-02-17 16:18:10 +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
7851b9ba81 ActivityPub: Use recipients fields. 2018-02-15 20:32:07 +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
ae26604378 ActivityPub: Refactor create function. 2018-02-15 19:59:35 +01:00
lain
b331cb449a Merge branch 'develop' into feature/activitypub 2018-02-12 10:24:15 +01:00
lain
91928b06ab Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop 2018-02-12 08:15:37 +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
52200998c9 Merge branch 'develop' into feature/activitypub 2018-02-11 09:50:55 +01:00
hakabahitoyo
a61f21ff4f print <link rel="next"> element in atom.feed 2018-02-09 23:10:32 +09:00
Hakaba Hitoyo
7124f12a94 introduce max_id parameter in feed.atom (debug) 2018-02-09 21:46:05 +09:00
Roger Braun
08f458e6df UtilController: Fix statusnet config api compatibility. 2018-02-09 13:43:12 +01:00
Hakaba Hitoyo
9c61f60558 introduce max_id parameter in feed.atom 2018-02-09 21:41:30 +09:00
lambda
af854f7e01 Merge branch 'develop' into 'develop'
action_fallback for OAuth Controller

See merge request pleroma/pleroma!63
2018-02-09 08:57:54 +00:00
lambda
f0cde24f71 Merge branch 'fix/config-disable-chat' into 'develop'
Add config option for enabling/disabling chat.

See merge request pleroma/pleroma!58
2018-02-08 18:18:28 +00:00
Calv Collins
73249fa5ff Changed fallback controller to handle all cases from OAuthController 2018-02-08 18:15:59 +00:00
Calv Collins
314f4775c5 Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop 2018-02-08 16:58:31 +00:00
Calv Collins
bdb5dd2194 Create action_fallback for username/password incorrect input 2018-02-08 16:57:30 +00:00
Roger Braun
2f291576e4 Fix compile errors on 1.4.5 2018-02-08 16:03:30 +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
c8a2931549 add backend endpoint /images 2018-02-03 20:52:01 +09:00
eal
f0745148a3 Add config option for enabling/disabling chat. 2018-02-03 13:42:37 +02: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
Hakaba Hitoyo
03c15a54f5 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:09:47 +09:00
Hakaba Hitoyo
e47f60c053 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:04:34 +09:00
Hakaba Hitoyo
a4335e391f provide instance thumbnail at /api/v1/instance 2018-01-31 22:51:25 +09:00
Roger Braun
5e37adedfb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-01-30 12:21:05 +01:00
Roger Braun
ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop 2018-01-30 12:20:39 +01:00
Hakaba Hitoyo
cefb6cfea1 provide logo at feed.atom (debug) 2018-01-30 19:37:04 +09:00
Hakaba Hitoyo
b713b28dfd provide logo at feed.atom 2018-01-30 19:26:07 +09:00
lambda
2f23ae5b68 Merge branch 'pr-upstream-http-proxy' into 'develop'
Pr upstream http proxy

See merge request pleroma/pleroma!43
2018-01-30 08:16:31 +00:00
Roger Braun
64e51c2cfa Fix incoming Pleroma CWs. Closes #96. 2018-01-29 17:44:35 +01:00
Jeff Becker
dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy 2018-01-24 13:15:54 -05:00
eal
beb13bf3a9 Revert "Revert "Add remote follow pages.""
This reverts commit b259b4e4d1.
2018-01-18 18:42:44 +02:00
eal
57d413e655 Revert "Revert "Add remote follow path to webfinger.""
This reverts commit fb5aa34092.
2018-01-18 18:42:32 +02:00
eal
b259b4e4d1 Revert "Add remote follow pages."
This reverts commit 47e8c8db05.
2018-01-18 03:42:18 +02:00
eal
fb5aa34092 Revert "Add remote follow path to webfinger."
This reverts commit bc689740f0.
2018-01-18 03:42:09 +02:00
eal
47e8c8db05 Add remote follow pages. 2018-01-18 03:11:03 +02:00
eal
bc689740f0 Add remote follow path to webfinger. 2018-01-18 02:38:02 +02: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
d8db39564e Move user count to stats agent. 2018-01-14 08:15:11 +02:00
eal
9717166d10 Add a stats agent for storing data from expensive queries. 2018-01-13 18:24:16 +02:00
Jeff Becker
1e185b9301
apply proxy settings to media_proxy 2017-12-31 09:25:00 -05:00
eal
5c09d8d3f1 Unlink follow import process from the one processing request.
Mistakes were made.
2017-12-23 16:40:43 +02:00
href
0ccd0e5cc9
Remove a useless URI.encode call in MediaProxy 2017-12-21 20:59:10 +01:00
lambda
35ac549a99 Merge branch 'media-proxy' into 'develop'
Media proxy

See merge request pleroma/pleroma!34
2017-12-20 14:22:24 +00: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