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

Fixed entities without username

Browse Source
This commit is contained in:
Igor Zhukov 2016-07-01 20:53:36 +03:00
parent 114024b7f7
commit 94eaf320d4
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1391,7 +1391,7 @@ angular.module('izhukov.utils', [])
} }
function parseMarkdown (text, entities) { function parseMarkdown (text, entities) {
if (text.indexOf('`') == -1) { if (text.indexOf('`') == -1 && text.indexOf('@') == -1) {
return text.trim() return text.trim()
} }
var raw = text var raw = text
@ -1433,6 +1433,7 @@ angular.module('izhukov.utils', [])
}) })
rawOffset -= 2 rawOffset -= 2
} else if (match[10]) { // custom mention } else if (match[10]) { // custom mention
console.log(match);
newText.push(text) newText.push(text)
entities.push({ entities.push({
_: 'messageEntityMentionName', _: 'messageEntityMentionName',
@ -1455,6 +1456,8 @@ angular.module('izhukov.utils', [])
if (!entities.length) { if (!entities.length) {
newText = newText.trim() newText = newText.trim()
} }
console.warn(dT(), newText, entities);
// throw new Error(11);
return newText return newText
} }

18
app/js/messages_manager.js
View File

@ -1258,12 +1258,16 @@ angular.module('myApp.services')
if (!options.viaBotID) { if (!options.viaBotID) {
text = RichTextProcessor.parseMarkdown(text, entities) text = RichTextProcessor.parseMarkdown(text, entities)
} }
angular.forEach(entities, function (entity) { var sendEntites = entities
if (entity._ == 'messageEntityMentionName') { if (entities.length) {
entity._ = 'inputMessageEntityMentionName' sendEntites = angular.copy(entities)
entity.user_id = AppUsersManager.getUserInput(entity.user_id) angular.forEach(sendEntites, function (entity) {
} if (entity._ == 'messageEntityMentionName') {
}) entity._ = 'inputMessageEntityMentionName'
entity.user_id = AppUsersManager.getUserInput(entity.user_id)
}
})
}
if (!text.length) { if (!text.length) {
return return
@ -1315,7 +1319,7 @@ angular.module('myApp.services')
reply_to_msg_id: replyToMsgID, reply_to_msg_id: replyToMsgID,
via_bot_id: options.viaBotID, via_bot_id: options.viaBotID,
reply_markup: options.reply_markup, reply_markup: options.reply_markup,
entities: entities, entities: sendEntites,
views: asChannel && 1, views: asChannel && 1,
pending: true pending: true
} }