4 files changed, 34 insertions, 54 deletions

diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index 22b223bc5..5441f260c 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -715,6 +715,32 @@ export function getPostsAfter(postId, offset, numPost, isPost) {
     );
 }
 
+export function getFileInfosForPost(channelId, postId) {
+    const callName = 'getFileInfosForPost' + postId;
+
+    if (isCallInProgress(callName)) {
+        return;
+    }
+
+    Client.getFileInfosForPost(
+        channelId,
+        postId,
+        (data) => {
+            callTracker[callName] = 0;
+
+            AppDispatcher.handleServerAction({
+                type: ActionTypes.RECEIVED_FILE_INFOS,
+                postId,
+                infos: data
+            });
+        },
+        (err) => {
+            callTracker[callName] = 0;
+            dispatchError(err, 'getPostFile');
+        }
+    );
+}
+
 export function getMe() {
     if (isCallInProgress('getMe')) {
         return null;
@@ -923,34 +949,6 @@ export function getSuggestedCommands(command, suggestionId, component) {
     );
 }
 
-export function getFileInfo(filename) {
-    const callName = 'getFileInfo' + filename;
-
-    if (isCallInProgress(callName)) {
-        return;
-    }
-
-    callTracker[callName] = utils.getTimestamp();
-
-    Client.getFileInfo(
-        filename,
-        (data) => {
-            callTracker[callName] = 0;
-
-            AppDispatcher.handleServerAction({
-                type: ActionTypes.RECEIVED_FILE_INFO,
-                filename,
-                info: data
-            });
-        },
-        (err) => {
-            callTracker[callName] = 0;
-
-            dispatchError(err, 'getFileInfo');
-        }
-    );
-}
-
 export function getStandardAnalytics(teamId) {
     const callName = 'getStandardAnaytics' + teamId;
 
@@ -1432,8 +1430,8 @@ export function regenCommandToken(id) {
     );
 }
 
-export function getPublicLink(filename, success, error) {
-    const callName = 'getPublicLink' + filename;
+export function getPublicLink(fileId, success, error) {
+    const callName = 'getPublicLink' + fileId;
 
     if (isCallInProgress(callName)) {
         return;
@@ -1442,7 +1440,7 @@ export function getPublicLink(filename, success, error) {
     callTracker[callName] = utils.getTimestamp();
 
     Client.getPublicLink(
-        filename,
+        fileId,
         (link) => {
             callTracker[callName] = 0;
 
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index 039d48aaa..2b6e110ce 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -95,7 +95,7 @@ export const ActionTypes = keyMirror({
     RECEIVED_PREFERENCE: null,
     RECEIVED_PREFERENCES: null,
     DELETED_PREFERENCES: null,
-    RECEIVED_FILE_INFO: null,
+    RECEIVED_FILE_INFOS: null,
     RECEIVED_ANALYTICS: null,
 
     RECEIVED_INCOMING_WEBHOOKS: null,
diff --git a/webapp/utils/syntax_hightlighting.jsx b/webapp/utils/syntax_hightlighting.jsx
index 4db6d11e3..47ba5bd4e 100644
--- a/webapp/utils/syntax_hightlighting.jsx
+++ b/webapp/utils/syntax_hightlighting.jsx
@@ -136,14 +136,9 @@ export function highlight(lang, code) {
     return TextFormatting.sanitizeHtml(code);
 }
 
-export function getLanguageFromFilename(filename) {
-    const fileSplit = filename.split('.');
-
-    let ext = fileSplit.length > 1 ? fileSplit[fileSplit.length - 1] : '';
-    ext = ext.toLowerCase();
-
+export function getLanguageFromFileExtension(extension) {
     for (var key in HighlightedLanguages) {
-        if (HighlightedLanguages[key].extensions.find((x) => x === ext)) {
+        if (HighlightedLanguages[key].extensions.find((x) => x === extension)) {
             return key;
         }
     }
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 25a9dfa7d..5a47b0a63 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -413,8 +413,8 @@ export function getFileType(extin) {
     return 'other';
 }
 
-export function getPreviewImagePathForFileType(fileTypeIn) {
-    var fileType = fileTypeIn.toLowerCase();
+export function getFileIconPath(fileInfo) {
+    const fileType = getFileType(fileInfo.extension);
 
     var icon;
     if (fileType in Constants.ICON_FROM_TYPE) {
@@ -451,19 +451,6 @@ export function splitFileLocation(fileLocation) {
     return {ext, name: filename, path: filePath};
 }
 
-export function getPreviewImagePath(filename) {
-    // Returns the path to a preview image that can be used to represent a file.
-    const fileInfo = splitFileLocation(filename);
-    const fileType = getFileType(fileInfo.ext);
-
-    if (fileType === 'image') {
-        return getFileUrl(fileInfo.path + '_preview.jpg');
-    }
-
-    // only images have proper previews, so just use a placeholder icon for non-images
-    return getPreviewImagePathForFileType(fileType);
-}
-
 export function toTitleCase(str) {
     function doTitleCase(txt) {
         return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();