added prebuild-tdlib and dep update

t0mer · Sep 23, 2023 · 94d92d0 · 94d92d0
1 parent 4f92efa
commit 94d92d0
Show file tree

Hide file tree

Showing 11 changed files with 4,190 additions and 3,017 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 Telegram Nearby Map uses OpenStreetMap and the official Telegram library to find the position of nearby users.
 
+**Please note:** Telegram's API was updated a while ago to make nearby user distances less precise, preventing exact location calculations. Therefore, Telegram Nearby Map displays users nearby, but does not show their exact location.
+
 Inspired by [Ahmed's blog post](https://blog.ahmed.nyc/2021/01/if-you-use-this-feature-on-telegram.html) and a [Hacker News discussion](https://news.ycombinator.com/item?id=25641399).
 Developed by [github.com/tejado](https://github.com/tejado).
 
@@ -24,11 +26,13 @@ Requirements: node.js and an Telegram account
 6. Look carefully at the output: you will need to confirm your Telegram login
 7. Go to http:https://localhost:3000 and have fun
 
-## Dependencies
-To avoid that you have to build TDLib yourself (https://github.com/tdlib/td#building), I added [tdlib.native](https://github.com/ForNeVeR/tdlib.native/releases) in the lib/tdlib folder. Please note that this is an external dependency that has not been fully reviewed by me!
-
 ## Changelog
 
+### 2023-09-23
+- Switched to [prebuild-tdlib](https://github.com/Bannerets/tdl)
+- Updated all dependencies
+- Bugfix of the search distance field
+
 ### 2021-11-13
 - Added [tdlib.native](https://github.com/ForNeVeR/tdlib.native/releases) for Linux (now it works in GitHub Codespaces)
 - Updated all dependencies

diff --git a/lib/tdlib/libcrypto-1_1-x64.dll b/lib/tdlib/libcrypto-1_1-x64.dll
diff --git a/lib/tdlib/libssl-1_1-x64.dll b/lib/tdlib/libssl-1_1-x64.dll
diff --git a/lib/tdlib/libtdjson.dylib b/lib/tdlib/libtdjson.dylib
diff --git a/lib/tdlib/libtdjson.so b/lib/tdlib/libtdjson.so
diff --git a/lib/tdlib/tdjson.dll b/lib/tdlib/tdjson.dll
diff --git a/lib/tdlib/zlib1.dll b/lib/tdlib/zlib1.dll
diff --git a/lib/telegram-nearby.js b/lib/telegram-nearby.js
@@ -1,8 +1,8 @@
-const { Client } = require('tdl');
-const { TDLib } = require('tdl-tdlib-addon');
+const tdl = require('tdl');
 const { to } = require('await-to-js');
 const path = require('path');
 const log = require('./logger.js');
+const { getTdjson } = require('prebuilt-tdlib')
 
 function sleep(ms) {
  return new Promise((resolve) => {
@@ -12,25 +12,16 @@ function sleep(ms) {
 
 class TelegramNearby {
  constructor(apiId, apiHash) {
- let root = process.cwd();
- process.chdir('lib/tdlib/');
-
- let tdLibraryPath = "./libtdjson.so";
- if (process.platform === "win32") {
- tdLibraryPath = "tdjson.dll";
- } else if(process.platform === "darwin") {
- tdLibraryPath = "./libtdjson.dylib";
- }
-
- console.log(`Current WD: ${process.cwd()}`)
+ const tdLibraryPath = getTdjson();
  console.log(`Lib Path: ${tdLibraryPath}`)
- this.client = new Client(new TDLib(tdLibraryPath), {
+
+ tdl.configure({ tdjson: tdLibraryPath })
+
+ this.client = tdl.createClient({
  apiId: apiId,
  apiHash: apiHash,
  });
 
- process.chdir(root);
-
  this.client.connectAndLogin();
  this.client.on('error', log.warn);
  }