Skip to content

Commit

Permalink
Merge pull request #458 from ilya-fedin/merge-wip
Browse files Browse the repository at this point in the history
Merge patches-track-wip branch (tdesktop 4.15.3)

This branch is currently NOT ready to release, however, Telegram disabled login on older versions, which affects all Kotatogram version up to 1.4.9 beta, so this patches-track-wip is merged into dev to provide nightly versions.

Bugs and missing features list (updated version of https://t.me/kotatogram_dev/12 ):

— “Show/hide pinned message”: no reaction
— “Recent actions” button in profile: no reaction
— Folders: bug with premium limits
— Account limit: currently capped to 6 because of bug

Visual flaws:
— Icons that are out of general style: scheduled messages, notifications (in the profile header), Kotatogram settings
— Offset bug for icons of manage buttons in the profile

Features that are being rebuilt from scratch:
— Rounding of avatars (is in this branch currently, see https://t.me/kotatogram_dev/13 for docs)
— Compact chats (currently disabled)
  • Loading branch information
EricKotato authored Jun 30, 2024
2 parents 52b300c + 75785e6 commit 7493e78
Show file tree
Hide file tree
Showing 4,208 changed files with 284,366 additions and 77,982 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 14 additions & 3 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ body:
label: Operating system
description: >
Your operating system name, version and desktop environment.
Please don't use kernel version (uname), it's useless.
**Don't use kernel version (uname), it's useless.**
validations:
required: true
- type: input
attributes:
label: Version of Kotatogram Desktop
description: >
Please note we don't support versions from Linux distro repositories.
If you need support for these versions, please contact your distro maintainer
If you need support for these versions, **please contact your distro maintainer**
or your distro bugtracker.
Don't use 'latest', specify actual version, that's a reason to close your issue.
**Don't use 'latest'**, specify actual version, **that's a reason to close your issue**.
validations:
required: true
- type: dropdown
Expand All @@ -60,8 +60,19 @@ body:
- Other (unofficial) source
validations:
required: true
- type: input
attributes:
label: Crash ID
description: >
If you're reporting a crash, please enter the crash ID from the crash reporter
opening on the next launch after crash. **You have to enable beta versions
installation in Settings -> Advanced for the reporter to appear.**
You don't have to wait for a beta version to arrive.
- type: textarea
attributes:
label: Logs
description: >
You can find log.txt using the `viewlogs`
[cheat code](https://github.com/telegramdesktop/tdesktop/wiki/Cheat-Codes).
placeholder: Insert log.txt here (if necessary)
render: shell
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name: Feature request
description: Suggest an idea.
labels: [enhancement]
title: "[Feature Request] "
body:
- type: textarea
attributes:
Expand Down
8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/QUESTION.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Platform-wide issue
url: https://bugs.telegram.org
about: Any bug report or feature request affecting more than only Telegram Desktop.
- name: Issue of other client
url: https://bugs.telegram.org
about: Any bug report or feature request not about Telegram Desktop.
- name: Question
url: https://t.me/TelegramDesktopTalk
about: Ask a question.
21 changes: 0 additions & 21 deletions .github/stale.yml

This file was deleted.

23 changes: 21 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,30 @@ jobs:
name: Ubuntu
runs-on: ubuntu-latest

env:
IMAGE_TAG: ghcr.io/${{ github.repository }}/centos_env:latest

steps:
- name: Clone.
uses: actions/checkout@v2
uses: actions/checkout@v3.1.0
with:
submodules: recursive

- name: First set up.
run: |
sudo apt update
curl -sSL https://install.python-poetry.org | python3 -
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
- name: Free up some disk space.
uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8

- name: Docker image build.
run: docker build -t telegram_desktop Telegram/build/docker/centos_env
run: |
cd Telegram/build/docker/centos_env
poetry install
DEBUG= LTO= poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t $IMAGE_TAG -
- name: Push the Docker image.
if: ${{ github.ref_name == github.event.repository.default_branch }}
run: docker push $IMAGE_TAG
37 changes: 15 additions & 22 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
paths-ignore:
- 'docs/**'
- '**.md'
- '!docs/building-linux.md'
- 'kotatogram_changes.txt'
- 'changelog.txt'
- 'LEGAL'
Expand All @@ -25,7 +24,6 @@ on:
paths-ignore:
- 'docs/**'
- '**.md'
- '!docs/building-linux.md'
- 'kotatogram_changes.txt'
- 'changelog.txt'
- 'LEGAL'
Expand All @@ -45,28 +43,18 @@ on:
jobs:

linux:
name: CentOS 7
name: Rocky Linux 8
if: >
!(github.event_name == 'push'
&& contains(github.event.head_commit.message, '[skip ci]'))
&& !(github.event_name == 'pull_request'
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name)
runs-on: ubuntu-latest
container:
image: docker.pkg.github.com/kotatogram/kotatogram-desktop/centos_env
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

defaults:
run:
shell: scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash --noprofile --norc -eo pipefail {0}

strategy:
matrix:
defines:
- ""
#- "DESKTOP_APP_DISABLE_DBUS_INTEGRATION"
#- "DESKTOP_APP_DISABLE_X11_INTEGRATION"
#- "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"

Expand All @@ -78,19 +66,20 @@ jobs:
run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV

- name: Clone.
uses: actions/checkout@v2
uses: actions/checkout@v3.1.0
with:
submodules: recursive
path: ${{ env.REPO_NAME }}

- name: First set up.
run: |
gcc --version
ln -s $LibrariesPath Libraries
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
docker pull ghcr.io/$GITHUB_REPOSITORY/centos_env
docker tag ghcr.io/$GITHUB_REPOSITORY/centos_env tdesktop:centos_env
- name: Kotatogram Desktop build.
run: |
cd $REPO_NAME/Telegram
cd $REPO_NAME
DEFINE=""
if [ -n "${{ matrix.defines }}" ]; then
Expand All @@ -101,17 +90,21 @@ jobs:
echo "ARTIFACT_NAME=Kotatogram" >> $GITHUB_ENV
fi
./configure.sh \
docker run --rm \
-v $PWD:/usr/src/tdesktop \
-e CONFIG=Debug \
tdesktop:centos_env \
/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
-D CMAKE_C_FLAGS_DEBUG="" \
-D CMAKE_CXX_FLAGS_DEBUG="" \
-D CMAKE_C_FLAGS="-Werror" \
-D CMAKE_CXX_FLAGS="-Werror" \
-D CMAKE_EXE_LINKER_FLAGS="-s" \
-D TDESKTOP_API_TEST=ON \
-D DESKTOP_APP_USE_PACKAGED=OFF \
-D DESKTOP_APP_DISABLE_AUTOUPDATE=OFF \
-D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
$DEFINE
cmake --build ../out --config Debug --parallel
- name: Check.
run: |
filePath="$REPO_NAME/out/Debug/Kotatogram"
Expand All @@ -130,7 +123,7 @@ jobs:
run: |
cd $REPO_NAME/out/Debug
mkdir artifact
mv Kotatogram artifact/
mv {Kotatogram,Updater} artifact/
- uses: actions/upload-artifact@master
if: env.UPLOAD_ARTIFACT == 'true'
name: Upload artifact.
Expand Down
Loading

0 comments on commit 7493e78

Please sign in to comment.