@waline/client 2.0.0 → 2.0.3

package/src/widgets/recentComments.ts

@@ -1,15 +1,44 @@
-import { fetchRecentComment, getRoot, getUserInfo } from '../utils';
+import { useUserInfo } from '../composables';
+import { fetchRecentComment, getRoot } from '../utils';
 
 import type { WalineComment } from '../typings';
 
-export interface RecentCommentsOptions {
+export interface WalineRecentCommentsOptions {
+  /**
+   * Waline 服务端地址
+   *
+   * Waline serverURL
+   */
   serverURL: string;
+
+  /**
+   * 获取最新评论的数量
+   *
+   * fetch number of latest comments
+   */
   count: number;
+
+  /**
+   * 需要挂载的元素
+   *
+   * Element to be mounted
+   */
   el?: string | HTMLElement;
 }
 
-export interface RecentCommentsResult {
+export interface WalineRecentCommentsResult {
+  /**
+   * 评论数据
+   *
+   * Comment Data
+   */
   comments: WalineComment[];
+
+  /**
+   * 取消挂载挂件
+   *
+   * Umount widget
+   */
   destroy: () => void;
 }
 
@@ -17,7 +46,8 @@ export const RecentComments = ({
   el,
   serverURL,
   count,
-}: RecentCommentsOptions): Promise<RecentCommentsResult> => {
+}: WalineRecentCommentsOptions): Promise<WalineRecentCommentsResult> => {
+  const userInfo = useUserInfo();
   const root = getRoot(el);
   const controller = new AbortController();
 
@@ -25,7 +55,7 @@ export const RecentComments = ({
     serverURL,
     count,
     signal: controller.signal,
-    token: getUserInfo()?.token,
+    token: userInfo.value?.token,
   }).then((comments) => {
     if (root && comments.length) {
       root.innerHTML = `<ul class="wl-recent-list">${comments

package/src/composables/store.ts

@@ -1,38 +0,0 @@
-export interface Store {
-  get: <T = unknown>(key: string) => T | null;
-  set: <T = unknown>(key: string, content: T) => void;
-  update: <T = unknown>(content: T) => void;
-}
-
-export const useStore = (cacheKey: string): Store => {
-  let storage: Record<string, unknown> = {};
-  const content = localStorage.getItem(cacheKey);
-
-  if (content) {
-    try {
-      storage = JSON.parse(content) as Record<string, unknown>;
-    } catch (err) {
-      // do nothing
-    }
-  }
-
-  return {
-    get: <T>(key: string): T | null => (storage[key] as T) || null,
-
-    set<T>(key: string, content: T): void {
-      try {
-        // make sure the content can be stringify and make a deep copy here
-        storage[key] = JSON.parse(JSON.stringify(content));
-        localStorage.setItem(cacheKey, JSON.stringify(storage));
-      } catch (err) {
-        // do nothing
-      }
-    },
-
-    update<T>(content: T): void {
-      // make sure the content can be stringify and make a deep copy here
-      storage = JSON.parse(JSON.stringify(content)) as Record<string, unknown>;
-      localStorage.setItem(cacheKey, JSON.stringify(storage));
-    },
-  };
-};

package/src/utils/timeAgo.ts

@@ -1,75 +0,0 @@
-import type { WalineLocale } from '../typings';
-
-const padWithZeros = (vNumber: number, width: number): string => {
-  let numAsString = vNumber.toString();
-
-  while (numAsString.length < width) {
-    numAsString = '0' + numAsString;
-  }
-
-  return numAsString;
-};
-
-const dateFormat = (date: Date): string => {
-  const vDay = padWithZeros(date.getDate(), 2);
-  const vMonth = padWithZeros(date.getMonth() + 1, 2);
-  const vYear = padWithZeros(date.getFullYear(), 2);
-
-  return `${vYear}-${vMonth}-${vDay}`;
-};
-
-export const timeAgo = (date: Date | string, locale: WalineLocale): string => {
-  if (date)
-    try {
-      if (typeof date === 'string') {
-        // compat with mysql output date
-        date = new Date(
-          date.indexOf(' ') !== -1 ? date.replace(/-/g, '/') : date
-        );
-      }
-      const oldTime = date.getTime();
-      const currTime = new Date().getTime();
-      const diffValue = currTime - oldTime;
-
-      const days = Math.floor(diffValue / (24 * 3600 * 1000));
-
-      // 计算相差小时数
-      if (days === 0) {
-        // 计算天数后剩余的毫秒数
-        const leave1 = diffValue % (24 * 3600 * 1000);
-        const hours = Math.floor(leave1 / (3600 * 1000));
-
-        //计算相差分钟数
-        if (hours === 0) {
-          // 计算小时数后剩余的毫秒数
-          const leave2 = leave1 % (3600 * 1000);
-          const minutes = Math.floor(leave2 / (60 * 1000));
-
-          // 计算相差秒数
-          if (minutes === 0) {
-            // 计算分钟数后剩余的毫秒数
-            const leave3 = leave2 % (60 * 1000);
-            const seconds = Math.round(leave3 / 1000);
-
-            return `${seconds} ${locale.seconds}`;
-          }
-          return `${minutes} ${locale.minutes}`;
-        }
-        return `${hours} ${locale.hours}`;
-      }
-
-      if (days < 0) {
-        return locale.now;
-      }
-
-      if (days < 8) {
-        return `${days} ${locale.days}`;
-      } else {
-        return dateFormat(date);
-      }
-    } catch (error) {
-      console.log(error);
-    }
-
-  return '';
-};

package/src/utils/userInfo.ts

@@ -1,26 +0,0 @@
-export interface UserInfo {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  display_name: string;
-  email: string;
-  url: string;
-  token: string;
-  avatar: string;
-  mailMd5: string;
-}
-
-const USER_KEY = 'WALINE_USER';
-
-export const getUserInfo = (): UserInfo | null => {
-  try {
-    const localStorageData = localStorage.getItem(USER_KEY);
-    const sessionStorageData = sessionStorage.getItem(USER_KEY);
-
-    return localStorageData
-      ? (JSON.parse(localStorageData) as UserInfo)
-      : sessionStorageData
-      ? (JSON.parse(sessionStorageData) as UserInfo)
-      : null;
-  } catch (err) {
-    return null;
-  }
-};