Skip to content

Commit fe10f17

Browse files
Merge pull request #442 from Adamant-im/adelina
feat: Adelina
2 parents 97a2273 + 7bac5e1 commit fe10f17

File tree

8 files changed

+37
-21
lines changed

8 files changed

+37
-21
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ ADAMANT includes crypto wallets for ADAMANT (ADM), Bitcoin (BTC), Ethereum (ETH)
1414

1515
This application deployed at [msg.adamant.im](https://msg.adamant.im) and [available as standalone apps](https://adamant.im/#adm-apps) for macOS, Windows and Linux. Feel free to run your own messenger using this code and Build Setup.
1616

17+
ADAMANT Messenger has built-in crypto Exchanger and Adelina, an AI chat assistant based on ChatGPT.
18+
1719
## Project setup
1820

1921
```

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adamant-im",
3-
"version": "3.2.0",
3+
"version": "3.3.0",
44
"author": "ADAMANT Foundation <[email protected]>",
55
"license": "GPLv3",
66
"description": "Decentralized Messenger",
@@ -53,7 +53,7 @@
5353
"register-service-worker": "^1.7.2",
5454
"semver": "^7.3.7",
5555
"simple-audio": "^1.0.1",
56-
"socket.io-client": "^2.4.0",
56+
"socket.io-client": "^4.6.1",
5757
"sodium-browserify-tweetnacl": "^0.2.6",
5858
"throttle-promise": "^1.0.4",
5959
"visibilityjs": "^2.0.2",

src/config/production.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
},
2929
{
3030
"url": "http://5.161.53.74:36666"
31+
},
32+
{
33+
"url": "https://sunshine.adamant.im"
3134
}
3235
],
3336
"eth": [

src/config/tor.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
},
1111
{
1212
"url": "http://omhrhpc45njpgzp4fggtndazaodwuwvb5in6hsn3k7tvaqennmfaa2qd.onion"
13+
},
14+
{
15+
"url": "http://uxu6vnnrrnl7tmo7i657yvs4jbgdz734xvufryoi326az5dzufuwboad.onion"
16+
},
17+
{
18+
"url": "http://rukehjd2yalzgny7mdjqtzown2mazsaeh4zr7zjdg4l5afkgc3z2kgqd.onion"
1319
}
1420
],
1521
"eth": [

src/i18n/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
"virtual": {
5454
"bitcoin_bet": "Hi! I'm anonymous and Blockchain-proved bet bot 🤑. I accept bets on BTC rate and pay rewards to winners. Learn more on ADAMANT’s blog or type **/help** to start betting.",
5555
"bitcoin_bet_title": "Bet on Bitcoin price",
56+
"adelina": "Hello, I’m Adelina. Let's have a pleasure talk! I can do many things like:\n- Draft an email or other piece of writing\n- Write Python code\n- Answer questions about a set of documents\n- Support conversations\n- Tutor in a range of subjects\n- Translate languages\n- Compose a poem\n- Simulate characters for video games and much more",
57+
"adelina_title": "Adelina AI",
5658
"bounty_wallet_title": "ADAMANT Bounty Wallet",
5759
"bounty_foundation_wallet_title": "Adoption hot Wallet",
5860
"exchange_bot": "Hi! I'm your exchange bot ₿. I operate instantly and anonymously. Type **/help** to see what I can do. **ℹ**️ Learn more on ADAMANT blog.",

src/i18n/ru.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
"virtual": {
5454
"bitcoin_bet": "Привет! Принимаю ставки на курс биткоина анонимно и с доказательством в блокчейне 🤑. Узнайте больше в блоге АДАМАНТа или наберите **/help**.",
5555
"bitcoin_bet_title": "Ставки на курс биткоина",
56+
"adelina": "Привет, я Аделина. Давай приятно поговорим! Я много чего умею, например:\n\n- Создавать электронные письма и другие документы\n- Писать код на Python\n- Отвечать на вопросы о мире\n- Поддерживать разговоры,\n- Помогать в учебе по разным предметам\n- Переводить на языки\n- Сочинять стихи\n- Создавать персонажей для видеоигр и многое другое",
57+
"adelina_title": "Аделина AI",
5658
"bounty_wallet_title": "ADAMANT Bounty Wallet",
5759
"bounty_foundation_wallet_title": "Adoption hot Wallet",
5860
"exchange_bot": "Привет! Я — бот-обменник криптовалют ₿. Меняю анонимно и без задержек. **ℹ**️ Узнайте больше в блоге АДАМАНТа или наберите **/help**, чтобы приступить к обмену.",

src/store/modules/chat/index.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -475,63 +475,63 @@ const mutations = {
475475
page: 0
476476
})
477477

478-
const exchangeMessages = [
478+
const adelinaAI = [
479479
{
480-
id: 'e1',
481-
message: 'chats.virtual.exchange_bot',
480+
id: 't1',
481+
message: 'chats.virtual.adelina',
482482
timestamp: EPOCH,
483-
senderId: 'U5149447931090026688',
483+
senderId: 'U11138426591213238985',
484484
type: 'message',
485485
i18n: true,
486486
status: TS.CONFIRMED,
487487
readonly: true
488488
}
489489
]
490490

491-
Vue.set(state.chats, 'U5149447931090026688', {
492-
messages: exchangeMessages,
491+
Vue.set(state.chats, 'U11138426591213238985', {
492+
messages: adelinaAI,
493493
isAdamantChat: true,
494494
numOfNewMessages: 0,
495495
offset: 0,
496496
page: 0
497497
})
498498

499-
const donateMessages = [
499+
const exchangeMessages = [
500500
{
501-
id: 'd1',
502-
message: 'chats.virtual.donate_bot',
501+
id: 'e1',
502+
message: 'chats.virtual.exchange_bot',
503503
timestamp: EPOCH,
504-
senderId: 'U380651761819723095',
504+
senderId: 'U5149447931090026688',
505505
type: 'message',
506506
i18n: true,
507507
status: TS.CONFIRMED,
508508
readonly: true
509509
}
510510
]
511511

512-
Vue.set(state.chats, 'U380651761819723095', {
513-
messages: donateMessages,
512+
Vue.set(state.chats, 'U5149447931090026688', {
513+
messages: exchangeMessages,
514514
isAdamantChat: true,
515515
numOfNewMessages: 0,
516516
offset: 0,
517517
page: 0
518518
})
519519

520-
const bitcoinBetMessages = [
520+
const donateMessages = [
521521
{
522-
id: 't1',
523-
message: 'chats.virtual.bitcoin_bet',
522+
id: 'd1',
523+
message: 'chats.virtual.donate_bot',
524524
timestamp: EPOCH,
525-
senderId: 'U17840858470710371662',
525+
senderId: 'U380651761819723095',
526526
type: 'message',
527527
i18n: true,
528528
status: TS.CONFIRMED,
529529
readonly: true
530530
}
531531
]
532532

533-
Vue.set(state.chats, 'U17840858470710371662', {
534-
messages: bitcoinBetMessages,
533+
Vue.set(state.chats, 'U380651761819723095', {
534+
messages: donateMessages,
535535
isAdamantChat: true,
536536
numOfNewMessages: 0,
537537
offset: 0,

src/store/modules/partners/partners-state.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export default () => {
88
U5149447931090026688: { displayName: 'chats.virtual.exchange_bot_title' },
99
U1644771796259136854: { displayName: 'chats.virtual.bounty_bot_title' },
1010
U380651761819723095: { displayName: 'chats.virtual.donate_bot_title' },
11-
U17840858470710371662: { displayName: 'chats.virtual.bitcoin_bet_title' }
11+
U17840858470710371662: { displayName: 'chats.virtual.bitcoin_bet_title' },
12+
U11138426591213238985: { displayName: 'chats.virtual.adelina_title' }
1213
}
1314
}
1415
}

0 commit comments

Comments
 (0)