.gitattributes

@@ -1,2 +0,0 @@
-* text=auto eol=lf
-

.gitignore

@@ -1,14 +1,2 @@
 patches/*/*-custom.patch
 patches/*/*.patch-failed
-resources/distok/versionlogs/*
-!resources/distok/versionlogs/.gitkeep
-resources/fdroid/repo/icons/*.xml
-resources/fonts/*.ttf
-resources/fonts/*.otf
-resources/icons/others/*
-!resources/icons/others/.gitkeep
-resources/ringtones/*
-!resources/ringtones/.gitkeep
-resources/keystores/*
-!resources/keystores/.gitkeep
-*.apk

BUILDING.md

@@ -2,14 +2,13 @@
 
 #### Toolchain setup
 
-- Get apktool (use [this self-built version](//f001.backblazeb2.com/file/avepub/apktool-cli-all.jar) which is master + [this pr](https://github.com/iBotPeaches/Apktool/pull/2463)).
+- Get apktool (due to 2 bugs present in v2.3.4, you're strongly recommended to use v2.4.0 or higher, I compile latest from source).
 - Get a keystore, see [here](https://stackoverflow.com/a/14994354/3286892), step 1.
 - Get apksigner, it's part of android build tools.
 - If you want Mutant Standard emoji patches, get 72x72 PNG copies of latest version of mutant standard emojis with codepoints. I have a zip [here](https://mutant.lavatech.top/72x72.zip).
 - If you want Blob emoji patches, get 72x72 PNG copies of blobmojis with codepoints. I personally resized the png/128 folder in this [repo](https://github.com/C1710/blobmoji) (`find /home/ave/blobmoji/png/72 -iname '*.png' -exec convert \{\} -verbose -resize 72x72\> \{\} \;`).
 - Extract the emojis you got somewhere.
-- Clone this repo somewhere.
-- Set your environment variables (see below), put them to somewhere where they'll persist (like your .bashrc/.zshrc, or preferably a build script).
+- Clone this repo somewhere, edit `patches/mutant/emojireplace.py` and `patches/blobs/emojireplace.py`, set the `extracted_mutstd_path` and `extracted_blobmoji_path` folders respectively to the folder you just extracted emojis to.
 - Get a Discord apk (*cough* [apkmirror](https://www.apkmirror.com/apk/discord-inc/discord-chat-for-gamers/), [aptoide API](https://ws75.aptoide.com/api/7/app/getMeta?package_name=com.discord)).
 
 ### Using CutTheCord CI
@@ -21,20 +20,13 @@ CTCCI requires python3.6+, and also likely requires Linux (I haven't tried it on
 #### Initial setup
 
 - Follow the "Toolchain setup" steps above in case you haven't already.
+- Install dependencies (`python3 -m pip install -Ur requirements.txt`)
 - Copy `ctcci/ctcconfig.example.py` to `ctcci/ctcconfig.py` and configure contents to your local data and your personal preferences.
-- If you don't want to always automatically be required to use the latest discord version, edit the `$REPO_FOLDER/patchport-state.json` file.
+- If you don't want to always automatically be required to use the latest discord version, set `LOCAL_STATE` to `True` and point `STATE_FILE` to a `state.json` file that looks like this: `{"android": {"com.discord": {"version": 909}}}`.
 - Set up a local distok-style file storage for your APKs, and copy your APKs on it, and name them properly (the format is `$DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk`, example: `/home/ave/distok/android/com.discord-909.apk`).
 
-#### Environment Variables
-
-- `DISTOK_VERSION_LOGS` (required, default: `"/root/distokrepos/versionlogs/"`): Should point to an empty directory (such as `export DISTOK_VERSION_LOGS="/home/ave/distokversionlogs"`). This directory will hold versions that will increase with each build. This is a hack that I need to eventually re-design, preferably move to a json file etc.
-- `DISTOK_EMOJI_MUTANT` (optional, default: `"/root/distokfiles/mutant/72x72"`): Folder with the mutant emoji files. This should be set if you're going to be enabling the mutant emoji patches.
-- `DISTOK_EMOJI_BLOBMOJI` (optional, default: `"/root/distokfiles/blobmoji/png/72"`): Folder with the blobmoji files. This should be set if you're going to be enabling the blobmoji patches.
-- `DISTOK_EXTRACTED_DISCORD_PATH` (complicated, default: `"/tmp/cutthecord/discord"`): Directory at which your extracted discord files reside. This is required on manual builds, but will be overriden by ctcci with `WORK_APK_PATH` if ctcci is being used.
-
 #### Running builds
 
-- Firstly, ensure that you properly set your environment variables!
 - Simply run the `ctcci.py` script, with first argument being branch name, and latter ones being name of patches you want to add in.
 
 Example: `python3.6 /home/ave/distokrepos/cutthecord/ctcci/ctcci.py ave mutant customfont slashcommands tokenlogin customtheme customdefaultemoji customring bettertm notrack noprofilestrip nonearby experiments noblocked squareavatars`
@@ -60,11 +52,11 @@ To get the diff, run `diff -crB -x "dist" -x "res/raw" -x "build" CleanFolder Pa
 
 #### Porting patches
 
-You can use `patchport.py` to easily attempt to port patches. This is what I use to port between every single version. Note that while CTCCI requires python3.6+, `patchport.py` requires python3.7+.
+You can use `patchport.py` to easily attempt to port patches. This is what I use to port between every single version.
 
 It's not really intelligent and doesn't do much more than manually preparing necessary patch, checking if an existing patch can be applied to a given version, replacing relevant variables required for porting various patches and eliminating offsets caused by updates, but it saves a lot of time if used carefully.
 
-Example command: `python3.7 patchport.py /home/ave/workbench/ctc/com.discord-968`
+Example command: `python3 patchport.py /home/ave/workbench/ctc/com.discord-968`
 
 #### Figuring out which patch is causing your build to break
 

Dockerfile

@@ -1,68 +0,0 @@
-FROM ubuntu:21.04
-
-# Install needed packages
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 android-sdk-build-tools wget unzip imagemagick git patch software-properties-common
-# Mirror is being weird currently so install this seperatly
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install zipmerge
-
-# Install fdroid
-RUN add-apt-repository ppa:fdroid/fdroidserver
-RUN apt-get update
-RUN apt-get -y install fdroidserver
-
-# Create resources folder for tools/images etc
-ENV CTC_FOLDER=/opt/ctc
-RUN mkdir ${CTC_FOLDER}
-
-# Grab modified apktool
-RUN mkdir ${CTC_FOLDER}/tools
-RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/avepub/apktool-cli-all.jar
-
-# Grab xml-patch (https://github.com/dnault/xml-patch)
-RUN wget -O ${CTC_FOLDER}/tools/xml-patch.jar https://jcenter.bintray.com/com/github/dnault/xml-patch/0.3.1/xml-patch-0.3.1.jar
-
-# Grab dex2jar (https://github.com/Aliucord/dex2jar)
-RUN wget -O ${CTC_FOLDER}/tools/dex2jar.jar https://github.com/Aliucord/dex2jar/releases/download/v19-fork2/dex2jar.jar
-
-# Grab emoji sets
-ENV EMOJI_PATH=${CTC_FOLDER}/emojis
-ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant
-ENV EMOJI_BLOBMOJIS_PATH=${EMOJI_PATH}/blobmojis
-RUN mkdir ${EMOJI_PATH}
-
-# Mutant emojis
-RUN mkdir ${EMOJI_MUTANT_PATH}
-WORKDIR ${EMOJI_MUTANT_PATH}
-RUN wget https://mutant.lavatech.top/72x72.zip
-RUN unzip 72x72.zip
-RUN mv 72x72/*.png .
-RUN rm -rf 72x72
-RUN rm 72x72.zip
-
-# Blobmojis
-RUN mkdir ${EMOJI_BLOBMOJIS_PATH}
-RUN mkdir /tmp/blobmoji
-WORKDIR /tmp/blobmoji
-RUN wget https://github.com/C1710/blobmoji/archive/refs/heads/main.zip
-RUN 7za x main.zip
-WORKDIR /tmp/blobmoji/blobmoji-main/svg
-RUN find ./*.svg -exec mogrify -format png -resize 72x72 -path ${EMOJI_BLOBMOJIS_PATH} {} \; ; exit 0
-
-# Generate self signed KS
-RUN mkdir ${CTC_FOLDER}/keystores
-WORKDIR ${CTC_FOLDER}/keystores
-RUN keytool -genkey -alias test \
-    -keyalg RSA -keystore keystore.jks \
-    -dname "CN=Test, OU=Test, O=Test, L=Test, S=Test, C=Test" \
-    -storepass password -keypass password
-
-# Make folder for git repo
-RUN mkdir ${CTC_FOLDER}/gitrepo
-WORKDIR ${CTC_FOLDER}/gitrepo
-
-# paths in ctcconfig in docker
-# container							fs
-# /opt/ctc/gitrepo					
-# /opt/ctc/keystores/keystore.jks	not specified by default

README.md

@@ -2,17 +2,11 @@
 
 Modular Client Mod for Discord's Android app.
 
-**THIS IS A WORK IN PROGRESS BRANCH! SOME PATCHES ARE MISSING (tokenlogin, hideunusableemojis, plus showtag has a bug)!**
-
-Current state is good enough™ for an RC release, and there's currently RC releases in the repo. Update away!
-
-For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord
-
-**Latest supported Discord Android version:** 87.2 - Alpha (87202), released on 2021-08-04.
+**Latest supported Discord Android version:** 10.2.9 (1029), released on 2020-01-28.
 
 New patch development will be done for the latest supported version.
 
-![A CutTheCord screenshot](https://elixi.re/t/m16z287iw.png)
+![A CutTheCord screenshot](https://elixi.re/i/h3eirsy9.png)
 
 Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)!
 
@@ -24,13 +18,14 @@ You can add that to your phone and get updates easily or just download directly
 
 Feel free to ignore play protect, it's bullshit.
 
-If you fail recaptcha, [follow this](https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82).
+If you fail recaptcha, [follow this](https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82) (run through adb).
+
+**PSA: Please keep in mind that you may be unable to receive updates due to an F-Droid bug.**
+
+~~If you're affected by this, here's a workaround: F-Droid -> Settings -> Repositories -> Seabear, tap Share on top bar, copy to clipboard, tap Delete (next to share), then tap Add Repository. It should already be filled in (from clipboard), so add it and you should be able to get updates after that.~~
+
+If you're affected by this, ensure that your F-Droid version is 1.7 or higher. As of time of writing, F-Droid 1.7 is alpha, and can only be downloaded by enabling Unstable Updates through Settings -> Advanced Settings.
 
 ## Building
 
 See [BUILDING.md](BUILDING.md).
-
-## License
-
-- CTCCI, patchport and other scripts are AGPLv3.
-- We chose to not license the patches, and are therefore "All Rights Reserved". However, you're allowed to use it to build your own version of CutTheCord, fork CutTheCord, develop your own patches etc, and we kindly ask you to send us any patches you develop that you think may be helpful. You're free to distribute binaries (apks) including CutTheCord patches as long as you give appropriate credit to the CutTheCord project.

ctcci/.gitignore

@@ -0,0 +1 @@
+ctcconfig.py

ctcci/ctcci.py

@@ -2,6 +2,7 @@
 import os
 import sys
 import shutil
+import requests
 import json
 import subprocess
 from ctcconfig import *
@@ -14,20 +15,14 @@ FORCE = False
 DEFAULT_PATCHES = ["necessary", "branding", "customversion"]
 OPTIONAL_PATCHES = ["necessary", "blobs"]
 
-def xmlpatch(patch_file, workdir, patch_name=""):
-    if not os.path.exists(patch_file):
-        # Allow missing patches
-        return
-
-    print(f"Applying {patch_file}")
-
-    subprocess.run(f"{XML_PATCH_BIN} com.github.dnault.xmlpatch.BatchPatcher --patch {patch_file} --srcdir {workdir}",
-                   shell=True, check=True, cwd=workdir)
 
 def patch(patch_file, workdir, patch_name=""):
     if not os.path.exists(patch_file):
-        # Allow missing patches
-        return
+        # Allow missing optional patches
+        if patch_name in OPTIONAL_PATCHES:
+            return
+
+        raise FileNotFoundError(f"No patches with name \"{patch_file}\" :(")
 
     print(f"Applying {patch_file}")
 
@@ -39,19 +34,19 @@ def patch(patch_file, workdir, patch_name=""):
 if os.path.exists(WORK_APK_PATH):
     shutil.rmtree(WORK_APK_PATH)
 
-os.environ["DISTOK_EXTRACTED_DISCORD_PATH"] = WORK_APK_PATH
-
 os.makedirs(WORK_FOLDER, exist_ok=True)
 
-with open(os.path.join(REPO_FOLDER, "resources/patchport-state.json")) as f:
-    STATE = json.load(f)
-    VERSION = STATE["versioncode"]
+if LOCAL_STATE:
+    # Get the version of the APK from distok state file
+    with open(STATE_FILE) as f:
+        STATE = json.load(f)
+else:
+    # Get the version of the APK from distok.top
+    STATE = requests.get("https://distok.top/state.json").json()
+
+VERSION = STATE["android"][PACKAGE_ID]["version"]
 
 BASE_APK_PATH = os.path.join(WORK_FOLDER, f"discord-base-{VERSION}")
-BASE_JAR_PATH = os.path.join(WORK_FOLDER, f"discord-base-{VERSION}-jar")
-# Wipe and recreate the base jar folder
-if os.path.exists(BASE_JAR_PATH):
-    shutil.rmtree(BASE_JAR_PATH)
 
 # Prepare names of input and output APKs
 INPUT_FILE = os.path.join(DISTOK_FOLDER, "android",
@@ -79,49 +74,51 @@ if DO_GITPULL:
 
 # Extract the APK if it's not already extracted to base cache
 if not os.path.exists(BASE_APK_PATH):
-    subprocess.run(f"{APKTOOL_BIN} d --no-dummy {INPUT_FILE} -o {BASE_APK_PATH} -f",
+    subprocess.run(f"{APKTOOL_BIN} d {INPUT_FILE} -o {BASE_APK_PATH} -f",
                    shell=True,
                    cwd=WORK_FOLDER)
 
-# Convert the dexs to a jar (for slashcommands etc) TODO versionise gradle/this
-if not os.path.exists(BASE_JAR_PATH):
-    subprocess.run(f"unzip -j {INPUT_FILE} *.dex -d {BASE_JAR_PATH}", shell=True, cwd=WORK_FOLDER)
-    subprocess.run(f"{DEX2JAR_BIN} *.dex", shell=True, cwd=BASE_JAR_PATH)
-    subprocess.run(f"zipmerge discord-base.jar classes*dex2jar.jar", shell=True, cwd=BASE_JAR_PATH)
-
 # Copy the base cache to work on it
 shutil.copytree(BASE_APK_PATH, WORK_APK_PATH)
 
 # Go through patches and apply every single one of them
 for patch_name in PATCHES:
-    pre_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, f"{VERSION}-pre.sh")
+    pre_script = os.path.join(REPO_FOLDER, "patches",
+                              patch_name, f"{VERSION}-pre.sh")
     if os.path.exists(pre_script):
-        subprocess.run(f"bash {pre_script}", shell=True, cwd=WORK_APK_PATH)
-    pre_script = os.path.join(REPO_FOLDER, "resources/xmlpatches", patch_name, f"{VERSION}-pre.sh")
-    if os.path.exists(pre_script):
-        subprocess.run(f"bash {pre_script}", shell=True, cwd=WORK_APK_PATH)
+        subprocess.run(f"bash {pre_script}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
     # Apply custom emoji patches
     if patch_name in ["mutant", "blobs"]:
         print(f"Applying {patch_name} emoji patch")
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "emojireplace.py")
-        subprocess.run(f"{PYTHON_BIN} {patch_script}", shell=True, cwd=WORK_APK_PATH)
+        patch_script = os.path.join(REPO_FOLDER, "patches",
+                                    patch_name, "emojireplace.py")
+        subprocess.run(f"{PYTHON_BIN} {patch_script}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
     # Apply custom emoji patches
     elif patch_name == "customtheme":
         print(f"Applying splash patch")
-        splash = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "asset_loading.png")
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "fixsplash.sh")
+        splash = os.path.join(REPO_FOLDER, "patches",
+                              patch_name, "asset_loading.png")
+        patch_script = os.path.join(REPO_FOLDER, "patches",
+                                    patch_name, "fixsplash.sh")
 
-        subprocess.run(f"bash {patch_script} {splash}", shell=True, cwd=WORK_APK_PATH)
+        subprocess.run(f"bash {patch_script} {splash}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
-    patch_file = os.path.join(REPO_FOLDER, "resources/patches", patch_name, f"{VERSION}.patch")
-    xml_patch_file = os.path.join(REPO_FOLDER, "resources/xmlpatches", patch_name, f"{VERSION}.xml")
+    patch_file = os.path.join(REPO_FOLDER, "patches",
+                              patch_name, f"{VERSION}.patch")
 
     # Apply custom version patches
     if patch_name == "customversion":
         print(f"Applying custom version")
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "addpatch.py")
+        patch_script = os.path.join(REPO_FOLDER, "patches",
+                                    patch_name, "addpatch.py")
 
         subprocess.run(f"{PYTHON_BIN} {patch_script} {patch_file} "
                        f"{' '.join(PATCHES)}",
@@ -134,27 +131,44 @@ for patch_name in PATCHES:
         print(f"Applying branding icon patch")
         if BRANCH in ICONS:
             shutil.copyfile(ICONS[BRANCH],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "logo_debug.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi", "logo_debug.png"))
         elif "default" in ICONS:
             shutil.copyfile(ICONS["default"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "logo_debug.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi", "logo_debug.png"))
 
         if BRANCH in DYN_ICONS:
+            shutil.copyfile(DYN_ICONS[BRANCH]["bg"],
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_background.png"))
             shutil.copyfile(DYN_ICONS[BRANCH]["fg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_foreground.png"))
         elif "default" in ICONS:
+            shutil.copyfile(DYN_ICONS["default"]["bg"],
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_background.png"))
             shutil.copyfile(DYN_ICONS["default"]["fg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_foreground.png"))
 
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "customicon.sh")
+        patch_script = os.path.join(REPO_FOLDER, "patches",
+                                    patch_name, "customicon.sh")
 
         subprocess.run(f"bash {patch_script}", shell=True, cwd=WORK_APK_PATH)
 
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "customdynamicicon.sh")
+        patch_script = os.path.join(REPO_FOLDER, "patches",
+                                    patch_name, "customdynamicicon.sh")
 
         subprocess.run(f"bash {patch_script}", shell=True, cwd=WORK_APK_PATH)
 
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "addpatch.py")
+        patch_script = os.path.join(REPO_FOLDER, "patches",
+                                    patch_name, "addpatch.py")
 
         # Hell code
         app_name = APP_NAMES.get(BRANCH, APP_NAMES.get("default", "CutTheCord"))
@@ -167,9 +181,13 @@ for patch_name in PATCHES:
         patch(patch_file.replace(".patch", "-custom.patch"), WORK_APK_PATH)
     elif patch_name in ["bettertm", "bettertmlight"]:
         print(f"Applying bettertm emoji patch")
-        patch_dir = os.path.join(REPO_FOLDER, "resources/patches", patch_name)
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "bettertm.sh")
-        subprocess.run(f"bash {patch_script} {patch_dir}", shell=True, cwd=WORK_APK_PATH)
+        patch_dir = os.path.join(REPO_FOLDER, "patches",
+                                 patch_name)
+        patch_script = os.path.join(REPO_FOLDER, "patches",
+                                    patch_name, "bettertm.sh")
+        subprocess.run(f"bash {patch_script} {patch_dir}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
     # Apply custom ringtone
     elif patch_name == "customring":
         print(f"Applying custom ringtone")
@@ -178,7 +196,9 @@ for patch_name in PATCHES:
         else:
             CUSTOM_RINGTONE = RINGTONES["default"]
 
-        shutil.copyfile(CUSTOM_RINGTONE, os.path.join(WORK_APK_PATH, "res", "raw", "call_ringing.mp3"))
+        shutil.copyfile(CUSTOM_RINGTONE,
+                        os.path.join(WORK_APK_PATH, "res",
+                                     "raw", "call_ringing.mp3"))
     # Apply custom fonts
     elif patch_name == "customfont":
         print(f"Applying custom font")
@@ -188,18 +208,19 @@ for patch_name in PATCHES:
             fonts = FONTS["default"]
 
         for font in fonts:
-            shutil.copyfile(fonts[font], os.path.join(WORK_APK_PATH, "res", "font", font))
+            shutil.copyfile(fonts[font],
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "font", font))
     # Apply any other patches
     else:
         patch(patch_file, WORK_APK_PATH, patch_name)
-        xmlpatch(xml_patch_file, WORK_APK_PATH, patch_name)
 
-    post_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, f"{VERSION}-post.sh")
+    post_script = os.path.join(REPO_FOLDER, "patches",
+                               patch_name, f"{VERSION}-post.sh")
     if os.path.exists(post_script):
-        subprocess.run(f"bash {post_script}", shell=True, cwd=WORK_APK_PATH)
-    post_script = os.path.join(REPO_FOLDER, "resources/xmlpatches", patch_name, f"{VERSION}-post.sh")
-    if os.path.exists(post_script):
-        subprocess.run(f"bash {post_script}", shell=True, cwd=WORK_APK_PATH)
+        subprocess.run(f"bash {post_script}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
 # Pack the APK
 subprocess.run(f"{APKTOOL_BIN} b discord",

ctcci/ctcconfig.example.py

@@ -0,0 +1,81 @@
+import os
+
+APKTOOL_BIN = "java -jar /home/ave/apktool-cli-all.jar"  # use latest
+
+# Set to false if you're going to use a local state.json file
+# state.json has information about the latest discord version
+LOCAL_STATE = False
+STATE_FILE = "/home/ave/distok/state.json"
+
+# APKs must be placed under $DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk
+# Example: /home/ave/distok/android/com.discord-909.apk
+DISTOK_FOLDER = "/home/ave/distok"
+
+# Set if F-Droid repo should be automatically updated or not
+# If set to False, you can leave FDROID_FOLDER empty
+DO_FDROID = True
+FDROID_FOLDER = "/var/www/fdroid/seabear"
+
+# This is where APKs will be placed
+RESULT_FOLDER = FDROID_FOLDER + "/repo"
+
+# Repo for CutTheCord (https://gitdab.com/distok/cutthecord)
+DO_GITPULL = True
+REPO_FOLDER = "/home/ave/distokrepos/cutthecord"
+
+# If false, jarsigner will be used for signing the apk.
+DO_APKSIGNER = True
+
+# Keystore file, alias and pass. Required.
+KEYSTORE_FILE = "/home/ave/oof.keystore"
+KEYSTORE_ALIAS = "distok"
+KEYSTORE_PASS = "redacted"
+
+# Set this to the python version you want to use. Needs to be 3.6+.
+PYTHON_BIN = "python3.6"
+
+# Folder where the apk will be extracted to, patched in, and packed back on
+# You're not recommended to touch WORK_APK_PATH.
+WORK_FOLDER = "/tmp/cutthecord"
+WORK_APK_PATH = os.path.join(WORK_FOLDER, "discord")
+
+# Package ID for discord. You should probably not touch this.
+PACKAGE_ID = "com.discord"
+
+# Set to force if you want builds to be done
+# even if there's already a build for this version
+FORCE = False
+
+# Custom ringtones, default = applied to all the ones not explicitly stated
+RINGTONES = {"ave": "/home/ave/sans.mp3",
+             "default": "/home/ave/removeskype.mp3"}
+
+# Custom icons, default = applied to all the ones not explicitly stated
+ICONS = {"ave": "/home/ave/ctclogoave.png",
+         "default": "/home/ave/ctclogo.png"}
+
+# Custom dynamic icons, default = applied to all the ones not explicitly stated
+DYN_ICONS = {"ave": {"bg": "/home/ave/distokrepos/cutthecord/icons/bg.png",
+                     "fg": "/home/ave/distokrepos/cutthecord/icons/fg.png"},
+             "default": {"bg": "/home/ave/dcbg.png",
+                         "fg": "/home/ave/dcfg.png"}}
+
+# Custom app names, default = applied to all the ones not explicitly stated
+# Needs to be one word, __ gets replaced with space
+APP_NAMES = {"ave": "CutTheCord__Ave",
+             "litecord": "Litecord",
+             "test": "CTC__Testing",
+             "default": "CutTheCord"}
+
+# Custom fonts, default = applied to all the ones not explicitly stated
+FONTS = {"ellie": {"whitney_bold.ttf": "/home/ave/fonts/GoogleSans-Bold.ttf",
+                   "whitney_semibold.ttf": "/home/ave/fonts/GoogleSans-Medium.ttf",
+                   "whitney_medium.ttf": "/home/ave/fonts/GoogleSans-Regular.ttf"},
+        "dyslexic": {"whitney_bold.ttf": "/home/ave/fonts/OpenDyslexic3-Bold.ttf",
+                   "whitney_semibold.ttf": "/home/ave/fonts/OpenDyslexic3-Bold.ttf",
+                   "whitney_medium.ttf": "/home/ave/fonts/OpenDyslexic3-Regular.ttf"},
+        "murm": {"whitney_bold.ttf": "/home/ave/fonts/comicbd.ttf",
+                 "whitney_semibold.ttf": "/home/ave/fonts/comicbd.ttf",
+                 "whitney_medium.ttf": "/home/ave/fonts/comic.ttf"},
+        "ave": {"sourcecodepro_semibold.ttf": "/home/ave/fonts/comic.ttf"},
+        "default": {}}

ctcci/requirements.txt

@@ -0,0 +1 @@
+requests

old-patches/README.md

@@ -9,9 +9,3 @@ Here's why these patches are no longer maintained in this form:
 - compact: It's just a pain to maintain.
 - smalltime: It's just a pain to maintain.
 - customdefaultemoji: There doesn't seem to be default emojis anymore?
-- noprofilestrip: UI changes removed the profile strip.
-- nonearby: Didn't add much anyways.
-- squareavatars: Moved to xml-patchs
-- betterrotation: Moved to xml-patchs
-- noblocked: Moved to xml-patchs
-- slashcommands: Moved to dynamic patch due to discord api supporting this now