بعض الإصلاحات + تغير اسم التطبيق ط

rn0x · Apr 28, 2022 · a5f1ff6 · a5f1ff6
1 parent 0856dcb
commit a5f1ff6
Show file tree

Hide file tree

Showing 28 changed files with 456 additions and 500 deletions.
diff --git a/README.md b/README.md
@@ -42,6 +42,20 @@
 
 ## تنزيل التطبيق
 
+<br><br>
+
+<p align="center">
+  <a href="https://snapcraft.io/islam-bot">
+     <img alt="احصل عليه من Snap Store" src="https://snapcraft.io/static/images/badges/ar/snap-store-black.svg"/>
+  </a>
+
+  ```bash
+
+  sudo snap install islam-bot 
+
+  ```
+</p>
+
 - **Linux**: [Download the .AppImage, .deb, or .rpm file](https://github.com/rn0x/islam_bot/releases/latest)
 - **Windows**: [Download the .exe file](https://github.com/rn0x/islam_bot/releases/latest)
 

diff --git a/index.js b/index.js
@@ -18,7 +18,7 @@ const createWindow = () => {
         center: true,
         resizable: false, // قابل لتكبير والتصغير
         frame: false, // ايطار البرنامج
-        title: 'islam_bot',
+        title: 'islam-bot',
         icon: path.join(Path_Local, '/build/icons/icon.png'),
         webPreferences: {
             preload: path.join(__dirname, 'preload.js')
@@ -45,13 +45,13 @@ const createWindow = () => {
         event.preventDefault();
 
 
-        if (fs.existsSync(path.join(Path_appDate, '/islam_bot/Settings.json'))) {
+        if (fs.existsSync(path.join(Path_appDate, '/islam-bot/Settings.json'))) {
 
-            let Settings = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Settings.json'));
+            let Settings = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Settings.json'));
             if (Settings.start === true) {
 
                 let data = Object.assign({}, Settings, { start: false })
-                fs.writeJSONSync(path.join(Path_appDate, '/islam_bot/Settings.json'), data, { spaces: '\t' })
+                fs.writeJSONSync(path.join(Path_appDate, '/islam-bot/Settings.json'), data, { spaces: '\t' })
 
             }
         }
@@ -78,7 +78,7 @@ const createWindow = () => {
     ]);
     tray = new Tray(path.join(Path_Local, '/build/icons/icon.png'));
     tray.setContextMenu(trayMenu);
-    tray.setToolTip("islam_bot");
+    tray.setToolTip("islam-bot");
     tray.on('click', () => {
         mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show()
     });
@@ -97,9 +97,9 @@ app.whenReady().then(async () => {
 
     }
 
-    if (fs.existsSync(path.join(Path_appDate, '/islam_bot/Settings.json'))) {
+    if (fs.existsSync(path.join(Path_appDate, '/islam-bot/Settings.json'))) {
 
-        let Settings = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Settings.json'));
+        let Settings = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Settings.json'));
 
         if (Settings.start === true && Settings.off_on === 'on') {
 
@@ -111,14 +111,14 @@ app.whenReady().then(async () => {
 
     setInterval(async () => {
 
-        if (fs.existsSync(path.join(Path_appDate, '/islam_bot/Settings.json'))) {
+        if (fs.existsSync(path.join(Path_appDate, '/islam-bot/Settings.json'))) {
 
-            let Settings = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Settings.json'));
+            let Settings = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Settings.json'));
             if (Settings.start === false && Settings.off_on === 'on') {
 
                 islam_bot(app.getPath("appData"), Path_Local, Notification);
                 let data = Object.assign({}, Settings, { start: true })
-                fs.writeJSONSync(path.join(Path_appDate, '/islam_bot/Settings.json'), data, { spaces: '\t' });
+                fs.writeJSONSync(path.join(Path_appDate, '/islam-bot/Settings.json'), data, { spaces: '\t' });
 
             }
         }
@@ -159,6 +159,6 @@ app.on('window-all-closed', () => {
 
 app.setLoginItemSettings({
   openAtLogin: true,
-  path: path.join(process.resourcesPath, '../Islam_Bot.exe'),
+  path: path.join(process.resourcesPath, '../islam-bot.exe'),
   args: ['--hidden']
 })
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "islam_bot",
-  "version": "1.0.6",
+  "name": "islam-bot",
+  "version": "1.0.7",
   "homepage": "https://github.com/rn0x",
-  "description": "Islam_Bot - publishes adhkar and the Qur’an ..",
+  "description": "islam-bot - publishes adhkar and the Qur’an ..",
   "main": "index.js",
   "type": "commonjs",
   "author": {
@@ -31,9 +31,9 @@
     "telegraf": "^4.7.0"
   },
   "build": {
-    "productName": "Islam_Bot",
+    "productName": "islam-bot",
     "appId": "org.IslamBot.rn0x",
-    "copyright": "Copyright © 2022 Islam_Bot",
+    "copyright": "Copyright © 2022 islam-bot",
     "extraFiles": [
       {
         "from": "./",
@@ -75,8 +75,8 @@
       "installerIcon": "build/icon.ico",
       "uninstallerIcon": "build/icon.ico",
       "license": "build/LICENSE.txt",
-      "shortcutName": "Islam_Bot",
-      "uninstallDisplayName": "Islam_Bot",
+      "shortcutName": "islam-bot",
+      "uninstallDisplayName": "islam-bot",
       "installerSidebar": "build/installerSidebar.bmp",
       "uninstallerSidebar": "build/installerSidebar.bmp",
       "installerHeader": "build/installerHeader.bmp"
@@ -85,13 +85,13 @@
       "category": "Education",
       "icon": "build/icons/icon.icns",
       "vendor": "Ryan Almalki",
-      "executableName": "Islam_Bot",
-      "description": "Islam_Bot - publishes adhkar and the Qur’an ..",
+      "description": "islam-bot - publishes adhkar and the Qur’an ..",
       "synopsis": "publishes adhkar and the Qur’an",
       "target": [
         "AppImage",
         "deb",
-        "rpm"
+        "rpm",
+        "snap"
       ]
     },
     "directories": {

diff --git a/src/Telegram/Error.js b/src/Telegram/Error.js
@@ -3,7 +3,7 @@ const path = require('path');
 
 module.exports = async function Error(error, Path_appDate) {
 
-    let json = fs.readJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'));
+    let json = fs.readJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'));
 
     if (error.response !== undefined) {
 
@@ -16,7 +16,7 @@ module.exports = async function Error(error, Path_appDate) {
                 [id_new]: json[id_old]
             })[id_old]
             json[id_new].id = id_new
-            fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json, { spaces: '\t' });
+            fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json, { spaces: '\t' });
 
         }
 
@@ -25,7 +25,7 @@ module.exports = async function Error(error, Path_appDate) {
             let id_user = error.on.payload.chat_id
 
             delete json[id_user]
-            fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json, { spaces: '\t' });
+            fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json, { spaces: '\t' });
 
         }
 
@@ -34,7 +34,7 @@ module.exports = async function Error(error, Path_appDate) {
             let id_user = error.on.payload.chat_id
 
             delete json[id_user]
-            fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json, { spaces: '\t' });
+            fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json, { spaces: '\t' });
 
         }
 
@@ -43,7 +43,7 @@ module.exports = async function Error(error, Path_appDate) {
             let id_user = error.on.payload.chat_id
 
             delete json[id_user]
-            fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json, { spaces: '\t' });
+            fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json, { spaces: '\t' });
 
         }
 
@@ -52,10 +52,18 @@ module.exports = async function Error(error, Path_appDate) {
             let id_user = error.on.payload.chat_id
 
             delete json[id_user]
-            fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json, { spaces: '\t' });
+            fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json, { spaces: '\t' });
 
         }
 
+        else if (error.response.description === "Forbidden: bot was kicked from the supergroup chat") {
+
+            let id_user = error.on.payload.chat_id
+
+            delete json[id_user]
+            fs.writeJsonSync(join(Path_appDate, '/islam-bot/Users.json'), json, { spaces: '\t' });
+
+        }
 
     }
 

diff --git a/src/Telegram/Save_db.js b/src/Telegram/Save_db.js
@@ -1,20 +1,20 @@
 const fs = require('fs-extra');
 const path = require('path');
 
-module.exports = async function Save_db(id, first_name, username, type, Path_appDate) {
+module.exports = async function Save_db(id, username, first_name, type, Path_appDate) {
 
     try {
 
-        if (fs.existsSync(path.join(Path_appDate, '/islam_bot/Users.json')) === false) {
+        if (fs.existsSync(path.join(Path_appDate, '/islam-bot/Users.json')) === false) {
 
-            fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), {});
+            fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), {});
 
 
         }
 
-        else if (fs.existsSync(path.join(Path_appDate, '/islam_bot/Users.json'))) {
+        else if (fs.existsSync(path.join(Path_appDate, '/islam-bot/Users.json'))) {
 
-            let json = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Users.json'));
+            let json = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Users.json'));
 
             if (Object.keys(json).includes(id.toString()) === false) {
 
@@ -31,7 +31,7 @@ module.exports = async function Save_db(id, first_name, username, type, Path_app
                 }
 
 
-                fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), Object.assign({}, json, db));
+                fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), Object.assign({}, json, db));
 
             }
 

diff --git a/src/Telegram/broadcast.js b/src/Telegram/broadcast.js
@@ -22,7 +22,7 @@ module.exports = async function broadcast(bot, Path_appDate, Path_Local) {
         const photo = fs.readJSONSync(path.join(Path_Local, '/src/Telegram/button/Photo_Json.json'));
         const video = fs.readJSONSync(path.join(Path_Local, '/src/Telegram/button/Video_json.json'));
         const QuranJson = fs.readJSONSync(path.join(Path_Local, '/src/Telegram/button/Quran.json'));
-        const json = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Users.json'));
+        const json = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Users.json'));
         const user = Object.keys(json);
         const me = await bot.telegram.getMe();
 

diff --git a/src/Telegram/button/Lectures.js b/src/Telegram/button/Lectures.js
@@ -8,15 +8,15 @@ module.exports = async function Lectures(bot, Path_appDate, Markup, Path_Local)
         let id = ctx.chat.id;
         let Lectures_json = fs.readJSONSync(path.join(Path_Local, '/src/Telegram/button/Lectures.json'));
         let random = Lectures_json[Math.floor(Math.random() * Lectures_json.length)]
-        let json = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Users.json'));
+        let json = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Users.json'));
         json[id].message_id !== undefined ? ctx.deleteMessage(json[id].message_id) : ''
         let but_1 = [Markup.button.callback('🔄', 'Lectures'), Markup.button.callback('الرجوع', 'start')];
         let button = Markup.inlineKeyboard([but_1]);
         let caption = `<b>▪${random.Lectures}</b>\n\n`
         caption += `${random.Author ? `\n\n<b>الشيخ:</b> ${random.Author} 🔊` : ''}`
         let { message_id } = await ctx.replyWithVideo({ url: random.FilePath }, { caption: caption, reply_markup: button.reply_markup , parse_mode: 'HTML' });
         json[id].message_id = message_id
-        fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json);
+        fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json);
 
 
     });

diff --git a/src/Telegram/button/Names_Of_Allah.js b/src/Telegram/button/Names_Of_Allah.js
@@ -8,15 +8,15 @@ module.exports = async function Names_Of_Allah(bot, Path_appDate, Markup, Path_L
         let id = ctx.chat.id;
         let Names_Of_Allah_json = fs.readJSONSync(path.join(Path_Local, '/src/Telegram/button/Names_Of_Allah.json'));
         let random = Names_Of_Allah_json[Math.floor(Math.random() * Names_Of_Allah_json.length)]
-        let json = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Users.json'));
+        let json = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Users.json'));
         json[id].message_id !== undefined ? ctx.deleteMessage(json[id].message_id) : ''
         let message = `<b>الإسم: ${random.name}</b>\n\n`
         message += `المعنى: ${random.text}\n\n`
         let but_1 = [Markup.button.callback('🔄', 'Names_Of_Allah'), Markup.button.callback('الرجوع للقائمة الرئيسية', 'start')];
         let button = Markup.inlineKeyboard([but_1]);
         let { message_id } = await ctx.reply(message, { reply_markup: button.reply_markup , parse_mode: 'HTML' })
         json[id].message_id = message_id
-        fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json);
+        fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json);
 
 
     });

diff --git a/src/Telegram/button/Quran.js b/src/Telegram/button/Quran.js
@@ -6,7 +6,7 @@ module.exports = async function quran(bot, Path_appDate, Markup) {
     bot.action('quran', async (ctx) => {
 
         let id = ctx.chat.id;
-        let json = fs.readJSONSync(path.join(Path_appDate, '/islam_bot/Users.json'));
+        let json = fs.readJSONSync(path.join(Path_appDate, '/islam-bot/Users.json'));
         json[id].message_id !== undefined ? ctx.deleteMessage(json[id].message_id) : ''
         let quran_menu = 'قم بإختيار القارئ 🔊 \n\n'
         quran_menu += '1- أدريس أبكر \n'
@@ -28,7 +28,7 @@ module.exports = async function quran(bot, Path_appDate, Markup) {
         let button = Markup.inlineKeyboard([but_1, but_2, but_3, but_4, but_5, but_6]);
         let { message_id } = await ctx.reply(quran_menu, button);
         json[id].message_id = message_id
-        fs.writeJsonSync(path.join(Path_appDate, '/islam_bot/Users.json'), json);
+        fs.writeJsonSync(path.join(Path_appDate, '/islam-bot/Users.json'), json);
 
 
     });