fixing broken date on markdown files and api key generation and monit…

…or subscribe undefined
filecoin-project · Apr 30, 2021 · 4656540 · 4656540
1 parent 7501aad
commit 4656540
Show file tree

Hide file tree

Showing 10 changed files with 6,377 additions and 655 deletions.
diff --git a/components/core/SlateMediaObject.js b/components/core/SlateMediaObject.js
@@ -169,7 +169,7 @@ export default class SlateMediaObject extends React.Component {
     }
 
     if (file.filename.endsWith(".md") || type.startsWith("text/plain")) {
-      return <MarkdownFrame date={file.data.date} url={url} />;
+      return <MarkdownFrame date={file.createdAt} url={url} />;
     }
 
     if (Validations.isPreviewableImage(type)) {

diff --git a/node_common/data/methods/get-every-file.js b/node_common/data/methods/get-every-file.js
@@ -13,7 +13,8 @@ export default async ({ sanitize = false, publicOnly = false } = {}) => {
           "files.ownerId",
           "files.cid",
           "files.isPublic",
-          "files.data"
+          "files.data",
+          "files.createdAt"
         )
           .from("files")
           .leftJoin("slate_files", "slate_files.fileId", "files.id")

diff --git a/node_common/data/methods/get-files-by-ids.js b/node_common/data/methods/get-files-by-ids.js
@@ -14,7 +14,8 @@ export default async ({ ids, sanitize = false, publicOnly = false }) => {
           "files.cid",
           "files.isPublic",
           "files.filename",
-          "files.data"
+          "files.data",
+          "files.createdAt"
         )
           .from("files")
           .leftJoin("slate_files", "slate_files.fileId", "=", "files.id")

diff --git a/node_common/data/methods/get-files-by-user-id.js b/node_common/data/methods/get-files-by-user-id.js
@@ -14,7 +14,8 @@ export default async ({ id, sanitize = false, publicOnly = false }) => {
           "files.cid",
           "files.isPublic",
           "files.filename",
-          "files.data"
+          "files.data",
+          "files.createdAt"
         )
           .from("files")
           .leftJoin("slate_files", "slate_files.fileId", "=", "files.id")

diff --git a/node_common/data/methods/get-slate-files-by-cids.js b/node_common/data/methods/get-slate-files-by-cids.js
@@ -14,7 +14,8 @@ export default async ({ slateId, cids }) => {
         "files.cid",
         "files.isPublic",
         "files.filename",
-        "files.data"
+        "files.data",
+        "files.createdAt"
       )
         .from("files")
         .join("slate_files", "slate_files.fileId", "=", "files.id")

diff --git a/node_common/managers/search.js b/node_common/managers/search.js
@@ -27,7 +27,7 @@ const websocketSend = async (type, data) => {
   );
 
   // NOTE(jim): Only allow this to be passed around encrypted.
-  if (ws.readyState === WebSocket.OPEN) {
+  if (ws && ws.readyState === WebSocket.OPEN) {
     ws.send(
       JSON.stringify({
         type,

diff --git a/node_common/managers/viewer.js b/node_common/managers/viewer.js
@@ -30,7 +30,7 @@ const websocketSend = async (type, data) => {
   );
 
   // NOTE(jim): Only allow this to be passed around encrypted.
-  if (ws.readyState === WebSocket.OPEN) {
+  if (ws && ws.readyState === WebSocket.OPEN) {
     ws.send(
       JSON.stringify({
         type,

diff --git a/node_common/monitor.js b/node_common/monitor.js
@@ -304,7 +304,7 @@ export const subscribeSlate = ({ user, targetSlate }) => {
     const userURL = `<${userProfileURL}|${user.username}>`;
 
     const targetSlatePageURL = `https://slate.host/$/${targetSlate.id}`;
-    const targetSlateURL = `<${targetSlatePageURL}|${targetSlate.slateId}>`;
+    const targetSlateURL = `<${targetSlatePageURL}|${targetSlate.id}>`;
 
     const message = `*${userURL}* subscribed to collection:${targetSlateURL}`;
     Social.sendSlackMessage(message);

diff --git a/node_common/serializers.js b/node_common/serializers.js
@@ -44,6 +44,7 @@ export const sanitizeFile = (entity) => {
     ownerId: entity.ownerId,
     isPublic: entity.isPublic,
     filename: entity.filename,
+    createdAt: entity.createdAt,
     data: {
       type: entity.data?.type,
       name: entity.data?.name,