Browse Source

Implement file recieving via user tokens

master
Inex Code 1 month ago
parent
commit
05766eed21
3 changed files with 45 additions and 15 deletions
  1. +10
    -10
      README.md
  2. +1
    -1
      package.json
  3. +34
    -4
      src/vk.ts

+ 10
- 10
README.md View File

@ -107,11 +107,11 @@ https://oauth.vk.com/authorize?client_id=<CLIENT_ID>&display=page&redirect_uri=h
- [x] Auth as a user instead of group
- [x] Text content
- [x] Forwards
- [ ] Image content
- [ ] Audio content
- [ ] Video content
- [ ] Stickers
- [ ] Other files
- [x] Image content
- [ ] Audio content - unavailable via user tokens
- [ ] Video content - unavailable via user tokens
- [x] Stickers
- [x] Other files
- [ ] Presence
- [x] Typing notifs
- [x] User profiles
@ -223,11 +223,11 @@ https://oauth.vk.com/authorize?client_id=<CLIENT_ID>&display=page&redirect_uri=h
- Вконтакте (как пользователь) -> Matrix
- [x] Текстовые сообщения
- [x] Пересланные сообщения
- [ ] Изображения
- [ ] Аудио
- [ ] Видео
- [ ] Стикеры
- [ ] Прочие файлы
- [x] Изображения
- [ ] Аудио - недоступно через токен пользователя
- [ ] Видео - недоступно через токен пользователя
- [x] Стикеры
- [x] Прочие файлы
- [ ] Индикатор "в сети"
- [x] Индикатор печати
- [x] Имена и аватарки пользователей


+ 1
- 1
package.json View File

@ -1,6 +1,6 @@
{
"name": "mx-puppet-vk",
"version": "0.2.0",
"version": "0.3.0",
"description": "",
"main": "index.js",
"scripts": {


+ 34
- 4
src/vk.ts View File

@ -507,11 +507,39 @@ export class VkPuppet {
}
}
if (context.hasAttachments()) {
for (const f of context.attachments) {
const attachments = p.data.isUserToken
? (await p.client.api.messages.getById({message_ids: context.id})).items[0].attachments!
: context.attachments;
for (const f of attachments) {
switch (f.type) {
case AttachmentType.PHOTO:
try {
await this.puppet.sendFileDetect(params, f["largeSizeUrl"]);
if (p.data.isUserToken) {
// VK API is weird. Very weird.
let url: string = "";
f["photo"]["sizes"].forEach((element) => {
if (element["type"] === "w") {
url = element["url"] || "";
}
});
if (url === "") {
f["photo"]["sizes"].forEach((element) => {
if (element["type"] === "z") {
url = element["url"] || "";
}
});
}
if (url === undefined) {
f["photo"]["sizes"].forEach((element) => {
if (element["type"] === "y") {
url = element["url"];
}
});
}
await this.puppet.sendFileDetect(params, url);
} else {
await this.puppet.sendFileDetect(params, f["largeSizeUrl"]);
}
} catch (err) {
const opts: IMessageEvent = {
body: `Image was sent: ${f["largeSizeUrl"]}`,
@ -521,7 +549,8 @@ export class VkPuppet {
break;
case AttachmentType.STICKER:
try {
await this.puppet.sendFileDetect(params, f["imagesWithBackground"][4]["url"]);
p.data.isUserToken ? await this.puppet.sendFileDetect(params, f["sticker"]["images_with_background"][4]["url"])
: await this.puppet.sendFileDetect(params, f["imagesWithBackground"][4]["url"]);
} catch (err) {
const opts: IMessageEvent = {
body: `Sticker was sent: ${f["imagesWithBackground"][4]["url"]}`,
@ -541,7 +570,8 @@ export class VkPuppet {
break;
case AttachmentType.DOCUMENT:
try {
await this.puppet.sendFileDetect(params, f["url"], f["title"]);
p.data.isUserToken ? await this.puppet.sendFileDetect(params, f["doc"]["url"], f["doc"]["title"])
: await this.puppet.sendFileDetect(params, f["url"], f["title"]);
} catch (err) {
const opts: IMessageEvent = {
body: `Document was sent: ${f["url"]}`,


Loading…
Cancel
Save