kopia lustrzana https://github.com/Stopka/fedicrawl
Added addresses to fulltext
rodzic
d2ab8bfb2f
commit
b5df2b986a
|
@ -11,7 +11,7 @@ import { createFeed } from '../../Storage/Feeds/createFeed'
|
||||||
import prepareFulltext from './prepareFulltext'
|
import prepareFulltext from './prepareFulltext'
|
||||||
|
|
||||||
export const addFeed = async (prisma: PrismaClient, node: Node, feedData: FeedData): Promise<Feed> => {
|
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)
|
const feed = await createFeed(prisma, { ...feedData, fulltext }, node)
|
||||||
|
|
||||||
await createFeedFields(prisma, feed, feedData.fields)
|
await createFeedFields(prisma, feed, feedData.fields)
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
import { FeedData } from '../../Fediverse/Providers/FeedData'
|
import { FeedData } from '../../Fediverse/Providers/FeedData'
|
||||||
import striptags from 'striptags'
|
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(
|
return striptags(
|
||||||
feedData.displayName +
|
feedData.displayName +
|
||||||
' ' + feedData.description +
|
' ' + feedData.description +
|
||||||
' ' + feedData.fields.map(field => field.name).join(' ') +
|
' ' + 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) : '')
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { PrismaClient, Feed } from '@prisma/client'
|
import { PrismaClient, Feed, Node } from '@prisma/client'
|
||||||
import { FeedData } from '../../Fediverse/Providers/FeedData'
|
import { FeedData } from '../../Fediverse/Providers/FeedData'
|
||||||
import { createMissingTags } from '../../Storage/Tags/createMissingTags'
|
import { createMissingTags } from '../../Storage/Tags/createMissingTags'
|
||||||
import { createFeedTags } from '../../Storage/Tags/createFeedTags'
|
import { createFeedTags } from '../../Storage/Tags/createFeedTags'
|
||||||
|
@ -13,8 +13,8 @@ import { deleteAllFeedEmails } from '../../Storage/Emails/deleteAllFeedEmails'
|
||||||
import { updateFeed } from '../../Storage/Feeds/updateFeed'
|
import { updateFeed } from '../../Storage/Feeds/updateFeed'
|
||||||
import prepareFulltext from './prepareFulltext'
|
import prepareFulltext from './prepareFulltext'
|
||||||
|
|
||||||
export const refreshFeed = async (prisma: PrismaClient, feed:Feed, feedData: FeedData): Promise<Feed> => {
|
export const refreshFeed = async (prisma: PrismaClient, feed:Feed, feedData: FeedData, node: Node): Promise<Feed> => {
|
||||||
const fulltext = prepareFulltext(feedData)
|
const fulltext = prepareFulltext(feedData, node)
|
||||||
|
|
||||||
await deleteAllFeedFields(prisma, feed)
|
await deleteAllFeedFields(prisma, feed)
|
||||||
await createFeedFields(prisma, feed, feedData.fields)
|
await createFeedFields(prisma, feed, feedData.fields)
|
||||||
|
|
|
@ -8,7 +8,7 @@ export const refreshOrAddFeed = async (prisma:PrismaClient, node:Node, feedData:
|
||||||
const feed = await fetchFeedByNodeAndName(prisma, node, feedData.name)
|
const feed = await fetchFeedByNodeAndName(prisma, node, feedData.name)
|
||||||
if (feed) {
|
if (feed) {
|
||||||
console.info('Refreshing feed', { nodeDomain: node.domain, feedName: feedData.name, feedType: feedData.type })
|
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 })
|
console.info('Adding feed', { nodeDomain: node.domain, feedName: feedData.name, feedType: feedData.type })
|
||||||
return await addFeed(prisma, node, feedData)
|
return await addFeed(prisma, node, feedData)
|
||||||
|
|
Ładowanie…
Reference in New Issue