r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed trim message before send

Browse Source 
Close #1135
Close #1125
This commit is contained in:
Igor Zhukov 2016-06-07 14:07:59 +03:00
parent 82a37f0e7a
commit b5a60fef0b
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/js/lib/ng_utils.js
View File

@ -1397,7 +1397,7 @@ angular.module('izhukov.utils', [])
function parseMarkdown (text, entities) { function parseMarkdown (text, entities) {
if (text.indexOf('`') == -1) { if (text.indexOf('`') == -1) {
return text; return text.trim();
} }
var raw = text; var raw = text;
var match; var match;
@ -1448,6 +1448,9 @@ angular.module('izhukov.utils', [])
newText = text; newText = text;
entities.splice(0, entities.length); entities.splice(0, entities.length);
} }
if (!entities.length) {
newText = newText.trim();
}
return newText; return newText;
} }

15
app/js/messages_manager.js
View File

@ -1297,10 +1297,18 @@ angular.module('myApp.services')
} }
function sendText(peerID, text, options) { function sendText(peerID, text, options) {
if (!angular.isString(text) || !text.length) { if (!angular.isString(text)) {
return; return;
} }
options = options || {}; options = options || {};
var entities = options.entities || [];
if (!options.viaBotID) {
text = RichTextProcessor.parseMarkdown(text, entities);
}
if (!text.length) {
return;
}
var messageID = tempID--, var messageID = tempID--,
randomID = [nextRandomInt(0xFFFFFFFF), nextRandomInt(0xFFFFFFFF)], randomID = [nextRandomInt(0xFFFFFFFF), nextRandomInt(0xFFFFFFFF)],
randomIDS = bigint(randomID[0]).shiftLeft(32).add(bigint(randomID[1])).toString(), randomIDS = bigint(randomID[0]).shiftLeft(32).add(bigint(randomID[1])).toString(),
@ -1311,13 +1319,8 @@ angular.module('myApp.services')
isChannel = AppPeersManager.isChannel(peerID), isChannel = AppPeersManager.isChannel(peerID),
isMegagroup = isChannel && AppPeersManager.isMegagroup(peerID), isMegagroup = isChannel && AppPeersManager.isMegagroup(peerID),
asChannel = isChannel && !isMegagroup ? true : false, asChannel = isChannel && !isMegagroup ? true : false,
entities = options.entities || [],
message; message;
if (!options.viaBotID) {
text = RichTextProcessor.parseMarkdown(text, entities);
}
if (historyStorage === undefined) { if (historyStorage === undefined) {
historyStorage = historiesStorage[peerID] = {count: null, history: [], pending: []}; historyStorage = historiesStorage[peerID] = {count: null, history: [], pending: []};
} }