From f2a602b455a006fb162890a6910e1d928d7d4ab0 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Mon, 10 Nov 2014 21:33:37 +0300
Subject: [PATCH] Added new embeds

Added 0.3.3 changelog
---
 app/css/app.css                           | 39 +++++++++++++++--------
 app/js/lib/mtproto_wrapper.js             |  2 +-
 app/js/lib/ng_utils.js                    | 13 +++++++-
 app/js/services.js                        | 38 ++++++++++++++++------
 app/partials/desktop/changelog_modal.html | 17 +++++++++-
 package.json                              |  2 +-
 6 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/app/css/app.css b/app/css/app.css
index 0a3ca666..42e128ef 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -1293,20 +1293,31 @@ div.im_message_video_thumb {
   background-image: url(../img/icons/IconsetW_1x.png);
 }
 
-.im_message_iframe_video {
-    position: relative;
-    padding-bottom: 56.25%; /* 16/9 ratio */
-    height: 0;
-    overflow: hidden;
-    margin-top: 5px;
-}
-.im_message_iframe_video iframe,
-.im_message_iframe_video webview {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
+.im_message_media_embed {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  margin-top: 5px;
+}
+.im_message_video_embed {
+  padding-bottom: 56.25%; /* 16/9 ratio */
+}
+.im_message_insta_embed {
+  padding-bottom: 122%;
+}
+.im_message_vine_embed {
+  padding-bottom: 100%;
+}
+.im_message_media_embed iframe,
+.im_message_media_embed webview {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.im_message_twitter_embed > blockquote {
+  visibility: hidden;
 }
 
 .im_message_gif_wrap {
diff --git a/app/js/lib/mtproto_wrapper.js b/app/js/lib/mtproto_wrapper.js
index ea7bd883..e7363014 100644
--- a/app/js/lib/mtproto_wrapper.js
+++ b/app/js/lib/mtproto_wrapper.js
@@ -251,7 +251,7 @@ angular.module('izhukov.mtproto.wrapper', ['izhukov.utils', 'izhukov.mtproto'])
 
   function downloadCheck(dcID) {
     var downloadPull = downloadPulls[dcID];
-    var downloadLimit = dcID == 'upload' ? 17 : 5;
+    var downloadLimit = dcID == 'upload' ? 11 : 5;
 
     if (downloadActives[dcID] >= downloadLimit || !downloadPull || !downloadPull.length) {
       return false;
diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js
index 929cd58a..61fa441b 100644
--- a/app/js/lib/ng_utils.js
+++ b/app/js/lib/ng_utils.js
@@ -727,6 +727,7 @@ angular.module('izhukov.utils', [])
 
 .service('ExternalResourcesManager', function ($q, $http) {
   var urlPromises = {};
+  var twitterAttached = false;
 
   function downloadImage (url) {
     if (urlPromises[url] !== undefined) {
@@ -740,8 +741,18 @@ angular.module('izhukov.utils', [])
       });
   }
 
+  function attachTwitterScript () {
+    twitterAttached = true;
+
+    $('<script>').appendTo('body')
+    // .on('load', function() {
+    // })
+    .attr('src', '//platform.twitter.com/widgets.js');
+  }
+
   return {
-    downloadImage: downloadImage
+    downloadImage: downloadImage,
+    attachTwitterScript: attachTwitterScript
   }
 })
 
diff --git a/app/js/services.js b/app/js/services.js
index 51ee0ac2..04a6b044 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -3062,7 +3062,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
   }
 })
 
-.service('RichTextProcessor', function ($sce, $sanitize) {
+.service('RichTextProcessor', function ($sce, $sanitize, ExternalResourcesManager) {
 
   var emojiUtf = [],
       emojiMap = {},
@@ -3105,6 +3105,9 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
   var regexAlphaNumericChars  = "0-9\.\_" + regexAlphaChars;
   var regExp = new RegExp('((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')|(^|\\s)(#[' + regexAlphaNumericChars + ']{3,20})', 'i');
   var youtubeRegex = /(?:https?:\/\/)?(?:www\.)?youtu(?:|.be|be.com|.b)(?:\/v\/|\/watch\\?v=|e\/|(?:\/\??#)?\/watch(?:.+)v=)(.{11})(?:\&[^\s]*)?/;
+  var instagramRegex = /https?:\/\/(?:instagr\.am\/p\/|instagram\.com\/p\/)([a-zA-Z0-9\-\_]+)/i;
+  var vineRegex = /https?:\/\/vine\.co\/v\/([a-zA-Z0-9\-\_]+)/i;
+  var twitterRegex = /https?:\/\/twitter\.com\/.+?\/status\/\d+/i;
 
   return {
     wrapRichText: wrapRichText,
@@ -3231,15 +3234,30 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
     }
 
     // console.log(4, text, html);
-    if (!options.noLinks) {
-      var youtubeMatches = text.match(youtubeRegex),
-          videoID = youtubeMatches && youtubeMatches[1];
-
-      if (videoID) {
-        var tag = Config.Modes.chrome_packed ? 'webview' : 'iframe';
-        text = text + '<div class="im_message_iframe_video"><' + tag + ' type="text/html" frameborder="0" ' +
-              'src="http://www.youtube.com/embed/' + videoID +
-              '?autoplay=0&amp;controls=2"></' + tag + '></div>'
+    if (!options.noLinks && !Config.Navigator.mobile) {
+      var embedUrlMatches,
+          embedTag = Config.Modes.chrome_packed ? 'webview' : 'iframe';
+
+      if (embedUrlMatches = text.match(youtubeRegex)) {
+        var videoID = embedUrlMatches[1]
+        text = text + '<div class="im_message_media_embed im_message_video_embed"><' + embedTag + ' type="text/html" frameborder="0" ' +
+              'src="//www.youtube.com/embed/' + videoID +
+              '?autoplay=0&amp;controls=2"></' + embedTag + '></div>'
+      }
+      else if (embedUrlMatches = text.match(instagramRegex)) {
+        var instaID = embedUrlMatches[1];
+        text = text + '<div class="im_message_media_embed im_message_insta_embed"><' + embedTag + ' type="text/html" frameborder="0" ' +
+              'src="//instagram.com/p/' + instaID +
+              '/embed/"></' + embedTag + '></div>';
+      }
+      else if (embedUrlMatches = text.match(vineRegex)) {
+        var vineID = embedUrlMatches[1];
+        text = text + '<div class="im_message_media_embed im_message_vine_embed"><' + embedTag + ' type="text/html" frameborder="0" ' +
+              'src="//vine.co/v/' + vineID + '/embed/simple"></' + embedTag + '></div>';
+      }
+      else if (embedUrlMatches = !Config.Modes.chrome_packed && text.match(twitterRegex)) {
+        text = text + '<div class="im_message_twitter_embed"><blockquote class="twitter-tweet" lang="en"><a href="' + embedUrlMatches[0] + '"></a></blockquote></div>';
+        onContentLoaded(ExternalResourcesManager.attachTwitterScript);
       }
     }
 
diff --git a/app/partials/desktop/changelog_modal.html b/app/partials/desktop/changelog_modal.html
index dec2b2a4..da0703d4 100644
--- a/app/partials/desktop/changelog_modal.html
+++ b/app/partials/desktop/changelog_modal.html
@@ -19,9 +19,24 @@
 
       <div class="modal_section changelog_version_wrap">
         <h3 class="modal_section_header changelog_version_title">
-          Version 0.3.2
+          Version 0.3.3
           <span class="pull-right" my-i18n="changelog_modal_title_current_version"></span>
         </h3>
+        <div class="modal_section_body changelog_version_changes">
+          <ul class="list-unstyled changelog_version_changes_list">
+            <li>Added Native Client module: dramatically improved encryption speed; Download and upload speed is now as high as in native applications.</li>
+            <li>HTTPS. We recommend you to use <a href="https://web.telegram.org" target="_blank">https://web.telegram.org</a>.</li>
+            <li>Added multiple open tabs warning. Please note, that only one tab with Telegram Web will work.</li>
+            <li>Jump to selected spot when playing back audio.</li>
+            <li>Bugfixes</li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="modal_section changelog_version_wrap">
+        <h3 class="modal_section_header changelog_version_title">
+          Version 0.3.2
+        </h3>
         <div class="modal_section_body changelog_version_changes">
           <ul class="list-unstyled changelog_version_changes_list">
             <li>Usernames support: <a href="" ng-click="changeUsername()">Choose a username right now!</a></li>
diff --git a/package.json b/package.json
index 24f083a5..756bda23 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Telegram",
   "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "app/index.html",
   "single-instance": true,
   "dom_storage_quota": 40,