nostr/iris-messenger
1
0
Fork 0
mirror of https://github.com/irislib/iris-messenger.git synced 2024-09-19 17:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore reposts in feed

Browse Source
This commit is contained in:
Martti Malmi 2023-03-13 08:18:25 +02:00
parent 9a35c354bc
commit d046a9778f
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/components/Feed.jsx
View File

@ -262,9 +262,12 @@ class Feed extends Component {
// throttle?
const events = Events.db
.chain()
.find({ pubkey, kind: 1 })
.find({ pubkey, kind: { $between: [1, 6] } })
.where((e) => {
// TODO apply all filters from state.settings
if (![1, 6].includes(e.kind)) {
return false;
}
if (!includeReplies && e.tags.find((t) => t[0] === 'e')) {
return false;
}
@ -276,7 +279,7 @@ class Feed extends Component {
this.updateSortedMessages(events);
};
callback();
this.unsub = PubSub.subscribe([{ kinds: [1, 5, 7], authors: [pubkey] }], callback);
this.unsub = PubSub.subscribe([{ kinds: [1, 5, 6, 7], authors: [pubkey] }], callback);
}
getMessagesByEveryone() {
@ -284,7 +287,13 @@ class Feed extends Component {
const settings = this.state.settings;
// TODO apply filters
const dv = Events.db.addDynamicView('everyone');
dv.applyFind({ kind: 1 });
dv.applyFind({ kind: { $between: [1, 6] } });
dv.applyWhere((e) => {
if (![1, 6].includes(e.kind)) {
return false;
}
return true;
});
const simpleSortDesc =
settings.sortBy === 'created_at' ? settings.sortDirection === 'desc' : true;
dv.applySimpleSort('created_at', { desc: simpleSortDesc });
@ -310,15 +319,18 @@ class Feed extends Component {
this.updateSortedMessages(events);
}, 1000);
callback();
this.unsub = PubSub.subscribe([{ kinds: [1, 3, 5, 7, 9735], limit: 100 }], callback, 'global');
this.unsub = PubSub.subscribe([{ kinds: [1, 3, 5, 6, 7, 9735], limit: 100 }], callback, 'global');
}
getMessagesByFollows() {
this.unsub?.();
const dv = Events.db.addDynamicView('follows');
dv.applyFind({ kind: 1 });
dv.applyFind({ kind: { $between: [1, 6] } });
dv.applyWhere((e) => {
const followDistance = SocialNetwork.followDistanceByUser.get(e.pubkey);
if (![1, 6].includes(e.kind)) {
return false;
}
if (!followDistance || followDistance > 1) {
return false;
}
@ -353,7 +365,7 @@ class Feed extends Component {
}, 1000);
callback();
this.unsub = PubSub.subscribe([{ kinds: [1, 3, 5, 7, 9735] }], callback, 'global');
this.unsub = PubSub.subscribe([{ kinds: [1, 3, 5, 6, 7, 9735] }], callback, 'global');
}
updateParams(prevState) {
@ -541,7 +553,9 @@ class Feed extends Component {
this.setState({ settings: { ...this.state.settings, sortDirection: 'desc' } })
}
/>
<label style="margin-right: 30px" htmlFor="ordering_desc">▼</label>
<label style="margin-right: 30px" htmlFor="ordering_desc">
▼
</label>
<input
type="radio"
name="ordering"