From b5df2b986a5356947faffc363d913d8a7b4e94a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0korpil?= <stepan@skorpil.cz>
Date: Sat, 1 Jan 2022 12:21:43 +0100
Subject: [PATCH] Added addresses to fulltext

---
 application/src/Jobs/Feeds/addFeed.ts          | 2 +-
 application/src/Jobs/Feeds/prepareFulltext.ts  | 7 +++++--
 application/src/Jobs/Feeds/refreshFeed.ts      | 6 +++---
 application/src/Jobs/Feeds/refreshOrAddFeed.ts | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/application/src/Jobs/Feeds/addFeed.ts b/application/src/Jobs/Feeds/addFeed.ts
index 7ab203e..40a0332 100644
--- a/application/src/Jobs/Feeds/addFeed.ts
+++ b/application/src/Jobs/Feeds/addFeed.ts
@@ -11,7 +11,7 @@ import { createFeed } from '../../Storage/Feeds/createFeed'
 import prepareFulltext from './prepareFulltext'
 
 export const addFeed = async (prisma: PrismaClient, node: Node, feedData: FeedData): Promise<Feed> => {
-  const fulltext = prepareFulltext(feedData)
+  const fulltext = prepareFulltext(feedData, node)
   const feed = await createFeed(prisma, { ...feedData, fulltext }, node)
 
   await createFeedFields(prisma, feed, feedData.fields)
diff --git a/application/src/Jobs/Feeds/prepareFulltext.ts b/application/src/Jobs/Feeds/prepareFulltext.ts
index 653d2ba..8ba309c 100644
--- a/application/src/Jobs/Feeds/prepareFulltext.ts
+++ b/application/src/Jobs/Feeds/prepareFulltext.ts
@@ -1,11 +1,14 @@
 import { FeedData } from '../../Fediverse/Providers/FeedData'
 import striptags from 'striptags'
+import { Node } from '@prisma/client'
 
-export default function (feedData: FeedData):string {
+export default function (feedData: FeedData, node: Node):string {
   return striptags(
     feedData.displayName +
         ' ' + feedData.description +
         ' ' + feedData.fields.map(field => field.name).join(' ') +
-        ' ' + feedData.fields.map(field => field.value).join(' ')
+        ' ' + feedData.fields.map(field => field.value).join(' ') +
+      ' ' + feedData.name + '@' + node.domain +
+      (feedData.parentFeed ? (' ' + feedData.parentFeed.name + '@' + feedData.parentFeed.hostDomain) : '')
   )
 }
diff --git a/application/src/Jobs/Feeds/refreshFeed.ts b/application/src/Jobs/Feeds/refreshFeed.ts
index 7f69c78..bedd894 100644
--- a/application/src/Jobs/Feeds/refreshFeed.ts
+++ b/application/src/Jobs/Feeds/refreshFeed.ts
@@ -1,4 +1,4 @@
-import { PrismaClient, Feed } from '@prisma/client'
+import { PrismaClient, Feed, Node } from '@prisma/client'
 import { FeedData } from '../../Fediverse/Providers/FeedData'
 import { createMissingTags } from '../../Storage/Tags/createMissingTags'
 import { createFeedTags } from '../../Storage/Tags/createFeedTags'
@@ -13,8 +13,8 @@ import { deleteAllFeedEmails } from '../../Storage/Emails/deleteAllFeedEmails'
 import { updateFeed } from '../../Storage/Feeds/updateFeed'
 import prepareFulltext from './prepareFulltext'
 
-export const refreshFeed = async (prisma: PrismaClient, feed:Feed, feedData: FeedData): Promise<Feed> => {
-  const fulltext = prepareFulltext(feedData)
+export const refreshFeed = async (prisma: PrismaClient, feed:Feed, feedData: FeedData, node: Node): Promise<Feed> => {
+  const fulltext = prepareFulltext(feedData, node)
 
   await deleteAllFeedFields(prisma, feed)
   await createFeedFields(prisma, feed, feedData.fields)
diff --git a/application/src/Jobs/Feeds/refreshOrAddFeed.ts b/application/src/Jobs/Feeds/refreshOrAddFeed.ts
index a6e5c4c..1652737 100644
--- a/application/src/Jobs/Feeds/refreshOrAddFeed.ts
+++ b/application/src/Jobs/Feeds/refreshOrAddFeed.ts
@@ -8,7 +8,7 @@ export const refreshOrAddFeed = async (prisma:PrismaClient, node:Node, feedData:
   const feed = await fetchFeedByNodeAndName(prisma, node, feedData.name)
   if (feed) {
     console.info('Refreshing feed', { nodeDomain: node.domain, feedName: feedData.name, feedType: feedData.type })
-    return await refreshFeed(prisma, feed, feedData)
+    return await refreshFeed(prisma, feed, feedData, node)
   }
   console.info('Adding feed', { nodeDomain: node.domain, feedName: feedData.name, feedType: feedData.type })
   return await addFeed(prisma, node, feedData)