code saving

melod1n · Oct 8, 2021 · 4552bf0 · 4552bf0
1 parent ffab674
commit 4552bf0
Show file tree

Hide file tree

Showing 38 changed files with 1,021 additions and 460 deletions.
diff --git a/.run/index.js.run.xml b/.run/index.js.run.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="index.js" type="NodeJSConfigurationType" nameIsGenerated="true" path-to-js-file="src/index.js" working-dir="$PROJECT_DIR$">
+    <method v="2">
+      <option name="TypeScript.Before.Run" enabled="true" FAIL_ON_ERROR="true" CONFIG_PATH="$PROJECT_DIR$/tsconfig.json" />
+    </method>
+  </configuration>
+</component>
diff --git a/data/database.sql b/data/database.sql
diff --git a/data/settings.json b/data/settings.json
@@ -1,6 +1,6 @@
 {
-  "sendActionMessage": true,
+  "messagesReceived": 696,
+  "messagesSent": 377,
   "testAnswer": true,
-  "messagesReceived": 0,
-  "messagesSent": 0
+  "sendActionMessage": true
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,6 +9,8 @@
     "inversify": "^5.1.1",
     "node-fetch": "^2.6.1",
     "reflect-metadata": "^0.1.13",
+    "sql-template-strings": "^2.2.2",
+    "sqlite": "^4.0.23",
     "sqlite3": "^5.0.2",
     "systeminformation": "^5.6.1",
     "ts-node": "^9.1.1",

diff --git a/src/api/loader/chats-loader.ts b/src/api/loader/chats-loader.ts
@@ -2,6 +2,8 @@ import {Loader} from '../../model/loader';
 import {VkChat} from '../../model/vk-chat';
 import {vk} from '../../index';
 import {VkUser} from '../../model/vk-user';
+import {CacheStorage} from '../../database/cache-storage';
+import {MemoryCache} from '../../database/memory-cache';
 
 export class ChatsLoader extends Loader<VkChat> {
 
@@ -25,8 +27,8 @@ export class ChatsLoader extends Loader<VkChat> {
 
                     const jsonMembers = await vk.api.call('messages.getConversationMembers',
                         {
-                            peer_id: chat.peerId,
-                            fields: 'photo200, online,online_mobile,online_info, sex'
+                            peer_id: chat.id,
+                            fields: 'photo200, online, online_mobile, online_info, sex'
                         }
                     );
 
@@ -44,10 +46,13 @@ export class ChatsLoader extends Loader<VkChat> {
 
                 resolve(chats);
 
-                // const usersPromise = this.cacheStorage.users.store(users);
-                // const chatsPromise = this.cacheStorage.chats.store(chats);
+                chats.forEach(chat => MemoryCache.appendChat(chat));
+                users.forEach(user => MemoryCache.appendUser(user));
 
-                // await Promise.all([usersPromise, chatsPromise]);
+                const usersPromise = CacheStorage.users.store(users);
+                const chatsPromise = CacheStorage.chats.store(chats);
+
+                await Promise.all([usersPromise, chatsPromise]);
             } catch (e) {
                 reject(e);
             }

diff --git a/src/api/loader/users-loader.ts b/src/api/loader/users-loader.ts
@@ -2,6 +2,7 @@ import {Loader} from '../../model/loader';
 import {VkUser} from '../../model/vk-user';
 import {vk} from '../../index';
 import {CacheStorage} from '../../database/cache-storage';
+import {MemoryCache} from '../../database/memory-cache';
 
 export class UsersLoader extends Loader<VkUser> {
 
@@ -16,13 +17,16 @@ export class UsersLoader extends Loader<VkUser> {
                 const users = VkUser.parse(r);
                 resolve(users);
 
+                users.forEach(user => MemoryCache.appendUser(user));
+
                 await CacheStorage.users.store(users);
             });
         });
     }
 
-    async loadSingle(params: any): Promise<VkUser> {
-        return Promise.resolve(undefined);
+    async loadSingle(userId: number): Promise<VkUser> {
+        if (isFinite(userId)) return null;
+        return new Promise((resolve, reject) => this.load([userId]).then(users => resolve(users[0])).catch(reject));
     }
 
 }
diff --git a/src/commands/add-admin.ts b/src/commands/add-admin.ts
diff --git a/src/commands/admins.ts b/src/commands/admins.ts
@@ -1,32 +1,141 @@
-import {Command} from '../model/chat-command';
+import {Command, Requirements} from '../model/chat-command';
 import {Api} from '../api/api';
 import {LoadManager} from '../api/load-manager';
 import {MemoryCache} from '../database/memory-cache';
 import {CacheStorage} from '../database/cache-storage';
+import {MessageContext, MessageForwardsCollection} from 'vk-io';
+import {TAG, TAG_ERROR} from '../index';
 
-export class Admins extends Command {
+class AdminsList extends Command {
     regexp = /^\/admins/i;
     title = '/admins';
     description = 'list of bot\'s admins';
 
     async execute(context) {
-        if (MemoryCache.admins.length == 0) {
+        if (MemoryCache.isAdminsEmpty()) {
             await Api.sendMessage(context, 'Администраторов нет 😞');
             return;
         }
 
         let text = 'Список администраторов:\n\n';
 
-        for (let i = 0; i < MemoryCache.admins.length; i++) {
-            const id = MemoryCache.admins[i];
+        for (let i = 0; i < MemoryCache.adminsSize(); i++) {
+            const id = MemoryCache.getAdminByIndex(i);
 
-            let user = await CacheStorage.users.getSingle(id);
+            let user = await MemoryCache.getUser(id);
             if (!user) user = await LoadManager.users.loadSingle(id);
 
             text += `❤ @id${id}(${user.firstName} ${user.lastName})\n`;
         }
 
         await Api.sendMessage(context, text, true);
     }
+}
 
-}
+class AdminAdd extends Command {
+
+    regexp = /^\/addadmin/i;
+    title = '/addAdmin';
+    description = 'adds bot\'s admin by id or replied message';
+
+    requirements = Requirements.Build().apply(true);
+
+    async execute(
+        context: MessageContext,
+        params: string[],
+        fwd?: MessageForwardsCollection,
+        reply?: MessageContext
+    ): Promise<void> {
+
+        let userId: number = null;
+
+        if (reply) {
+            userId = reply.senderId;
+        }
+
+        if (!userId) {
+            if (context.text.includes(' ')) {
+                const split = context.text.split(' ');
+                try {
+                    userId = Number(split[1]);
+                    if (isNaN(userId)) userId = -1;
+                } catch (e) {
+                    userId = -1;
+                }
+            }
+        }
+
+        if (!userId || userId < 0) {
+            console.log(`${TAG_ERROR}: /addAdmin: wrong userId`);
+            await Api.sendMessage(context, 'Неверный userId.', null, context.id);
+        } else {
+            console.log(`${TAG}: /addAdmin: added new admin: ${userId}`);
+
+            let user = await MemoryCache.getUser(userId);
+            if (!user) {
+                await Api.sendMessage(context, 'секунду...');
+                user = await LoadManager.users.loadSingle(userId);
+            }
+
+            const message = `@id${user.id}(${user.firstName} ${user.lastName}) теперь администратор! 🥳`;
+
+            const sendMessagePromise = Api.sendMessage(context, message, true);
+            const storeUserPromise = CacheStorage.users.storeSingle(user);
+            const storeAdminPromise = CacheStorage.admins.storeSingle(userId);
+
+            await Promise.all([sendMessagePromise, storeUserPromise, storeAdminPromise]);
+        }
+    }
+
+}
+
+class AdminRemove extends Command {
+
+    regexp = /^\/removeAdmin/i;
+    title = '/removeAdmin';
+    name = '/removeAdmin';
+    description = 'removes bot\'s admin';
+
+    requirements = Requirements.Build().apply(true);
+
+    async execute(context, params, fwd, reply): Promise<void> {
+
+        let userId: number = null;
+
+        if (reply) {
+            userId = reply.senderId;
+        }
+
+        if (!userId) {
+            if (context.text.includes(' ')) {
+                try {
+                    userId = Number(context.text.split(' ')[1]);
+                    if (isNaN(userId)) userId = null;
+                } catch (e) {
+                    userId = null;
+                }
+            }
+        }
+
+        if (!userId || userId < 0) {
+            console.log(`${TAG_ERROR}: /removeAdmin: wrong userId`);
+            await Api.sendMessage(context, 'Неверный userId.', null, context.id);
+        } else {
+            console.log(`${TAG}: /removeAdmin: removed admin: ${userId}`);
+            await CacheStorage.admins.deleteSingle(userId);
+
+            let user = await MemoryCache.getUser(userId);
+            if (!user) {
+                await Api.sendMessage(context, 'секунду...');
+                user = await LoadManager.users.loadSingle(userId);
+            }
+
+            const message = `@id${user.id}(${user.firstName} ${user.lastName}) больше не администратор 💔`;
+
+            await Api.sendMessage(context, message, true);
+        }
+    }
+
+}
+
+export {AdminsList, AdminAdd, AdminRemove};
diff --git a/src/commands/bat.ts b/src/commands/bat.ts
@@ -8,7 +8,7 @@ export class Bat extends Command {
     name = '/bat';
     description = 'executed value in cmd';
 
-    requirements = Requirements.builder().apply(true);
+    requirements = Requirements.Build().apply(true);
 
     async execute(context, params) {
         const text = params[1];

diff --git a/src/commands/json-request.ts b/src/commands/json-request.ts
@@ -9,7 +9,7 @@ export class JsonRequest extends Command {
     title = '/json';
     description = 'retrieved json from url';
 
-    requirements = Requirements.builder().apply(false, true, false, false, false, false);
+    requirements = Requirements.Build().apply(false, true, false, false, false, false);
 
     async execute(context, params) {
         let url = params[1];

diff --git a/src/commands/kick.ts b/src/commands/kick.ts
@@ -8,7 +8,7 @@ export class Kick extends Command {
     name = '/kick';
     description = 'kicks user from chat';
 
-    requirements = Requirements.builder().apply(false, true, true, true, false, true);
+    requirements = Requirements.Build().apply(false, true, true, true, false, true);
 
     async execute(context) {
         const message = await LoadManager.messages.loadByConversationMessageId(