aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2020-05-03 14:10:24 +0300
committerGravatar Vitaly Takmazov2020-05-03 14:10:24 +0300
commitde3d0da3eaec03d534ed2d509396c79d166addc7 (patch)
treeb183e238e3e7913b9a9bde900509d12af30fbbc6
parenta9521ab38dbc25d55a792d07940e3fc6c674e50a (diff)
Minor cleanup
-rw-r--r--src/main/assets/embed.js2
-rw-r--r--src/main/assets/style.css1
-rw-r--r--src/main/java/com/juick/EmailManager.java3
-rw-r--r--src/main/java/com/juick/config/ActivityPubConfig.java2
-rw-r--r--src/main/java/com/juick/service/MessagesServiceImpl.java2
-rw-r--r--src/main/java/com/juick/www/api/Users.java1
6 files changed, 2 insertions, 9 deletions
diff --git a/src/main/assets/embed.js b/src/main/assets/embed.js
index 1fb7f25b..bef6f80c 100644
--- a/src/main/assets/embed.js
+++ b/src/main/assets/embed.js
@@ -63,7 +63,7 @@ function makeIframe(src, w, h, scrolling = 'no') {
let iframe = document.createElement('iframe');
iframe.style.width = w;
iframe.style.height = h;
- iframe.frameBorder = 0;
+ iframe.frameBorder = '0';
iframe.scrolling = scrolling;
iframe.setAttribute('allowFullScreen', '');
iframe.src = src;
diff --git a/src/main/assets/style.css b/src/main/assets/style.css
index 96d47930..dc19e6d2 100644
--- a/src/main/assets/style.css
+++ b/src/main/assets/style.css
@@ -465,7 +465,6 @@ article .tags > a::before,
border-bottom: 1px solid #ff339a;
}
-
.msgthread {
margin-bottom: 0;
}
diff --git a/src/main/java/com/juick/EmailManager.java b/src/main/java/com/juick/EmailManager.java
index e5b527f4..f3b0e85b 100644
--- a/src/main/java/com/juick/EmailManager.java
+++ b/src/main/java/com/juick/EmailManager.java
@@ -29,7 +29,6 @@ import com.juick.service.MessagesService;
import com.juick.service.UserService;
import com.juick.service.component.*;
import com.juick.util.MessageUtils;
-import com.mitchellbosecke.pebble.PebbleEngine;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,8 +63,6 @@ public class EmailManager implements NotificationListener {
@Inject
private UserService userService;
@Inject
- private PebbleEngine pebbleEngine;
- @Inject
private ObjectMapper jsonMapper;
@Inject
private WebApp webApp;
diff --git a/src/main/java/com/juick/config/ActivityPubConfig.java b/src/main/java/com/juick/config/ActivityPubConfig.java
index 0411d0c7..0bf48127 100644
--- a/src/main/java/com/juick/config/ActivityPubConfig.java
+++ b/src/main/java/com/juick/config/ActivityPubConfig.java
@@ -19,14 +19,12 @@ package com.juick.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.juick.ActivityPubManager;
-import com.juick.SignatureManager;
import com.juick.www.api.activity.model.Activity;
import com.juick.util.HeaderRequestInterceptor;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.protocol.HttpContext;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
diff --git a/src/main/java/com/juick/service/MessagesServiceImpl.java b/src/main/java/com/juick/service/MessagesServiceImpl.java
index e3b7482b..c97bf87e 100644
--- a/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -60,8 +60,6 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
@Inject
private UserService userService;
@Inject
- private TagService tagService;
- @Inject
private SearchService searchService;
@Inject
private ImagesService imagesService;
diff --git a/src/main/java/com/juick/www/api/Users.java b/src/main/java/com/juick/www/api/Users.java
index f4c3a4c1..bf1119d3 100644
--- a/src/main/java/com/juick/www/api/Users.java
+++ b/src/main/java/com/juick/www/api/Users.java
@@ -254,6 +254,7 @@ public class Users {
return IOUtils.toByteArray(URI.create(webApp.getAvatarUrl(user)));
}
public class SecureUser extends User {
+
public String getHash() {
return getAuthHash();
}