diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 3f0da6da9b8d..d87bbef3f5c8 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -20kdc, 4dplanner, aaronmell, Absolute-Potato, Acruid, actioninja, actually-reb, aeosynth, AJCM-git, Alainx277, ALMv1, AlphaQwerty, ancientpower, areitpog, artak10t, as334, asperger-sind, AugustEymann, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, bhespiritu, BingoJohnson, bloodrizer, BobdaBiscuit, boiled-water-tsar, Brian-Archambault, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, CakeQ, Capnsockless, Carou02, CatTheSystem, CC-4477, Centronias, chairbender, Charlese2, cheesePizza2, clement-or, clusterfack, clyfordv, Clyybber, ColdAutumnRain, collinlunn, ComicIronic, creadth, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DamianX, daniel-cr, Decappi, Delete69, DelleVelleD, Dezandor, DmitriyZodiak, DogZeroX, drongood12, DrSmugleaf, DTanxxx, DubiousDoggo, Efruit, ElectroJr, Elijahrane, elthundercloud, Emisse, EmoGarbage404, Ephememory, esguard, exp111, Fiftyllama, FirinMaLazors, Fishfish458, Fogapod, FoLoKe, Fortune117, Fouin, freeman2651, GalacticChimp, gbasood, Git-Nivrak, gituhabu, h3half, halworsen, Hardly3D, harikattar, HoofedEar, hubismal, Hugal31, iczero, ike709, Injazz, InquisitivePenguin, Insineer, j-giebel, Jackw2As, janekvap, Jaskanbe, JasperJRoth, JiimBob, JohnGinnane, johnku1, juliangiebel, JustinTether, JustinTrotter, KaiShibaa, kalanosh, keronshb, kira-er, Kmc2000, komunre, lajolico, Lamrr, lapatison, Leander-0, LetterN, LittleBuilderJane, localcc, lvvova1, lzimann, Macoron, ManelNavola, Markek1, Matz05, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, metalgearsloth, michaelcooke, micheel665, Miniwoffer, Mirino97, mirrorcult, misnor, Mith-randalf, MLGTASTICa, Moneyl, moonheart08, Morb0, N3X15, namespace-Memory, NickPowers43, Nirnael, NIXC, nuke-haus, Nukeuler123, nullarmo, Pangogie, Partmedia, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PetMudstone, Phantom-Lily, Pill-U, Pireax, PJB3005, Plasmaguy, plinyvic, pointer-to-null, ProfanedBane, PrPleGoo, psykzz, Putnam3145, Radosvik, Radrark, RedlineTriad, RednoWCirabrab, Rember, RemieRichards, remove32, RemTim, renodubois, retequizzle, Rich-Dunne, rneuser, Rohesie, rok-povsic, RomanNovo, Saakra, SamV522, SaphireLattice, ScalyChimp, scrato, ScumbagDog, Serkket, SethLafuente, sewerpig, ShadowCommander, shaeone, SignalWalker, Silvertorch5, sirsikes777, Snowni, SoulSloth, Soundwavesghost, Soupstraw, SpaceManiac, SplinterGP, spoogemonster, StanberyTrask, StrawberryMoses, StStevens, SweptWasTaken, Szunti, TaralGit, TemporalOroboros, tentekal, thatrandomcanadianguy, TheCze, TheDarkElites, theOperand, thevinter, TimrodDX, tkdrg, tmtmtl30, Tomeno, Tyler-IN, UKNOWH, UnderscoreX5, UristMcContributor, UristMcDorf, Venomii, Veritius, Visne, volundr-, vulppine, Watermelon914, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, Ygg01, YotaXP, youarereadingthis, zach-hill, zamp, ZelteHonor, ZeroDayDaemon, ZeWaka, zionnBE, zlodo, ZNixian, Zth--, Zumorica, Zymem +20kdc, 4dplanner, aaronmell, Absolute-Potato, Acruid, actioninja, actually-reb, aeosynth, AJCM-git, Alainx277, ALMv1, AlphaQwerty, ancientpower, areitpog, artak10t, as334, asperger-sind, AugustEymann, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, bhespiritu, BingoJohnson, bloodrizer, BobdaBiscuit, boiled-water-tsar, Brian-Archambault, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, CakeQ, Capnsockless, Carou02, CatTheSystem, CC-4477, Centronias, chairbender, Charlese2, cheesePizza2, clement-or, clusterfack, clyfordv, Clyybber, ColdAutumnRain, collinlunn, ComicIronic, creadth, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, DamianX, daniel-cr, Decappi, Delete69, DelleVelleD, Dezandor, DmitriyZodiak, DogZeroX, drongood12, DrSmugleaf, DTanxxx, DubiousDoggo, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Ephememory, esguard, exp111, Fiftyllama, FirinMaLazors, Fishfish458, Fogapod, FoLoKe, Fortune117, Fouin, freeman2651, GalacticChimp, gbasood, Git-Nivrak, gituhabu, h3half, halworsen, Hardly3D, harikattar, HoofedEar, hubismal, Hugal31, iczero, ike709, Injazz, InquisitivePenguin, Insineer, j-giebel, Jackw2As, janekvap, Jaskanbe, JasperJRoth, JiimBob, JohnGinnane, johnku1, juliangiebel, JustinTether, JustinTrotter, KaiShibaa, kalanosh, keronshb, kira-er, Kmc2000, komunre, lajolico, Lamrr, lapatison, Leander-0, LetterN, LittleBuilderJane, localcc, lvvova1, lzimann, Macoron, ManelNavola, Markek1, Matz05, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, metalgearsloth, michaelcooke, micheel665, Miniwoffer, Mirino97, mirrorcult, misnor, Mith-randalf, MLGTASTICa, Moneyl, moony, Morb0, N3X15, namespace-Memory, NickPowers43, Nirnael, NIXC, nuke-haus, Nukeuler123, nullarmo, Pangogie, Partmedia, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PetMudstone, Phantom-Lily, Pill-U, Pireax, PJB3005, Plasmaguy, plinyvic, pointer-to-null, ProfanedBane, PrPleGoo, psykzz, Putnam3145, Radosvik, Radrark, Rane, RedlineTriad, RednoWCirabrab, Rember, RemieRichards, remove32, RemTim, renodubois, retequizzle, Rich-Dunne, rneuser, Rohesie, rok-povsic, RomanNovo, Saakra, SamV522, SaphireLattice, ScalyChimp, scrato, ScumbagDog, Serkket, SethLafuente, sewerpig, ShadowCommander, shaeone, SignalWalker, Silvertorch5, sirsikes777, Snowni, SoulSloth, Soundwavesghost, Soupstraw, SpaceManiac, SplinterGP, spoogemonster, StanberyTrask, StrawberryMoses, StStevens, SweptWasTaken, Szunti, TaralGit, TemporalOroboros, tentekal, thatrandomcanadianguy, TheCze, TheDarkElites, theOperand, thevinter, TimrodDX, tkdrg, tmtmtl30, Tomeno, Tyler-IN, UKNOWH, UnderscoreX5, UristMcContributor, UristMcDorf, Venomii, Veritius, Visne, volundr-, vulppine, Watermelon914, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, Ygg01, YotaXP, youarereadingthis, zach-hill, zamp, ZelteHonor, ZeWaka, zionnBE, zlodo, ZNixian, Zth--, Zumorica, Zymem diff --git a/Tools/contribs_shared.ps1 b/Tools/contribs_shared.ps1 new file mode 100644 index 000000000000..b2847d320b8a --- /dev/null +++ b/Tools/contribs_shared.ps1 @@ -0,0 +1,12 @@ +$replacements = @{ + "moonheart08" = "moony" + "Elijahrane" = "Rane" + "ZeroDayDaemon" = "Daemon" + "ElectroJr" = "ElectroSR" +} + +$ignore = @{ + "PJBot" = $true + "ZDDM" = $true + "TYoung86" = $true +} diff --git a/Tools/dump_contributors_since.ps1 b/Tools/dump_contributors_since.ps1 index 680e09e52397..c4ee7d574d34 100644 --- a/Tools/dump_contributors_since.ps1 +++ b/Tools/dump_contributors_since.ps1 @@ -8,16 +8,8 @@ param( [Nullable[DateTime]]$until); -$replacements = @{ - "moonheart08" = "moony" - "Elijahrane" = "Rane" - "ZeroDayDaemon" = "Daemon" - "ElectroJr" = "ElectroSR" -} - -$ignore = @{ - "PJBot" = $true -} +$scriptDir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent +. $(join-path $scriptDir contribs_shared.ps1) $engine = & "$PSScriptRoot\dump_commits_since.ps1" -repo space-wizards/RobustToolbox -since $since -until $until $content = & "$PSScriptRoot\dump_commits_since.ps1" -repo space-wizards/space-station-14 -since $since -until $until diff --git a/Tools/dump_github_contributors.ps1 b/Tools/dump_github_contributors.ps1 index 9b548282c298..51d8612b28ad 100755 --- a/Tools/dump_github_contributors.ps1 +++ b/Tools/dump_github_contributors.ps1 @@ -1,8 +1,7 @@ #!/usr/bin/env pwsh -# TODO: This is definitely gonna stop being accurate when we get above 100 contributors on one of the repos. -$engineJson = (Invoke-WebRequest "https://api.github.com/repos/space-wizards/RobustToolbox/contributors?per_page=100").Content | convertfrom-json -$contentJson = (Invoke-WebRequest "https://api.github.com/repos/space-wizards/space-station-14/contributors?per_page=100").Content | convertfrom-json +$scriptDir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent +. $(join-path $scriptDir contribs_shared.ps1) function load_contribs([string] $repo) { @@ -30,11 +29,9 @@ function load_contribs([string] $repo) $engineJson = load_contribs("space-wizards/RobustToolbox") $contentJson = load_contribs("space-wizards/space-station-14") -$scriptDir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$bad = get-content $(join-path $scriptDir "ignored_github_contributors.txt") - ($engineJson).login + ($contentJson).login ` | select -unique ` - | where { $bad -notcontains $_ } ` + | Where-Object { -not $ignore[$_] }` + | ForEach-Object { if($replacements[$_] -eq $null){ $_ } else { $replacements[$_] }} ` | Sort-object ` | Join-String -Separator ", " diff --git a/Tools/ignored_github_contributors.txt b/Tools/ignored_github_contributors.txt deleted file mode 100644 index 43efdba4c17d..000000000000 --- a/Tools/ignored_github_contributors.txt +++ /dev/null @@ -1,3 +0,0 @@ -ZDDM -TYoung86 -PJBot