From dfbe4d5dd481ba666de9aab72c30b8b462bfff1e Mon Sep 17 00:00:00 2001 From: jedi Date: Sun, 14 May 2023 16:10:54 +0200 Subject: [PATCH] stash --- frontend/src/store.js | 41 ++++++++++++++++++++++++++++++---- frontend/src/views/Friends.vue | 8 +++---- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/frontend/src/store.js b/frontend/src/store.js index 2faa2aa..fe52dee 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -2,6 +2,7 @@ import {createStore} from 'vuex'; import router from '@/router'; import FallBackResolver from "@/dns"; import NeighborsCache from "@/neigbors"; +import {useRoute} from "vue-router"; export default createStore({ @@ -46,6 +47,9 @@ export default createStore({ setInventoryItems(state, {url, items}) { state.item_map[url] = items; }, + setFriends(state, friends) { + state.friends = friends; + }, logout(state) { state.user = null; state.token = null; @@ -95,8 +99,15 @@ export default createStore({ return false; } }, - async getFriends(state) { - return ['jedi@j3d1.de', 'foobar@example.com', 'foobaz@example.eleon', 'alice@example2.com']; + async getFriends({commit, dispatch, state}) { + const home_server = "localhost:8000" + const data = await dispatch('apiFederatedGet', { + host: home_server, + target: '/api/friends/' + }) + console.log('getFriends', data) + commit('setFriends', data) + return data }, async getFriendServer({state}, {username}) { const domain = username.split('@')[1] @@ -204,8 +215,30 @@ export default createStore({ console.log('ext_reply', ext_reply) return true; }, - async acceptFriend({state, dispatch}, args) { - console.log('accepting friend ' + args) + async acceptFriend({state, dispatch}, {id, secret}) { + console.log('accepting friend ' + id) + state.home_server = 'localhost:8000' + const home_reply = await dispatch('apiFederatedPost', { + host: state.home_server, + target: '/api/friends/', + data: { + friend_request_id: id, secret: secret + } + }) + console.log('home_reply', home_reply) + const ext_serqver = await dispatch('getFriendServer', {username: home_reply.befriender}) + const ext_reply = await dispatch('apiFederatedPost', { + host: ext_serqver[0], + target: '/api/friendrequests/', + data: { + befriender: state.user, + befriendee: username, + befriender_key: nacl.to_hex(state.keypair.signPk), + secret: home_reply.secret + } + }) + console.log('ext_reply', ext_reply) + return true }, async declineFriend({state, dispatch}, args) { console.log('declining friend ' + args) diff --git a/frontend/src/views/Friends.vue b/frontend/src/views/Friends.vue index 1a0c5b1..ed5ea59 100644 --- a/frontend/src/views/Friends.vue +++ b/frontend/src/views/Friends.vue @@ -80,11 +80,11 @@ {{ request.befriender_public_key.slice(0,32) }}... -   - @@ -158,8 +158,8 @@ export default { } }).catch(() => {}) }, - tryAcceptFriend(friend) { - this.acceptFriend({username: friend}).then((ok) => { + tryAcceptFriend(request) { + this.acceptFriend({id: request.id, secret: request.secret}).then((ok) => { if (ok) { this.fetchContent() }