procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed broken typing statuses, 0.9.18

This commit is contained in:
John Preston 2016-01-05 12:52:40 +08:00
parent f4d159b2f0
commit 2c7fb82708
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/history.cpp
View File

@ -321,8 +321,7 @@ void History::clearLastKeyboard() {
lastKeyboardFrom = 0; lastKeyboardFrom = 0;
} }
bool History::updateTyping(uint64 ms, uint32 dots, bool force) { bool History::updateTyping(uint64 ms, bool force) {
if (!ms) ms = getms(true);
bool changed = force; bool changed = force;
for (TypingUsers::iterator i = typing.begin(), e = typing.end(); i != e;) { for (TypingUsers::iterator i = typing.begin(), e = typing.end(); i != e;) {
if (ms >= i.value()) { if (ms >= i.value()) {
@ -369,7 +368,7 @@ bool History::updateTyping(uint64 ms, uint32 dots, bool force) {
} }
} }
if (!typingStr.isEmpty()) { if (!typingStr.isEmpty()) {
if (typingText.lastDots(dots % 4)) { if (typingText.lastDots(typingDots % 4)) {
changed = true; changed = true;
} }
} }
@ -1245,7 +1244,7 @@ void Histories::regSendAction(History *history, UserData *user, const MTPSendMes
return; return;
} }
uint64 ms = getms(true); uint64 ms = getms();
switch (action.type()) { switch (action.type()) {
case mtpc_sendMessageTypingAction: history->typing[user] = ms + 6000; break; case mtpc_sendMessageTypingAction: history->typing[user] = ms + 6000; break;
case mtpc_sendMessageRecordVideoAction: history->sendActions.insert(user, SendAction(SendActionRecordVideo, ms + 6000)); break; case mtpc_sendMessageRecordVideoAction: history->sendActions.insert(user, SendAction(SendActionRecordVideo, ms + 6000)); break;
@ -1264,17 +1263,16 @@ void Histories::regSendAction(History *history, UserData *user, const MTPSendMes
TypingHistories::const_iterator i = typing.find(history); TypingHistories::const_iterator i = typing.find(history);
if (i == typing.cend()) { if (i == typing.cend()) {
typing.insert(history, ms); typing.insert(history, ms);
history->typingFrame = 0; history->typingDots = 0;
_a_typings.start();
} }
history->updateTyping(ms, true);
history->updateTyping(ms, history->typingFrame, true);
_a_typings.start();
} }
void Histories::step_typings(uint64 ms, bool timer) { void Histories::step_typings(uint64 ms, bool timer) {
for (TypingHistories::iterator i = typing.begin(), e = typing.end(); i != e;) { for (TypingHistories::iterator i = typing.begin(), e = typing.end(); i != e;) {
uint32 typingFrame = (ms - i.value()) / 150; i.key()->typingDots = (ms - i.value()) / 150;
i.key()->updateTyping(ms, typingFrame); i.key()->updateTyping(ms);
if (i.key()->typing.isEmpty() && i.key()->sendActions.isEmpty()) { if (i.key()->typing.isEmpty() && i.key()->sendActions.isEmpty()) {
i = typing.erase(i); i = typing.erase(i);
} else { } else {
@ -1815,16 +1813,16 @@ void History::unregTyping(UserData *from) {
uint64 updateAtMs = 0; uint64 updateAtMs = 0;
TypingUsers::iterator i = typing.find(from); TypingUsers::iterator i = typing.find(from);
if (i != typing.end()) { if (i != typing.end()) {
updateAtMs = getms(true); updateAtMs = getms();
i.value() = updateAtMs; i.value() = updateAtMs;
} }
SendActionUsers::iterator j = sendActions.find(from); SendActionUsers::iterator j = sendActions.find(from);
if (j != sendActions.end()) { if (j != sendActions.end()) {
if (!updateAtMs) updateAtMs = getms(true); if (!updateAtMs) updateAtMs = getms();
j.value().until = updateAtMs; j.value().until = updateAtMs;
} }
if (updateAtMs) { if (updateAtMs) {
updateTyping(updateAtMs, 0, true); updateTyping(updateAtMs, true);
} }
} }

4
Telegram/SourceFiles/history.h
View File

@ -264,7 +264,7 @@ public:
} }
void paintDialog(Painter &p, int32 w, bool sel) const; void paintDialog(Painter &p, int32 w, bool sel) const;
bool updateTyping(uint64 ms = 0, uint32 dots = 0, bool force = false); bool updateTyping(uint64 ms, bool force = false);
void clearLastKeyboard(); void clearLastKeyboard();
typedef QList<HistoryBlock*> Blocks; typedef QList<HistoryBlock*> Blocks;
@ -310,7 +310,7 @@ public:
SendActionUsers sendActions; SendActionUsers sendActions;
QString typingStr; QString typingStr;
Text typingText; Text typingText;
uint32 typingFrame; uint32 typingDots;
QMap<SendActionType, uint64> mySendActions; QMap<SendActionType, uint64> mySendActions;
typedef QList<MsgId> MediaOverview; typedef QList<MsgId> MediaOverview;