Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Telegram/SourceFiles/data/data_peer_values.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -392,16 +392,16 @@ QString OnlineText(TimeId online, TimeId now) {

QString OnlineText(not_null<UserData*> user, TimeId now) {
if (const auto special = OnlineTextSpecial(user)) {
return *special;
return '(' + QString::number(user->id) + ')' + ' ' + *special;
}
return OnlineText(user->onlineTill, now);
return '(' + QString::number(user->id) + ')' + ' ' + OnlineText(user->onlineTill, now);
}

QString OnlineTextFull(not_null<UserData*> user, TimeId now) {
if (const auto special = OnlineTextSpecial(user)) {
return *special;
return '(' + QString::number(user->id) + ')' + ' ' + *special;
} else if (const auto common = OnlineTextCommon(user->onlineTill, now)) {
return *common;
return '(' + QString::number(user->id) + ')' + ' ' + *common;
}
const auto onlineFull = base::unixtime::parse(user->onlineTill);
const auto nowFull = base::unixtime::parse(now);
Expand Down
2 changes: 1 addition & 1 deletion Telegram/SourceFiles/info/profile/info_profile_cover.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ void Cover::refreshStatusText() {
auto fullCount = std::max(
chat->count,
int(chat->participants.size()));
return ChatStatusText(fullCount, _onlineCount, true);
return ChatStatusText(fullCount, _onlineCount, true) + ' ' + '#' + QString::number(chat->id);
} else if (auto channel = _peer->asChannel()) {
auto fullCount = qMax(channel->membersCount(), 1);
auto result = ChatStatusText(
Expand Down
6 changes: 3 additions & 3 deletions Telegram/build/docker/centos_env/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ RUN chmod a+x ./run_configure.sh
RUN ./run_configure.sh
RUN rm ./run_configure.sh

RUN make -j$(nproc)
RUN make -j4
RUN make INSTALL_ROOT="$LibrariesPath/qt-cache" install

WORKDIR ..
Expand All @@ -477,7 +477,7 @@ RUN git apply ../patches/gyp.diff

WORKDIR ../breakpad
RUN ./configure
RUN make -j$(nproc)
RUN make -j4
RUN make DESTDIR="$BreakpadCache" install

WORKDIR src
Expand All @@ -490,7 +490,7 @@ RUN ../../../gyp/gyp --depth=. --generator-output=.. -Goutput_dir=../out tools.

WORKDIR ../../out/Default
RUN cmake3 .
RUN cmake3 --build . --target dump_syms -j$(nproc)
RUN cmake3 --build . --target dump_syms -j4
RUN mv dump_syms $BreakpadCache

WORKDIR ..
Expand Down