aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/assets/scripts.js37
-rw-r--r--src/main/java/com/juick/SignatureManager.java2
-rw-r--r--src/main/java/com/juick/config/SecurityConfig.java2
-rw-r--r--src/main/java/com/juick/www/api/activity/Profile.java3
-rw-r--r--src/main/java/com/juick/www/api/activity/model/Context.java3
-rw-r--r--src/main/resources/application.properties4
-rw-r--r--src/test/java/com/juick/server/tests/ServerTests.java1
7 files changed, 26 insertions, 26 deletions
diff --git a/src/main/assets/scripts.js b/src/main/assets/scripts.js
index bf74cfb5..b204766d 100644
--- a/src/main/assets/scripts.js
+++ b/src/main/assets/scripts.js
@@ -512,29 +512,22 @@ function addTag(tag) {
return false;
}
-var users = {};
-
function fetchUserUri(dataUri, callback) {
- if (users[dataUri]) {
- callback(users[dataUri]);
- } else {
- let data = new FormData();
- data.append('uri', dataUri);
- fetch('/u/', {
- method: 'POST',
- body: data
- }).then(handleErrors)
- .then(response => {
- return response.json();
- })
- .then(json => {
- users[dataUri] = json;
- callback(json);
- })
- .catch(e => {
- callback({ preferredUsername: dataUri });
- });
- }
+ let data = new FormData();
+ data.append('uri', dataUri);
+ fetch('/api/u/', {
+ method: 'POST',
+ body: data
+ }).then(handleErrors)
+ .then(response => {
+ return response.json();
+ })
+ .then(json => {
+ callback(json);
+ })
+ .catch(e => {
+ callback({ uname: dataUri, uri: dataUri });
+ });
}
function notificationsCheckPermissions(button) {
diff --git a/src/main/java/com/juick/SignatureManager.java b/src/main/java/com/juick/SignatureManager.java
index 295909cc..8032a6fa 100644
--- a/src/main/java/com/juick/SignatureManager.java
+++ b/src/main/java/com/juick/SignatureManager.java
@@ -30,6 +30,7 @@ import com.juick.www.api.webfinger.model.Link;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -160,6 +161,7 @@ public class SignatureManager {
return AnonymousUser.INSTANCE;
}
+ @Cacheable("profiles")
public Optional<Context> getContext(URI contextUri) {
try {
Context context = apClient.getForEntity(contextUri, Context.class).getBody();
diff --git a/src/main/java/com/juick/config/SecurityConfig.java b/src/main/java/com/juick/config/SecurityConfig.java
index 869a6d06..ad189052 100644
--- a/src/main/java/com/juick/config/SecurityConfig.java
+++ b/src/main/java/com/juick/config/SecurityConfig.java
@@ -133,7 +133,7 @@ public class SecurityConfig {
"/api/skypebotendpoint", "/api/_fblogin",
"/api/_vklogin", "/api/_tglogin",
"/api/_google", "/api/_applelogin", "/api/signup",
- "/api/inbox", "/api/events",
+ "/api/inbox", "/api/events", "/api/u/",
"/api/info/**",
"/api/nodeinfo/2.0")
.permitAll()
diff --git a/src/main/java/com/juick/www/api/activity/Profile.java b/src/main/java/com/juick/www/api/activity/Profile.java
index 506f5ace..404e0734 100644
--- a/src/main/java/com/juick/www/api/activity/Profile.java
+++ b/src/main/java/com/juick/www/api/activity/Profile.java
@@ -55,9 +55,11 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.core.convert.ConversionService;
import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -268,6 +270,7 @@ public class Profile {
throw new HttpNotFoundException();
}
+ @CacheEvict(cacheNames = "profiles", key = "{ #visitor.uri }")
@PostMapping(value = "/api/inbox", consumes = { Context.LD_JSON_MEDIA_TYPE,
Context.ACTIVITYSTREAMS_PROFILE_MEDIA_TYPE })
public ResponseEntity<CommandResult> processInbox(@Visitor User visitor, InputStream inboxData) throws Exception {
diff --git a/src/main/java/com/juick/www/api/activity/model/Context.java b/src/main/java/com/juick/www/api/activity/model/Context.java
index 63f991cc..1eb057a6 100644
--- a/src/main/java/com/juick/www/api/activity/model/Context.java
+++ b/src/main/java/com/juick/www/api/activity/model/Context.java
@@ -24,6 +24,7 @@ import com.juick.www.api.activity.helpers.LinkValueDeserializer;
import com.juick.www.api.activity.model.activities.*;
import com.juick.www.api.activity.model.objects.*;
+import java.io.Serializable;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
@@ -59,7 +60,7 @@ import java.util.Map;
@JsonSubTypes.Type(value = Group.class, name = "Group"),
@JsonSubTypes.Type(value = Organization.class, name = "Organization")
})
-public class Context {
+public class Context implements Serializable {
private List<Object> context;
private String id;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 91117c31..594c53ac 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -7,6 +7,6 @@ spring.h2.console.enabled=true
spring.datasource.generate-unique-name=false
spring.flyway.locations=classpath:db/migration,classpath:db/specific/{vendor}
spring.sql.init.platform=h2
-spring.cache.type=none
-spring.cache.cache-names=help, usernames, users_by_name, discover, discussions, messages, replies, popular_tags
+spring.cache.type=simple
+spring.cache.cache-names=help, usernames, users_by_name, discover, discussions, messages, replies, popular_tags, profiles
spring.profiles.active=@activatedProperties@
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index afc874f4..290e07fe 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -1605,6 +1605,7 @@ public class ServerTests {
@Test
public void mentionsInPosts() {
jdbcTemplate.execute("DELETE FROM bl_users");
+ jdbcTemplate.execute("DELETE FROM followers");
int mid = messagesService.createMessage(ugnich.getUid(), "@freefd is dick", null, Set.of());
Message msg = messagesService.getMessage(mid).get();
assertThat(subscriptionService.getSubscribedUsers(ugnich.getUid(), msg).get(0), is(freefd));
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 15:52:45 +0000