chore: remove and replace log with info

This commit is contained in:
Tristan Yang
2022-09-01 18:34:59 +08:00
parent ffbdc212f7
commit 3247de57db
36 changed files with 37 additions and 77 deletions
+2 -2
View File
@@ -29,7 +29,7 @@ const whiteList = [
const baseQuery = fetchBaseQuery({
baseUrl: BASE_URL,
prepareHeaders: (headers, { getState, endpoint }) => {
console.log("req", endpoint);
console.info("req", endpoint);
const { token } = (getState() as RootState).authData;
if (token && !whiteList.includes(endpoint)) {
headers.set(tokenHeader, token);
@@ -73,7 +73,7 @@ const baseQueryWithTokenCheck = async (args, api, extraOptions) => {
result = await baseQuery(args, api, extraOptions);
}
if (result?.error) {
console.log("api error", result.error, api.endpoint);
console.error("api error", result.error, api.endpoint);
switch (result.error.originalStatus || result.error.status) {
case "FETCH_ERROR":
{
+4 -4
View File
@@ -31,7 +31,7 @@ export const channelApi = createApi({
await queryFulfilled;
dispatch(removeChannel(gid));
} catch {
console.log("channel update failed");
console.error("channel update failed");
}
}
}),
@@ -54,7 +54,7 @@ export const channelApi = createApi({
try {
await queryFulfilled;
} catch {
console.log("channel update failed");
console.error("channel update failed");
}
}
}),
@@ -115,7 +115,7 @@ export const channelApi = createApi({
dispatch(removeReactionMessage(mids));
}
} catch {
console.log("remove channel error");
console.error("remove channel error");
}
}
}),
@@ -178,7 +178,7 @@ export const channelApi = createApi({
})
);
} catch (error) {
console.log("err", error);
console.error("err", error);
}
}
})
-1
View File
@@ -56,7 +56,6 @@ export const onMessageSendStarted = async (
}, 300);
// dispatch(removePendingMessage({ id, mid:ts, type: from }));
} catch {
console.log("message send failed");
toast.error("Send Message Failed");
dispatch(removeContextMessage({ id, mid: ts }));
dispatch(removeMessage(ts));
-1
View File
@@ -57,7 +57,6 @@ export const messageApi = createApi({
body: formData
}),
transformResponse: (data: UploadFileResponse | null) => {
console.log("upload file response", data);
return data ? data : {};
}
}),
+2 -2
View File
@@ -31,7 +31,7 @@ export const serverApi = createApi({
const logo = `${BASE_URL}/resource/organization/logo?t=${+new Date()}`;
dispatch(updateInfo({ ...server, logo }));
} catch {
console.log("get server info error");
console.error("get server info error");
}
}
}),
@@ -146,7 +146,7 @@ export const serverApi = createApi({
})
);
} catch {
console.log("update server logo error");
console.error("update server logo error");
}
}
}),
-1
View File
@@ -89,7 +89,6 @@ const uiSlice = createSlice({
{
const { data } = rest;
const isArray = Array.isArray(data);
console.log("add opt", data, files, isArray);
if (files) {
if (isArray) {
data.forEach((item) => {
+1 -1
View File
@@ -13,7 +13,7 @@ const Avatar: FC<Props> = ({ url = "", name = "Deleted User", type = "user", ...
const [src, setSrc] = useState("");
const handleError = (err: SyntheticEvent<HTMLImageElement>) => {
console.log("load avatar error", err);
console.error("load avatar error", err);
const tmp = getInitialsAvatar({
initials: getInitials(name),
background: type == "channel" ? "#EAECF0" : undefined,
-1
View File
@@ -36,7 +36,6 @@ const renderPreview = (data: Data) => {
switch (true) {
case checks.image.test(_type):
{
console.log("image");
preview = <ImagePreview url={content} />;
}
break;
@@ -25,7 +25,7 @@ const Audio: FC<Props> = ({ url }) => {
const [err, setErr] = useState(false);
const handleError: ReactEventHandler<HTMLAudioElement> = (err) => {
console.log("audio err", err);
console.error("audio err", err);
setErr(true);
};
+1 -2
View File
@@ -80,7 +80,7 @@ const FileMessage: FC<Props> = ({
setUploadingFile(false);
} catch (error) {
setUploadingFile(false);
console.log("fetch local file error", error);
console.error("fetch local file error", error);
}
};
// local file
@@ -93,7 +93,6 @@ const FileMessage: FC<Props> = ({
const propsV2 = imageSize ? { ...props, ...imageSize } : props;
// 本地文件 并且上传成功
if (uploadSuccess && isLocalFile(content)) {
console.log("send local file message", uploadSuccess, propsV2, data, content);
// 把已经上传的东西当做消息发出去
const { path } = data;
sendMessage({
@@ -37,7 +37,6 @@ const ForwardModal: FC<IProps> = ({ mids, closeModal }) => {
const ids = type == "user" ? selectedMembers : selectedChannels;
const updateState = type == "user" ? setSelectedMembers : setSelectedChannels;
let tmp = ids.includes(+id) ? ids.filter((m) => m != id) : [...ids, +id];
console.log(id, currentTarget);
updateState(tmp);
};
const updateAppendText = (evt: ChangeEvent<HTMLInputElement>) => {
@@ -90,7 +89,6 @@ const ForwardModal: FC<IProps> = ({ mids, closeModal }) => {
channels.map((c) => {
const { gid } = c;
const checked = selectedChannels.includes(gid);
console.log({ checked });
return (
<li
key={gid}
@@ -108,7 +106,6 @@ const ForwardModal: FC<IProps> = ({ mids, closeModal }) => {
users.map((u) => {
const { uid } = u;
const checked = selectedMembers.includes(uid);
console.log({ checked });
return (
<li
key={uid}
+1 -1
View File
@@ -25,7 +25,7 @@ const GuestOnly: FC<Props> = ({ children }) => {
return <Navigate to={`/`} replace />;
}
if (initChecking || guestSigning || fetchingConfig) return null;
console.log("guest check", token, user, loginConfig?.guest, initialized);
// console.log("guest check", token, user, loginConfig?.guest, initialized);
// 检查有没有开启guest mode
if (!loginConfig?.guest) return <Navigate to={`/v/off`} replace />;
// 未初始化 则先走setup 流程
@@ -86,7 +86,6 @@ const ImagePreviewModal: FC<Props> = ({ download = true, data, closeModal }) =>
useKey(
"Escape",
() => {
console.log("close preview modal");
closeModal();
},
{ eventTypes: ["keyup"] }
-1
View File
@@ -34,7 +34,6 @@ const MarkdownRender: FC<IProps> = ({ content }) => {
container.addEventListener(
"click",
(evt) => {
console.log(evt);
evt.stopPropagation();
const target = evt.target as HTMLImageElement;
if (!target) return;
@@ -66,7 +66,6 @@ const EditMessage: FC<Props> = ({ mid, cancelEdit }) => {
useKey(
"Shift",
(e) => {
console.log("shift", e.type);
setShift(e.type == "keydown");
},
{ eventTypes: ["keydown", "keyup"], target: inputRef }
@@ -75,7 +74,6 @@ const EditMessage: FC<Props> = ({ mid, cancelEdit }) => {
useKey(
"Escape",
() => {
console.log("cancel edit");
cancelEdit();
},
{ eventTypes: ["keydown", "keyup"], target: inputRef }
@@ -89,8 +89,6 @@ const ForwardedMessage: FC<Props> = ({ context, to, from_uid, id }) => {
);
}
}, [messages, context, to, from_uid]);
console.log("archive data", messages);
if (!id) return null;
return forwards;
@@ -123,7 +123,6 @@ const ReactionDetails = ({
names.length > 3
? `${names.join(", ")} and ${names.length - 3} others reacted with`
: `${names.join(", ")} reacted with`;
console.log("eeee", emojiData);
return (
<StyledDetails className={index == 0 ? "first" : ""}>
<div className="emoji">
@@ -153,7 +152,6 @@ const Reaction: FC<Props> = ({ mid, reactions = null, readOnly = false }) => {
const handleReact = (emoji: string) => {
reactWithEmoji({ mid, action: emoji });
};
console.log("curr reactions", reactions);
if (!reactions || Object.entries(reactions).length == 0) return null;
return (
<StyledWrapper className="reactions">
@@ -48,7 +48,6 @@ const ReactionPicker: FC<Props> = ({ mid, hidePicker }) => {
};
});
const handleReact = (emoji: string) => {
console.log("react", emoji);
reactMessage({ mid, action: emoji });
hidePicker();
};
-2
View File
@@ -109,7 +109,6 @@ const renderContent = (data) => {
// eslint-disable-next-line no-useless-escape
/(\s{1}\@[0-9]+\s{1})/g,
(match, idx) => {
console.log("match", match);
const uid = match.trim().slice(1);
return <Mention key={idx} uid={+uid} popover={false} />;
}
@@ -163,7 +162,6 @@ const Reply: FC<ReplyProps> = ({ mid, interactive = true }) => {
msgEle.dataset.highlight = "true";
msgEle.scrollIntoView({ behavior: "smooth", block: "center" });
setTimeout(() => {
console.log("scroll view", msgEle);
msgEle.dataset.highlight = "false";
}, 3000);
}
@@ -49,7 +49,6 @@ const renderContent = ({
)}
>
{reactStringReplace(content, /(\s{1}@[0-9]+\s{1})/g, (match, idx) => {
console.log("match", match);
const uid = match.trim().slice(1);
return <Mention key={idx} uid={+uid} cid={to} />;
})}
@@ -16,20 +16,19 @@ const useDeviceToken = (vapidKey: string) => {
})
.then((currentToken) => {
if (currentToken) {
console.log("current token for client: ", currentToken);
setToken(currentToken);
// updateDeviceToken(currentToken)
// Perform any other necessary action with the token
} else {
// Show permission request UI
console.log("No registration token available. Request permission to generate one.");
console.error("No registration token available. Request permission to generate one.");
}
requesting = false;
})
.catch((err) => {
requesting = false;
error = true;
console.log("An error occurred while retrieving token. ", err);
console.error("An error occurred while retrieving token. ", err);
});
}
return token as string;
@@ -39,7 +39,6 @@ export default function EmojiPicker({ selectEmoji }: { selectEmoji: (e: string)
};
const handleSelect = (emoji: EmojiData) => {
console.log("semojii", emoji);
selectEmoji((emoji as BaseEmoji).native);
};
-1
View File
@@ -83,7 +83,6 @@ const renderContent = (data: MessagePayload) => {
switch (content_type) {
case ContentTypes.text:
res = reactStringReplace(content, /(\s{1}@[0-9]+\s{1})/g, (match, idx) => {
console.log("match", match);
const uid = match.trim().slice(1);
return <Mention popover={false} key={idx} uid={+uid} />;
});
@@ -43,7 +43,6 @@ export default function UploadFileList({
}, [stageFiles.length]);
if (!context || !id || !stageFiles || stageFiles.length == 0) return null;
console.log("upload stageFiles", stageFiles);
return (
<>
{editInfo && (
-2
View File
@@ -5,11 +5,9 @@ function useChatScroll<T extends HTMLElement>() {
const ref = useRef<T>(null);
useEffect(() => {
if (ref.current) {
console.log("chat scroll", ref);
const ele = ref.current;
const resizeObserver = new ResizeObserver((entries) => {
for (let entry of entries) {
console.log("update scroll top");
entry.target.scrollTop = entry.target.scrollHeight;
}
});
-1
View File
@@ -34,7 +34,6 @@ const useCopy = (config: { enableToast: boolean } | void) => {
const copy = (text: string, isImage = false) => {
let inter = 0;
console.log("copy", text, isImage);
if (!copied) {
if (!isImage) {
setCopied(copyToClipboard(text));
-1
View File
@@ -58,7 +58,6 @@ export default function usePreload() {
useEffect(() => {
if (channelIds.length > 0 && !preloadChannelMsgs) {
const tmps = channelIds.filter((cid) => !channelMessageData[cid]);
console.log("tmpss", tmps);
tmps.forEach((id) => {
preloadChannelMessages({ id, limit: 50 });
});
+21 -22
View File
@@ -51,7 +51,7 @@ export default function useStreaming() {
let controller = new AbortController();
const startStreaming = async () => {
console.log("start streaming", initialized, initializing);
console.info("sse start streaming", initialized, initializing);
if (initialized || initializing) return;
// 如果token快要过期,先renew
const {
@@ -81,42 +81,42 @@ export default function useStreaming() {
async onopen(response) {
initializing = false;
if (response.ok && response.headers.get("content-type") === EventStreamContentType) {
console.log("sse everything ok");
console.info("sse everything ok");
initialized = true;
return; // everything's good
} else if (response.status >= 400 && response.status < 500 && response.status !== 429) {
// 重新登录
// client-side errors are usually non-retriable:
console.log("sse debug: open fatal");
console.info("sse debug: open fatal");
throw new FatalError();
} else {
// server error
console.log("sse debug: open retry");
console.info("sse debug: open retry");
throw new RetriableError();
}
},
onmessage(evt) {
initializing = false;
console.log("sse message", evt.data);
console.info("sse message", evt.data);
// if the server emits an error message, throw an exception
// so it gets handled by the onerror callback below:
if (evt.event === "FatalError") {
console.log("sse debug: error message fatal");
console.info("sse debug: error message fatal");
throw new FatalError(evt.data);
}
const data: ServerEvent = JSON.parse(evt.data);
const { type } = data;
switch (type) {
case "heartbeat":
console.log("heartbeat", loginUid);
console.info("sse heartbeat", loginUid);
break;
case "ready":
console.log("streaming ready");
console.info("sse streaming ready");
dispatch(setReady());
break;
case "users_snapshot":
{
console.log("users snapshot");
console.info("sse users snapshot");
const { version } = data;
dispatch(updateUsersVersion(version));
}
@@ -124,14 +124,14 @@ export default function useStreaming() {
case "users_log":
{
const { logs } = data;
console.log("users change logs", logs);
console.info("sse users change logs", logs);
dispatch(updateUsersByLogs(logs));
}
break;
case "user_settings":
case "user_settings_changed":
{
console.log("users settings");
console.info("sse users settings");
Object.keys(data).forEach((key) => {
switch (key) {
case "read_index_groups":
@@ -180,7 +180,7 @@ export default function useStreaming() {
break;
case "kick":
{
console.log("kicked");
console.info("sse kicked");
switch (data.reason) {
case "login_from_other_device":
dispatch(resetAuthData());
@@ -196,11 +196,11 @@ export default function useStreaming() {
}
break;
case "related_groups":
console.log("fill channels from streaming", data);
console.info("sse fill channels from streaming", data);
dispatch(fillChannels(data.groups));
break;
case "joined_group":
console.log("joined group", data.group);
console.info("sse joined group", data.group);
dispatch(addChannel(data.group));
break;
case "group_changed":
@@ -216,7 +216,7 @@ export default function useStreaming() {
break;
case "user_joined_group":
{
console.log("new user joined group", data.gid);
console.info("sse new user joined group", data.gid);
const { gid, uid: uids } = data;
// 去重
dispatch(
@@ -245,7 +245,7 @@ export default function useStreaming() {
}
break;
case "kick_from_group":
console.log("kicked from group", data.gid);
console.info("sse kicked from group", data.gid);
dispatch(removeChannel(data.gid));
break;
case "pinned_message_updated":
@@ -266,23 +266,23 @@ export default function useStreaming() {
break;
default:
console.log("sse event data", data);
console.info("sse event data", data);
break;
}
},
onclose() {
// if the server closes the connection unexpectedly, retry:
console.log("sse debug: closed");
console.info("sse debug: closed");
initializing = false;
throw new RetriableError();
},
onerror(err) {
initializing = false;
if (err instanceof FatalError || err.toString().indexOf("network error") > -1) {
console.log("sse debug: error fatal", err);
console.info("sse debug: error fatal", err);
throw err; // rethrow to stop the operation
} else {
console.log("sse debug: error other", err);
console.info("sse debug: error other", err);
stopStreaming();
if (inter) {
clearTimeout(inter);
@@ -304,7 +304,7 @@ export default function useStreaming() {
};
const stopStreaming = () => {
console.log("stop st");
console.info("sse stop streaming");
if (controller && controller.abort) {
controller.abort();
}
@@ -315,7 +315,6 @@ export default function useStreaming() {
};
useEffect(() => {
console.log("network changed", online, readyPullData);
if (readyPullData) {
if (online) {
startStreaming();
+1 -3
View File
@@ -57,7 +57,6 @@ const useUploadFile = (props?: IProps) => {
return;
}
const file_id = resp.data;
console.log("file id", file_id);
let uploadResult = null;
canceledRef.current = false;
@@ -90,11 +89,10 @@ const useUploadFile = (props?: IProps) => {
});
sliceUploadedCountRef.current++;
} catch (error) {
console.log("upload file error", error);
console.error("upload file error", error);
return;
}
}
console.log("wtfff", uploadResult);
}
// setUploadingFile(false);
if (!uploadResult || "error" in uploadResult) {
-1
View File
@@ -149,7 +149,6 @@ export const getFileIcon = (type: string, name = "") => {
switch (true) {
case checks.image.test(_type):
{
console.log("image");
icon = <IconImage className="icon" />;
}
break;
-1
View File
@@ -85,7 +85,6 @@ export default function ChannelChat({ cid = 0, dropFiles = [] }: Props) {
const { name, description, is_public, members = [], owner } = data;
const memberIds = is_public ? userIds : members.slice(0).sort((n) => (n == owner ? -1 : 0));
const addVisible = loginUser?.is_admin || owner == loginUser?.uid;
console.log("channel message list", msgIds);
const readIndex = footprint.readChannels[cid];
const pinCount = data?.pinned_messages?.length || 0;
const feeds = [...msgIds, ...appends];
-1
View File
@@ -77,7 +77,6 @@ const NavItem: FC<IProps> = ({ id, setFiles, toggleRemoveConfirm }) => {
}));
const handleReadAll = () => {
const lastMid = mids[mids.length - 1];
console.log("last mid", mids, lastMid);
if (lastMid) {
const param = { groups: [{ gid: id, mid: lastMid }] };
updateReadIndex(param);
-1
View File
@@ -31,7 +31,6 @@ const DMChat: FC<Props> = ({ uid = 0, dropFiles }) => {
});
const [updateReadIndex] = useReadMessageMutation();
const updateReadDebounced = useDebounce(updateReadIndex, 300);
console.log("dm files", dropFiles);
const { currUser, messageData, footprint, loginUid, selects } = useAppSelector((store) => {
return {
selects: store.ui.selectMessages[`user_${uid}`],
+1 -3
View File
@@ -59,7 +59,6 @@ const Operations: FC<Props> = ({ context, id }) => {
const handleFav = async () => {
const added = await addFavorite(mids);
if (added) {
console.log("added", added);
dispatch(updateSelectMessages({ context, id, operation: "reset" }));
toast.success("Messages Saved!");
} else {
@@ -79,8 +78,7 @@ const Operations: FC<Props> = ({ context, id }) => {
setForwardModalVisible((prev) => !prev);
};
useKey("Escape", (evt) => {
console.log("Escape keypress", evt);
useKey("Escape", () => {
dispatch(updateSelectMessages({ context, id, operation: "reset" }));
});
const canDel = canDelete(mids);
-2
View File
@@ -58,7 +58,6 @@ export const renderPreviewMessage = (message = null) => {
case ContentTypes.text:
{
res = reactStringReplace(content, /(\s{1}@[0-9]+\s{1})/g, (match, idx) => {
console.log("match", match);
const uid = match.trim().slice(1);
return <Mention key={idx} uid={+uid} textOnly={true} />;
});
@@ -177,7 +176,6 @@ export const renderMessageFragment = ({
}
}
const _key = local_id || mid;
console.log("_key", _key, local_id, mid);
return (
<React.Fragment key={_key}>
{divider && <Divider content={divider}></Divider>}
-1
View File
@@ -62,7 +62,6 @@ export default function LoginPage() {
useEffect(() => {
if (error) {
console.log("login err", error);
switch ((error as FetchBaseQueryError).status) {
case 401:
toast.error("Username or Password incorrect");