feat: halo-dev#1036 (halo-dev#1331)

* feat: halo-dev#1036

* revert: BaseCommentRepository.

src/main/java/run/halo/app/model/dto/BaseCommentDTO.java

@@ -46,4 +46,5 @@ public class BaseCommentDTO implements OutputConverter<BaseCommentDTO, BaseComme
 
     private Date createTime;
 
+    private String avatar;
 }

src/main/java/run/halo/app/model/properties/CommentProperties.java

@@ -50,6 +50,11 @@ public enum CommentProperties implements PropertyEnum {
     INTERNAL_PLUGIN_JS("comment_internal_plugin_js", String.class,
         "//cdn.jsdelivr.net/npm/halo-comment@latest/dist/halo-comment.min.js"),
 
+    /**
+     * Gravatar mirror source base url.
+     */
+    GRAVATAR_SOURCE("gravatar_source", String.class, "//gravatar.com/avatar/"),
+
     COMMENT_BAN_TIME("comment_ban_time", Integer.class, "10"),
 
     COMMENT_RANGE("comment_range", Integer.class, "30");

src/main/java/run/halo/app/service/AttachmentService.java

@@ -82,13 +82,4 @@ public interface AttachmentService extends CrudService<Attachment, Integer> {
      * @return list of type.
      */
     List<AttachmentType> listAllType();
-
-    /**
-     * Replace attachment url in batch.
-     *
-     * @param oldUrl old blog url.
-     * @param newUrl new blog url.
-     * @return replaced attachments.
-     */
-    List<Attachment> replaceUrl(@NonNull String oldUrl, @NonNull String newUrl);
 }

src/main/java/run/halo/app/service/OptionService.java

@@ -468,15 +468,6 @@ <V, E extends Enum<E> & ValueEnum<V>> E getValueEnumByPropertyOrDefault(
      */
     Boolean isEnabledAbsolutePath();
 
-    /**
-     * Replace option url in batch.
-     *
-     * @param oldUrl old blog url.
-     * @param newUrl new blog url.
-     * @return replaced options.
-     */
-    List<OptionDTO> replaceUrl(@NonNull String oldUrl, @NonNull String newUrl);
-
     /**
      * Converts to option output dto.
      *

src/main/java/run/halo/app/service/PhotoService.java

@@ -79,13 +79,4 @@ public interface PhotoService extends CrudService<Photo, Integer> {
      * @return list of teams
      */
     List<String> listAllTeams();
-
-    /**
-     * Replace photo url in batch.
-     *
-     * @param oldUrl old blog url.
-     * @param newUrl new blog url.
-     * @return replaced photos.
-     */
-    List<PhotoDTO> replaceUrl(@NonNull String oldUrl, @NonNull String newUrl);
 }

src/main/java/run/halo/app/service/ThemeSettingService.java

@@ -56,15 +56,6 @@ public interface ThemeSettingService extends CrudService<ThemeSetting, Integer>
     @NonNull
     Map<String, Object> listAsMapBy(@NonNull String themeId);
 
-    /**
-     * Replace theme setting url in batch.
-     *
-     * @param oldUrl old blog url.
-     * @param newUrl new blog url.
-     * @return replaced theme settings.
-     */
-    List<ThemeSetting> replaceUrl(@NonNull String oldUrl, @NonNull String newUrl);
-
     /**
      * Delete unused theme setting.
      */

src/main/java/run/halo/app/service/base/BaseCommentService.java

@@ -296,38 +296,4 @@ List<COMMENT> listChildrenBy(@NonNull Integer targetId, @NonNull Long commentPar
     @NonNull
     List<COMMENT> listChildrenBy(@NonNull Integer targetId, @NonNull Long commentParentId,
         @NonNull Sort sort);
-
-    /**
-     * Filters comment ip address.
-     *
-     * @param comment comment dto must not be null
-     */
-    @Deprecated
-    <T extends BaseCommentDTO> T filterIpAddress(@NonNull T comment);
-
-    /**
-     * Filters comment ip address.
-     *
-     * @param comments comment dto list
-     */
-    @Deprecated
-    <T extends BaseCommentDTO> List<T> filterIpAddress(@Nullable List<T> comments);
-
-    /**
-     * Filters comment ip address.
-     *
-     * @param commentPage comment page
-     */
-    @Deprecated
-    <T extends BaseCommentDTO> Page<T> filterIpAddress(@NonNull Page<T> commentPage);
-
-    /**
-     * Replace comment url in batch.
-     *
-     * @param oldUrl old blog url.
-     * @param newUrl new blog url.
-     * @return replaced comments.
-     */
-    List<BaseCommentDTO> replaceUrl(@NonNull String oldUrl, @NonNull String newUrl);
-
 }

src/main/java/run/halo/app/service/base/BasePostService.java

@@ -297,16 +297,6 @@ public interface BasePostService<POST extends BasePost> extends CrudService<POST
     @NonNull
     List<POST> updateStatusByIds(@NonNull List<Integer> ids, @NonNull PostStatus status);
 
-    /**
-     * Replace post blog url in batch.
-     *
-     * @param oldUrl old blog url.
-     * @param newUrl new blog url.
-     * @return replaced posts.
-     */
-    @NonNull
-    List<BasePostDetailDTO> replaceUrl(@NonNull String oldUrl, @NonNull String newUrl);
-
     /**
      * Generate description.
      *

src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java

@@ -1,6 +1,5 @@
 package run.halo.app.service.impl;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -77,7 +76,7 @@ public Page<AttachmentDTO> pageDtosBy(@NonNull Pageable pageable,
     private Specification<Attachment> buildSpecByQuery(@NonNull AttachmentQuery attachmentQuery) {
         Assert.notNull(attachmentQuery, "Attachment query must not be null");
 
-        return (Specification<Attachment>) (root, query, criteriaBuilder) -> {
+        return (root, query, criteriaBuilder) -> {
             List<Predicate> predicates = new LinkedList<>();
 
             if (attachmentQuery.getMediaType() != null) {
@@ -198,22 +197,6 @@ public List<AttachmentType> listAllType() {
         return attachmentRepository.findAllType();
     }
 
-    @Override
-    public List<Attachment> replaceUrl(String oldUrl, String newUrl) {
-        List<Attachment> attachments = listAll();
-        List<Attachment> replaced = new ArrayList<>();
-        attachments.forEach(attachment -> {
-            if (StringUtils.isNotEmpty(attachment.getPath())) {
-                attachment.setPath(attachment.getPath().replaceAll(oldUrl, newUrl));
-            }
-            if (StringUtils.isNotEmpty(attachment.getThumbPath())) {
-                attachment.setThumbPath(attachment.getThumbPath().replaceAll(oldUrl, newUrl));
-            }
-            replaced.add(attachment);
-        });
-        return updateInBatch(replaced);
-    }
-
     @Override
     public Attachment create(Attachment attachment) {
         Assert.notNull(attachment, "Attachment must not be null");