Skip to content

Commit

Permalink
submodules fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xmdnx committed Nov 25, 2023
1 parent ebe1d98 commit f89e930
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@
[submodule "Telegram/lib_webview"]
path = Telegram/lib_webview
url = https://github.com/desktop-app/lib_webview.git
[submodule "Telegram/ThirdParty/jemalloc"]
path = Telegram/ThirdParty/jemalloc
url = https://github.com/jemalloc/jemalloc
[submodule "Telegram/ThirdParty/dispatch"]
path = Telegram/ThirdParty/dispatch
url = https://github.com/apple/swift-corelibs-libdispatch
Expand Down
10 changes: 7 additions & 3 deletions Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1222,9 +1222,15 @@ bool FieldAutocomplete::Inner::chooseAtIndex(
} else if (!_mrows->empty()) {
if (index < _mrows->size()) {
const auto user = _mrows->at(index).user;
const auto botStatus = _parent->chat()
? _parent->chat()->botStatus
: ((_parent->channel() && _parent->channel()->isMegagroup())
? _parent->channel()->mgInfo->botStatus
: -1);

_mentionChosen.fire({
user,
RabbitSettings::JsonSettings::GetBool("comma_after_mention")
RabbitSettings::JsonSettings::GetBool("comma_after_mention") && botStatus != 1
? PrimaryUsername(user) + ","
: PrimaryUsername(user),
method });
Expand All @@ -1251,8 +1257,6 @@ bool FieldAutocomplete::Inner::chooseAtIndex(
const auto commandString = QString("/%1%2").arg(
command,
insertUsername ? ('@' + PrimaryUsername(user)) : QString());
// TODO: comma after mention
// @.*username

_botCommandChosen.fire({ commandString, method });
return true;
Expand Down
2 changes: 1 addition & 1 deletion Telegram/build/setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define MyAppId "4356CE01-4137-4C55-9F8B-FB4EEBB6EC0C"
#define CurrentYear GetDateTimeString('yyyy','','')
#define MyBuildTarget "win64"
#define MyAppVersionFull "4.11.8-20112023"
#define MyAppVersionFull "4.11.8-22112023"

[Setup]
; NOTE: The value of AppId uniquely identifies this application.
Expand Down
2 changes: 1 addition & 1 deletion Telegram/lib_base

0 comments on commit f89e930

Please sign in to comment.