@@ -71,18 +69,21 @@ function countRepliesRecursive(event) {
if (!event.replies) {
return 0
}
- let count = event.replies.length
- for (const reply of event.replies) {
- count += countRepliesRecursive(reply)
+ let count = 0
+ for (const thread of event.replies) {
+ if (!thread || !Array.isArray(thread)) {
+ continue
+ }
+ count += thread.length
+ for (const reply of thread) {
+ count += countRepliesRecursive(reply)
+ }
}
return count
}
function postFromEvents(events) {
const event = events[0]
- if (event.replies.length) {
- console.log(event)
- }
return {
id: event.id,
author: event.pubkey,
@@ -149,22 +150,22 @@ export default {
}
}
&-content {
- margin-left: 10px;
+ margin-left: 12px;
flex-grow: 1;
&-header {
p {
- margin: 8px 0;
- font-weight: bold;
- color: #fff;
+ margin: 0 0 8px;
> span {
color: $color-dark-gray;
+ &:first-child {
+ color: #fff;
+ }
& + span {
margin-left: 8px;
}
&.nip05 {
}
&.created-at {
- font-weight: normal;
}
}
}
@@ -197,6 +198,7 @@ export default {
justify-content: space-between;
max-width: 450px;
width: 100%;
+ margin-left: -9px;
.action-item {
display: flex;
align-items: center;
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 1dbb9e7..0348f4d 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -22,7 +22,7 @@
-
+
@@ -120,7 +120,7 @@ export default defineComponent({
data() {
return {
- cachedPages: ['Feed', 'Notifications', 'Messages'],
+ cachedPages: ['Feed', 'Feed2', 'Notifications', 'Messages'],
middlePagePos: {},
broadcastChannel: new BroadcastChannel('hamstr'),
activeWindow: false,
diff --git a/src/pages/Feed2.vue b/src/pages/Feed2.vue
index 5c4ae83..973448f 100644
--- a/src/pages/Feed2.vue
+++ b/src/pages/Feed2.vue
@@ -23,18 +23,20 @@
to chat with the AI bot create a new post and mention it by typing '@gpt3' and selecting the AI bot from the user list
-
-
-
+
@@ -47,6 +49,7 @@ import {dbFeed, dbUserFollows} from '../query'
import BaseButtonLoadMore from 'components/BaseButtonLoadMore.vue'
import { createMetaMixin } from 'quasar'
import Post from 'components/Post/index.vue'
+//import BasePostThread from 'components/BasePostThread.vue'
// const debouncedAddToThread = mergebounce(
@@ -76,6 +79,7 @@ export default defineComponent({
mixins: [helpersMixin, createMetaMixin(metaData)],
components: {
+ //BasePostThread,
Post,
BaseButtonLoadMore,
},
@@ -269,12 +273,24 @@ export default defineComponent({
}
})
-