From 8684ea54fc9eb48603f43d1d7c43e084022eb274 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Tue, 15 Apr 2014 21:59:49 -0400
Subject: [PATCH] Improved grouping, passing app version

---
 app/js/controllers.js |  2 ++
 app/js/lib/mtproto.js |  2 +-
 gulpfile.js           | 10 +++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 92d9011a..2a602131 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -471,6 +471,8 @@ angular.module('myApp.controllers', [])
         if (prevMessage &&
             curMessage.from_id == prevMessage.from_id &&
             curMessage.date < prevMessage.date + 30 &&
+            !prevMessage.action &&
+            !curMessage.action &&
             !prevMessage.fwd_from_id &&
             !curMessage.fwd_from_id &&
             curMessage.message && curMessage.message.length < 60) {
diff --git a/app/js/lib/mtproto.js b/app/js/lib/mtproto.js
index 6cbc7904..fc96e87f 100644
--- a/app/js/lib/mtproto.js
+++ b/app/js/lib/mtproto.js
@@ -1775,7 +1775,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
       serializer.storeInt(2496, 'api_id');
       serializer.storeString(navigator.userAgent || 'Unknown UserAgent', 'device_model');
       serializer.storeString(navigator.platform  || 'Unknown Platform', 'system_version');
-      serializer.storeString('0.1', 'app_version');
+      serializer.storeString('0.0.21', 'app_version');
       serializer.storeString(navigator.language || 'en', 'lang_code');
     }
 
diff --git a/gulpfile.js b/gulpfile.js
index 6ca53d5a..87af350e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -90,6 +90,12 @@ gulp.task('update-version-settings', function() {
     .pipe(gulp.dest('app/partials'));
 });
 
+gulp.task('update-version-mtproto', function() {
+ return gulp.src('app/js/lib/mtproto.js')
+    .pipe($.replace(/'.+?', 'app_version'/, '\'' + pj.version  + '\', \'app_version\''))
+    .pipe(gulp.dest('app/js/lib'));
+});
+
 gulp.task('update-version-comments', function() {
  return gulp.src('app/**/*.js')
   .pipe($.replace(/Webogram v[0-9.]*/, 'Webogram v' +  pj.version))
@@ -139,7 +145,9 @@ gulp.task('clean', function() {
   return gulp.src(['dist/*', 'app/js/templates.js', '!dist/.git']).pipe($.clean());
 });
 
-gulp.task('bump', ['update-version-manifests', 'update-version-settings', 'update-version-comments']);
+gulp.task('bump', ['update-version-manifests', 'update-version-settings', 'update-version-mtproto'], function () {
+  gulp.start('update-version-comments');
+});
 
 gulp.task('build', ['usemin', 'copy', 'copy-images'], function () {
   gulp.start('disable-production');