working on showing single posts for users we dont know about
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { generateID } from "IDUtils";
|
||||
import { PeerManager, PeerEventTypes } from "PeerManager";
|
||||
import { Sync } from "Sync";
|
||||
import { openDatabase, getData, addData, deleteData, getAllData } from "db";
|
||||
import { openDatabase, getData, addData, deleteData, getAllData, getPostForUser } from "db";
|
||||
import { arrayBufferToBase64, compressString } from "dataUtils";
|
||||
import { log, logID, renderLog, setLogVisibility } from "log";
|
||||
class Post {
|
||||
@@ -139,7 +139,7 @@ export class App {
|
||||
console.log.apply(null, log(`[app] Need (${neededPostIDs.length}) posts for user ${logID(userID)} from peer ${logID(peerID)}`));
|
||||
let neededPostCount = neededPostIDs.length;
|
||||
this.statusBar.updatePeerStatus(peerID, `need(${logID(userID)} | ${neededPostCount})`, { havePostCount: 0, neededPostCount: neededPostCount });
|
||||
let neededPosts = await this.peerManager?.rpc.getPostsForUser(peerID, this.peerID, userID, neededPostIDs);
|
||||
await this.peerManager?.rpc.getPostsForUser(peerID, this.peerID, userID, neededPostIDs);
|
||||
}
|
||||
else {
|
||||
console.log.apply(null, log(`[app] Don't need any posts for user ${logID(userID)} from peer ${logID(peerID)}`));
|
||||
@@ -172,13 +172,22 @@ export class App {
|
||||
for (let userID of userIDs) {
|
||||
// console.log.apply(null, log(`[app] announceUsers, got user:${userID} from peer ${sendingPeerID}`));
|
||||
this.sync.addUserPeer(userID, sendingPeerID);
|
||||
if (!(this.sync.shouldSyncUserID(userID) || (this.router.route === App.Route.USER && userID === this.router.userID))) {
|
||||
if (!(this.sync.shouldSyncUserID(userID) || (this.router.route & (App.Route.USER | App.Route.POST) && userID === this.router.userID))) {
|
||||
console.log.apply(null, log(`[app] announceUser_rpc_response skipping user[${logID(userID)}] from[${logID(sendingPeerID)}]`));
|
||||
continue;
|
||||
}
|
||||
console.log.apply(null, log(`[app] calling getPostIDsForUser for user [${logID(userID)}] on peer [${logID(sendingPeerID)}]`));
|
||||
this.statusBar.updatePeerStatus(sendingPeerID, `getPostIDs(${logID(userID)})⬆️`);
|
||||
let postIDs = await this.peerManager?.rpc.getPostIDsForUser(sendingPeerID, userID);
|
||||
let postIDs = null;
|
||||
if (this.router.route === App.Route.POST && this.router.userID == userID) {
|
||||
postIDs = [this.router.postID];
|
||||
}
|
||||
else {
|
||||
postIDs = await this.peerManager?.rpc.getPostIDsForUser(sendingPeerID, userID);
|
||||
}
|
||||
if (!postIDs) {
|
||||
continue;
|
||||
}
|
||||
this.statusBar.updatePeerStatus(sendingPeerID, `syncing(${logID(userID)} ${postIDs.length})`);
|
||||
console.log.apply(null, log(`[app] Got (${postIDs.length}) post IDs for user [${logID(userID)}] from peer [${logID(sendingPeerID)}]`));
|
||||
this.addPostIDsToSyncQueue(userID, sendingPeerID, postIDs);
|
||||
@@ -223,6 +232,7 @@ export class App {
|
||||
if (postIDs) {
|
||||
return postIDs;
|
||||
}
|
||||
return [];
|
||||
});
|
||||
this.peerManager.registerRPC('getPostsForUser', async (requestingPeerID, userID, postIDs) => {
|
||||
let posts = await this.sync.getPostsForUser(userID, postIDs);
|
||||
@@ -798,15 +808,19 @@ export class App {
|
||||
async loadPostsFromStorage(userID, postID) {
|
||||
this.timerStart();
|
||||
let posts = [];
|
||||
// if (postID) {
|
||||
// posts = await gePostForUser(userID, postID);
|
||||
// }
|
||||
posts = await getData(userID, new Date(2022, 8), new Date());
|
||||
if (posts.length > 0) {
|
||||
if (postID) {
|
||||
posts = await getPostForUser(userID, postID);
|
||||
}
|
||||
else {
|
||||
posts = await getData(userID, new Date(2022, 8), new Date());
|
||||
}
|
||||
if (posts?.length) {
|
||||
console.log.apply(null, log(`Loaded ${posts.length} posts in ${this.timerDelta().toFixed(2)}ms`));
|
||||
;
|
||||
return posts;
|
||||
}
|
||||
console.log.apply(null, log(`No posts found for userID:${userID}, postID:${postID}`));
|
||||
;
|
||||
// posts = await createTestData2(userID);
|
||||
// log("Adding test data...");
|
||||
// addDataArray(userID, posts);
|
||||
@@ -1174,12 +1188,12 @@ export class App {
|
||||
(function (App) {
|
||||
let Route;
|
||||
(function (Route) {
|
||||
Route[Route["USER"] = 0] = "USER";
|
||||
Route[Route["POST"] = 1] = "POST";
|
||||
Route[Route["MEDIA"] = 2] = "MEDIA";
|
||||
Route[Route["GROUP"] = 3] = "GROUP";
|
||||
Route[Route["HOME"] = 4] = "HOME";
|
||||
Route[Route["CONNECT"] = 5] = "CONNECT";
|
||||
Route[Route["USER"] = 1] = "USER";
|
||||
Route[Route["POST"] = 2] = "POST";
|
||||
Route[Route["MEDIA"] = 4] = "MEDIA";
|
||||
Route[Route["GROUP"] = 8] = "GROUP";
|
||||
Route[Route["HOME"] = 16] = "HOME";
|
||||
Route[Route["CONNECT"] = 32] = "CONNECT";
|
||||
})(Route = App.Route || (App.Route = {}));
|
||||
})(App || (App = {}));
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user