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 'upstream/master'

Browse source
This commit is contained in:
Kowith Singkornkeeree 2018-12-07 08:52:52 +07:00
commit 4a52115bb7
15 changed files with 7798 additions and 603 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -1,7 +1,7 @@
dist: trusty
language: csharp
mono: none
dotnet: 2.1.403
dotnet: 2.2.100
solution: FilterLists.sln
addons:
mariadb: '10.3'

4891
data/FilterList.json
View file

File diff suppressed because it is too large Load diff

494
data/FilterListLanguage.json
View file

@ -39,6 +39,22 @@
"filterListId": 20,
"languageId": 44
},
{
"filterListId": 20,
"languageId": 46
},
{
"filterListId": 20,
"languageId": 106
},
{
"filterListId": 20,
"languageId": 137
},
{
"filterListId": 20,
"languageId": 160
},
{
"filterListId": 30,
"languageId": 11
@ -235,10 +251,18 @@
"filterListId": 183,
"languageId": 17
},
{
"filterListId": 197,
"languageId": 31
},
{
"filterListId": 197,
"languageId": 179
},
{
"filterListId": 198,
"languageId": 31
},
{
"filterListId": 198,
"languageId": 179
@ -511,10 +535,6 @@
"filterListId": 326,
"languageId": 141
},
{
"filterListId": 328,
"languageId": 44
},
{
"filterListId": 329,
"languageId": 99
@ -627,10 +647,6 @@
"filterListId": 370,
"languageId": 105
},
{
"filterListId": 386,
"languageId": 46
},
{
"filterListId": 388,
"languageId": 44
@ -1126,5 +1142,465 @@
{
"filterListId": 847,
"languageId": 87
},
{
"filterListId": 868,
"languageId": 141
},
{
"filterListId": 869,
"languageId": 141
},
{
"filterListId": 870,
"languageId": 141
},
{
"filterListId": 871,
"languageId": 141
},
{
"filterListId": 872,
"languageId": 141
},
{
"filterListId": 873,
"languageId": 141
},
{
"filterListId": 874,
"languageId": 141
},
{
"filterListId": 875,
"languageId": 141
},
{
"filterListId": 876,
"languageId": 141
},
{
"filterListId": 877,
"languageId": 141
},
{
"filterListId": 878,
"languageId": 141
},
{
"filterListId": 879,
"languageId": 141
},
{
"filterListId": 880,
"languageId": 141
},
{
"filterListId": 882,
"languageId": 141
},
{
"filterListId": 884,
"languageId": 139
},
{
"filterListId": 885,
"languageId": 10
},
{
"filterListId": 886,
"languageId": 83
},
{
"filterListId": 888,
"languageId": 122
},
{
"filterListId": 889,
"languageId": 110
},
{
"filterListId": 892,
"languageId": 110
},
{
"filterListId": 894,
"languageId": 110
},
{
"filterListId": 895,
"languageId": 79
},
{
"filterListId": 897,
"languageId": 110
},
{
"filterListId": 898,
"languageId": 110
},
{
"filterListId": 901,
"languageId": 110
},
{
"filterListId": 905,
"languageId": 163
},
{
"filterListId": 906,
"languageId": 110
},
{
"filterListId": 907,
"languageId": 110
},
{
"filterListId": 909,
"languageId": 79
},
{
"filterListId": 914,
"languageId": 110
},
{
"filterListId": 915,
"languageId": 110
},
{
"filterListId": 917,
"languageId": 163
},
{
"filterListId": 920,
"languageId": 163
},
{
"filterListId": 921,
"languageId": 110
},
{
"filterListId": 924,
"languageId": 110
},
{
"filterListId": 925,
"languageId": 163
},
{
"filterListId": 926,
"languageId": 79
},
{
"filterListId": 928,
"languageId": 110
},
{
"filterListId": 930,
"languageId": 79
},
{
"filterListId": 931,
"languageId": 163
},
{
"filterListId": 932,
"languageId": 110
},
{
"filterListId": 933,
"languageId": 79
},
{
"filterListId": 935,
"languageId": 79
},
{
"filterListId": 940,
"languageId": 110
},
{
"filterListId": 942,
"languageId": 79
},
{
"filterListId": 943,
"languageId": 122
},
{
"filterListId": 944,
"languageId": 79
},
{
"filterListId": 945,
"languageId": 79
},
{
"filterListId": 952,
"languageId": 163
},
{
"filterListId": 953,
"languageId": 163
},
{
"filterListId": 954,
"languageId": 163
},
{
"filterListId": 957,
"languageId": 122
},
{
"filterListId": 963,
"languageId": 110
},
{
"filterListId": 964,
"languageId": 163
},
{
"filterListId": 965,
"languageId": 110
},
{
"filterListId": 967,
"languageId": 110
},
{
"filterListId": 970,
"languageId": 163
},
{
"filterListId": 971,
"languageId": 110
},
{
"filterListId": 972,
"languageId": 79
},
{
"filterListId": 976,
"languageId": 110
},
{
"filterListId": 979,
"languageId": 122
},
{
"filterListId": 980,
"languageId": 110
},
{
"filterListId": 984,
"languageId": 163
},
{
"filterListId": 985,
"languageId": 141
},
{
"filterListId": 986,
"languageId": 110
},
{
"filterListId": 987,
"languageId": 122
},
{
"filterListId": 989,
"languageId": 110
},
{
"filterListId": 996,
"languageId": 122
},
{
"filterListId": 1002,
"languageId": 163
},
{
"filterListId": 1005,
"languageId": 163
},
{
"filterListId": 1007,
"languageId": 122
},
{
"filterListId": 1009,
"languageId": 163
},
{
"filterListId": 1010,
"languageId": 79
},
{
"filterListId": 1014,
"languageId": 110
},
{
"filterListId": 1015,
"languageId": 122
},
{
"filterListId": 1021,
"languageId": 163
},
{
"filterListId": 1022,
"languageId": 110
},
{
"filterListId": 1024,
"languageId": 163
},
{
"filterListId": 1025,
"languageId": 110
},
{
"filterListId": 1026,
"languageId": 110
},
{
"filterListId": 1027,
"languageId": 110
},
{
"filterListId": 1028,
"languageId": 110
},
{
"filterListId": 1030,
"languageId": 122
},
{
"filterListId": 1032,
"languageId": 110
},
{
"filterListId": 1033,
"languageId": 122
},
{
"filterListId": 1034,
"languageId": 79
},
{
"filterListId": 1038,
"languageId": 110
},
{
"filterListId": 1042,
"languageId": 122
},
{
"filterListId": 1046,
"languageId": 163
},
{
"filterListId": 1047,
"languageId": 110
},
{
"filterListId": 1054,
"languageId": 122
},
{
"filterListId": 1055,
"languageId": 163
},
{
"filterListId": 1064,
"languageId": 110
},
{
"filterListId": 1067,
"languageId": 79
},
{
"filterListId": 1069,
"languageId": 122
},
{
"filterListId": 1071,
"languageId": 83
},
{
"filterListId": 1073,
"languageId": 122
},
{
"filterListId": 1082,
"languageId": 110
},
{
"filterListId": 1086,
"languageId": 110
},
{
"filterListId": 1087,
"languageId": 110
},
{
"filterListId": 1088,
"languageId": 110
},
{
"filterListId": 1090,
"languageId": 122
},
{
"filterListId": 1091,
"languageId": 110
},
{
"filterListId": 1092,
"languageId": 110
},
{
"filterListId": 1093,
"languageId": 79
},
{
"filterListId": 1096,
"languageId": 79
},
{
"filterListId": 1098,
"languageId": 163
},
{
"filterListId": 1099,
"languageId": 122
},
{
"filterListId": 1101,
"languageId": 110
},
{
"filterListId": 1104,
"languageId": 141
},
{
"filterListId": 1105,
"languageId": 141
},
{
"filterListId": 1106,
"languageId": 141
},
{
"filterListId": 1123,
"languageId": 141
},
{
"filterListId": 1124,
"languageId": 141
},
{
"filterListId": 1162,
"languageId": 141
}
]
]

1464
data/FilterListMaintainer.json
View file

File diff suppressed because it is too large Load diff

1468
data/FilterListTag.json
View file

File diff suppressed because it is too large Load diff

24
data/Language.json
View file

@ -229,16 +229,6 @@
"localName": "ꆈꌠ꒿ Nuosuhxop",
"name": "Nuosu"
},
{
"id": 24,
"iso6391": "nn",
"iso6392": "nno",
"iso6392B": "nno",
"iso6392T": "nno",
"iso6393": "nno",
"localName": "Norsk (Nynorsk)",
"name": "Norwegian Nynorsk"
},
{
"id": 25,
"iso6391": "lt",
@ -419,16 +409,6 @@
"localName": "Owambo",
"name": "Ndonga"
},
{
"id": 43,
"iso6391": "nb",
"iso6392": "nob",
"iso6392B": "nob",
"iso6392T": "nob",
"iso6393": "nob",
"localName": "Norsk (Bokmål)",
"name": "Norwegian Bokmål"
},
{
"id": 44,
"iso6391": "no",
@ -717,7 +697,7 @@
"iso6392T": "gla",
"iso6393": "gla",
"localName": "Gàidhlig",
"name": "Gaelic"
"name": "Scottish Gaelic"
},
{
"id": 73,
@ -1839,4 +1819,4 @@
"localName": "isiZulu",
"name": "Zulu"
}
]
]

16
data/Maintainer.json
View file

@ -551,5 +551,21 @@
"id": 107,
"homeUrl": "https://github.com/bogachenko",
"name": "Bogachenko Vyacheslav"
},
{
"id": 108,
"emailAddress": "nolamiller1203+githubmochifilter@gmail.com",
"homeUrl": "https://pokapoka.shoooter.net/",
"name": "eEIi0A5L",
"twitterHandle": "mochi_adfilter"
},
{
"id": 109,
"name": "deathbybandaid"
},
{
"id": 110,
"homeUrl": "https://akamaru.de/",
"name": "Akamaru"
}
]

6
scripts/deploy.sh
View file

@ -4,16 +4,16 @@
sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/data/ $FTP_USER@$FTP_HOST:$FTP_DIR
#deploy Agent
sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Agent/bin/Release/netcoreapp2.1/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Agent/bin/Release/netcoreapp2.2/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
#deploy API
sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl stop filterlists.api.service'
sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp2.1/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp2.2/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl start filterlists.api.service'
#deploy Web
sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl stop filterlists.web.service'
sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Web/bin/Release/netcoreapp2.1/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Web/bin/Release/netcoreapp2.2/ubuntu.18.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR
sshpass -p $FTP_PASSWORD ssh -o StrictHostKeyChecking=no $FTP_USER@$FTP_HOST 'sudo systemctl start filterlists.web.service'
#purge CDN

10
src/FilterLists.Agent/FilterLists.Agent.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>latest</LangVersion>
<RuntimeIdentifiers>ubuntu.18.04-x64</RuntimeIdentifiers>
@ -22,10 +22,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
</ItemGroup>
<ItemGroup>

6
src/FilterLists.Api/FilterLists.Api.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>latest</LangVersion>
<RuntimeIdentifiers>ubuntu.18.04-x64</RuntimeIdentifiers>
@ -36,10 +36,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Humanizer.Core" Version="2.5.1" />
<PackageReference Include="Humanizer.Core" Version="2.5.16" />
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="2.3.0" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />

4
src/FilterLists.Data/FilterLists.Data.csproj
View file

@ -21,11 +21,11 @@
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.2">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
</ItemGroup>
</Project>

2
src/FilterLists.Services/FilterLists.Services.csproj
View file

@ -19,7 +19,7 @@
<ItemGroup>
<PackageReference Include="AutoMapper" Version="8.0.0" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="5.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />

4
src/FilterLists.Web/FilterLists.Web.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>latest</LangVersion>
<RuntimeIdentifiers>ubuntu.18.04-x64</RuntimeIdentifiers>
@ -24,7 +24,7 @@
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
</ItemGroup>

6
tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>latest</LangVersion>
<Authors>Collin M. Barrett</Authors>
@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
<PackageReference Include="coverlet.msbuild" Version="2.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
@ -25,7 +25,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.4">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>latest</LangVersion>
<Authors>Collin M. Barrett</Authors>
@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
<PackageReference Include="coverlet.msbuild" Version="2.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>