From 1751a985b07204f65e862893da29e647a58e9ba8 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sat, 14 Aug 2021 11:20:54 +0300 Subject: Add user agent to ActivityPub requests * This should help to accept us by Cloudflare site protection on some Mastodon instances --- src/main/java/com/juick/config/ActivityPubConfig.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/juick/config') diff --git a/src/main/java/com/juick/config/ActivityPubConfig.java b/src/main/java/com/juick/config/ActivityPubConfig.java index 430dc8d1..89aacff0 100644 --- a/src/main/java/com/juick/config/ActivityPubConfig.java +++ b/src/main/java/com/juick/config/ActivityPubConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2020, Juick + * Copyright (C) 2008-2021, Juick * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,8 +19,7 @@ package com.juick.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.juick.ActivityPubManager; -import com.juick.www.api.activity.model.Activity; -import com.juick.util.HeaderRequestInterceptor; +import com.juick.util.ActivityPubRequestInterceptor; import org.apache.http.impl.client.CloseableHttpClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,7 +30,6 @@ import org.springframework.web.client.RestTemplate; import javax.inject.Inject; import java.nio.charset.StandardCharsets; -import java.util.Collections; @Configuration public class ActivityPubConfig { @@ -63,8 +61,7 @@ public class ActivityPubConfig { restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter()); restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8)); restTemplate.setErrorHandler(activityPubClientErrorHandler); - restTemplate.setInterceptors(Collections.singletonList( - new HeaderRequestInterceptor("Accept", Activity.ACTIVITY_MEDIA_TYPE))); + restTemplate.getInterceptors().add(new ActivityPubRequestInterceptor()); return restTemplate; } } \ No newline at end of file -- cgit v1.2.3