From 89ae795b220a91512563558440586ddd17c16f63 Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Tue, 25 Jul 2017 00:49:40 -0700
Subject: [PATCH] added file extensions to the share links

---
 controllers/showController.js       |  3 +++
 routes/serve-routes.js              |  2 +-
 views/partials/assetInfo.handlebars | 14 +++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/controllers/showController.js b/controllers/showController.js
index 5f1ac3fd..78ef27bf 100644
--- a/controllers/showController.js
+++ b/controllers/showController.js
@@ -28,6 +28,7 @@ module.exports = {
               // 3. if a matching record is found locally, serve it
               if (result) {
                 // return the data for the file to be served
+                result.dataValues['fileExt'] = result.fileName.substring(result.fileName.lastIndexOf('.'));
                 serveHelpers.getShortUrlByClaimId(name, claimId)
                   .then(shortUrl => {
                     result.dataValues['shortUrl'] = shortUrl;
@@ -64,6 +65,7 @@ module.exports = {
           if (result) {
             logger.debug('local result found');
             // return the data for the file to be served
+            result.dataValues['fileExt'] = result.fileName.substring(result.fileName.lastIndexOf('.'));
             serveHelpers.getShortUrlByClaimId(name, claimId)
               .then(shortUrl => {
                 result.dataValues['shortUrl'] = shortUrl;
@@ -123,6 +125,7 @@ module.exports = {
           // 3. if a match is found locally, serve that claim
           if (result) {
             // return the data for the file to be served
+            result.dataValues['fileExt'] = result.fileName.substring(result.fileName.lastIndexOf('.'));
             result.dataValues['shortUrl'] = shortUrl;
             resolve(result.dataValues);
             // update the file, as needed
diff --git a/routes/serve-routes.js b/routes/serve-routes.js
index 8e0cfe5a..d1bcf2b0 100644
--- a/routes/serve-routes.js
+++ b/routes/serve-routes.js
@@ -141,7 +141,7 @@ module.exports = (app) => {
     } else if (dotIndex === -1) {
       // google analytics
       sendGoogleAnalytics('show', headers, ip, originalUrl);
-      // get and render the content
+      // begin image-show process
       showClaimByName(params.name)
         .then(fileInfo => {
           // check to make sure a file was found
diff --git a/views/partials/assetInfo.handlebars b/views/partials/assetInfo.handlebars
index a163c0ef..f0c54d8d 100644
--- a/views/partials/assetInfo.handlebars
+++ b/views/partials/assetInfo.handlebars
@@ -6,20 +6,20 @@
 	<h2 class="subheader">Links</h2>
 	{{!--short direct link to asset--}}
 	<div class="share-option">
-		<a href="/{{fileInfo.name}}/{{fileInfo.shortUrl}}">Permanent Short Link</a>
+		<a href="/{{fileInfo.name}}/{{fileInfo.shortUrl}}{{fileInfo.fileExt}}">Permanent Short Link</a>
 		(most convenient)
 		<div class="input-error" id="input-error-copy-short-link" hidden="true"></div>
 		<br/>
-		<input type="text" id="short-link" class="link" readonly spellcheck="false" value="https://spee.ch/{{fileInfo.name}}/{{fileInfo.shortUrl}}" onclick="select()"/>
+		<input type="text" id="short-link" class="link" readonly spellcheck="false" value="https://spee.ch/{{fileInfo.name}}/{{fileInfo.shortUrl}}{{fileInfo.fileExt}}" onclick="select()"/>
 		<button class="copy-button" data-elementtocopy="short-link" onclick="copyToClipboard(event)">copy</button>
 	</div>
 	{{!-- link to show route for asset--}}
 	<div class="share-option">
-		<a href="/{{fileInfo.name}}/{{fileInfo.claimId}}">Permanent Long Link</a>
+		<a href="/{{fileInfo.name}}/{{fileInfo.claimId}}{{fileInfo.fileExt}}">Permanent Long Link</a>
 		(fastest service)
 		<div class="input-error" id="input-error-copy-long-link" hidden="true"></div>
 		</br>
-		<input type="text" id="long-link" class="link" readonly onclick="select()" spellcheck="false" value="https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}}"/>
+		<input type="text" id="long-link" class="link" readonly onclick="select()" spellcheck="false" value="https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}}{{fileInfo.fileExt}}"/>
 		<button class="copy-button" data-elementtocopy="long-link" onclick="copyToClipboard(event)">copy</button>
 	</div>
 	{{!-- html text for embedding asset--}}
@@ -28,9 +28,9 @@
 		<div class="input-error" id="input-error-copy-embed-text" hidden="true"></div>
 		<br/>
 		{{#ifConditional fileInfo.fileType '===' 'video/mp4'}}
-			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;video width="100%" controls>&lt;source src="https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}}" />&lt;/video>'/>
+			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;video width="100%" controls>&lt;source src="https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}}{{fileInfo.fileExt}}" />&lt;/video>'/>
 		{{else}}
-			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;img src="https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}}" />'/>
+			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;img src="https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}}{{fileInfo.fileExt}}" />'/>
 		{{/ifConditional}}
 		<button class="copy-button" data-elementtocopy="embed-text" onclick="copyToClipboard(event)">copy</button>
 	</div>
@@ -41,7 +41,7 @@
 		Markdown
 		<div class="input-error" id="input-error-copy-markdown-text" hidden="true"></div>
 		<br/>
-		<input type="text" id="markdown-text" class="link" readonly onclick="select()" spellcheck="false" value='![{{fileInfo.name}}](https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}})'/>
+		<input type="text" id="markdown-text" class="link" readonly onclick="select()" spellcheck="false" value='![{{fileInfo.name}}](https://spee.ch/{{fileInfo.name}}/{{fileInfo.claimId}}{{fileInfo.fileExt}})'/>
 		<button class="copy-button" data-elementtocopy="markdown-text" onclick="copyToClipboard(event)">copy</button>
 	</div>
 	{{/ifConditional}}