mirror of
https://github.com/orangecoding/fredy.git
synced 2026-06-16 12:31:07 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3249881771 | ||
|
|
3b727ea708 | ||
|
|
a2a765f43d | ||
|
|
c17a815263 | ||
|
|
7a2dacaa61 | ||
|
|
359e00e69f |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -7,3 +7,4 @@ npm-debug.log
|
||||
.idea
|
||||
.vscode
|
||||
tools/release/config.json
|
||||
.agents
|
||||
@@ -38,11 +38,15 @@ import { formatListing } from './utils/formatListing.js';
|
||||
* 3) Normalize listings to the provider schema
|
||||
* 4) Filter out incomplete/blacklisted listings
|
||||
* 5) Identify new listings (vs. previously stored hashes)
|
||||
* 6) Persist new listings
|
||||
* 7) Filter out entries similar to already seen ones
|
||||
* 8) Filter out entries that do not match the job's specFilter
|
||||
* 9) Filter out entries that do not match the job's spatialFilter
|
||||
* 10) Dispatch notifications
|
||||
* 6) Optionally enrich new listings via provider.fetchDetails
|
||||
* 7) Optionally re-apply the provider blacklist using the (now enriched)
|
||||
* description — only when the user opted in via
|
||||
* `blacklist_filter_on_provider_details`
|
||||
* 8) Persist new listings
|
||||
* 9) Filter out entries similar to already seen ones
|
||||
* 10) Filter out entries that do not match the job's specFilter
|
||||
* 11) Filter out entries that do not match the job's spatialFilter
|
||||
* 12) Dispatch notifications
|
||||
*/
|
||||
class FredyPipelineExecutioner {
|
||||
/**
|
||||
@@ -86,6 +90,7 @@ class FredyPipelineExecutioner {
|
||||
.then(this._filter.bind(this))
|
||||
.then(this._findNew.bind(this))
|
||||
.then(this._fetchDetails.bind(this))
|
||||
.then(this._filterAfterDetails.bind(this))
|
||||
.then(this._geocode.bind(this))
|
||||
.then(this._save.bind(this))
|
||||
.then(this._calculateDistance.bind(this))
|
||||
@@ -266,6 +271,48 @@ class FredyPipelineExecutioner {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-apply the provider's blacklist filter after `_fetchDetails` has had a
|
||||
* chance to enrich the listings (e.g., load the full description from the
|
||||
* detail page). The initial `_filter` step only sees the truncated snippet
|
||||
* exposed on the search results page, so a blacklisted term that lives
|
||||
* deeper in the listing's full description would otherwise slip through.
|
||||
*
|
||||
* Opt-in: gated by the user setting `blacklist_filter_on_provider_details`.
|
||||
* The full detail description tends to contain a lot of boilerplate (legal,
|
||||
* exposé contact info, generic marketing copy) which can accidentally match
|
||||
* a blacklist term and remove otherwise relevant listings. Users who want
|
||||
* the stricter behavior must enable the setting explicitly.
|
||||
*
|
||||
* Throws {@link NoNewListingsWarning} when all listings are filtered out
|
||||
* so the rest of the pipeline (save + notify) is short-circuited.
|
||||
*
|
||||
* @param {ParsedListing[]} listings Enriched listings to re-filter.
|
||||
* @returns {ParsedListing[]} Listings that still pass the provider's filter.
|
||||
* @throws {NoNewListingsWarning} When every listing is filtered out.
|
||||
*/
|
||||
_filterAfterDetails(listings) {
|
||||
if (typeof this._providerConfig.filter !== 'function') {
|
||||
return listings;
|
||||
}
|
||||
const userId = getJob(this._jobKey)?.userId;
|
||||
const enabled = getUserSettings(userId)?.blacklist_filter_on_provider_details === true;
|
||||
if (!enabled) {
|
||||
return listings;
|
||||
}
|
||||
const kept = listings.filter(this._providerConfig.filter);
|
||||
const removed = listings.length - kept.length;
|
||||
if (removed > 0) {
|
||||
logger.debug(
|
||||
`Re-filter after detail enrichment removed ${removed} listing(s) by blacklist (Provider: '${this._providerId}')`,
|
||||
);
|
||||
}
|
||||
if (kept.length === 0) {
|
||||
throw new NoNewListingsWarning();
|
||||
}
|
||||
return kept;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine which listings are new by comparing their IDs against stored hashes.
|
||||
*
|
||||
|
||||
@@ -26,6 +26,7 @@ export default async function listingsPlugin(fastify) {
|
||||
providerFilter,
|
||||
watchListFilter,
|
||||
statusFilter,
|
||||
hiddenOnly,
|
||||
sortfield = null,
|
||||
sortdir = 'asc',
|
||||
freeTextFilter,
|
||||
@@ -38,6 +39,7 @@ export default async function listingsPlugin(fastify) {
|
||||
};
|
||||
const normalizedActivity = toBool(activityFilter);
|
||||
const normalizedWatch = toBool(watchListFilter);
|
||||
const normalizedHidden = toBool(hiddenOnly) === true;
|
||||
const allowedStatuses = ['applied', 'rejected', 'accepted', 'none'];
|
||||
const normalizedStatus =
|
||||
typeof statusFilter === 'string' && allowedStatuses.includes(statusFilter.toLowerCase())
|
||||
@@ -62,6 +64,7 @@ export default async function listingsPlugin(fastify) {
|
||||
providerFilter,
|
||||
watchListFilter: normalizedWatch,
|
||||
statusFilter: normalizedStatus,
|
||||
hiddenOnly: normalizedHidden,
|
||||
sortField: sortfield || null,
|
||||
sortDir: sortdir === 'desc' ? 'desc' : 'asc',
|
||||
userId: request.session.currentUser,
|
||||
@@ -192,4 +195,21 @@ export default async function listingsPlugin(fastify) {
|
||||
}
|
||||
return reply.send();
|
||||
});
|
||||
|
||||
fastify.post('/restore', async (request, reply) => {
|
||||
const { ids } = request.body || {};
|
||||
const settings = await getSettings();
|
||||
try {
|
||||
if (settings.demoMode && !isAdminFn(request)) {
|
||||
return reply.code(403).send({ error: 'Sorry, but you cannot restore listings in demo mode ;)' });
|
||||
}
|
||||
if (Array.isArray(ids) && ids.length > 0) {
|
||||
listingStorage.restoreListingsById(ids);
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error(error);
|
||||
return reply.code(500).send({ error: error.message });
|
||||
}
|
||||
return reply.send();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -103,6 +103,28 @@ export default async function userSettingsPlugin(fastify) {
|
||||
}
|
||||
});
|
||||
|
||||
fastify.post('/blacklist-filter-on-details', async (request, reply) => {
|
||||
const userId = request.session.currentUser;
|
||||
const { blacklist_filter_on_provider_details } = request.body;
|
||||
|
||||
const globalSettings = await getSettings();
|
||||
if (globalSettings.demoMode && !isAdmin(request)) {
|
||||
return reply.code(403).send({ error: 'In demo mode, it is not allowed to change settings.' });
|
||||
}
|
||||
|
||||
if (typeof blacklist_filter_on_provider_details !== 'boolean') {
|
||||
return reply.code(400).send({ error: 'blacklist_filter_on_provider_details must be a boolean.' });
|
||||
}
|
||||
|
||||
try {
|
||||
upsertSettings({ blacklist_filter_on_provider_details }, userId);
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
logger.error('Error updating blacklist-filter-on-details setting', error);
|
||||
return reply.code(500).send({ error: error.message });
|
||||
}
|
||||
});
|
||||
|
||||
fastify.post('/listings-view-mode', async (request, reply) => {
|
||||
const userId = request.session.currentUser;
|
||||
const { listings_view_mode } = request.body;
|
||||
|
||||
@@ -14,7 +14,7 @@ const mapListing = (listing, baseUrl) => ({
|
||||
size: listing.size,
|
||||
title: listing.title,
|
||||
url: listing.link,
|
||||
fredyUrl: baseUrl && listing.id ? `${baseUrl}/listings/listing/${listing.id}` : null,
|
||||
fredyUrl: baseUrl && listing.id ? `${baseUrl}/#/listings/listing/${listing.id}` : null,
|
||||
});
|
||||
|
||||
export const send = async ({ serviceName, newListings, notificationConfig, jobKey, baseUrl }) => {
|
||||
|
||||
@@ -53,7 +53,7 @@ const mapListingsWithCid = async (serviceName, jobKey, listings, baseUrl) => {
|
||||
jobKey,
|
||||
hasImage: false,
|
||||
imageCid: '',
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/listings/listing/${l.id}` : null,
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/#/listings/listing/${l.id}` : null,
|
||||
};
|
||||
|
||||
if (imgUrl) {
|
||||
|
||||
@@ -25,7 +25,7 @@ const mapListings = (serviceName, jobKey, listings, baseUrl) =>
|
||||
price: l.price || '',
|
||||
image,
|
||||
hasImage: Boolean(image),
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/listings/listing/${l.id}` : null,
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/#/listings/listing/${l.id}` : null,
|
||||
serviceName,
|
||||
jobKey,
|
||||
};
|
||||
|
||||
@@ -20,7 +20,7 @@ const mapListings = (serviceName, jobKey, listings, baseUrl) =>
|
||||
hasImage: Boolean(image),
|
||||
// optional plain text snippet
|
||||
snippet: [l.address, l.price, l.size].filter(Boolean).join(' | '),
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/listings/listing/${l.id}` : null,
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/#/listings/listing/${l.id}` : null,
|
||||
serviceName,
|
||||
jobKey,
|
||||
};
|
||||
|
||||
@@ -25,7 +25,7 @@ const mapListings = (serviceName, jobKey, listings, baseUrl) =>
|
||||
price: l.price || '',
|
||||
image,
|
||||
hasImage: Boolean(image),
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/listings/listing/${l.id}` : null,
|
||||
fredyUrl: baseUrl && l.id ? `${baseUrl}/#/listings/listing/${l.id}` : null,
|
||||
serviceName,
|
||||
jobKey,
|
||||
};
|
||||
|
||||
@@ -198,7 +198,9 @@ function normalize(o) {
|
||||
* @returns {boolean}
|
||||
*/
|
||||
function applyBlacklist(o) {
|
||||
return !isOneOf(o.title, appliedBlackList);
|
||||
const titleNotBlacklisted = !isOneOf(o.title, appliedBlackList);
|
||||
const descNotBlacklisted = !isOneOf(o.description, appliedBlackList);
|
||||
return titleNotBlacklisted && descNotBlacklisted;
|
||||
}
|
||||
/** @type {ProviderConfig} */
|
||||
const config = {
|
||||
|
||||
@@ -42,7 +42,9 @@ function normalize(o) {
|
||||
* @returns {boolean}
|
||||
*/
|
||||
function applyBlacklist(o) {
|
||||
return !isOneOf(o.title, appliedBlackList);
|
||||
const titleNotBlacklisted = !isOneOf(o.title, appliedBlackList);
|
||||
const descNotBlacklisted = !isOneOf(o.description, appliedBlackList);
|
||||
return titleNotBlacklisted && descNotBlacklisted;
|
||||
}
|
||||
|
||||
/** @type {ProviderConfig} */
|
||||
|
||||
@@ -103,6 +103,13 @@ const EQUIPMENT_MAP = {
|
||||
lodgerflat: 'lodgerflat',
|
||||
};
|
||||
|
||||
// The web UI uses "swapflat", but the mobile API only understands "swap_flat".
|
||||
// An unknown value is not ignored: the API silently returns 0 results for the
|
||||
// whole search. Other values (e.g. "projectlisting") are identical on both APIs.
|
||||
const EXCLUSION_CRITERIA_MAP = {
|
||||
swapflat: 'swap_flat',
|
||||
};
|
||||
|
||||
const REAL_ESTATE_TYPE = {
|
||||
'haus-mieten': 'houserent',
|
||||
'wohnung-mieten': 'apartmentrent',
|
||||
@@ -251,6 +258,9 @@ export function convertWebToMobile(webUrl) {
|
||||
...(currentEquipmentParams ?? []),
|
||||
...items.map((item) => EQUIPMENT_MAP[item.toLowerCase()]).filter(Boolean),
|
||||
];
|
||||
} else if (key === 'exclusioncriteria') {
|
||||
const items = [].concat(val).flatMap((v) => `${v}`.split(','));
|
||||
mobileParams[PARAM_NAME_MAP[key]] = items.map((item) => EXCLUSION_CRITERIA_MAP[item.toLowerCase()] ?? item);
|
||||
} else {
|
||||
mobileParams[PARAM_NAME_MAP[key]] = val;
|
||||
}
|
||||
|
||||
@@ -264,6 +264,7 @@ export const storeListings = (jobId, providerId, listings) => {
|
||||
* @param {number} [params.createdBefore] - Only include listings created at or before this unix timestamp (ms).
|
||||
* @param {string} [params.userId] - Current user id used to scope listings (ignored for admins).
|
||||
* @param {boolean} [params.isAdmin=false] - When true, returns all listings.
|
||||
* @param {boolean} [params.hiddenOnly=false] - When true, returns only soft-deleted (manually_deleted = 1) listings.
|
||||
* @returns {{ totalNumber:number, page:number, result:Object[] }}
|
||||
*/
|
||||
export const queryListings = ({
|
||||
@@ -284,6 +285,7 @@ export const queryListings = ({
|
||||
maxPrice = null,
|
||||
userId = null,
|
||||
isAdmin = false,
|
||||
hiddenOnly = false,
|
||||
} = {}) => {
|
||||
// sanitize inputs
|
||||
const safePageSize = Number.isFinite(pageSize) && pageSize > 0 ? Math.min(1000, Math.floor(pageSize)) : 50;
|
||||
@@ -365,8 +367,8 @@ export const queryListings = ({
|
||||
whereParts.push('(l.price <= @maxPrice)');
|
||||
}
|
||||
|
||||
// Build whereSql (filtering by manually_deleted = 0)
|
||||
whereParts.push('(l.manually_deleted = 0)');
|
||||
// Build whereSql: in normal mode hide soft-deleted; in hiddenOnly mode show only soft-deleted.
|
||||
whereParts.push(hiddenOnly ? '(l.manually_deleted = 1)' : '(l.manually_deleted = 0)');
|
||||
|
||||
const whereSqlWithAlias = whereParts.length ? `WHERE ${whereParts.join(' AND ')}` : '';
|
||||
|
||||
@@ -463,6 +465,23 @@ export const deleteListingsById = (ids, hardDelete = false) => {
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Restore previously soft-deleted listings by clearing their `manually_deleted` flag.
|
||||
*
|
||||
* @param {string[]} ids - Array of DB row IDs to restore.
|
||||
* @returns {any} The result from SqliteConnection.execute.
|
||||
*/
|
||||
export const restoreListingsById = (ids) => {
|
||||
if (!Array.isArray(ids) || ids.length === 0) return;
|
||||
const placeholders = ids.map(() => '?').join(',');
|
||||
return SqliteConnection.execute(
|
||||
`UPDATE listings
|
||||
SET manually_deleted = 0
|
||||
WHERE id IN (${placeholders})`,
|
||||
ids,
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Return all listings that are active, have an address, and do not yet have geocoordinates.
|
||||
*
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "fredy",
|
||||
"version": "22.6.0",
|
||||
"version": "22.8.0",
|
||||
"description": "[F]ind [R]eal [E]states [d]amn eas[y].",
|
||||
"scripts": {
|
||||
"prepare": "husky",
|
||||
@@ -86,7 +86,7 @@
|
||||
"node-cron": "^4.2.1",
|
||||
"node-fetch": "3.3.2",
|
||||
"node-mailjet": "6.0.11",
|
||||
"nodemailer": "^8.0.10",
|
||||
"nodemailer": "^8.0.11",
|
||||
"p-throttle": "^8.1.0",
|
||||
"package-up": "^5.0.0",
|
||||
"puppeteer-core": "^25.1.0",
|
||||
@@ -98,7 +98,7 @@
|
||||
"react-router": "7.17.0",
|
||||
"react-router-dom": "7.17.0",
|
||||
"resend": "^6.12.4",
|
||||
"semver": "^7.8.3",
|
||||
"semver": "^7.8.4",
|
||||
"slack": "11.0.2",
|
||||
"vite": "8.0.16",
|
||||
"x-var": "^3.0.1",
|
||||
|
||||
@@ -17,8 +17,12 @@ export const getGeocoordinatesByAddress = (any) => {
|
||||
return null;
|
||||
};
|
||||
|
||||
let userSettings = null;
|
||||
export function setUserSettings(settings) {
|
||||
userSettings = settings;
|
||||
}
|
||||
export function getUserSettings(userId) {
|
||||
return null;
|
||||
return userSettings;
|
||||
}
|
||||
|
||||
export async function getSettings() {
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
* Licensed under Apache-2.0 with Commons Clause and Attribution/Naming Clause
|
||||
*/
|
||||
|
||||
import { expect } from 'vitest';
|
||||
import { afterEach, expect } from 'vitest';
|
||||
import { mockFredy } from './utils.js';
|
||||
import * as mockStore from './mocks/mockStore.js';
|
||||
import { get as getLastNotification } from './mocks/mockNotification.js';
|
||||
|
||||
describe('Issue reproduction: listings filtered by similarity or area should be marked as manually deleted', () => {
|
||||
it('should call deleteListingsById when listings are filtered by similarity', async () => {
|
||||
@@ -113,3 +114,223 @@ describe('Issue reproduction: listings filtered by similarity or area should be
|
||||
expect(mockStore.deletedIds).toContain('2');
|
||||
});
|
||||
});
|
||||
|
||||
describe('Blacklist is re-applied after detail enrichment', () => {
|
||||
afterEach(() => {
|
||||
mockStore.setUserSettings(null);
|
||||
});
|
||||
|
||||
it('filters out a listing whose blacklisted term only appears in the enriched description', async () => {
|
||||
const Fredy = await mockFredy();
|
||||
const providerId = 'test-provider';
|
||||
|
||||
mockStore.setUserSettings({
|
||||
provider_details: [providerId],
|
||||
blacklist_filter_on_provider_details: true,
|
||||
});
|
||||
|
||||
const mockSimilarityCache = {
|
||||
checkAndAddEntry: () => false,
|
||||
};
|
||||
|
||||
const blacklist = ['allkauf'];
|
||||
|
||||
// The search results page returns a clean snippet (no blacklisted term).
|
||||
// fetchDetails simulates loading the full detail page and discovers the
|
||||
// blacklisted term hidden deep in the description.
|
||||
const providerConfig = {
|
||||
url: 'http://example.com',
|
||||
getListings: () =>
|
||||
Promise.resolve([
|
||||
{
|
||||
id: 'kept',
|
||||
title: 'Nice house',
|
||||
address: 'Some street',
|
||||
price: '500000',
|
||||
link: 'http://example.com/kept',
|
||||
description: 'Cozy home with garden',
|
||||
},
|
||||
{
|
||||
id: 'blacklisted',
|
||||
title: 'Eleganz trifft Raumkomfort',
|
||||
address: 'Other street',
|
||||
price: '600000',
|
||||
link: 'http://example.com/blacklisted',
|
||||
description: 'Eleganz trifft Raumkomfort',
|
||||
},
|
||||
]),
|
||||
normalize: (l) => l,
|
||||
filter: (l) => {
|
||||
const text = `${l.title ?? ''} ${l.description ?? ''}`.toLowerCase();
|
||||
return !blacklist.some((term) => text.includes(term));
|
||||
},
|
||||
fetchDetails: (listing) => {
|
||||
if (listing.id === 'blacklisted') {
|
||||
return Promise.resolve({
|
||||
...listing,
|
||||
description: 'Mit allkauf Haus wird dein Traum vom Eigenheim wahr.',
|
||||
});
|
||||
}
|
||||
return Promise.resolve(listing);
|
||||
},
|
||||
crawlFields: {
|
||||
id: 'id',
|
||||
title: 'title',
|
||||
address: 'address',
|
||||
price: 'price',
|
||||
link: 'link',
|
||||
description: 'description',
|
||||
},
|
||||
requiredFieldNames: ['id', 'title', 'address', 'price', 'link', 'description'],
|
||||
};
|
||||
|
||||
const mockedJob = {
|
||||
id: 'blacklist-test-job',
|
||||
notificationAdapter: null,
|
||||
specFilter: null,
|
||||
spatialFilter: null,
|
||||
};
|
||||
|
||||
const fredy = new Fredy(providerConfig, mockedJob, providerId, mockSimilarityCache, undefined);
|
||||
|
||||
const result = await fredy.execute();
|
||||
|
||||
expect(result).toBeInstanceOf(Array);
|
||||
const ids = result.map((l) => l.id);
|
||||
expect(ids).toContain('kept');
|
||||
expect(ids).not.toContain('blacklisted');
|
||||
|
||||
const notification = getLastNotification();
|
||||
const notifiedIds = (notification?.payload ?? []).map((p) => p.id);
|
||||
expect(notifiedIds).not.toContain('blacklisted');
|
||||
});
|
||||
|
||||
it('short-circuits the pipeline when all listings get blacklisted after enrichment', async () => {
|
||||
const Fredy = await mockFredy();
|
||||
const providerId = 'all-blacklisted-provider';
|
||||
|
||||
mockStore.setUserSettings({
|
||||
provider_details: [providerId],
|
||||
blacklist_filter_on_provider_details: true,
|
||||
});
|
||||
|
||||
const mockSimilarityCache = {
|
||||
checkAndAddEntry: () => false,
|
||||
};
|
||||
|
||||
const blacklist = ['allkauf'];
|
||||
|
||||
const providerConfig = {
|
||||
url: 'http://example.com',
|
||||
getListings: () =>
|
||||
Promise.resolve([
|
||||
{
|
||||
id: 'only',
|
||||
title: 'Eleganz trifft Raumkomfort',
|
||||
address: 'Some street',
|
||||
price: '700000',
|
||||
link: 'http://example.com/only',
|
||||
description: 'Eleganz trifft Raumkomfort',
|
||||
},
|
||||
]),
|
||||
normalize: (l) => l,
|
||||
filter: (l) => {
|
||||
const text = `${l.title ?? ''} ${l.description ?? ''}`.toLowerCase();
|
||||
return !blacklist.some((term) => text.includes(term));
|
||||
},
|
||||
fetchDetails: (listing) =>
|
||||
Promise.resolve({
|
||||
...listing,
|
||||
description: 'Mit allkauf Haus wird dein Traum vom Eigenheim wahr.',
|
||||
}),
|
||||
crawlFields: {
|
||||
id: 'id',
|
||||
title: 'title',
|
||||
address: 'address',
|
||||
price: 'price',
|
||||
link: 'link',
|
||||
description: 'description',
|
||||
},
|
||||
requiredFieldNames: ['id', 'title', 'address', 'price', 'link', 'description'],
|
||||
};
|
||||
|
||||
const mockedJob = {
|
||||
id: 'all-blacklisted-job',
|
||||
notificationAdapter: null,
|
||||
specFilter: null,
|
||||
spatialFilter: null,
|
||||
};
|
||||
|
||||
const fredy = new Fredy(providerConfig, mockedJob, providerId, mockSimilarityCache, undefined);
|
||||
|
||||
// Should resolve to undefined (NoNewListingsWarning is caught in _handleError).
|
||||
const result = await fredy.execute();
|
||||
expect(result).toBeUndefined();
|
||||
});
|
||||
|
||||
it('does NOT re-filter when blacklist_filter_on_provider_details is disabled', async () => {
|
||||
const Fredy = await mockFredy();
|
||||
const providerId = 'opt-out-provider';
|
||||
|
||||
// provider_details enabled (so fetchDetails runs) but blacklist re-filter NOT enabled.
|
||||
mockStore.setUserSettings({
|
||||
provider_details: [providerId],
|
||||
blacklist_filter_on_provider_details: false,
|
||||
});
|
||||
|
||||
const mockSimilarityCache = {
|
||||
checkAndAddEntry: () => false,
|
||||
};
|
||||
|
||||
const blacklist = ['allkauf'];
|
||||
|
||||
const providerConfig = {
|
||||
url: 'http://example.com',
|
||||
getListings: () =>
|
||||
Promise.resolve([
|
||||
{
|
||||
id: 'leaks-through',
|
||||
title: 'Eleganz trifft Raumkomfort',
|
||||
address: 'Other street',
|
||||
price: '600000',
|
||||
link: 'http://example.com/leaks-through',
|
||||
description: 'Eleganz trifft Raumkomfort',
|
||||
},
|
||||
]),
|
||||
normalize: (l) => l,
|
||||
filter: (l) => {
|
||||
const text = `${l.title ?? ''} ${l.description ?? ''}`.toLowerCase();
|
||||
return !blacklist.some((term) => text.includes(term));
|
||||
},
|
||||
fetchDetails: (listing) =>
|
||||
Promise.resolve({
|
||||
...listing,
|
||||
description: 'Mit allkauf Haus wird dein Traum vom Eigenheim wahr.',
|
||||
}),
|
||||
crawlFields: {
|
||||
id: 'id',
|
||||
title: 'title',
|
||||
address: 'address',
|
||||
price: 'price',
|
||||
link: 'link',
|
||||
description: 'description',
|
||||
},
|
||||
requiredFieldNames: ['id', 'title', 'address', 'price', 'link', 'description'],
|
||||
};
|
||||
|
||||
const mockedJob = {
|
||||
id: 'opt-out-job',
|
||||
notificationAdapter: null,
|
||||
specFilter: null,
|
||||
spatialFilter: null,
|
||||
};
|
||||
|
||||
const fredy = new Fredy(providerConfig, mockedJob, providerId, mockSimilarityCache, undefined);
|
||||
|
||||
const result = await fredy.execute();
|
||||
|
||||
// Listing leaks through because user has not opted in to the stricter check.
|
||||
expect(result).toBeInstanceOf(Array);
|
||||
expect(result.map((l) => l.id)).toContain('leaks-through');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -31,12 +31,35 @@ describe('#immoscout-mobile URL conversion', () => {
|
||||
const webUrl =
|
||||
'https://www.immobilienscout24.de/Suche/de/berlin/berlin/wohnung-mieten?heatingtypes=central,selfcontainedcentral&haspromotion=false&numberofrooms=2.0-5.0&livingspace=10.0-25.0&energyefficiencyclasses=a,b,c,d,e,f,g,h,a_plus&exclusioncriteria=projectlisting,swapflat&equipment=parking,cellar,builtinkitchen,lift,garden,guesttoilet,balcony&petsallowedtypes=no,yes,negotiable&price=10.0-100.0&constructionyear=1920-2026&apartmenttypes=halfbasement,penthouse,other,loft,groundfloor,terracedflat,raisedgroundfloor,roofstorey,apartment,maisonette&pricetype=calculatedtotalrent&floor=2-7&enteredFrom=result_list';
|
||||
const expectedMobileUrl =
|
||||
'https://api.mobile.immobilienscout24.de/search/list?apartmenttypes=halfbasement,penthouse,other,loft,groundfloor,terracedflat,raisedgroundfloor,roofstorey,apartment,maisonette&constructionyear=1920-2026&energyefficiencyclasses=a,b,c,d,e,f,g,h,a_plus&equipment=parking,cellar,builtInKitchen,lift,garden,guestToilet,balcony&exclusioncriteria=projectlisting,swapflat&floor=2-7&geocodes=%2Fde%2Fberlin%2Fberlin&haspromotion=false&heatingtypes=central,selfcontainedcentral&livingspace=10.0-25.0&numberofrooms=2.0-5.0&petsallowedtypes=no,yes,negotiable&price=10.0-100.0&pricetype=calculatedtotalrent&realestatetype=apartmentrent&searchType=region';
|
||||
'https://api.mobile.immobilienscout24.de/search/list?apartmenttypes=halfbasement,penthouse,other,loft,groundfloor,terracedflat,raisedgroundfloor,roofstorey,apartment,maisonette&constructionyear=1920-2026&energyefficiencyclasses=a,b,c,d,e,f,g,h,a_plus&equipment=parking,cellar,builtInKitchen,lift,garden,guestToilet,balcony&exclusioncriteria=projectlisting,swap_flat&floor=2-7&geocodes=%2Fde%2Fberlin%2Fberlin&haspromotion=false&heatingtypes=central,selfcontainedcentral&livingspace=10.0-25.0&numberofrooms=2.0-5.0&petsallowedtypes=no,yes,negotiable&price=10.0-100.0&pricetype=calculatedtotalrent&realestatetype=apartmentrent&searchType=region';
|
||||
|
||||
const actualMobileUrl = convertWebToMobile(webUrl);
|
||||
expect(actualMobileUrl).toBe(expectedMobileUrl);
|
||||
});
|
||||
|
||||
// The web UI encodes "no swap flats" as exclusioncriteria=swapflat, but the
|
||||
// mobile API only understands swap_flat. Unknown values are not ignored by the
|
||||
// API - the search silently returns 0 results, so the mapping is essential.
|
||||
it('should map exclusioncriteria=swapflat to the mobile API value swap_flat', () => {
|
||||
const webUrl =
|
||||
'https://www.immobilienscout24.de/Suche/de/berlin/berlin/wohnung-mieten?exclusioncriteria=swapflat&price=-1500.0';
|
||||
|
||||
const converted = convertWebToMobile(webUrl);
|
||||
const queryParams = new URL(converted).searchParams;
|
||||
expect(queryParams.get('exclusioncriteria')).toBe('swap_flat');
|
||||
});
|
||||
|
||||
// Values the mobile API shares with the web API (e.g. projectlisting) must
|
||||
// pass through unchanged, in any combination with mapped values.
|
||||
it('should keep other exclusioncriteria values untouched', () => {
|
||||
const webUrl =
|
||||
'https://www.immobilienscout24.de/Suche/de/berlin/berlin/wohnung-mieten?exclusioncriteria=projectlisting,swapflat';
|
||||
|
||||
const converted = convertWebToMobile(webUrl);
|
||||
const queryParams = new URL(converted).searchParams;
|
||||
expect(queryParams.get('exclusioncriteria')).toBe('projectlisting,swap_flat');
|
||||
});
|
||||
|
||||
// Test URL conversion of web-only SEO path
|
||||
it('should convert a SEO web path to the correct query params', () => {
|
||||
const webUrl = 'https://www.immobilienscout24.de/Suche/de/berlin/berlin/wohnung-mit-balkon-mieten?equipment=garden';
|
||||
|
||||
@@ -120,6 +120,57 @@ describe('listingsStorage.queryListings statusFilter', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('listingsStorage.queryListings hiddenOnly', () => {
|
||||
let listingsStorage;
|
||||
|
||||
beforeEach(async () => {
|
||||
calls.execute.length = 0;
|
||||
calls.query.length = 0;
|
||||
sqliteMock.__queryHandler = (sql) => {
|
||||
if (/COUNT\(1\)/.test(sql)) return [{ cnt: 0 }];
|
||||
return [];
|
||||
};
|
||||
listingsStorage = await import('../../lib/services/storage/listingsStorage.js');
|
||||
});
|
||||
|
||||
it('filters by manually_deleted = 0 by default', () => {
|
||||
listingsStorage.queryListings({ userId: 'u1', isAdmin: true });
|
||||
const pageQuery = calls.query.find((c) => !/COUNT\(1\)/.test(c.sql));
|
||||
expect(pageQuery.sql).toMatch(/\(l\.manually_deleted = 0\)/);
|
||||
});
|
||||
|
||||
it('filters by manually_deleted = 1 when hiddenOnly is true', () => {
|
||||
listingsStorage.queryListings({ userId: 'u1', isAdmin: true, hiddenOnly: true });
|
||||
const pageQuery = calls.query.find((c) => !/COUNT\(1\)/.test(c.sql));
|
||||
expect(pageQuery.sql).toMatch(/\(l\.manually_deleted = 1\)/);
|
||||
expect(pageQuery.sql).not.toMatch(/\(l\.manually_deleted = 0\)/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('listingsStorage.restoreListingsById', () => {
|
||||
let listingsStorage;
|
||||
|
||||
beforeEach(async () => {
|
||||
calls.execute.length = 0;
|
||||
calls.query.length = 0;
|
||||
sqliteMock.__queryHandler = null;
|
||||
listingsStorage = await import('../../lib/services/storage/listingsStorage.js');
|
||||
});
|
||||
|
||||
it('clears the manually_deleted flag for the given ids', () => {
|
||||
listingsStorage.restoreListingsById(['a', 'b']);
|
||||
expect(calls.execute).toHaveLength(1);
|
||||
expect(calls.execute[0].sql).toMatch(/UPDATE listings\s+SET manually_deleted = 0\s+WHERE id IN \(\?,\?\)/);
|
||||
expect(calls.execute[0].params).toEqual(['a', 'b']);
|
||||
});
|
||||
|
||||
it('is a no-op when ids are missing or empty', () => {
|
||||
listingsStorage.restoreListingsById([]);
|
||||
listingsStorage.restoreListingsById(undefined);
|
||||
expect(calls.execute).toHaveLength(0);
|
||||
});
|
||||
});
|
||||
|
||||
describe('listingsStorage.getListingById', () => {
|
||||
let listingsStorage;
|
||||
|
||||
|
||||
@@ -22,9 +22,9 @@ import './ListingsGrid.less';
|
||||
import { useTranslation, useLocale } from '../../../services/i18n/i18n.jsx';
|
||||
|
||||
/**
|
||||
* @param {{ listings: object[], onWatch: Function, onNavigate: Function, onDelete: Function, onStatusChange: Function }} props
|
||||
* @param {{ listings: object[], onWatch: Function, onNavigate: Function, onDelete: Function, onRestore?: Function, isHiddenView?: boolean, onStatusChange: Function }} props
|
||||
*/
|
||||
const ListingsGrid = ({ listings, onWatch, onNavigate, onDelete, onStatusChange }) => {
|
||||
const ListingsGrid = ({ listings, onWatch, onNavigate, onDelete, onRestore, isHiddenView = false, onStatusChange }) => {
|
||||
const t = useTranslation();
|
||||
const locale = useLocale();
|
||||
return (
|
||||
@@ -126,18 +126,38 @@ const ListingsGrid = ({ listings, onWatch, onNavigate, onDelete, onStatusChange
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Tooltip content={t('listings.tooltipRemove')}>
|
||||
<Button
|
||||
size="small"
|
||||
icon={<IconDelete />}
|
||||
style={{ color: '#fb7185' }}
|
||||
theme="borderless"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onDelete(item.id);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
{isHiddenView ? (
|
||||
<Tooltip content={t('listings.tooltipUndelete')}>
|
||||
<Button
|
||||
size="small"
|
||||
icon={
|
||||
<span className="listingsGrid__strike" aria-hidden="true">
|
||||
<IconDelete />
|
||||
</span>
|
||||
}
|
||||
style={{ color: '#34d399' }}
|
||||
theme="borderless"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onRestore?.(item.id);
|
||||
}}
|
||||
aria-label={t('listings.tooltipUndelete')}
|
||||
/>
|
||||
</Tooltip>
|
||||
) : (
|
||||
<Tooltip content={t('listings.tooltipRemove')}>
|
||||
<Button
|
||||
size="small"
|
||||
icon={<IconDelete />}
|
||||
style={{ color: '#fb7185' }}
|
||||
theme="borderless"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onDelete(item.id);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -139,4 +139,23 @@
|
||||
border-radius: @radius-chip !important;
|
||||
}
|
||||
}
|
||||
|
||||
&__strike {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: -2px;
|
||||
right: -2px;
|
||||
top: 50%;
|
||||
height: 2px;
|
||||
background: currentColor;
|
||||
transform: rotate(-45deg);
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,18 @@ import {
|
||||
parseString,
|
||||
parseNullableBoolean,
|
||||
} from '../../hooks/useSearchParamState.js';
|
||||
import { Button, Pagination, Toast, Input, Select, Empty, Radio, RadioGroup, Tooltip } from '@douyinfe/semi-ui-19';
|
||||
import {
|
||||
Button,
|
||||
Pagination,
|
||||
Toast,
|
||||
Input,
|
||||
Select,
|
||||
Empty,
|
||||
Radio,
|
||||
RadioGroup,
|
||||
Tooltip,
|
||||
Banner,
|
||||
} from '@douyinfe/semi-ui-19';
|
||||
import { IconSearch, IconArrowUp, IconArrowDown, IconGridView, IconList } from '@douyinfe/semi-icons';
|
||||
import { useNavigate, useSearchParams } from 'react-router-dom';
|
||||
import ListingDeletionModal from '../ListingDeletionModal.jsx';
|
||||
@@ -50,9 +61,12 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
const [activityFilter, setActivityFilter] = useSearchParamState(sp, 'active', null, parseNullableBoolean);
|
||||
const [providerFilter, setProviderFilter] = useSearchParamState(sp, 'provider', null, parseString);
|
||||
const [statusFilter, setStatusFilter] = useSearchParamState(sp, 'status', null, parseString);
|
||||
const [hiddenOnly, setHiddenOnly] = useSearchParamState(sp, 'hidden', false, parseNullableBoolean);
|
||||
const [deleteModalVisible, setDeleteModalVisible] = useState(false);
|
||||
const [listingToDelete, setListingToDelete] = useState(null);
|
||||
|
||||
const isHiddenView = hiddenOnly === true;
|
||||
|
||||
// In watchlist mode the watch filter is forced to "watched only" — regardless of the URL.
|
||||
const effectiveWatchListFilter = isWatchlistMode ? true : watchListFilter;
|
||||
|
||||
@@ -66,9 +80,10 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
filter: {
|
||||
watchListFilter: effectiveWatchListFilter,
|
||||
jobNameFilter,
|
||||
activityFilter,
|
||||
activityFilter: isHiddenView ? null : activityFilter,
|
||||
providerFilter,
|
||||
statusFilter,
|
||||
hiddenOnly: isHiddenView ? true : undefined,
|
||||
},
|
||||
});
|
||||
};
|
||||
@@ -85,6 +100,7 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
jobNameFilter,
|
||||
watchListFilter,
|
||||
statusFilter,
|
||||
hiddenOnly,
|
||||
isWatchlistMode,
|
||||
]);
|
||||
|
||||
@@ -138,7 +154,21 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
setDeleteModalVisible(true);
|
||||
};
|
||||
|
||||
const handleNavigate = (id) => navigate(`/listings/listing/${id}`);
|
||||
const handleRestore = async (id) => {
|
||||
try {
|
||||
await actions.listingsData.restoreListings([id]);
|
||||
Toast.success(t('listings.toastRestored'));
|
||||
loadData();
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
Toast.error(t('listings.toastRestoreError'));
|
||||
}
|
||||
};
|
||||
|
||||
const handleNavigate = (id) => {
|
||||
if (isHiddenView) return;
|
||||
navigate(`/listings/listing/${id}`);
|
||||
};
|
||||
|
||||
const confirmDeletion = async (hardDelete, remember, id = listingToDelete) => {
|
||||
try {
|
||||
@@ -158,118 +188,161 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
|
||||
const listings = listingsData?.result || [];
|
||||
|
||||
const activityRadioValue = isHiddenView ? 'hidden' : activityFilter === null ? 'all' : String(activityFilter);
|
||||
|
||||
return (
|
||||
<div className="listingsOverview">
|
||||
<div className="listingsOverview__topbar">
|
||||
<Input
|
||||
className="listingsOverview__topbar__search"
|
||||
prefix={<IconSearch />}
|
||||
showClear
|
||||
placeholder={t('listings.searchPlaceholder')}
|
||||
defaultValue={freeTextFilter ?? ''}
|
||||
onChange={handleFilterChange}
|
||||
/>
|
||||
<Tooltip content={t('listings.filterSearchHelp')} trigger="hover" position="top">
|
||||
<span className="listingsOverview__topbar__tooltipWrap listingsOverview__topbar__search">
|
||||
<Input
|
||||
prefix={<IconSearch />}
|
||||
showClear
|
||||
placeholder={t('listings.searchPlaceholder')}
|
||||
defaultValue={freeTextFilter ?? ''}
|
||||
onChange={handleFilterChange}
|
||||
/>
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
<RadioGroup
|
||||
type="button"
|
||||
buttonSize="middle"
|
||||
value={activityFilter === null ? 'all' : String(activityFilter)}
|
||||
onChange={(e) => {
|
||||
const v = e.target.value;
|
||||
setActivityFilter(v === 'all' ? null : v === 'true');
|
||||
setPage(1);
|
||||
}}
|
||||
>
|
||||
<Radio value="all">{t('listings.filterAll')}</Radio>
|
||||
<Radio value="true">{t('listings.filterActive')}</Radio>
|
||||
<Radio value="false">{t('listings.filterInactive')}</Radio>
|
||||
</RadioGroup>
|
||||
<Tooltip content={t('listings.filterActivityHelp')} trigger="hover" position="top">
|
||||
<span className="listingsOverview__topbar__tooltipWrap">
|
||||
<RadioGroup
|
||||
type="button"
|
||||
buttonSize="middle"
|
||||
value={activityRadioValue}
|
||||
onChange={(e) => {
|
||||
const v = e.target.value;
|
||||
if (v === 'hidden') {
|
||||
setHiddenOnly(true);
|
||||
setActivityFilter(null);
|
||||
} else {
|
||||
setHiddenOnly(false);
|
||||
setActivityFilter(v === 'all' ? null : v === 'true');
|
||||
}
|
||||
setPage(1);
|
||||
}}
|
||||
>
|
||||
<Radio value="all">{t('listings.filterAll')}</Radio>
|
||||
<Radio value="true">{t('listings.filterActive')}</Radio>
|
||||
<Radio value="false">{t('listings.filterInactive')}</Radio>
|
||||
<Radio value="hidden">{t('listings.filterHidden')}</Radio>
|
||||
</RadioGroup>
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
{!isWatchlistMode && (
|
||||
<RadioGroup
|
||||
type="button"
|
||||
buttonSize="middle"
|
||||
value={watchListFilter === null ? 'all' : String(watchListFilter)}
|
||||
onChange={(e) => {
|
||||
const v = e.target.value;
|
||||
setWatchListFilter(v === 'all' ? null : v === 'true');
|
||||
setPage(1);
|
||||
}}
|
||||
>
|
||||
<Radio value="all">{t('listings.filterAll')}</Radio>
|
||||
<Radio value="true">{t('listings.filterWatched')}</Radio>
|
||||
<Radio value="false">{t('listings.filterUnwatched')}</Radio>
|
||||
</RadioGroup>
|
||||
<Tooltip content={t('listings.filterWatchHelp')} trigger="hover" position="top">
|
||||
<span className="listingsOverview__topbar__tooltipWrap">
|
||||
<RadioGroup
|
||||
type="button"
|
||||
buttonSize="middle"
|
||||
value={watchListFilter === null ? 'all' : String(watchListFilter)}
|
||||
onChange={(e) => {
|
||||
const v = e.target.value;
|
||||
setWatchListFilter(v === 'all' ? null : v === 'true');
|
||||
setPage(1);
|
||||
}}
|
||||
>
|
||||
<Radio value="all">{t('listings.filterAll')}</Radio>
|
||||
<Radio value="true">{t('listings.filterWatched')}</Radio>
|
||||
<Radio value="false">{t('listings.filterUnwatched')}</Radio>
|
||||
</RadioGroup>
|
||||
</span>
|
||||
</Tooltip>
|
||||
)}
|
||||
|
||||
<Select
|
||||
placeholder={t('listings.filterStatusPlaceholder')}
|
||||
showClear
|
||||
onChange={(val) => {
|
||||
setStatusFilter(val ?? null);
|
||||
setPage(1);
|
||||
}}
|
||||
value={statusFilter}
|
||||
style={{ width: 150 }}
|
||||
>
|
||||
<Select.Option value="applied">{t('listings.filterStatusApplied')}</Select.Option>
|
||||
<Select.Option value="rejected">{t('listings.filterStatusRejected')}</Select.Option>
|
||||
<Select.Option value="accepted">{t('listings.filterStatusAccepted')}</Select.Option>
|
||||
<Select.Option value="none">{t('listings.filterStatusNone')}</Select.Option>
|
||||
</Select>
|
||||
<Tooltip content={t('listings.filterStatusHelp')} trigger="hover" position="top">
|
||||
<span className="listingsOverview__topbar__tooltipWrap">
|
||||
<Select
|
||||
placeholder={t('listings.filterStatusPlaceholder')}
|
||||
showClear
|
||||
onChange={(val) => {
|
||||
setStatusFilter(val ?? null);
|
||||
setPage(1);
|
||||
}}
|
||||
value={statusFilter}
|
||||
style={{ width: 150 }}
|
||||
>
|
||||
<Select.Option value="applied">{t('listings.filterStatusApplied')}</Select.Option>
|
||||
<Select.Option value="rejected">{t('listings.filterStatusRejected')}</Select.Option>
|
||||
<Select.Option value="accepted">{t('listings.filterStatusAccepted')}</Select.Option>
|
||||
<Select.Option value="none">{t('listings.filterStatusNone')}</Select.Option>
|
||||
</Select>
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
<Select
|
||||
placeholder={t('listings.filterProviderPlaceholder')}
|
||||
showClear
|
||||
onChange={(val) => {
|
||||
setProviderFilter(val);
|
||||
setPage(1);
|
||||
}}
|
||||
value={providerFilter}
|
||||
style={{ width: 130 }}
|
||||
>
|
||||
{providers?.map((p) => (
|
||||
<Select.Option key={p.id} value={p.id}>
|
||||
{p.name}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
<Tooltip content={t('listings.filterProviderHelp')} trigger="hover" position="top">
|
||||
<span className="listingsOverview__topbar__tooltipWrap">
|
||||
<Select
|
||||
placeholder={t('listings.filterProviderPlaceholder')}
|
||||
showClear
|
||||
onChange={(val) => {
|
||||
setProviderFilter(val);
|
||||
setPage(1);
|
||||
}}
|
||||
value={providerFilter}
|
||||
style={{ width: 130 }}
|
||||
>
|
||||
{providers?.map((p) => (
|
||||
<Select.Option key={p.id} value={p.id}>
|
||||
{p.name}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
<Select
|
||||
placeholder={t('listings.filterJobPlaceholder')}
|
||||
showClear
|
||||
onChange={(val) => {
|
||||
setJobNameFilter(val);
|
||||
setPage(1);
|
||||
}}
|
||||
value={jobNameFilter}
|
||||
style={{ width: 130 }}
|
||||
>
|
||||
{jobs?.map((j) => (
|
||||
<Select.Option key={j.id} value={j.id}>
|
||||
{j.name}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
<Tooltip content={t('listings.filterJobHelp')} trigger="hover" position="top">
|
||||
<span className="listingsOverview__topbar__tooltipWrap">
|
||||
<Select
|
||||
placeholder={t('listings.filterJobPlaceholder')}
|
||||
showClear
|
||||
onChange={(val) => {
|
||||
setJobNameFilter(val);
|
||||
setPage(1);
|
||||
}}
|
||||
value={jobNameFilter}
|
||||
style={{ width: 130 }}
|
||||
>
|
||||
{jobs?.map((j) => (
|
||||
<Select.Option key={j.id} value={j.id}>
|
||||
{j.name}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
<Select
|
||||
prefix={t('listings.sortPrefix')}
|
||||
className="listingsOverview__topbar__sort"
|
||||
style={{ width: 220 }}
|
||||
value={sortField}
|
||||
onChange={(val) => setSortField(val)}
|
||||
>
|
||||
<Select.Option value="job_name">{t('listings.sortByJobName')}</Select.Option>
|
||||
<Select.Option value="created_at">{t('listings.sortByDate')}</Select.Option>
|
||||
<Select.Option value="price">{t('listings.sortByPrice')}</Select.Option>
|
||||
<Select.Option value="provider">{t('listings.sortByProvider')}</Select.Option>
|
||||
</Select>
|
||||
<Tooltip content={t('listings.filterSortHelp')} trigger="hover" position="top">
|
||||
<span className="listingsOverview__topbar__tooltipWrap listingsOverview__topbar__sort">
|
||||
<Select
|
||||
prefix={t('listings.sortPrefix')}
|
||||
style={{ width: 220 }}
|
||||
value={sortField}
|
||||
onChange={(val) => setSortField(val)}
|
||||
>
|
||||
<Select.Option value="job_name">{t('listings.sortByJobName')}</Select.Option>
|
||||
<Select.Option value="created_at">{t('listings.sortByDate')}</Select.Option>
|
||||
<Select.Option value="price">{t('listings.sortByPrice')}</Select.Option>
|
||||
<Select.Option value="provider">{t('listings.sortByProvider')}</Select.Option>
|
||||
</Select>
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
<Button
|
||||
icon={sortDir === 'asc' ? <IconArrowUp /> : <IconArrowDown />}
|
||||
onClick={() => setSortDir(sortDir === 'asc' ? 'desc' : 'asc')}
|
||||
title={sortDir === 'asc' ? t('listings.sortAscending') : t('listings.sortDescending')}
|
||||
/>
|
||||
<Tooltip
|
||||
content={sortDir === 'asc' ? t('listings.sortAscending') : t('listings.sortDescending')}
|
||||
trigger="hover"
|
||||
position="top"
|
||||
>
|
||||
<span className="listingsOverview__topbar__tooltipWrap">
|
||||
<Button
|
||||
icon={sortDir === 'asc' ? <IconArrowUp /> : <IconArrowDown />}
|
||||
onClick={() => setSortDir(sortDir === 'asc' ? 'desc' : 'asc')}
|
||||
aria-label={sortDir === 'asc' ? t('listings.sortAscending') : t('listings.sortDescending')}
|
||||
/>
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
<div className="listingsOverview__topbar__view-toggle">
|
||||
<Tooltip content={t('listings.tooltipGridView')}>
|
||||
@@ -293,6 +366,16 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{isHiddenView && (
|
||||
<Banner
|
||||
type="info"
|
||||
fullMode={false}
|
||||
closeIcon={null}
|
||||
description={t('listings.hiddenViewBanner')}
|
||||
style={{ marginBottom: 12 }}
|
||||
/>
|
||||
)}
|
||||
|
||||
{listings.length === 0 && (
|
||||
<Empty
|
||||
image={<IllustrationNoResult />}
|
||||
@@ -307,6 +390,8 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
onWatch={handleWatch}
|
||||
onNavigate={handleNavigate}
|
||||
onDelete={handleDelete}
|
||||
onRestore={handleRestore}
|
||||
isHiddenView={isHiddenView}
|
||||
onStatusChange={handleStatusChange}
|
||||
/>
|
||||
) : (
|
||||
@@ -315,6 +400,8 @@ const ListingsOverview = ({ mode = 'all' }) => {
|
||||
onWatch={handleWatch}
|
||||
onNavigate={handleNavigate}
|
||||
onDelete={handleDelete}
|
||||
onRestore={handleRestore}
|
||||
isHiddenView={isHiddenView}
|
||||
onStatusChange={handleStatusChange}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -8,6 +8,15 @@
|
||||
margin-bottom: @space-4;
|
||||
flex-wrap: wrap;
|
||||
|
||||
&__tooltipWrap {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
|
||||
> * {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
&__search {
|
||||
min-width: 200px;
|
||||
flex: 1;
|
||||
|
||||
@@ -22,9 +22,17 @@ import './ListingsTable.less';
|
||||
import { useTranslation, useLocale } from '../../services/i18n/i18n.jsx';
|
||||
|
||||
/**
|
||||
* @param {{ listings: object[], onWatch: Function, onNavigate: Function, onDelete: Function, onStatusChange: Function }} props
|
||||
* @param {{ listings: object[], onWatch: Function, onNavigate: Function, onDelete: Function, onRestore?: Function, isHiddenView?: boolean, onStatusChange: Function }} props
|
||||
*/
|
||||
const ListingsTable = ({ listings, onWatch, onNavigate, onDelete, onStatusChange }) => {
|
||||
const ListingsTable = ({
|
||||
listings,
|
||||
onWatch,
|
||||
onNavigate,
|
||||
onDelete,
|
||||
onRestore,
|
||||
isHiddenView = false,
|
||||
onStatusChange,
|
||||
}) => {
|
||||
const t = useTranslation();
|
||||
const locale = useLocale();
|
||||
return (
|
||||
@@ -123,18 +131,38 @@ const ListingsTable = ({ listings, onWatch, onNavigate, onDelete, onStatusChange
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Tooltip content={t('listings.tooltipRemove')}>
|
||||
<Button
|
||||
size="small"
|
||||
icon={<IconDelete />}
|
||||
style={{ color: '#fb7185' }}
|
||||
theme="borderless"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onDelete(item.id);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
{isHiddenView ? (
|
||||
<Tooltip content={t('listings.tooltipUndelete')}>
|
||||
<Button
|
||||
size="small"
|
||||
icon={
|
||||
<span className="listingsTable__strike" aria-hidden="true">
|
||||
<IconDelete />
|
||||
</span>
|
||||
}
|
||||
style={{ color: '#34d399' }}
|
||||
theme="borderless"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onRestore?.(item.id);
|
||||
}}
|
||||
aria-label={t('listings.tooltipUndelete')}
|
||||
/>
|
||||
</Tooltip>
|
||||
) : (
|
||||
<Tooltip content={t('listings.tooltipRemove')}>
|
||||
<Button
|
||||
size="small"
|
||||
icon={<IconDelete />}
|
||||
style={{ color: '#fb7185' }}
|
||||
theme="borderless"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onDelete(item.id);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -5,6 +5,25 @@
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
|
||||
&__strike {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: -2px;
|
||||
right: -2px;
|
||||
top: 50%;
|
||||
height: 2px;
|
||||
background: currentColor;
|
||||
transform: rotate(-45deg);
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
&__row {
|
||||
display: grid;
|
||||
grid-template-columns: 56px 1fr 140px 200px 120px 110px auto;
|
||||
|
||||
@@ -135,6 +135,7 @@
|
||||
"listings.filterAll": "Alle",
|
||||
"listings.filterActive": "Aktiv",
|
||||
"listings.filterInactive": "Inaktiv",
|
||||
"listings.filterHidden": "Versteckt",
|
||||
"listings.filterWatched": "Beobachtet",
|
||||
"listings.filterUnwatched": "Nicht beobachtet",
|
||||
"listings.filterStatusPlaceholder": "Status",
|
||||
@@ -144,6 +145,17 @@
|
||||
"listings.filterStatusNone": "Kein Status",
|
||||
"listings.filterProviderPlaceholder": "Anbieter",
|
||||
"listings.filterJobPlaceholder": "Job",
|
||||
"listings.filterSearchHelp": "Volltextsuche über Titel, Adresse, Anbieter und Link.",
|
||||
"listings.filterActivityHelp": "Filtert nach Inseratsstatus: 'Alle' zeigt jedes Inserat, 'Aktiv' nur noch online verfügbare, 'Inaktiv' beim Anbieter verschwundene, 'Versteckt' zeigt deine manuell gelöschten (soft-deleted) Inserate, damit du sie wiederherstellen kannst.",
|
||||
"listings.filterWatchHelp": "Filtert nach Watchlist-Zugehörigkeit: 'Alle' zeigt jedes Inserat, 'Beobachtet' nur die auf deiner Watchlist gespeicherten, 'Nicht beobachtet' die anderen.",
|
||||
"listings.filterStatusHelp": "Filtert nach dem persönlichen Status (Beworben, Abgelehnt, Angenommen) oder zeigt nur Inserate ohne Status.",
|
||||
"listings.filterProviderHelp": "Zeigt nur Inserate des ausgewählten Anbieters (ImmoScout24, Kleinanzeigen, ...).",
|
||||
"listings.filterJobHelp": "Zeigt nur Inserate des ausgewählten Jobs.",
|
||||
"listings.filterSortHelp": "Wählt das Sortierkriterium. Mit dem Pfeil-Button schaltet man zwischen aufsteigend und absteigend.",
|
||||
"listings.hiddenViewBanner": "Du siehst gerade versteckte (soft-gelöschte) Inserate. Sie werden in den normalen Ansichten ausgeblendet. Über den Wiederherstellen-Button kannst du sie zurückholen.",
|
||||
"listings.toastRestored": "Inserat wiederhergestellt",
|
||||
"listings.toastRestoreError": "Wiederherstellung fehlgeschlagen",
|
||||
"listings.tooltipUndelete": "Inserat wiederherstellen",
|
||||
"listings.sortByJobName": "Job-Name",
|
||||
"listings.sortByDate": "Inserat-Datum",
|
||||
"listings.sortByPrice": "Preis",
|
||||
@@ -334,6 +346,11 @@
|
||||
"settings.providerDetailsPlaceholder": "Anbieter für Detail-Abruf auswählen...",
|
||||
"settings.providerDetailsUpdated": "Anbieter-Detail-Einstellung aktualisiert.",
|
||||
"settings.providerDetailsUpdateError": "Einstellung konnte nicht aktualisiert werden.",
|
||||
"settings.blacklistFilterOnProviderDetails": "Blacklist-Filter auf Anbieter-Details anwenden",
|
||||
"settings.blacklistFilterOnProviderDetailsHelp": "Wenn aktiv, wird die Blacklist zusätzlich gegen die vollständige Beschreibung geprüft, die durch den obigen Anbieter-Details-Schritt geladen wurde. Damit lassen sich Spam-Anbieter (z. B. 'allkauf', 'massa') herausfiltern, die nur tief in der Detail-Seite auftauchen und nicht im kurzen Vorschau-Text der Suchergebnisse stehen. Standardmäßig aus, weil die vollständige Beschreibung oft generischen Boilerplate-Text (Kontaktdaten, rechtliche Hinweise) enthält, der ein Blacklist-Wort versehentlich auslösen und passende Inserate entfernen kann. Hat keine Wirkung auf Anbieter, für die Anbieter-Details nicht aktiviert sind.",
|
||||
"settings.blacklistFilterOnProviderDetailsEnable": "Blacklist auf die vollständige Detail-Beschreibung anwenden",
|
||||
"settings.blacklistFilterOnProviderDetailsUpdated": "Einstellung Blacklist-auf-Details aktualisiert.",
|
||||
"settings.blacklistFilterOnProviderDetailsUpdateError": "Einstellung konnte nicht aktualisiert werden.",
|
||||
"settings.listingDeletion": "Inserate löschen",
|
||||
"settings.listingDeletionHelp": "Wähle den Standard-Löschmodus. Soft Delete blendet Inserate aus ohne erneutes Scraping; Hard Delete entfernt sie aus der Datenbank.",
|
||||
"settings.listingDeletionSoftLabel": "Als gelöscht markieren (Soft Delete)",
|
||||
|
||||
@@ -135,6 +135,7 @@
|
||||
"listings.filterAll": "All",
|
||||
"listings.filterActive": "Active",
|
||||
"listings.filterInactive": "Inactive",
|
||||
"listings.filterHidden": "Hidden",
|
||||
"listings.filterWatched": "Watched",
|
||||
"listings.filterUnwatched": "Unwatched",
|
||||
"listings.filterStatusPlaceholder": "Status",
|
||||
@@ -144,6 +145,17 @@
|
||||
"listings.filterStatusNone": "No status",
|
||||
"listings.filterProviderPlaceholder": "Provider",
|
||||
"listings.filterJobPlaceholder": "Job",
|
||||
"listings.filterSearchHelp": "Free-text search across title, address, provider and link.",
|
||||
"listings.filterActivityHelp": "Filter by listing activity: All shows every listing, Active only those still online, Inactive those that disappeared from the provider, Hidden shows your manually deleted (soft-deleted) listings so you can restore them.",
|
||||
"listings.filterWatchHelp": "Filter by watchlist membership: All shows every listing, Watched only those you saved to your watchlist, Unwatched only those you have not saved.",
|
||||
"listings.filterStatusHelp": "Filter by the personal status you set on a listing (Applied, Rejected, Accepted) or show only listings with no status yet.",
|
||||
"listings.filterProviderHelp": "Show only listings coming from the selected real-estate provider (ImmoScout24, Kleinanzeigen, ...).",
|
||||
"listings.filterJobHelp": "Show only listings produced by the selected job.",
|
||||
"listings.filterSortHelp": "Choose the column to sort listings by. Use the arrow button to toggle ascending and descending order.",
|
||||
"listings.hiddenViewBanner": "You are viewing hidden (soft-deleted) listings. They are excluded from the regular views. Use the restore button on a card to bring it back.",
|
||||
"listings.toastRestored": "Listing restored",
|
||||
"listings.toastRestoreError": "Failed to restore listing",
|
||||
"listings.tooltipUndelete": "Restore Listing",
|
||||
"listings.sortByJobName": "Job Name",
|
||||
"listings.sortByDate": "Listing Date",
|
||||
"listings.sortByPrice": "Price",
|
||||
@@ -334,6 +346,11 @@
|
||||
"settings.providerDetailsPlaceholder": "Select providers to fetch details from...",
|
||||
"settings.providerDetailsUpdated": "Provider details setting updated.",
|
||||
"settings.providerDetailsUpdateError": "Failed to update setting.",
|
||||
"settings.blacklistFilterOnProviderDetails": "Blacklist-Filtering on Provider Details",
|
||||
"settings.blacklistFilterOnProviderDetailsHelp": "When enabled, the blacklist is re-checked against the full description loaded by the Provider Details step above. This catches spam advertisers (e.g. 'allkauf', 'massa') that only appear deep in the detail page and not in the short search-result snippet. Off by default, because the full description often contains generic boilerplate (contact info, legal text) that may accidentally trigger a blacklist term and remove otherwise relevant listings. Has no effect on providers for which Provider Details is not enabled.",
|
||||
"settings.blacklistFilterOnProviderDetailsEnable": "Apply blacklist to the full detail description",
|
||||
"settings.blacklistFilterOnProviderDetailsUpdated": "Blacklist-on-details setting updated.",
|
||||
"settings.blacklistFilterOnProviderDetailsUpdateError": "Failed to update setting.",
|
||||
"settings.listingDeletion": "Listing deletion",
|
||||
"settings.listingDeletionHelp": "Choose the default deletion mode. Soft delete hides them without re-scraping; hard delete removes them from the database.",
|
||||
"settings.listingDeletionSoftLabel": "Mark as deleted (Soft Delete)",
|
||||
|
||||
@@ -276,6 +276,14 @@ export const useFredyState = create(
|
||||
throw Exception;
|
||||
}
|
||||
},
|
||||
async restoreListings(ids) {
|
||||
try {
|
||||
await xhrPost('/api/listings/restore', { ids });
|
||||
} catch (Exception) {
|
||||
console.error('Error while trying to restore listings. Error:', Exception);
|
||||
throw Exception;
|
||||
}
|
||||
},
|
||||
},
|
||||
userSettings: {
|
||||
async getUserSettings() {
|
||||
@@ -337,6 +345,28 @@ export const useFredyState = create(
|
||||
throw Exception;
|
||||
}
|
||||
},
|
||||
async setBlacklistFilterOnProviderDetails(enabled) {
|
||||
try {
|
||||
await xhrPost('/api/user/settings/blacklist-filter-on-details', {
|
||||
blacklist_filter_on_provider_details: enabled,
|
||||
});
|
||||
set((state) => ({
|
||||
userSettings: {
|
||||
...state.userSettings,
|
||||
settings: {
|
||||
...state.userSettings.settings,
|
||||
blacklist_filter_on_provider_details: enabled,
|
||||
},
|
||||
},
|
||||
}));
|
||||
} catch (Exception) {
|
||||
console.error(
|
||||
'Error while trying to update blacklist-filter-on-provider-details setting. Error:',
|
||||
Exception,
|
||||
);
|
||||
throw Exception;
|
||||
}
|
||||
},
|
||||
async setListingsViewMode(listings_view_mode) {
|
||||
try {
|
||||
await xhrPost('/api/user/settings/listings-view-mode', { listings_view_mode });
|
||||
|
||||
@@ -130,6 +130,9 @@ const GeneralSettings = function GeneralSettings() {
|
||||
// User settings state
|
||||
const homeAddress = useSelector((state) => state.userSettings.settings.home_address);
|
||||
const providerDetails = useSelector((state) => state.userSettings.settings.provider_details);
|
||||
const blacklistFilterOnProviderDetails = useSelector(
|
||||
(state) => state.userSettings.settings.blacklist_filter_on_provider_details,
|
||||
);
|
||||
const listingDeletionPreference = useSelector((state) => state.userSettings.settings.listing_deletion_preference);
|
||||
const allProviders = useSelector((state) => state.provider);
|
||||
const [address, setAddress] = useState(homeAddress?.address || '');
|
||||
@@ -647,6 +650,25 @@ const GeneralSettings = function GeneralSettings() {
|
||||
/>
|
||||
</SegmentPart>
|
||||
|
||||
<SegmentPart
|
||||
name={t('settings.blacklistFilterOnProviderDetails')}
|
||||
helpText={t('settings.blacklistFilterOnProviderDetailsHelp')}
|
||||
>
|
||||
<Checkbox
|
||||
checked={blacklistFilterOnProviderDetails === true}
|
||||
onChange={async (e) => {
|
||||
try {
|
||||
await actions.userSettings.setBlacklistFilterOnProviderDetails(e.target.checked);
|
||||
Toast.success(t('settings.blacklistFilterOnProviderDetailsUpdated'));
|
||||
} catch {
|
||||
Toast.error(t('settings.blacklistFilterOnProviderDetailsUpdateError'));
|
||||
}
|
||||
}}
|
||||
>
|
||||
{t('settings.blacklistFilterOnProviderDetailsEnable')}
|
||||
</Checkbox>
|
||||
</SegmentPart>
|
||||
|
||||
<SegmentPart name={t('settings.listingDeletion')} helpText={t('settings.listingDeletionHelp')}>
|
||||
<RadioGroup
|
||||
value={listingDeleteHard ? 'hard' : 'soft'}
|
||||
|
||||
@@ -7,7 +7,10 @@ import react from '@vitejs/plugin-react';
|
||||
import { defineConfig } from 'vite';
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig({
|
||||
base: '',
|
||||
// Must be absolute: with a relative base, asset URLs in index.html break on
|
||||
// deep links like /listings/listing/:id (the SPA fallback serves index.html,
|
||||
// but ./assets/* then resolves below the route path and loads HTML as JS).
|
||||
base: '/',
|
||||
build: {
|
||||
chunkSizeWarningLimit: 9999999,
|
||||
outDir: './ui/public',
|
||||
|
||||
16
yarn.lock
16
yarn.lock
@@ -5795,10 +5795,10 @@ node-releases@^2.0.27:
|
||||
resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz"
|
||||
integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
|
||||
|
||||
nodemailer@^8.0.10:
|
||||
version "8.0.10"
|
||||
resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-8.0.10.tgz#009d4deaa06f54b6bd7ddc6cac1bf78e3bcb0bf2"
|
||||
integrity sha512-BLFuSth7QtHOkBzyqTehWWyub0NTRDuK2Q2SQfnGLsrJnzyU+Yeh4WpV1eZGuARFj1xQJHIdnTuJZLP+b9R1GQ==
|
||||
nodemailer@^8.0.11:
|
||||
version "8.0.11"
|
||||
resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-8.0.11.tgz#ce46b7c2c8bbf17b0408122fbfb4e47f4bffc688"
|
||||
integrity sha512-nrO/pDAUKl+wXX+lx16tDLbnm0fW6sK/x8mgohaCpg+CdCEl482bD4tCuAZk2DyliruiNTIZxRCoWkDqJEnAiA==
|
||||
|
||||
nodemon@^3.1.14:
|
||||
version "3.1.14"
|
||||
@@ -6974,10 +6974,10 @@ semver@^7.6.0:
|
||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
|
||||
integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==
|
||||
|
||||
semver@^7.8.3:
|
||||
version "7.8.3"
|
||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.3.tgz#c350de61c2a1ddbc96d7fae3e5b6fcf92d477fbe"
|
||||
integrity sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==
|
||||
semver@^7.8.4:
|
||||
version "7.8.4"
|
||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.4.tgz#c73eceebae0616934be8dff28a7fd70757c8e696"
|
||||
integrity sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==
|
||||
|
||||
send@^1.1.0:
|
||||
version "1.2.1"
|
||||
|
||||
Reference in New Issue
Block a user