Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ dependencies {
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2',
'io.jsonwebtoken:jjwt-jackson:0.11.2'
implementation 'joda-time:joda-time:2.10.13'
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'

compileOnly 'org.projectlombok:lombok'
Expand Down
8 changes: 6 additions & 2 deletions frontend/components/article/ArticleMeta.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React from "react";
import ArticleActions from "./ArticleActions";
import CustomImage from "../common/CustomImage";
import CustomLink from "../common/CustomLink";
import relativeTime from "../../lib/utils/relativeTime";

const ArticleMeta = ({ article }) => {
if (!article) return;
Expand All @@ -24,8 +25,11 @@ const ArticleMeta = ({ article }) => {
>
{article.author?.username}
</CustomLink>
<span className="date">
{new Date(article.createdAt).toDateString()}
<span
className="date"
title={new Date(article.createdAt).toLocaleString()}
>
{relativeTime(article.createdAt)}
</span>
</div>

Expand Down
8 changes: 6 additions & 2 deletions frontend/components/article/ArticlePreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import CustomImage from "../common/CustomImage";
import { usePageDispatch } from "../../lib/context/PageContext";
import checkLogin from "../../lib/utils/checkLogin";
import { SERVER_BASE_URL } from "../../lib/utils/constant";
import relativeTime from "../../lib/utils/relativeTime";
import storage from "../../lib/utils/storage";

const FAVORITED_CLASS = "btn btn-sm btn-primary";
Expand Down Expand Up @@ -90,8 +91,11 @@ const ArticlePreview = ({ article }) => {
>
<span onClick={() => setPage(0)}>{preview.author.username}</span>
</CustomLink>
<span className="date">
{new Date(preview.createdAt).toDateString()}
<span
className="date"
title={new Date(preview.createdAt).toLocaleString()}
>
{relativeTime(preview.createdAt)}
</span>
</div>

Expand Down
8 changes: 6 additions & 2 deletions frontend/components/comment/Comment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import CustomImage from "../common/CustomImage";
import Maybe from "../common/Maybe";
import DeleteButton from "./DeleteButton";
import checkLogin from "../../lib/utils/checkLogin";
import relativeTime from "../../lib/utils/relativeTime";
import storage from "../../lib/utils/storage";

const Comment = ({ comment }) => {
Expand Down Expand Up @@ -39,8 +40,11 @@ const Comment = ({ comment }) => {
>
{comment.author.username}
</CustomLink>
<span className="date-posted">
{new Date(comment.createdAt).toDateString()}
<span
className="date-posted"
title={new Date(comment.createdAt).toLocaleString()}
>
{relativeTime(comment.createdAt)}
</span>
<Maybe test={canModify}>
<DeleteButton commentId={comment.id} />
Expand Down
29 changes: 29 additions & 0 deletions frontend/lib/utils/relativeTime.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const units = [
{ name: "year", seconds: 31536000 },
{ name: "month", seconds: 2592000 },
{ name: "week", seconds: 604800 },
{ name: "day", seconds: 86400 },
{ name: "hour", seconds: 3600 },
{ name: "minute", seconds: 60 },
{ name: "second", seconds: 1 },
];

export default function relativeTime(value: string): string {
const date = new Date(value);

if (Number.isNaN(date.getTime())) return "";

const difference = date.getTime() - Date.now();
const seconds = Math.abs(difference) / 1000;

if (seconds < 45) return "just now";

const unit = units.find(({ seconds: unitSeconds }) => seconds >= unitSeconds);
const amount = Math.round(difference / 1000 / unit.seconds);

const formatter = new (Intl as any).RelativeTimeFormat("en", {
numeric: "always",
});

return formatter.format(amount, unit.name);
}
19 changes: 11 additions & 8 deletions src/main/java/io/spring/JacksonCustomizations.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import java.io.IOException;
import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat;
import java.time.Instant;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class JacksonCustomizations {
private static final DateTimeFormatter DATE_TIME_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").withZone(ZoneOffset.UTC);

@Bean
public Module realWorldModules() {
Expand All @@ -21,23 +24,23 @@ public Module realWorldModules() {

public static class RealWorldModules extends SimpleModule {
public RealWorldModules() {
addSerializer(DateTime.class, new DateTimeSerializer());
addSerializer(Instant.class, new InstantSerializer());
}
}

public static class DateTimeSerializer extends StdSerializer<DateTime> {
public static class InstantSerializer extends StdSerializer<Instant> {

protected DateTimeSerializer() {
super(DateTime.class);
protected InstantSerializer() {
super(Instant.class);
}

@Override
public void serialize(DateTime value, JsonGenerator gen, SerializerProvider provider)
public void serialize(Instant value, JsonGenerator gen, SerializerProvider provider)
throws IOException {
if (value == null) {
gen.writeNull();
} else {
gen.writeString(ISODateTimeFormat.dateTime().withZoneUTC().print(value));
gen.writeString(DATE_TIME_FORMATTER.format(value));
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/spring/application/ArticleQueryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.spring.infrastructure.mybatis.readservice.ArticleFavoritesReadService;
import io.spring.infrastructure.mybatis.readservice.ArticleReadService;
import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -17,7 +18,6 @@
import java.util.Optional;
import java.util.Set;
import lombok.AllArgsConstructor;
import org.joda.time.DateTime;
import org.springframework.stereotype.Service;

@Service
Expand Down Expand Up @@ -55,7 +55,7 @@ public CursorPager<ArticleData> findRecentArticlesWithCursor(
String tag,
String author,
String favoritedBy,
CursorPageParameter<DateTime> page,
CursorPageParameter<Instant> page,
User currentUser) {
List<String> articleIds =
articleReadService.findArticlesWithCursor(tag, author, favoritedBy, page);
Expand All @@ -78,7 +78,7 @@ public CursorPager<ArticleData> findRecentArticlesWithCursor(
}

public CursorPager<ArticleData> findUserFeedWithCursor(
User user, CursorPageParameter<DateTime> page) {
User user, CursorPageParameter<Instant> page) {
List<String> followdUsers = userRelationshipQueryService.followedUsers(user.getId());
if (followdUsers.size() == 0) {
return new CursorPager<>(new ArrayList<>(), page.getDirection(), false);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/spring/application/CommentQueryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import io.spring.core.user.User;
import io.spring.infrastructure.mybatis.readservice.CommentReadService;
import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.AllArgsConstructor;
import org.joda.time.DateTime;
import org.springframework.stereotype.Service;

@Service
Expand Down Expand Up @@ -54,7 +54,7 @@ public List<CommentData> findByArticleId(String articleId, User user) {
}

public CursorPager<CommentData> findByArticleIdWithCursor(
String articleId, User user, CursorPageParameter<DateTime> page) {
String articleId, User user, CursorPageParameter<Instant> page) {
List<CommentData> comments = commentReadService.findByArticleIdWithCursor(articleId, page);
if (comments.isEmpty()) {
return new CursorPager<>(new ArrayList<>(), page.getDirection(), false);
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/io/spring/application/DateTimeCursor.java
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
package io.spring.application;

import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import java.time.Instant;

public class DateTimeCursor extends PageCursor<DateTime> {
public class DateTimeCursor extends PageCursor<Instant> {

public DateTimeCursor(DateTime data) {
public DateTimeCursor(Instant data) {
super(data);
}

@Override
public String toString() {
return String.valueOf(getData().getMillis());
return String.valueOf(getData().toEpochMilli());
}

public static DateTime parse(String cursor) {
public static Instant parse(String cursor) {
if (cursor == null) {
return null;
}
return new DateTime().withMillis(Long.parseLong(cursor)).withZone(DateTimeZone.UTC);
return Instant.ofEpochMilli(Long.parseLong(cursor));
}
}
6 changes: 3 additions & 3 deletions src/main/java/io/spring/application/data/ArticleData.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import io.spring.application.DateTimeCursor;
import java.time.Instant;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.joda.time.DateTime;

@Data
@NoArgsConstructor
Expand All @@ -19,8 +19,8 @@ public class ArticleData implements io.spring.application.Node {
private String body;
private boolean favorited;
private int favoritesCount;
private DateTime createdAt;
private DateTime updatedAt;
private Instant createdAt;
private Instant updatedAt;
private List<String> tagList;

@JsonProperty("author")
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/spring/application/data/CommentData.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import io.spring.application.DateTimeCursor;
import io.spring.application.Node;
import java.time.Instant;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.joda.time.DateTime;

@Data
@NoArgsConstructor
Expand All @@ -16,8 +16,8 @@ public class CommentData implements Node {
private String id;
private String body;
@JsonIgnore private String articleId;
private DateTime createdAt;
private DateTime updatedAt;
private Instant createdAt;
private Instant updatedAt;

@JsonProperty("author")
private ProfileData profileData;
Expand Down
17 changes: 9 additions & 8 deletions src/main/java/io/spring/core/article/Article.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import static java.util.stream.Collectors.toList;

import io.spring.Util;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.HashSet;
import java.util.List;
import java.util.UUID;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.joda.time.DateTime;

@Getter
@NoArgsConstructor
Expand All @@ -22,12 +23,12 @@ public class Article {
private String description;
private String body;
private List<Tag> tags;
private DateTime createdAt;
private DateTime updatedAt;
private Instant createdAt;
private Instant updatedAt;

public Article(
String title, String description, String body, List<String> tagList, String userId) {
this(title, description, body, tagList, userId, new DateTime());
this(title, description, body, tagList, userId, Instant.now().truncatedTo(ChronoUnit.MILLIS));
}

public Article(
Expand All @@ -36,7 +37,7 @@ public Article(
String body,
List<String> tagList,
String userId,
DateTime createdAt) {
Instant createdAt) {
this.id = UUID.randomUUID().toString();
this.slug = toSlug(title);
this.title = title;
Expand All @@ -52,15 +53,15 @@ public void update(String title, String description, String body) {
if (!Util.isEmpty(title)) {
this.title = title;
this.slug = toSlug(title);
this.updatedAt = new DateTime();
this.updatedAt = Instant.now().truncatedTo(ChronoUnit.MILLIS);
}
if (!Util.isEmpty(description)) {
this.description = description;
this.updatedAt = new DateTime();
this.updatedAt = Instant.now().truncatedTo(ChronoUnit.MILLIS);
}
if (!Util.isEmpty(body)) {
this.body = body;
this.updatedAt = new DateTime();
this.updatedAt = Instant.now().truncatedTo(ChronoUnit.MILLIS);
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/main/java/io/spring/core/comment/Comment.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package io.spring.core.comment;

import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.UUID;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.joda.time.DateTime;

@Getter
@NoArgsConstructor
Expand All @@ -14,13 +15,13 @@ public class Comment {
private String body;
private String userId;
private String articleId;
private DateTime createdAt;
private Instant createdAt;

public Comment(String body, String userId, String articleId) {
this.id = UUID.randomUUID().toString();
this.body = body;
this.userId = userId;
this.articleId = articleId;
this.createdAt = new DateTime();
this.createdAt = Instant.now().truncatedTo(ChronoUnit.MILLIS);
}
}
Loading
Loading