prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into next

Browse source
This commit is contained in:
Collin Barrett 2025-08-30 14:33:18 -05:00
commit c63598181d
12 changed files with 91197 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/README.md vendored
View file

@ -1,7 +1,6 @@
<p align="center"><img src="https://github.com/collinbarrett/FilterLists/blob/main/img/logo_filterlists_outlined.png"></p>
<p align="center"><a href="https://twitter.com/FilterLists"><img alt="Twitter" src="https://img.shields.io/twitter/follow/FilterLists?style=social"></a>
<a href="https://github.com/collinbarrett/FilterLists/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/collinbarrett/filterlists.svg?label=License"></a>
<p align="center"><a href="https://github.com/collinbarrett/FilterLists/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/collinbarrett/filterlists.svg?label=License"></a>
<a href="https://builtwithdot.net/project/125/filterlists"><img alt="BuiltWithDot.net" src="https://builtwithdot.net/project/125/filterlists/badge" /></a>
<a href="https://madewithreactjs.com/p/filterlists/shield-link"><img alt="MadeWithReactJS.com" src="https://madewithreactjs.com/storage/repo-shields/2335-shield.svg"/></a>
<br/>FilterLists is the independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</p>

2
services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
View file

@ -22,7 +22,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4"/>
</ItemGroup>
<ItemGroup>

90985
services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20250830174129_FinishPR5113_AddMetaDnsmasqList.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

138
services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20250830174129_FinishPR5113_AddMetaDnsmasqList.cs Normal file
View file

@ -0,0 +1,138 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace FilterLists.Directory.Infrastructure.Migrations.Migrations
{
/// <inheritdoc />
public partial class FinishPR5113_AddMetaDnsmasqList : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2731,
column: "Description",
value: "Blocking of Meta Platforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2732,
column: "Description",
value: "Blocking of Meta Platforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2733,
column: "Description",
value: "Blocking of Meta Platforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2734,
column: "Description",
value: "Blocking of Meta Platforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2735,
column: "Description",
value: "Blocking of Meta Platforms Domains");
migrationBuilder.InsertData(
table: "FilterList",
columns: new[] { "Id", "ChatUrl", "Description", "DonateUrl", "EmailAddress", "ForumUrl", "HomeUrl", "IssuesUrl", "LicenseId", "Name", "OnionUrl", "PolicyUrl", "SubmissionUrl" },
values: new object[] { 2827, null, "Blocking of Meta Platforms Domains", null, null, null, "https://github.com/Bundy01/meta-blocklists", "https://github.com/Bundy01/meta-blocklists/issues", 4, "Meta Dnsmasq", null, null, null });
migrationBuilder.InsertData(
table: "FilterListMaintainer",
columns: new[] { "FilterListId", "MaintainerId" },
values: new object[] { 2827, 198 });
migrationBuilder.InsertData(
table: "FilterListSyntax",
columns: new[] { "FilterListId", "SyntaxId" },
values: new object[] { 2827, (short)20 });
migrationBuilder.InsertData(
table: "FilterListTag",
columns: new[] { "FilterListId", "TagId" },
values: new object[] { 2827, 19 });
migrationBuilder.InsertData(
table: "FilterListViewUrl",
columns: new[] { "FilterListId", "Id", "Primariness", "Url" },
values: new object[] { 2827, 3218, (short)1, "https://raw.githubusercontent.com/Bundy01/meta-blocklists/main/meta-dnsmasq.txt" });
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "FilterListMaintainer",
keyColumns: new[] { "FilterListId", "MaintainerId" },
keyValues: new object[] { 2827, 198 });
migrationBuilder.DeleteData(
table: "FilterListSyntax",
keyColumns: new[] { "FilterListId", "SyntaxId" },
keyValues: new object[] { 2827, (short)20 });
migrationBuilder.DeleteData(
table: "FilterListTag",
keyColumns: new[] { "FilterListId", "TagId" },
keyValues: new object[] { 2827, 19 });
migrationBuilder.DeleteData(
table: "FilterListViewUrl",
keyColumns: new[] { "FilterListId", "Id" },
keyValues: new object[] { 2827, 3218 });
migrationBuilder.DeleteData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2827);
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2731,
column: "Description",
value: "Blocking of Meta Plateforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2732,
column: "Description",
value: "Blocking of Meta Plateforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2733,
column: "Description",
value: "Blocking of Meta Plateforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2734,
column: "Description",
value: "Blocking of Meta Plateforms Domains");
migrationBuilder.UpdateData(
table: "FilterList",
keyColumn: "Id",
keyValue: 2735,
column: "Description",
value: "Blocking of Meta Plateforms Domains");
}
}
}

42
services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs
View file

@ -20169,7 +20169,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
new
{
Id = 2731,
Description = "Blocking of Meta Plateforms Domains",
Description = "Blocking of Meta Platforms Domains",
HomeUrl = "https://github.com/Bundy01/meta-blocklists",
IssuesUrl = "https://github.com/Bundy01/meta-blocklists/issues",
LicenseId = 4,
@ -20178,7 +20178,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
new
{
Id = 2732,
Description = "Blocking of Meta Plateforms Domains",
Description = "Blocking of Meta Platforms Domains",
HomeUrl = "https://github.com/Bundy01/meta-blocklists",
IssuesUrl = "https://github.com/Bundy01/meta-blocklists/issues",
LicenseId = 4,
@ -20187,7 +20187,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
new
{
Id = 2733,
Description = "Blocking of Meta Plateforms Domains",
Description = "Blocking of Meta Platforms Domains",
HomeUrl = "https://github.com/Bundy01/meta-blocklists",
IssuesUrl = "https://github.com/Bundy01/meta-blocklists/issues",
LicenseId = 4,
@ -20196,7 +20196,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
new
{
Id = 2734,
Description = "Blocking of Meta Plateforms Domains",
Description = "Blocking of Meta Platforms Domains",
HomeUrl = "https://github.com/Bundy01/meta-blocklists",
IssuesUrl = "https://github.com/Bundy01/meta-blocklists/issues",
LicenseId = 4,
@ -20205,7 +20205,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
new
{
Id = 2735,
Description = "Blocking of Meta Plateforms Domains",
Description = "Blocking of Meta Platforms Domains",
HomeUrl = "https://github.com/Bundy01/meta-blocklists",
IssuesUrl = "https://github.com/Bundy01/meta-blocklists/issues",
LicenseId = 4,
@ -21033,6 +21033,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
HomeUrl = "https://1275.ru/spisok-aktivnyh-dga-domain-generation-algorithm-domenov/",
LicenseId = 5,
Name = "1275.ru DGA Feed - SharkBot"
},
new
{
Id = 2827,
Description = "Blocking of Meta Platforms Domains",
HomeUrl = "https://github.com/Bundy01/meta-blocklists",
IssuesUrl = "https://github.com/Bundy01/meta-blocklists/issues",
LicenseId = 4,
Name = "Meta Dnsmasq"
});
});
@ -33527,6 +33536,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
{
FilterListId = 2826,
MaintainerId = 206
},
new
{
FilterListId = 2827,
MaintainerId = 198
});
});
@ -45204,6 +45218,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
{
FilterListId = 2826,
SyntaxId = (short)2
},
new
{
FilterListId = 2827,
SyntaxId = (short)20
});
});
@ -61821,6 +61840,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
{
FilterListId = 2826,
TagId = 6
},
new
{
FilterListId = 2827,
TagId = 19
});
});
@ -90749,6 +90773,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
Primariness = (short)1,
SegmentNumber = (short)0,
Url = "https://1275.ru/DGA/sharkbot.txt"
},
new
{
FilterListId = 2827,
Id = 3218,
Primariness = (short)1,
SegmentNumber = (short)0,
Url = "https://raw.githubusercontent.com/Bundy01/meta-blocklists/main/meta-dnsmasq.txt"
});
});

18
services/Directory/data/FilterList.json
View file

@ -17818,7 +17818,7 @@
"submissionUrl": "https://codeberg.org/toastal/github-less-social#pitching-in"
},
{
"description": "Blocking of Meta Plateforms Domains",
"description": "Blocking of Meta Platforms Domains",
"homeUrl": "https://github.com/Bundy01/meta-blocklists",
"id": 2731,
"issuesUrl": "https://github.com/Bundy01/meta-blocklists/issues",
@ -17826,7 +17826,7 @@
"name": "Meta Adblock"
},
{
"description": "Blocking of Meta Plateforms Domains",
"description": "Blocking of Meta Platforms Domains",
"homeUrl": "https://github.com/Bundy01/meta-blocklists",
"id": 2732,
"issuesUrl": "https://github.com/Bundy01/meta-blocklists/issues",
@ -17834,7 +17834,7 @@
"name": "Meta Domains"
},
{
"description": "Blocking of Meta Plateforms Domains",
"description": "Blocking of Meta Platforms Domains",
"homeUrl": "https://github.com/Bundy01/meta-blocklists",
"id": 2733,
"issuesUrl": "https://github.com/Bundy01/meta-blocklists/issues",
@ -17842,7 +17842,7 @@
"name": "Meta Hosts (IPv4 And IPv6)"
},
{
"description": "Blocking of Meta Plateforms Domains",
"description": "Blocking of Meta Platforms Domains",
"homeUrl": "https://github.com/Bundy01/meta-blocklists",
"id": 2734,
"issuesUrl": "https://github.com/Bundy01/meta-blocklists/issues",
@ -17850,7 +17850,7 @@
"name": "Meta Hosts (Only IPv4)"
},
{
"description": "Blocking of Meta Plateforms Domains",
"description": "Blocking of Meta Platforms Domains",
"homeUrl": "https://github.com/Bundy01/meta-blocklists",
"id": 2735,
"issuesUrl": "https://github.com/Bundy01/meta-blocklists/issues",
@ -18588,5 +18588,13 @@
"id": 2826,
"licenseId": 5,
"name": "1275.ru DGA Feed - SharkBot"
},
{
"description": "Blocking of Meta Platforms Domains",
"homeUrl": "https://github.com/Bundy01/meta-blocklists",
"id": 2827,
"issuesUrl": "https://github.com/Bundy01/meta-blocklists/issues",
"licenseId": 4,
"name": "Meta Dnsmasq"
}
]

4
services/Directory/data/FilterListMaintainer.json
View file

@ -6406,5 +6406,9 @@
{
"filterListId": 2826,
"maintainerId": 206
},
{
"filterListId": 2827,
"maintainerId": 198
}
]

4
services/Directory/data/FilterListSyntax.json
View file

@ -9326,5 +9326,9 @@
{
"filterListId": 2826,
"syntaxId": 2
},
{
"filterListId": 2827,
"syntaxId": 20
}
]

4
services/Directory/data/FilterListTag.json
View file

@ -13278,5 +13278,9 @@
{
"filterListId": 2826,
"tagId": 6
},
{
"filterListId": 2827,
"tagId": 19
}
]

6
services/Directory/data/FilterListViewUrl.json
View file

@ -17677,5 +17677,11 @@
"id": 3217,
"primariness": 1,
"url": "https://1275.ru/DGA/sharkbot.txt"
},
{
"filterListId": 2827,
"id": 3218,
"primariness": 1,
"url": "https://raw.githubusercontent.com/Bundy01/meta-blocklists/main/meta-dnsmasq.txt"
}
]

4
services/FilterLists.AppHost/FilterLists.AppHost.csproj
View file

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.0" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="9.4.0" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.1" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="9.4.1" />
</ItemGroup>
</Project>

4
services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj
View file

@ -9,8 +9,8 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.8.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />